Ver Fonte

Removed useless copy assignment operators

Christophe Riccio há 7 anos atrás
pai
commit
ce644e01bb

+ 0 - 2
glm/detail/type_mat2x2.hpp

@@ -74,8 +74,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<2, 2, T, Q> & operator=(mat<2, 2, T, Q> const& v);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, Q> & operator=(mat<2, 2, U, Q> const& m);
 		GLM_FUNC_DECL mat<2, 2, T, Q> & operator=(mat<2, 2, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 0 - 8
glm/detail/type_mat2x2.inl

@@ -235,14 +235,6 @@ namespace glm
 
 
 	// -- Unary updatable operators --
 	// -- Unary updatable operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator=(mat<2, 2, T, Q> const& m)
-	{
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator=(mat<2, 2, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator=(mat<2, 2, U, Q> const& m)

+ 0 - 2
glm/detail/type_mat2x3.hpp

@@ -75,8 +75,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<2, 3, T, Q> & operator=(mat<2, 3, T, Q> const& m);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<2, 3, T, Q> & operator=(mat<2, 3, U, Q> const& m);
 		GLM_FUNC_DECL mat<2, 3, T, Q> & operator=(mat<2, 3, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 0 - 8
glm/detail/type_mat2x3.inl

@@ -235,14 +235,6 @@ namespace glm
 
 
 	// -- Unary updatable operators --
 	// -- Unary updatable operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, T, Q> const& m)
-	{
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, U, Q> const& m)

+ 0 - 2
glm/detail/type_mat2x4.hpp

@@ -77,8 +77,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<2, 4, T, Q> & operator=(mat<2, 4, T, Q> const& m);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<2, 4, T, Q> & operator=(mat<2, 4, U, Q> const& m);
 		GLM_FUNC_DECL mat<2, 4, T, Q> & operator=(mat<2, 4, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 0 - 8
glm/detail/type_mat2x4.inl

@@ -237,14 +237,6 @@ namespace glm
 
 
 	// -- Unary updatable operators --
 	// -- Unary updatable operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator=(mat<2, 4, T, Q> const& m)
-	{
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator=(mat<2, 4, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator=(mat<2, 4, U, Q> const& m)

+ 0 - 2
glm/detail/type_mat3x2.hpp

@@ -82,8 +82,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<3, 2, T, Q> & operator=(mat<3, 2, T, Q> const& m);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<3, 2, T, Q> & operator=(mat<3, 2, U, Q> const& m);
 		GLM_FUNC_DECL mat<3, 2, T, Q> & operator=(mat<3, 2, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 3 - 12
glm/detail/type_mat3x2.inl

@@ -96,9 +96,9 @@ namespace glm
 #		endif
 #		endif
 	{
 	{
 #		if !GLM_HAS_INITIALIZER_LISTS
 #		if !GLM_HAS_INITIALIZER_LISTS
-			this->value[0] = col_type(x1, y1);
-			this->value[1] = col_type(x2, y2);
-			this->value[2] = col_type(x3, y3);
+			this->value[0] = col_type(x0, y0);
+			this->value[1] = col_type(x1, y1);
+			this->value[2] = col_type(x2, y2);
 #		endif
 #		endif
 	}
 	}
 
 
@@ -254,15 +254,6 @@ namespace glm
 
 
 	// -- Unary updatable operators --
 	// -- Unary updatable operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator=(mat<3, 2, T, Q> const& m)
-	{
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		this->value[2] = m[2];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator=(mat<3, 2, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator=(mat<3, 2, U, Q> const& m)

+ 0 - 2
glm/detail/type_mat3x3.hpp

@@ -81,8 +81,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<3, 3, T, Q> & operator=(mat<3, 3, T, Q> const& m);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, Q> & operator=(mat<3, 3, U, Q> const& m);
 		GLM_FUNC_DECL mat<3, 3, T, Q> & operator=(mat<3, 3, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 11 - 30
glm/detail/type_mat3x3.inl

@@ -37,15 +37,15 @@ namespace glm
 	}
 	}
 
 
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<3, 3, T, Q>::mat(T scalar)
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<3, 3, T, Q>::mat(T s)
 #		if GLM_HAS_INITIALIZER_LISTS
 #		if GLM_HAS_INITIALIZER_LISTS
-			: value{col_type(scalar, 0, 0), col_type(0, scalar, 0), col_type(0, 0, scalar)}
+			: value{col_type(s, 0, 0), col_type(0, s, 0), col_type(0, 0, s)}
 #		endif
 #		endif
 	{
 	{
 #		if !GLM_HAS_INITIALIZER_LISTS
 #		if !GLM_HAS_INITIALIZER_LISTS
-			this->value[0] = col_type(scalar, 0, 0);
-			this->value[1] = col_type(0, scalar, 0);
-			this->value[2] = col_type(0, 0, scalar);
+			this->value[0] = col_type(s, 0, 0);
+			this->value[1] = col_type(0, s, 0);
+			this->value[2] = col_type(0, 0, s);
 #		endif
 #		endif
 	}
 	}
 
 
@@ -68,12 +68,7 @@ namespace glm
 	}
 	}
 
 
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<3, 3, T, Q>::mat
-	(
-		col_type const& v0,
-		col_type const& v1,
-		col_type const& v2
-	)
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<3, 3, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2)
 #		if GLM_HAS_INITIALIZER_LISTS
 #		if GLM_HAS_INITIALIZER_LISTS
 			: value{col_type(v0), col_type(v1), col_type(v2)}
 			: value{col_type(v0), col_type(v1), col_type(v2)}
 #		endif
 #		endif
@@ -99,24 +94,19 @@ namespace glm
 		X3 x3, Y3 y3, Z3 z3
 		X3 x3, Y3 y3, Z3 z3
 	)
 	)
 #		if GLM_HAS_INITIALIZER_LISTS
 #		if GLM_HAS_INITIALIZER_LISTS
-			: value{col_type(static_cast<T>(x1), static_cast<T>(y1), static_cast<T>(z1)), col_type(static_cast<T>(x2), static_cast<T>(y2), static_cast<T>(z2)), col_type(static_cast<T>(x3), static_cast<T>(y3), static_cast<T>(z3))}
+			: value{col_type(x1, y1, z1), col_type(x2, y2, z2), col_type(x3, y3, z3)}
 #		endif
 #		endif
 	{
 	{
 #		if !GLM_HAS_INITIALIZER_LISTS
 #		if !GLM_HAS_INITIALIZER_LISTS
-			this->value[0] = col_type(static_cast<T>(x1), static_cast<T>(y1), static_cast<T>(z1));
-			this->value[1] = col_type(static_cast<T>(x2), static_cast<T>(y2), static_cast<T>(z2));
-			this->value[2] = col_type(static_cast<T>(x3), static_cast<T>(y3), static_cast<T>(z3));
+			this->value[0] = col_type(x1, y1, z1);
+			this->value[1] = col_type(x2, y2, z2);
+			this->value[2] = col_type(x3, y3, z3);
 #		endif
 #		endif
 	}
 	}
 
 
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename V1, typename V2, typename V3>
 	template<typename V1, typename V2, typename V3>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<3, 3, T, Q>::mat
-	(
-		vec<3, V1, Q> const& v1,
-		vec<3, V2, Q> const& v2,
-		vec<3, V3, Q> const& v3
-	)
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<3, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2, vec<3, V3, Q> const& v3)
 #		if GLM_HAS_INITIALIZER_LISTS
 #		if GLM_HAS_INITIALIZER_LISTS
 			: value{col_type(v1), col_type(v2), col_type(v3)}
 			: value{col_type(v1), col_type(v2), col_type(v3)}
 #		endif
 #		endif
@@ -266,15 +256,6 @@ namespace glm
 
 
 	// -- Unary updatable operators --
 	// -- Unary updatable operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator=(mat<3, 3, T, Q> const& m)
-	{
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		this->value[2] = m[2];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator=(mat<3, 3, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator=(mat<3, 3, U, Q> const& m)

+ 0 - 2
glm/detail/type_mat3x4.hpp

@@ -82,8 +82,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<3, 4, T, Q> & operator=(mat<3, 4, T, Q> const& m);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<3, 4, T, Q> & operator=(mat<3, 4, U, Q> const& m);
 		GLM_FUNC_DECL mat<3, 4, T, Q> & operator=(mat<3, 4, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 0 - 9
glm/detail/type_mat3x4.inl

@@ -260,15 +260,6 @@ namespace glm
 
 
 	// -- Unary updatable operators --
 	// -- Unary updatable operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator=(mat<3, 4, T, Q> const& m)
-	{
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		this->value[2] = m[2];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator=(mat<3, 4, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator=(mat<3, 4, U, Q> const& m)

+ 0 - 2
glm/detail/type_mat4x2.hpp

@@ -87,8 +87,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<4, 2, T, Q> & operator=(mat<4, 2, T, Q> const& m);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<4, 2, T, Q> & operator=(mat<4, 2, U, Q> const& m);
 		GLM_FUNC_DECL mat<4, 2, T, Q> & operator=(mat<4, 2, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 0 - 10
glm/detail/type_mat4x2.inl

@@ -273,16 +273,6 @@ namespace glm
 
 
 	// -- Unary updatable operators --
 	// -- Unary updatable operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<4, 2, T, Q>& mat<4, 2, T, Q>::operator=(mat<4, 2, T, Q> const& m)
-	{
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		this->value[2] = m[2];
-		this->value[3] = m[3];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, Q>& mat<4, 2, T, Q>::operator=(mat<4, 2, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<4, 2, T, Q>& mat<4, 2, T, Q>::operator=(mat<4, 2, U, Q> const& m)

+ 0 - 2
glm/detail/type_mat4x3.hpp

@@ -87,8 +87,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<4, 3, T, Q> & operator=(mat<4, 3, T, Q> const& m);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<4, 3, T, Q> & operator=(mat<4, 3, U, Q> const& m);
 		GLM_FUNC_DECL mat<4, 3, T, Q> & operator=(mat<4, 3, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 0 - 10
glm/detail/type_mat4x3.inl

@@ -273,16 +273,6 @@ namespace glm
 
 
 	// -- Unary updatable operators --
 	// -- Unary updatable operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<4, 3, T, Q>& mat<4, 3, T, Q>::operator=(mat<4, 3, T, Q> const& m)
-	{
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		this->value[2] = m[2];
-		this->value[3] = m[3];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, Q>& mat<4, 3, T, Q>::operator=(mat<4, 3, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<4, 3, T, Q>& mat<4, 3, T, Q>::operator=(mat<4, 3, U, Q> const& m)

+ 0 - 2
glm/detail/type_mat4x4.hpp

@@ -86,8 +86,6 @@ namespace glm
 
 
 		// -- Unary arithmetic operators --
 		// -- Unary arithmetic operators --
 
 
-		GLM_FUNC_DECL mat<4, 4, T, Q> & operator=(mat<4, 4, T, Q> const& m);
-
 		template<typename U>
 		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, Q> & operator=(mat<4, 4, U, Q> const& m);
 		GLM_FUNC_DECL mat<4, 4, T, Q> & operator=(mat<4, 4, U, Q> const& m);
 		template<typename U>
 		template<typename U>

+ 0 - 12
glm/detail/type_mat4x4.inl

@@ -304,18 +304,6 @@ namespace glm
 
 
 	// -- Unary arithmetic operators --
 	// -- Unary arithmetic operators --
 
 
-	template<typename T, qualifier Q>
-	GLM_FUNC_QUALIFIER mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator=(mat<4, 4, T, Q> const& m)
-	{
-		//memcpy could be faster
-		//memcpy(&this->value, &m.value, 16 * sizeof(valType));
-		this->value[0] = m[0];
-		this->value[1] = m[1];
-		this->value[2] = m[2];
-		this->value[3] = m[3];
-		return *this;
-	}
-
 	template<typename T, qualifier Q>
 	template<typename T, qualifier Q>
 	template<typename U>
 	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator=(mat<4, 4, U, Q> const& m)
 	GLM_FUNC_QUALIFIER mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator=(mat<4, 4, U, Q> const& m)