Browse Source

Removed invalid *= operators for non square matrix

Christophe Riccio 12 years ago
parent
commit
da67a79222

+ 0 - 2
glm/core/type_mat2x3.hpp

@@ -125,8 +125,6 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x3<T, P> & operator*= (U s);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x3<T, P> & operator*= (tmat2x3<U, P> const & m);
-		template <typename U> 
 		GLM_FUNC_DECL tmat2x3<T, P> & operator/= (U s);
 
 		//////////////////////////////////////

+ 0 - 7
glm/core/type_mat2x3.inl

@@ -339,13 +339,6 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P> 
-	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x3<T, P> & tmat2x3<T, P>::operator*= (tmat2x3<U, P> const & m)
-	{
-		return (*this = tmat2x3<U, P>(*this * m));
-	}
-
 	template <typename T, precision P>
 	template <typename U> 
 	GLM_FUNC_QUALIFIER tmat2x3<T, P> & tmat2x3<T, P>::operator/= (U s)

+ 0 - 2
glm/core/type_mat2x4.hpp

@@ -127,8 +127,6 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x4<T, P>& operator*= (U s);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x4<T, P>& operator*= (tmat2x4<U, P> const & m);
-		template <typename U> 
 		GLM_FUNC_DECL tmat2x4<T, P>& operator/= (U s);
 
 		//////////////////////////////////////

+ 0 - 7
glm/core/type_mat2x4.inl

@@ -342,13 +342,6 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
-	GLM_FUNC_QUALIFIER tmat2x4<T, P>& tmat2x4<T, P>::operator*= (tmat2x4<U, P> const & m)
-	{
-		return (*this = tmat2x4<T, P>(*this * m));
-	}
-
 	template <typename T, precision P>
 	template <typename U>
 	GLM_FUNC_QUALIFIER tmat2x4<T, P> & tmat2x4<T, P>::operator/= (U s)

+ 0 - 2
glm/core/type_mat3x2.hpp

@@ -131,8 +131,6 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x2<T, P> & operator*= (U s);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x2<T, P> & operator*= (tmat3x2<U, P> const & m);
-		template <typename U> 
 		GLM_FUNC_DECL tmat3x2<T, P> & operator/= (U s);
 
 		//////////////////////////////////////

+ 0 - 7
glm/core/type_mat3x2.inl

@@ -369,13 +369,6 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
-	GLM_FUNC_QUALIFIER tmat3x2<T, P>& tmat3x2<T, P>::operator*= (tmat3x2<U, P> const & m)
-	{
-		return (*this = tmat3x2<T, P>(*this * m));
-	}
-
 	template <typename T, precision P>
 	template <typename U>
 	GLM_FUNC_QUALIFIER tmat3x2<T, P> & tmat3x2<T, P>::operator/= (U s)

+ 0 - 2
glm/core/type_mat3x4.hpp

@@ -131,8 +131,6 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x4<T, P> & operator*= (U s);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x4<T, P> & operator*= (tmat3x4<U, P> const & m);
-		template <typename U> 
 		GLM_FUNC_DECL tmat3x4<T, P> & operator/= (U s);
 
 		//////////////////////////////////////

+ 0 - 7
glm/core/type_mat3x4.inl

@@ -368,13 +368,6 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
-	GLM_FUNC_QUALIFIER tmat3x4<T, P>& tmat3x4<T, P>::operator*= (tmat3x4<U, P> const & m)
-	{
-		return (*this = tmat3x4<T, P>(*this * m));
-	}
-
 	template <typename T, precision P>
 	template <typename U>
 	GLM_FUNC_QUALIFIER tmat3x4<T, P> & tmat3x4<T, P>::operator/= (U s)

+ 0 - 2
glm/core/type_mat4x2.hpp

@@ -136,8 +136,6 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x2<T, P>& operator*= (U s);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x2<T, P>& operator*= (tmat4x2<U, P> const & m);
-		template <typename U> 
 		GLM_FUNC_DECL tmat4x2<T, P>& operator/= (U s);
 
 		//////////////////////////////////////

+ 0 - 7
glm/core/type_mat4x2.inl

@@ -401,13 +401,6 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
-	GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator*= (tmat4x2<U, P> const & m)
-	{
-		return (*this = tmat4x2<T, P>(*this * m));
-	}
-
 	template <typename T, precision P>
 	template <typename U>
 	GLM_FUNC_QUALIFIER tmat4x2<T, P> & tmat4x2<T, P>::operator/= (U s)

+ 0 - 2
glm/core/type_mat4x3.hpp

@@ -136,8 +136,6 @@ namespace detail
 		template <typename U>
 		GLM_FUNC_DECL tmat4x3<T, P> & operator*= (U s);
 		template <typename U>
-		GLM_FUNC_DECL tmat4x3<T, P> & operator*= (tmat4x3<U, P> const & m);
-		template <typename U>
 		GLM_FUNC_DECL tmat4x3<T, P> & operator/= (U s);
 
 		//////////////////////////////////////

+ 0 - 7
glm/core/type_mat4x3.inl

@@ -401,13 +401,6 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
-	GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator*= (tmat4x3<U, P> const & m)
-	{
-		return (*this = tmat4x3<T, P>(*this * m));
-	}
-
 	template <typename T, precision P>
 	template <typename U>
 	GLM_FUNC_QUALIFIER tmat4x3<T, P> & tmat4x3<T, P>::operator/= (U s)