mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio
2013-09-15 03:30:20 +02:00
parent bb9cc43a6d c9f623e717
commit cc02b86fb1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
glm/gtx/rotate_vector.inl
View File

@@ -204,8 +204,12 @@ namespace glm
if(all(equal(Normal, Up)))
return detail::tmat4x4<T, P>(T(1));
detail::tvec3<T, P> RotationAxis = cross(Up, Normal);
T Angle = degrees(acos(dot(Normal, Up)));
detail::tvec3<T> RotationAxis = cross(Up, Normal);
# 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