mewin/glm
1
0
Fork 0
Code Releases Activity

Merge pull request #691 from OlivierSohn/master

Browse Source 
Fix rotation when vectors are in the same direction #691
This commit is contained in:
Christophe 2017-10-22 16:24:15 +02:00 committed by GitHub
commit 9d7e79de6e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/gtx/quaternion.inl
View File

@ -184,8 +184,10 @@ namespace glm
T cosTheta = dot(orig, dest); T cosTheta = dot(orig, dest);
vec<3, T, Q> rotationAxis; vec<3, T, Q> rotationAxis;
if(cosTheta >= static_cast<T>(1) - epsilon<T>()) if(cosTheta >= static_cast<T>(1) - epsilon<T>()) {
return quat(); // orig and dest point in the same direction
return quat_identity<T,Q>();
}
if(cosTheta < static_cast<T>(-1) + epsilon<T>()) if(cosTheta < static_cast<T>(-1) + epsilon<T>())
{ {