From 535f67e45e21393fd3ae3e773d26e02e065c8844 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 14 Apr 2012 14:32:30 +0100 Subject: [PATCH 1/2] Ticket #176, workaround for Intel compiler which has a bug with lookAt --- glm/gtc/matrix_transform.inl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index 0e4a4fa6..f2a1c80c 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -402,11 +402,9 @@ namespace glm Result[0][2] =-f.x; Result[1][2] =-f.y; Result[2][2] =-f.z; - /* Test this instead of translate3D Result[3][0] =-dot(s, eye); - Result[3][1] =-dot(y, eye); + Result[3][1] =-dot(u, eye); Result[3][2] = dot(f, eye); - */ - return translate(Result, -eye); + return Result; } }//namespace glm From 874a675bb9ac8c5b8f7f25597f39570193a23ce1 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 14 Apr 2012 14:45:27 +0100 Subject: [PATCH 2/2] Fixed nextafter for float on Intel compiler --- glm/gtx/ulp.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtx/ulp.inl b/glm/gtx/ulp.inl index d2d203e5..cb3b2d00 100644 --- a/glm/gtx/ulp.inl +++ b/glm/gtx/ulp.inl @@ -173,7 +173,7 @@ namespace detail #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_DBL(x, toward) _nextafter((x), (toward)) #else