summaryrefslogtreecommitdiff
path: root/matrix.h
diff options
context:
space:
mode:
Diffstat (limited to 'matrix.h')
-rw-r--r--matrix.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/matrix.h b/matrix.h
index b363571..14e04a4 100644
--- a/matrix.h
+++ b/matrix.h
@@ -14,6 +14,11 @@ __device__ __host__ Matrix make_matrix(float a00, float a01, float a02,
return m;
}
+__device__ __host__ Matrix make_matrix(float3 &u1, float3 &u2, float3 &u3)
+{
+ Matrix m = {u1.x, u2.x, u3.x, u1.y, u2.y, u3.y, u1.z, u2.z, u3.z};
+}
+
__device__ __host__ float3 operator* (const Matrix &m, const float3 &a)
{
return make_float3(m.a00*a.x + m.a01*a.y + m.a02*a.z,
@@ -202,6 +207,19 @@ __device__ __host__ Matrix inv(const Matrix &m)
m.a00*m.a11 - m.a01*m.a10)/det(m);
}
+__device__ __host__ Matrix inv(const Matrix&m, const float determinant)
+{
+ return make_matrix(m.a11*m.a22 - m.a12*m.a21,
+ m.a02*m.a21 - m.a01*m.a22,
+ m.a01*m.a12 - m.a02*m.a11,
+ m.a12*m.a20 - m.a10*m.a22,
+ m.a00*m.a22 - m.a02*m.a20,
+ m.a02*m.a10 - m.a00*m.a12,
+ m.a10*m.a21 - m.a11*m.a20,
+ m.a01*m.a20 - m.a00*m.a21,
+ m.a00*m.a11 - m.a01*m.a10)/determinant;
+}
+
__device__ __host__ Matrix outer(const float3 &a, const float3 &b)
{
return make_matrix(a.x*b.x, a.x*b.y, a.x*b.z,