diff --git a/glm/core/dummy.cpp b/glm/core/dummy.cpp index 25c91e2e..44c505c5 100644 --- a/glm/core/dummy.cpp +++ b/glm/core/dummy.cpp @@ -11,48 +11,78 @@ int main() glm::mat2x3 m(1.0f); glm::vec2 u(1.0f); glm::vec3 v(1.0f); + float x = 1.0f; glm::vec3 a = m * u; glm::vec2 b = v * m; + glm::mat2x3 n = x / m; + glm::mat2x3 o = m / x; + glm::mat2x3 p = x * m; + glm::mat2x3 q = m * x; } { glm::mat2x4 m(1.0f); glm::vec2 u(1.0f); glm::vec4 v(1.0f); + float x = 1.0f; glm::vec4 a = m * u; glm::vec2 b = v * m; + glm::mat2x4 n = x / m; + glm::mat2x4 o = m / x; + glm::mat2x4 p = x * m; + glm::mat2x4 q = m * x; } { glm::mat3x2 m(1.0f); glm::vec3 u(1.0f); glm::vec2 v(1.0f); + float x = 1.0f; glm::vec2 a = m * u; glm::vec3 b = v * m; + glm::mat3x2 n = x / m; + glm::mat3x2 o = m / x; + glm::mat3x2 p = x * m; + glm::mat3x2 q = m * x; } { glm::mat3x4 m(1.0f); glm::vec3 u(1.0f); glm::vec4 v(1.0f); + float x = 1.0f; glm::vec4 a = m * u; glm::vec3 b = v * m; + glm::mat3x4 n = x / m; + glm::mat3x4 o = m / x; + glm::mat3x4 p = x * m; + glm::mat3x4 q = m * x; } { glm::mat4x2 m(1.0f); glm::vec4 u(1.0f); glm::vec2 v(1.0f); + float x = 1.0f; glm::vec2 a = m * u; glm::vec4 b = v * m; + glm::mat4x2 n = x / m; + glm::mat4x2 o = m / x; + glm::mat4x2 p = x * m; + glm::mat4x2 q = m * x; } { glm::mat4x3 m(1.0f); glm::vec4 u(1.0f); glm::vec3 v(1.0f); + float x = 1.0f; glm::vec3 a = m * u; glm::vec4 b = v * m; + glm::mat4x3 n = x / m; + glm::mat4x3 o = m / x; + glm::mat4x3 p = x * m; + glm::mat4x3 q = m * x; } //{ diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp index 7a8f82ba..6a607a0d 100644 --- a/glm/core/type_mat2x3.hpp +++ b/glm/core/type_mat2x3.hpp @@ -157,12 +157,12 @@ namespace glm tmat3x2 const & m2); template - tmat3x2 operator/ ( + tmat2x3 operator/ ( tmat2x3 const & m, typename tmat2x3::value_type const & s); template - tmat3x2 operator/ ( + tmat2x3 operator/ ( typename tmat2x3::value_type const & s, tmat2x3 const & m); diff --git a/glm/core/type_mat2x3.inl b/glm/core/type_mat2x3.inl index 0b8a1bcf..00871076 100644 --- a/glm/core/type_mat2x3.inl +++ b/glm/core/type_mat2x3.inl @@ -463,8 +463,7 @@ namespace detail { return tmat2x3( m[0] / s, - m[1] / s, - m[2] / s); + m[1] / s); } template @@ -476,8 +475,7 @@ namespace detail { return tmat2x3( s / m[0], - s / m[1], - s / m[2]); + s / m[1]); } // Unary constant operators diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl index 0cae47e6..62ddd091 100644 --- a/glm/core/type_mat2x4.inl +++ b/glm/core/type_mat2x4.inl @@ -480,9 +480,7 @@ namespace detail { return tmat2x4( m[0] / s, - m[1] / s, - m[2] / s, - m[3] / s); + m[1] / s); } template @@ -494,9 +492,7 @@ namespace detail { return tmat2x4( s / m[0], - s / m[1], - s / m[2], - s / m[3]); + s / m[1]); } // Unary constant operators diff --git a/glm/core/type_mat3x2.inl b/glm/core/type_mat3x2.inl index c89210c4..6576cdcc 100644 --- a/glm/core/type_mat3x2.inl +++ b/glm/core/type_mat3x2.inl @@ -491,8 +491,7 @@ namespace detail return tmat3x2( m[0] / s, m[1] / s, - m[2] / s, - m[3] / s); + m[2] / s); } template @@ -505,8 +504,7 @@ namespace detail return tmat3x2( s / m[0], s / m[1], - s / m[2], - s / m[3]); + s / m[2]); } // Unary constant operators