diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-27 00:49:30 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-27 00:49:30 +0300 |
commit | f228a08d027ef700344d35f1ba958249afa93222 (patch) | |
tree | fc6c60d89f911bcb0c5019e2e6e4243e49cba9af /source/blender/collada/AnimationExporter.h | |
parent | e94276d4033c72000942a49100e552e800d09e58 (diff) | |
parent | 7dd0e36dc4582e57a3f5235f384b5207882c923e (diff) |
merge from master
Diffstat (limited to 'source/blender/collada/AnimationExporter.h')
-rw-r--r-- | source/blender/collada/AnimationExporter.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index 3bb510e51d6..1e0f434ca13 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -85,7 +85,7 @@ class AnimationExporter: COLLADASW::LibraryAnimations { private: Scene *scene; - const struct EvaluationContext *eval_ctx; + EvaluationContext *eval_ctx; COLLADASW::StreamWriter *sw; public: @@ -97,7 +97,7 @@ public: this->sw = sw; } - bool exportAnimations(const struct EvaluationContext *eval_ctx, Scene *sce); + bool exportAnimations(EvaluationContext *eval_ctx, Scene *sce); // called for each exported object void operator() (Object *ob); @@ -145,9 +145,12 @@ protected: float* get_eul_source_for_quat(Object *ob ); + bool is_flat_line(std::vector<float> &values, int channel_count); void export_keyframed_animation_set(Object *ob); void create_keyframed_animation(Object *ob, FCurve *fcu, char *transformName, bool is_param, Material *ma = NULL); void export_sampled_animation_set(Object *ob); + void export_sampled_transrotloc_animation(Object *ob, std::vector<float> &ctimes); + void export_sampled_matrix_animation(Object *ob, std::vector<float> &ctimes); void create_sampled_animation(int channel_count, std::vector<float> ×, std::vector<float> &values, std::string, std::string label, std::string axis_name, bool is_rot); void evaluate_anim_with_constraints(Object *ob, float ctime); @@ -162,7 +165,7 @@ protected: std::string create_source_from_vector(COLLADASW::InputSemantic::Semantics semantic, std::vector<float> &fra, bool is_rot, const std::string& anim_id, const char *axis_name); std::string create_xyz_source(float *v, int tot, const std::string& anim_id); - + std::string create_4x4_source(std::vector<float> ×, std::vector<float> &values, const std::string& anim_id); std::string create_4x4_source(std::vector<float> &frames, Object * ob_arm, Bone *bone, const std::string& anim_id); std::string create_interpolation_source(FCurve *fcu, const std::string& anim_id, const char *axis_name, bool *has_tangents); |