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

Merge branch '0.9.2' of ssh://g-truc.git.sourceforge.net/gitroot/ogl-math/ogl-math into 0.9.2

Browse Source
This commit is contained in:
Christophe Riccio 2011-05-27 00:28:50 +01:00
commit 5c70242e90
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/glm-0.9.2.pdf
View File

Binary file not shown.

2
glm/core/setup.hpp
View File

@ -17,7 +17,7 @@
#define GLM_VERSION_MAJOR 0
#define GLM_VERSION_MINOR 9
#define GLM_VERSION_PATCH 2
#define GLM_VERSION_REVISION 1
#define GLM_VERSION_REVISION 2
///////////////////////////////////////////////////////////////////////////////////////////////////

14
glm/gtc/quaternion.inl
View File

@ -147,6 +147,20 @@ namespace detail{
//////////////////////////////////////////////////////////////
// tquat<valType> external operators
template <typename T>
GLM_FUNC_QUALIFIER detail::tquat<T> operator*
(
detail::tquat<T> const & q,
detail::tquat<T> const & p
)
{
return detail::tquat<T>(
q.w + p.w,
q.x + p.x,
q.y + p.y,
q.z + p.z);
}
template <typename T>
GLM_FUNC_QUALIFIER detail::tquat<T> operator-
(

5
glm/gtx/integer.inl
View File

@ -49,9 +49,10 @@ namespace integer
template <typename genType>
GLM_FUNC_QUALIFIER genType factorial(genType const & x)
{
genType Temp = x;
genType Result;
for(Result = 1; x > 1; --x)
Result *= x;
for(Result = 1; Temp > 1; --Temp)
Result *= Temp;
return Result;
}