diff options
-rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/ExtraHandler.cpp | 4 | ||||
-rw-r--r-- | source/blender/collada/ExtraHandler.h | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 27442420f90..a4d1c1b451f 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -116,7 +116,7 @@ bool DocumentImporter::import() /** TODO Add error handler (implement COLLADASaxFWL::IErrorHandler */ COLLADASaxFWL::Loader loader; COLLADAFW::Root root(&loader, this); - ExtraHandler *ehandler = new ExtraHandler(this); + ExtraHandler *ehandler = new ExtraHandler(this, &(this->anim_importer)); loader.registerExtraDataCallbackHandler(ehandler); diff --git a/source/blender/collada/ExtraHandler.cpp b/source/blender/collada/ExtraHandler.cpp index 9999a61a470..a60ef8b2ea5 100644 --- a/source/blender/collada/ExtraHandler.cpp +++ b/source/blender/collada/ExtraHandler.cpp @@ -31,9 +31,10 @@ #include "ExtraHandler.h" -ExtraHandler::ExtraHandler(DocumentImporter *dimp) : currentExtraTags(0) +ExtraHandler::ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp) : currentExtraTags(0) { this->dimp = dimp; + this->aimp = aimp; } ExtraHandler::~ExtraHandler() {} @@ -42,6 +43,7 @@ bool ExtraHandler::elementBegin( const char* elementName, const char** attribute { // \todo attribute handling for profile tags currentElement = std::string(elementName); + //addToSidTree(attributes[0], attributes[1]); return true; } diff --git a/source/blender/collada/ExtraHandler.h b/source/blender/collada/ExtraHandler.h index de3b063290d..7296aaf1eb4 100644 --- a/source/blender/collada/ExtraHandler.h +++ b/source/blender/collada/ExtraHandler.h @@ -32,8 +32,10 @@ #include <algorithm> // sort() #include "COLLADASaxFWLIExtraDataCallbackHandler.h" +#include "COLLADASaxFWLFilePartLoader.h" #include "DocumentImporter.h" +#include "AnimationImporter.h" /** \brief Handler class for <extra> data, through which different * profiles can be handled @@ -42,7 +44,7 @@ class ExtraHandler : public COLLADASaxFWL::IExtraDataCallbackHandler { public: /** Constructor. */ - ExtraHandler(DocumentImporter *dimp); + ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp); /** Destructor. */ virtual ~ExtraHandler(); @@ -69,6 +71,7 @@ private: /** Handle to DocumentImporter for interface to extra element data saving. */ DocumentImporter* dimp; + AnimationImporter* aimp; /** Holds Id of element for which <extra> XML elements are handled. */ COLLADAFW::UniqueId currentUid; ExtraTags* currentExtraTags; |