Browse Source

Added product declarations

Christophe Riccio 14 years ago
parent
commit
cd1569c543

+ 10 - 0
glm/core/type_mat2x2.hpp

@@ -187,6 +187,16 @@ namespace detail
 	tmat2x2<T> operator* (
 	tmat2x2<T> operator* (
 		tmat2x2<T> const & m1, 
 		tmat2x2<T> const & m1, 
 		tmat2x2<T> const & m2);
 		tmat2x2<T> const & m2);
+		
+	template <typename T>
+	tmat3x2<T> operator* (
+		tmat2x2<T> const & m1, 
+		tmat3x2<T> const & m2);
+		
+	template <typename T>
+	tmat4x2<T> operator* (
+		tmat2x2<T> const & m1, 
+		tmat4x2<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 
 	tmat2x2<T> operator/ (
 	tmat2x2<T> operator/ (

+ 10 - 0
glm/core/type_mat2x3.hpp

@@ -164,10 +164,20 @@ namespace detail
 		typename tmat2x3<T>::col_type const & v, 
 		typename tmat2x3<T>::col_type const & v, 
 		tmat2x3<T> const & m);
 		tmat2x3<T> const & m);
 
 
+	template <typename T>
+	tmat2x3<T> operator* (
+		tmat2x3<T> const & m1, 
+		tmat2x2<T> const & m2);
+
 	template <typename T>
 	template <typename T>
 	tmat3x3<T> operator* (
 	tmat3x3<T> operator* (
 		tmat2x3<T> const & m1, 
 		tmat2x3<T> const & m1, 
 		tmat3x2<T> const & m2);
 		tmat3x2<T> const & m2);
+		
+	template <typename T>
+	tmat4x3<T> operator* (
+		tmat2x3<T> const & m1, 
+		tmat4x2<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 
 	tmat2x3<T> operator/ (
 	tmat2x3<T> operator/ (

+ 11 - 1
glm/core/type_mat2x4.hpp

@@ -165,10 +165,20 @@ namespace detail
 		typename tmat2x4<T>::col_type const & v, 
 		typename tmat2x4<T>::col_type const & v, 
 		tmat2x4<T> const & m);
 		tmat2x4<T> const & m);
 
 
+	template <typename T>
+	tmat4x4<T> operator* (
+		tmat2x4<T> const & m1, 
+		tmat4x2<T> const & m2);
+		
 	template <typename T>
 	template <typename T>
 	tmat2x4<T> operator* (
 	tmat2x4<T> operator* (
 		tmat2x4<T> const & m1, 
 		tmat2x4<T> const & m1, 
-		tmat2x4<T> const & m2);
+		tmat2x2<T> const & m2);
+		
+	template <typename T>
+	tmat3x4<T> operator* (
+		tmat2x4<T> const & m1, 
+		tmat3x2<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 
 	tmat2x4<T> operator/ (
 	tmat2x4<T> operator/ (

+ 10 - 0
glm/core/type_mat3x2.hpp

@@ -175,6 +175,16 @@ namespace detail
 	tmat2x2<T> operator* (
 	tmat2x2<T> operator* (
 		tmat3x2<T> const & m1, 
 		tmat3x2<T> const & m1, 
 		tmat2x3<T> const & m2);
 		tmat2x3<T> const & m2);
+		
+	template <typename T>
+	tmat3x2<T> operator* (
+		tmat3x2<T> const & m1, 
+		tmat3x3<T> const & m2);
+		
+	template <typename T>
+	tmat4x2<T> operator* (
+		tmat3x2<T> const & m1, 
+		tmat4x3<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 
 	tmat3x2<T> operator/ (
 	tmat3x2<T> operator/ (

+ 10 - 0
glm/core/type_mat3x3.hpp

@@ -190,6 +190,16 @@ namespace detail
 	tmat3x3<T> operator* (
 	tmat3x3<T> operator* (
 		tmat3x3<T> const & m1, 
 		tmat3x3<T> const & m1, 
 		tmat3x3<T> const & m2);
 		tmat3x3<T> const & m2);
+		
+	template <typename T>
+	tmat2x3<T> operator* (
+		tmat3x3<T> const & m1, 
+		tmat2x3<T> const & m2);
+		
+	template <typename T>
+	tmat4x3<T> operator* (
+		tmat3x3<T> const & m1, 
+		tmat4x3<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 
 	tmat3x3<T> operator/ (
 	tmat3x3<T> operator/ (

+ 10 - 0
glm/core/type_mat3x4.hpp

@@ -175,6 +175,16 @@ namespace detail
 	tmat4x4<T> operator* (
 	tmat4x4<T> operator* (
 		tmat3x4<T> const & m1, 
 		tmat3x4<T> const & m1, 
 		tmat4x3<T> const & m2);
 		tmat4x3<T> const & m2);
+		
+	template <typename T>
+	tmat2x4<T> operator* (
+		tmat3x4<T> const & m1, 
+		tmat2x3<T> const & m2);
+		
+	template <typename T>
+	tmat3x4<T> operator* (
+		tmat3x4<T> const & m1, 
+		tmat3x3<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 
 	tmat3x4<T> operator/ (
 	tmat3x4<T> operator/ (

+ 12 - 2
glm/core/type_mat4x2.hpp

@@ -176,9 +176,19 @@ namespace detail
 		typename tmat4x2<T>::col_type const & v, 
 		typename tmat4x2<T>::col_type const & v, 
 		tmat4x2<T> const & m);
 		tmat4x2<T> const & m);
 
 
-	template <typename T> 
-	tmat2x2<T> operator* (
+	template <typename T>
+	tmat3x2<T> operator* (
+		tmat4x2<T> const & m1, 
+		tmat3x4<T> const & m2);
+		
+	template <typename T>
+	tmat4x2<T> operator* (
 		tmat4x2<T> const & m1, 
 		tmat4x2<T> const & m1, 
+		tmat4x4<T> const & m2);
+		
+	template <typename T>
+	tmat2x3<T> operator* (
+		tmat4x3<T> const & m1, 
 		tmat2x4<T> const & m2);
 		tmat2x4<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 

+ 10 - 0
glm/core/type_mat4x3.hpp

@@ -174,10 +174,20 @@ namespace detail
 		typename tmat4x3<T>::col_type const & v, 
 		typename tmat4x3<T>::col_type const & v, 
 		tmat4x3<T> const & m);
 		tmat4x3<T> const & m);
 
 
+	template <typename T> 
+	tmat2x3<T> operator* (
+		tmat4x3<T> const & m1, 
+		tmat2x4<T> const & m2);
+
 	template <typename T> 
 	template <typename T> 
 	tmat3x3<T> operator* (
 	tmat3x3<T> operator* (
 		tmat4x3<T> const & m1, 
 		tmat4x3<T> const & m1, 
 		tmat3x4<T> const & m2);
 		tmat3x4<T> const & m2);
+		
+	template <typename T>
+	tmat4x3<T> operator* (
+		tmat4x3<T> const & m1, 
+		tmat4x4<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 
 	tmat4x3<T> operator/ (
 	tmat4x3<T> operator/ (

+ 10 - 0
glm/core/type_mat4x4.hpp

@@ -188,6 +188,16 @@ namespace detail
 	typename tmat4x4<T>::row_type operator* (
 	typename tmat4x4<T>::row_type operator* (
 		typename tmat4x4<T>::col_type const & v, 
 		typename tmat4x4<T>::col_type const & v, 
 		tmat4x4<T> const & m);
 		tmat4x4<T> const & m);
+		
+	template <typename T>
+	tmat2x4<T> operator* (
+		tmat4x4<T> const & m1, 
+		tmat2x4<T> const & m2);
+
+	template <typename T>
+	tmat3x4<T> operator* (
+		tmat4x4<T> const & m1, 
+		tmat3x4<T> const & m2);
 
 
 	template <typename T> 
 	template <typename T> 
 	tmat4x4<T> operator* (
 	tmat4x4<T> operator* (