diff options
Diffstat (limited to 'source/blender/collada/collada_internal.h')
| -rw-r--r-- | source/blender/collada/collada_internal.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index 5a5126025de..2e855764f4b 100644 --- a/source/blender/collada/collada_internal.h +++ b/source/blender/collada/collada_internal.h @@ -39,7 +39,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "BLI_math.h" -#include "BLI_math.h" #include "BLI_linklist.h" class UnitConverter @@ -48,6 +47,10 @@ private: COLLADAFW::FileInfo::Unit unit; COLLADAFW::FileInfo::UpAxisType up_axis; + float x_up_mat4[4][4]; + float y_up_mat4[4][4]; + float z_up_mat4[4][4]; + public: enum UnitSystem { @@ -71,9 +74,13 @@ public: void dae_matrix_to_mat4_(float out[4][4], const COLLADABU::Math::Matrix4& in); - void mat4_to_dae(float out[4][4], float const in[4][4]); + void mat4_to_dae(float out[4][4], float in[4][4]); + + void mat4_to_dae_double(double out[4][4], float in[4][4]); + + float(&get_rotation())[4][4]; + - void mat4_to_dae_double(double out[4][4], float const in[4][4]); }; class TransformBase @@ -85,6 +92,7 @@ public: extern void clear_global_id_map(); /** Look at documentation of translate_map */ extern std::string translate_id(const std::string &id); +extern std::string translate_id(const char *idString); extern std::string id_name(void *id); @@ -99,4 +107,6 @@ extern std::string get_camera_id(Object *ob); extern std::string get_material_id(Material *mat); +extern std::string get_morph_id(Object *ob); + #endif /* __COLLADA_INTERNAL_H__ */ |