diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
| commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
| tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/collada/TransformReader.h | |
| parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) | |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/collada/TransformReader.h')
| -rw-r--r-- | source/blender/collada/TransformReader.h | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/source/blender/collada/TransformReader.h b/source/blender/collada/TransformReader.h index 36d994c9487..6add2950c06 100644 --- a/source/blender/collada/TransformReader.h +++ b/source/blender/collada/TransformReader.h @@ -37,31 +37,36 @@ //struct Object; -class TransformReader -{ -protected: +class TransformReader { + protected: + UnitConverter *unit_converter; - UnitConverter *unit_converter; + public: + struct Animation { + Object *ob; + COLLADAFW::Node *node; + COLLADAFW::Transformation *tm; // which transform is animated by an AnimationList->id + }; -public: - struct Animation { - Object *ob; - COLLADAFW::Node *node; - COLLADAFW::Transformation *tm; // which transform is animated by an AnimationList->id - }; + TransformReader(UnitConverter *conv); - TransformReader(UnitConverter *conv); + void get_node_mat(float mat[4][4], + COLLADAFW::Node *node, + std::map<COLLADAFW::UniqueId, Animation> *animation_map, + Object *ob); + void get_node_mat(float mat[4][4], + COLLADAFW::Node *node, + std::map<COLLADAFW::UniqueId, Animation> *animation_map, + Object *ob, + float parent_mat[4][4]); - void get_node_mat(float mat[4][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob); - void get_node_mat(float mat[4][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob, float parent_mat[4][4]); - - void dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); - void dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); - void dae_scale_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); - void dae_matrix_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); - void dae_translate_to_v3(COLLADAFW::Transformation *tm, float v[3]); - void dae_scale_to_v3(COLLADAFW::Transformation *tm, float v[3]); - void dae_vector3_to_v3(const COLLADABU::Math::Vector3 &v3, float v[3]); + void dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); + void dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); + void dae_scale_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); + void dae_matrix_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); + void dae_translate_to_v3(COLLADAFW::Transformation *tm, float v[3]); + void dae_scale_to_v3(COLLADAFW::Transformation *tm, float v[3]); + void dae_vector3_to_v3(const COLLADABU::Math::Vector3 &v3, float v[3]); }; #endif |