diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index 2feda2c0..f3e01d82 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -422,11 +422,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 diff --git a/glm/gtc/ulp.inl b/glm/gtc/ulp.inl index c1527840..a58c1eb7 100644 --- a/glm/gtc/ulp.inl +++ b/glm/gtc/ulp.inl @@ -188,7 +188,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