mirror of
https://github.com/g-truc/glm.git
synced 2024-11-23 01:14:34 +00:00
Merge pull request #1061 from g-truc/revert-1012-master
Revert "Fix quaternion orientation in `glm::decompose`" #1061 #1012
This commit is contained in:
commit
5e243a8efa
@ -159,9 +159,9 @@ namespace detail
|
|||||||
root = sqrt(trace + static_cast<T>(1.0));
|
root = sqrt(trace + static_cast<T>(1.0));
|
||||||
Orientation.w = static_cast<T>(0.5) * root;
|
Orientation.w = static_cast<T>(0.5) * root;
|
||||||
root = static_cast<T>(0.5) / root;
|
root = static_cast<T>(0.5) / root;
|
||||||
Orientation.x = root * (Row[2].y - Row[1].z);
|
Orientation.x = root * (Row[1].z - Row[2].y);
|
||||||
Orientation.y = root * (Row[0].z - Row[2].x);
|
Orientation.y = root * (Row[2].x - Row[0].z);
|
||||||
Orientation.z = root * (Row[1].x - Row[0].y);
|
Orientation.z = root * (Row[0].y - Row[1].x);
|
||||||
} // End if > 0
|
} // End if > 0
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user