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

Merge branch '0.9.3' into 0.9.4

Browse Source
This commit is contained in:
Christophe Riccio 2012-04-14 14:49:59 +01:00
commit 80a4a7973c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/gtc/matrix_transform.inl
View File

@ -422,11 +422,9 @@ namespace glm
Result[0][2] =-f.x; Result[0][2] =-f.x;
Result[1][2] =-f.y; Result[1][2] =-f.y;
Result[2][2] =-f.z; Result[2][2] =-f.z;
/* Test this instead of translate3D
Result[3][0] =-dot(s, eye); Result[3][0] =-dot(s, eye);
Result[3][1] =-dot(y, eye); Result[3][1] =-dot(u, eye);
Result[3][2] = dot(f, eye); Result[3][2] = dot(f, eye);
*/ return Result;
return translate(Result, -eye);
} }
}//namespace glm }//namespace glm

2
glm/gtc/ulp.inl
View File

@ -188,7 +188,7 @@ namespace detail
#pragma warning(pop) #pragma warning(pop)
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC || GLM_COMPILER & GLM_COMPILER_INTEL)
# define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward)) # define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward))
# define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward)) # define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward))
#else #else