mirror of
https://github.com/g-truc/glm.git
synced 2024-11-26 10:14:35 +00:00
Merge pull request #1076 from stephomi/decompose_wxyz
Fix matrix decompose (wxyz quaternion) #1076
This commit is contained in:
commit
84f2045a79
@ -172,12 +172,18 @@ namespace detail
|
||||
j = Next[i];
|
||||
k = Next[j];
|
||||
|
||||
# ifdef GLM_FORCE_QUAT_DATA_XYZW
|
||||
int off = 0;
|
||||
# else
|
||||
int off = 1;
|
||||
# endif
|
||||
|
||||
root = sqrt(Row[i][i] - Row[j][j] - Row[k][k] + static_cast<T>(1.0));
|
||||
|
||||
Orientation[i] = static_cast<T>(0.5) * root;
|
||||
Orientation[i + off] = static_cast<T>(0.5) * root;
|
||||
root = static_cast<T>(0.5) / root;
|
||||
Orientation[j] = root * (Row[i][j] + Row[j][i]);
|
||||
Orientation[k] = root * (Row[i][k] + Row[k][i]);
|
||||
Orientation[j + off] = root * (Row[i][j] + Row[j][i]);
|
||||
Orientation[k + off] = root * (Row[i][k] + Row[k][i]);
|
||||
Orientation.w = root * (Row[j][k] - Row[k][j]);
|
||||
} // End if <= 0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user