mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.8'

Browse Source
This commit is contained in:
Christophe Riccio
2016-09-24 10:52:36 +02:00
parent 13754226bc 0675da467a
commit 02b954f9eb
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtx/quaternion.inl
View File

@@ -71,9 +71,9 @@ namespace glm
}
else
{
T QuatLen = sqrt(Vec3Len * Vec3Len + q.w * q.w);
T t = atan(Vec3Len, T(q.w)) / Vec3Len;
return tquat<T, P>(log(QuatLen), t * q.x, t * q.y, t * q.z);
T QuatLen2 = Vec3Len * Vec3Len + q.w * q.w;
return tquat<T, P>(static_cast<T>(0.5) * log(QuatLen2), t * q.x, t * q.y, t * q.z);
}
}