diff options
Diffstat (limited to 'source/blender/collada/DocumentImporter.h')
| -rw-r--r-- | source/blender/collada/DocumentImporter.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index d54b8db9f00..ff0cbd44043 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -40,11 +40,14 @@ #include "BKE_object.h" +#include "BKE_constraint.h" #include "TransformReader.h" #include "AnimationImporter.h" #include "ArmatureImporter.h" +#include "ControllerExporter.h" #include "MeshImporter.h" +#include "ImportSettings.h" @@ -61,7 +64,7 @@ public: Controller, //!< Second pass to collect controller data }; /** Constructor */ - DocumentImporter(bContext *C, const char *filename); + DocumentImporter(bContext *C, const ImportSettings *import_settings); /** Destructor */ ~DocumentImporter(); @@ -73,9 +76,11 @@ public: Object* create_camera_object(COLLADAFW::InstanceCamera*, Scene*); Object* create_lamp_object(COLLADAFW::InstanceLight*, Scene*); Object* create_instance_node(Object*, COLLADAFW::Node*, COLLADAFW::Node*, Scene*, bool); - void write_node(COLLADAFW::Node*, COLLADAFW::Node*, Scene*, Object*, bool); + void create_constraints(ExtraTags *et, Object *ob); + std::vector<Object *> *write_node(COLLADAFW::Node*, COLLADAFW::Node*, Scene*, Object*, bool); MTex* create_texture(COLLADAFW::EffectCommon*, COLLADAFW::Texture&, Material*, int, TexIndexTextureArrayMap&); void write_profile_COMMON(COLLADAFW::EffectCommon*, Material*); + void translate_anim_recursive(COLLADAFW::Node*, COLLADAFW::Node*, Object*); /** @@ -128,11 +133,15 @@ public: /** Get an extisting ExtraTags for uid */ ExtraTags* getExtraTags(const COLLADAFW::UniqueId &uid); + bool is_armature(COLLADAFW::Node * node); + + + private: + const ImportSettings *import_settings; /** Current import stage we're in. */ ImportStage mImportStage; - std::string mFilename; bContext *mContext; |