From f30f012d37facec0e0c3f87d3af1a4b082b4039a Mon Sep 17 00:00:00 2001 From: devmane144 Date: Thu, 1 Feb 2018 14:41:44 -0600 Subject: [PATCH 1/3] Adding a const & here for consistency reasons The other vector types have T const & scalar for their binary operator+ --- glm/detail/type_vec4.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 2bad9aee..9dca45e1 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -627,7 +627,7 @@ namespace detail // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER vec<4, T, Q> operator+(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, Q> operator+(vec<4, T, Q> const& v, T const & scalar) { return vec<4, T, Q>(v) += scalar; } From 9b621ee4db5ef683de4a89e7f6ad140861c2867d Mon Sep 17 00:00:00 2001 From: devmane144 Date: Thu, 1 Feb 2018 14:48:35 -0600 Subject: [PATCH 2/3] Added the other 3 const & to the file I added the other 3 const & that I missed. --- glm/detail/type_vec4.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 9dca45e1..dd8d2577 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -657,7 +657,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER vec<4, T, Q> operator-(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, Q> operator-(vec<4, T, Q> const& v, T const & scalar) { return vec<4, T, Q>(v) -= scalar; } @@ -687,7 +687,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER vec<4, T, Q> operator*(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, Q> operator*(vec<4, T, Q> const& v, T const & scalar) { return vec<4, T, Q>(v) *= scalar; } @@ -717,7 +717,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER vec<4, T, Q> operator/(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER vec<4, T, Q> operator/(vec<4, T, Q> const& v, T const & scalar) { return vec<4, T, Q>(v) /= scalar; } From abb7fecc5e8be3b06654a145e2e6d26c3905dd08 Mon Sep 17 00:00:00 2001 From: devmane144 Date: Thu, 1 Feb 2018 15:01:30 -0600 Subject: [PATCH 3/3] Update type_vec4.hpp --- glm/detail/type_vec4.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 3e338bc4..b4230567 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -281,7 +281,7 @@ namespace glm // -- Binary operators -- template - GLM_FUNC_DECL vec<4, T, Q> operator+(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL vec<4, T, Q> operator+(vec<4, T, Q> const& v, T const & scalar); template GLM_FUNC_DECL vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); @@ -296,7 +296,7 @@ namespace glm GLM_FUNC_DECL vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL vec<4, T, Q> operator-(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL vec<4, T, Q> operator-(vec<4, T, Q> const& v, T const & scalar); template GLM_FUNC_DECL vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); @@ -311,7 +311,7 @@ namespace glm GLM_FUNC_DECL vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL vec<4, T, Q> operator*(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL vec<4, T, Q> operator*(vec<4, T, Q> const& v, T const & scalar); template GLM_FUNC_DECL vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); @@ -326,7 +326,7 @@ namespace glm GLM_FUNC_DECL vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL vec<4, T, Q> operator/(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL vec<4, T, Q> operator/(vec<4, T, Q> const& v, T const & scalar); template GLM_FUNC_DECL vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);