diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-25 02:06:41 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-25 02:06:41 +0300 |
commit | 2b158861a3a516dd8f4dac73f8984230f02bc9de (patch) | |
tree | 9f53ceec22962a730b3ca50c1f252ec71c5a26e6 /source/blender/collada/AnimationExporter.h | |
parent | 94eb1897523d4cf464ea0cdf90ccbd7db90f997d (diff) | |
parent | d91f2ac37aa02d96a00d116fa55cdc9f55afd32c (diff) |
merged collada rework from master into blender 2.8
Diffstat (limited to 'source/blender/collada/AnimationExporter.h')
-rw-r--r-- | source/blender/collada/AnimationExporter.h | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index 5af5d884455..3bb510e51d6 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -91,9 +91,11 @@ private: public: AnimationExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings): - COLLADASW::LibraryAnimations(sw), export_settings(export_settings) - { this->sw = sw; } - + COLLADASW::LibraryAnimations(sw), + export_settings(export_settings) + { + this->sw = sw; + } bool exportAnimations(const struct EvaluationContext *eval_ctx, Scene *sce); @@ -103,7 +105,6 @@ public: protected: const ExportSettings *export_settings; - void dae_animation(Object *ob, FCurve *fcu, char *transformName, bool is_param, Material *ma = NULL); void export_object_constraint_animation(Object *ob); @@ -144,7 +145,15 @@ protected: float* get_eul_source_for_quat(Object *ob ); + 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 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); + std::string create_source_from_fcurve(COLLADASW::InputSemantic::Semantics semantic, FCurve *fcu, const std::string& anim_id, const char *axis_name); + std::string create_source_from_fcurve(COLLADASW::InputSemantic::Semantics semantic, FCurve *fcu, const std::string& anim_id, const char *axis_name, Object *ob); std::string create_lens_source_from_fcurve(Camera *cam, COLLADASW::InputSemantic::Semantics semantic, FCurve *fcu, const std::string& anim_id); @@ -165,8 +174,10 @@ protected: std::string get_light_param_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis); std::string get_camera_param_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis); - void find_frames(Object *ob, std::vector<float> &fra, const char *prefix, const char *tm_name); - void find_frames(Object *ob, std::vector<float> &fra); + void find_keyframes(Object *ob, std::vector<float> &fra, const char *prefix, const char *tm_name); + void find_keyframes(Object *ob, std::vector<float> &fra); + void find_sampleframes(Object *ob, std::vector<float> &fra); + void make_anim_frames_from_targets(Object *ob, std::vector<float> &frames ); @@ -187,6 +198,6 @@ protected: bool validateConstraints(bConstraint *con); - void calc_ob_mat_at_time(Object *ob, float ctime , float mat[][4]); + //void calc_obmat_at_time(Object *ob, float ctime); }; |