diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-15 19:36:02 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-15 19:36:02 +0400 |
| commit | 9fe4dbb9f10e611d2c24eccbfbcbb9260370b8bd (patch) | |
| tree | b551c97cc153d3dc76e9d307255b1cc6d0040211 /source/blender/collada/collada_internal.h | |
| parent | 313dfbe35daaba41d6410042b12d1a1b63cb31a1 (diff) | |
Fix: Collada Import files with X_UP and Y_UP axis where imported with wrong orientation
Diffstat (limited to 'source/blender/collada/collada_internal.h')
| -rw-r--r-- | source/blender/collada/collada_internal.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index ba077628499..7d59932bac9 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 { @@ -74,6 +77,10 @@ public: 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]; + + }; class TransformBase |