diff options
author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 04:24:21 +0000 |
---|---|---|
committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 04:24:21 +0000 |
commit | 34f464fb752432829a22a30767b66eb5c24a2242 (patch) | |
tree | 93545e6e6f56e7151ae8bc5100accf0998c262ad /o3d/import/cross/collada.h | |
parent | e8b80d819b7d1888e10f5cfef75bfeff0f5d3b03 (diff) | |
download | chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.zip chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.tar.gz chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.tar.bz2 |
Add o3djs.DestinationBuffer to converter.
I named it o3djs.DestinationBuffer because it has nothing to do
with O3D. It's purely part of our sample serialization example.
Review URL: http://codereview.chromium.org/149236
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import/cross/collada.h')
-rw-r--r-- | o3d/import/cross/collada.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/o3d/import/cross/collada.h b/o3d/import/cross/collada.h index a3aa963..77382d8 100644 --- a/o3d/import/cross/collada.h +++ b/o3d/import/cross/collada.h @@ -66,6 +66,7 @@ class FilePath; namespace o3d { +class ClassManager; class ColladaZipArchive; class Effect; class IErrorStatus; @@ -221,6 +222,9 @@ class Collada { std::vector<FilePath> GetOriginalDataFilenames() const; const std::string& GetOriginalData(const FilePath& filename) const; + // Init the Collada Importer. + static void Init(ServiceLocator* service_locator); + private: // Imports the given ZIP file into the given pack. bool ImportZIP(const FilePath& filename, Transform* parent, @@ -244,7 +248,7 @@ class Collada { // Recursively imports a tree of nodes from FCollada, rooted at the // given node, into the O3D scene. - void ImportTree(NodeInstance *instance, + bool ImportTree(NodeInstance *instance, Transform* parent, ParamFloat* animation_input); @@ -252,7 +256,7 @@ class Collada { // rooted at the given node, into the O3D scene. This is a separate step // from ImportTree because various kinds of instances can reference other // parts of the tree. - void ImportTreeInstances(FCDocument* doc, + bool ImportTreeInstances(FCDocument* doc, NodeInstance* instance); bool BuildFloatAnimation(ParamFloat* result, |