Browse Source

Add a new constructor to fmat4x4SIMD that takes a __m128[4]. This is used in a future commit.

Dave Reid 13 years ago
parent
commit
a4ea111417
2 changed files with 13 additions and 0 deletions
  1. 2 0
      glm/gtx/simd_mat4.hpp
  2. 11 0
      glm/gtx/simd_mat4.inl

+ 2 - 0
glm/gtx/simd_mat4.hpp

@@ -91,6 +91,8 @@ namespace detail
 			fvec4SIMD const & v3);
 		explicit fmat4x4SIMD(
 			tmat4x4<float> const & m);
+        explicit fmat4x4SIMD(
+            __m128 const in[4]);
 
 		// Conversions
 		//template <typename U> 

+ 11 - 0
glm/gtx/simd_mat4.inl

@@ -82,6 +82,17 @@ GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
 	this->Data[3] = fvec4SIMD(m[3]);
 }
 
+GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
+(
+    __m128 const in[4]
+)
+{
+    this->Data[0] = in[0];
+    this->Data[1] = in[1];
+    this->Data[2] = in[2];
+    this->Data[3] = in[3];
+}
+
 //////////////////////////////////////
 // Accesses