mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-16 14:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Partly revert last commit

Browse Source
This commit is contained in:
stfx 2017-11-20 18:21:18 +01:00 committed by GitHub
parent 915fbe0827
commit b17d3668a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glm/gtx/quaternion.inl
View File

@ -230,13 +230,10 @@ namespace glm
template<typename T, qualifier Q> template<typename T, qualifier Q>
GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAtRH(vec<3, T, Q> const& direction, vec<3, T, Q> const& up) GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAtRH(vec<3, T, Q> const& direction, vec<3, T, Q> const& up)
{ {
vec<3, T, Q> const invertedDirection(-direction);
vec<3, T, Q> const right(normalize(cross(up, invertedDirection)));
mat<3, 3, T, Q> result; mat<3, 3, T, Q> result;
result[0] = right; result[2] = -direction;
result[1] = cross(invertedDirection, right); result[0] = normalize(cross(up, Result[2]));
result[2] = invertedDirection; result[1] = cross(Result[2], Result[0]);
return quat_cast(result); return quat_cast(result);
} }
@ -244,11 +241,9 @@ namespace glm
template<typename T, qualifier Q> template<typename T, qualifier Q>
GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAtLH(vec<3, T, Q> const& direction, vec<3, T, Q> const& up) GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAtLH(vec<3, T, Q> const& direction, vec<3, T, Q> const& up)
{ {
vec<3, T, Q> const right(normalize(cross(up, direction)));
mat<3, 3, T, Q> result; mat<3, 3, T, Q> result;
result[0] = right; result[0] = normalize(cross(up, direction));
result[1] = cross(direction, right); result[1] = cross(direction, result[0]);
result[2] = direction; result[2] = direction;
return quat_cast(result); return quat_cast(result);