diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-11-25 08:20:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-11-25 08:39:34 +0300 |
| commit | e1e49fd1a8a5bca7f95ba230a7daf12fb059779b (patch) | |
| tree | 9913ba1244a0904189361058713489666d64d2dc /source/blender/collada | |
| parent | d30a0239a2fb1bf28befc547d9c4986b6be4d662 (diff) | |
Math Lib: rotate matrix cleanup
- Remove 'rotate_m2', unlike 'rotate_m4' it created a new matrix
duplicating 'angle_to_mat2' - now used instead.
(better avoid matching functions having different behavior).
- Add 'axis_angle_to_mat4_single',
convenience wrapper for 'axis_angle_to_mat3_single'.
- Replace 'unit_m4(), rotate_m4()' with a single call to 'axis_angle_to_mat4_single'.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/collada_internal.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index 38855013ee1..e1a13559b08 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -33,11 +33,8 @@ UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) { - unit_m4(x_up_mat4); - rotate_m4(x_up_mat4, 'Y', -0.5 * M_PI); - - unit_m4(y_up_mat4); - rotate_m4(y_up_mat4, 'X', 0.5 * M_PI); + axis_angle_to_mat4_single(x_up_mat4, 'Y', -0.5 * M_PI); + axis_angle_to_mat4_single(y_up_mat4, 'X', 0.5 * M_PI); unit_m4(z_up_mat4); unit_m4(scale_mat4); |