Add matrix constructors from floatN vectors for square matrices

redorav · May 16, 2020 · 1b9b62b · 1b9b62b
1 parent 0639b21
commit 1b9b62b
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/include/hlsl++_matrix_float.h b/include/hlsl++_matrix_float.h
@@ -155,6 +155,8 @@ namespace hlslpp
 
 		explicit hlslpp_inline float2x2(float f) : vec(_hlslpp_set1_ps(f)) {}
 
+		hlslpp_inline float2x2(const float2& f1, const float2& f2) : vec(_hlslpp_shuf_xyxy_ps(f1.vec, f2.vec)) {}
+
 		hlslpp_inline float2x2(const float2x2& m) : vec(m.vec) {}
 
 		union
@@ -291,6 +293,8 @@ namespace hlslpp
 
 		hlslpp_inline float3x3(const float3x3& m) : vec0(m.vec0), vec1(m.vec1), vec2(m.vec2) {}
 
+		hlslpp_inline float3x3(const float3& f1, const float3& f2, const float3& f3) : vec0(f1.vec), vec1(f2.vec), vec2(f3.vec) {}
+
 		static const float3x3& identity() { static const float3x3 iden = float3x3(1, 0, 0, 0, 1, 0, 0, 0, 1); return iden; }
 
 		union
@@ -407,6 +411,9 @@ namespace hlslpp
 
 		explicit hlslpp_inline float4x4(float f) : vec0(_hlslpp256_set1_ps(f)), vec1(_hlslpp256_set1_ps(f)) {}
 
+		hlslpp_inline float4x4(const float4& f1, const float4& f2, const float4& f3, const float4& f4) 
+			: vec0(_hlslpp256_set128_ps(f1.vec, f2.vec)), vec1(_hlslpp256_set128_ps(f3.vec, f4.vec)) {}
+
 		hlslpp_inline float4x4(const float4x4& m) : vec0(m.vec0), vec1(m.vec1) {}
 
 		union
@@ -478,6 +485,8 @@ namespace hlslpp
 
 		explicit hlslpp_inline float4x4(float f) : vec0(_hlslpp_set1_ps(f)), vec1(_hlslpp_set1_ps(f)), vec2(_hlslpp_set1_ps(f)), vec3(_hlslpp_set1_ps(f)) {}
 
+		hlslpp_inline float4x4(const float4& f1, const float4& f2, const float4& f3, const float4& f4) : vec0(f1.vec), vec1(f2.vec), vec2(f3.vec), vec3(f4.vec) {}
+
 		hlslpp_inline float4x4(const float4x4& m) : vec0(m.vec0), vec1(m.vec1), vec2(m.vec2), vec3(m.vec3) {}
 
 		union