diff options
author | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-07-09 19:15:17 +0400 |
---|---|---|
committer | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-07-09 19:15:17 +0400 |
commit | eb452225cec986e44f049d0cd42e862be13e4126 (patch) | |
tree | d52bbf65a72fb56d6af150223e8dddbf5748bc2b /source/blender/collada/AnimationImporter.h | |
parent | 767c7f24dd277fa1d8e97f02fcddb08cd6f25234 (diff) |
Improvements to import system. Ability to include more parameters.
Diffstat (limited to 'source/blender/collada/AnimationImporter.h')
-rw-r--r-- | source/blender/collada/AnimationImporter.h | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 138d932cdbf..037ae04a0b4 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -85,17 +85,41 @@ private: void add_fcurves_to_object(Object *ob, std::vector<FCurve*>& curves, char *rna_path, int array_index, Animation *animated); int typeFlag; - + + enum lightAnim + { +// INANIMATE = 0, + LIGHT_COLOR = 2, + LIGHT_FOA = 4, + LIGHT_FOE = 8 + }; + + enum cameraAnim + { +// INANIMATE = 0, + CAMERA_XFOV = 2, + CAMERA_XMAG = 4 + }; + enum AnimationType { INANIMATE = 0, NODE_TRANSFORM = 1, - LIGHT_COLOR = 2, + /* LIGHT_COLOR = 2, LIGHT_FOA = 4, LIGHT_FOE = 8, CAMERA_XFOV = 16, - CAMERA_XMAG = 32 + CAMERA_XMAG = 32*/ }; + + struct AnimMix + { + int transform; + int light; + int camera; + int material; + int texture; + }; public: AnimationImporter(UnitConverter *conv, ArmatureImporter *arm, Scene *scene); @@ -117,7 +141,7 @@ public: std::map<COLLADAFW::UniqueId, Object*>& object_map , std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map); - int get_animation_type( const COLLADAFW::Node * node , std::map<COLLADAFW::UniqueId,const COLLADAFW::Object*> FW_object_map ) ; + AnimMix* get_animation_type( const COLLADAFW::Node * node , std::map<COLLADAFW::UniqueId,const COLLADAFW::Object*> FW_object_map ) ; void Assign_transform_animations(COLLADAFW::Transformation* transform , |