Fixed glm::orientation with GLM_FORCE_RADIANS defined #112

master
Christophe Riccio ago%!(EXTRA string=12 years)
parent 9464e5b590
commit c9f623e717
  1. 6
      glm/gtx/rotate_vector.inl
  2. 1
      readme.txt

@ -205,7 +205,11 @@ namespace glm
return detail::tmat4x4<T>(T(1));
detail::tvec3<T> RotationAxis = cross(Up, Normal);
T Angle = degrees(acos(dot(Normal, Up)));
# ifdef GLM_FORCE_RADIANS
T Angle = acos(dot(Normal, Up));
# else
T Angle = degrees(acos(dot(Normal, Up)));
# endif
return rotate(Angle, RotationAxis);
}
}//namespace glm

@ -48,6 +48,7 @@ GLM 0.9.4.6: 2013-08-XX
- Added use of GCC frontend on Unix for ICC and Visual C++ fronted on Windows
for ICC
- Added compilation errors for unsupported compiler versions
- Fixed glm::orientation with GLM_FORCE_RADIANS defined #112
================================================================================
GLM 0.9.4.5: 2013-08-12

Loading…
Cancel
Save