mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio 2013-09-15 03:30:20 +02:00
commit cc02b86fb1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glm/gtx/rotate_vector.inl
View File

@ -204,8 +204,12 @@ namespace glm
if(all(equal(Normal, Up))) if(all(equal(Normal, Up)))
return detail::tmat4x4<T, P>(T(1)); return detail::tmat4x4<T, P>(T(1));
detail::tvec3<T, P> RotationAxis = cross(Up, Normal); detail::tvec3<T> RotationAxis = cross(Up, Normal);
T Angle = degrees(acos(dot(Normal, Up))); # ifdef GLM_FORCE_RADIANS
T Angle = acos(dot(Normal, Up));
# else
T Angle = degrees(acos(dot(Normal, Up)));
# endif
return rotate(Angle, RotationAxis); return rotate(Angle, RotationAxis);
} }
}//namespace glm }//namespace glm

1
readme.txt
View File

@ -70,6 +70,7 @@ GLM 0.9.4.6: 2013-08-XX
- Added use of GCC frontend on Unix for ICC and Visual C++ fronted on Windows - Added use of GCC frontend on Unix for ICC and Visual C++ fronted on Windows
for ICC for ICC
- Added compilation errors for unsupported compiler versions - Added compilation errors for unsupported compiler versions
- Fixed glm::orientation with GLM_FORCE_RADIANS defined #112
================================================================================ ================================================================================
GLM 0.9.4.5: 2013-08-12 GLM 0.9.4.5: 2013-08-12