diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index 7cdc2ed0..16124b41 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -327,7 +327,7 @@ namespace detail # define GLM_RESTRICT_VAR __restrict #elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC31)) # define GLM_DEPRECATED __attribute__((__deprecated__)) -# define GLM_ALIGN(x) __attribute__((aligned(x))) +# define GLM_ALIGN(x) __attribute__((aligned(x))) # if(GLM_COMPILER >= GLM_COMPILER_GCC33) # define GLM_RESTRICT __restrict__ # define GLM_RESTRICT_VAR __restrict__ diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index b8e79ca2..b063c363 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -332,14 +332,14 @@ namespace matrix_transform detail::tvec4 const & viewport ) { - assert(delta.x > 0.0f && delta.y > 0.0f) + assert(delta.x > 0.0f && delta.y > 0.0f); detail::tmat4x4 Result(1.0f); if(!(delta.x > 0.0f && delta.y > 0.0f)) return Result; // Error // Translate and scale the picked region to the entire window - Result = translate(Result, (T(viewport[2]) - T(2) * (x - T(viewport[0]))) / delta.x, (T(viewport[3]) - T(2) * (y - T(viewport[1]))) / delta.y, T(0)); + Result = translate(Result, (T(viewport[2]) - T(2) * (center.x - T(viewport[0]))) / delta.x, (T(viewport[3]) - T(2) * (center.y - T(viewport[1]))) / delta.y, T(0)); return scale(Result, T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)); } diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index 32577b77..2dbca071 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -403,7 +403,7 @@ namespace quaternion{ if(flip) alpha = -alpha; - return normalize(beta * x + alpha * y2); + return normalize(beta * x + alpha * y); } template