diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-01-21 17:45:49 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-01-21 17:45:49 +0400 |
commit | c263753d1770b5b812ea0e5c38174fa296492e2f (patch) | |
tree | fecb2a493596b9078e36c43d723d527e172a9546 /source/blender/collada/ArmatureImporter.h | |
parent | 7d286d9a8096438e7a197a2a3f365fbb9df6a0b1 (diff) |
Added gsoc-2012 collada improvements from bratwurst branch
Diffstat (limited to 'source/blender/collada/ArmatureImporter.h')
-rw-r--r-- | source/blender/collada/ArmatureImporter.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index bb710f09490..b07edfbf34d 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -29,13 +29,16 @@ #include "COLLADAFWNode.h" #include "COLLADAFWUniqueId.h" +#include "COLLADAFWMorphController.h" extern "C" { #include "BKE_context.h" +#include "BKE_key.h" #include "DNA_armature_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_key_types.h" #include "ED_armature.h" } @@ -88,6 +91,7 @@ private: std::map<COLLADAFW::UniqueId, COLLADAFW::Node*> joint_by_uid; // contains all joints std::vector<COLLADAFW::Node*> root_joints; std::vector<COLLADAFW::Node*> finished_joints; + std::vector<COLLADAFW::MorphController*> morph_controllers; std::map<COLLADAFW::UniqueId, Object*> joint_parent_map; std::map<COLLADAFW::UniqueId, Object*> unskinned_armature_map; @@ -103,12 +107,9 @@ private: JointData *get_joint_data(COLLADAFW::Node *node); #endif - void create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBone *parent, int totchild, + void create_bone(SkinInfo* skin, COLLADAFW::Node *node, EditBone *parent, int totchild, float parent_mat[4][4], bArmature *arm); - void create_unskinned_bone(COLLADAFW::Node *node, EditBone *parent, int totchild, - float parent_mat[4][4], Object * ob_arm); - void add_leaf_bone(float mat[4][4], EditBone *bone, COLLADAFW::Node * node); void fix_leaf_bones(); @@ -140,9 +141,6 @@ public: ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, AnimationImporterBase *anim, Scene *sce); ~ArmatureImporter(); - // root - if this joint is the top joint in hierarchy, if a joint - // is a child of a node (not joint), root should be true since - // this is where we build armature bones from void add_joint(COLLADAFW::Node *node, bool root, Object *parent, Scene *sce); #if 0 @@ -152,6 +150,8 @@ public: // here we add bones to armatures, having armatures previously created in write_controller void make_armatures(bContext *C); + void make_shape_keys(); + #if 0 // link with meshes, create vertex groups, assign weights void link_armature(Object *ob_arm, const COLLADAFW::UniqueId& geom_id, const COLLADAFW::UniqueId& controller_data_id); |