mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed glm::orientation with GLM_FORCE_RADIANS defined #112

Browse Source
This commit is contained in:
Christophe Riccio
2013-09-08 15:23:13 +02:00
parent 9464e5b590
commit c9f623e717
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glm/gtx/rotate_vector.inl
View File

@@ -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