summaryrefslogtreecommitdiff
path: root/src/matrix.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/matrix.h')
-rw-r--r--src/matrix.h312
1 files changed, 169 insertions, 143 deletions
diff --git a/src/matrix.h b/src/matrix.h
index a3e480b..0a66e58 100644
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -3,221 +3,247 @@
struct Matrix
{
- float a00, a01, a02, a10, a11, a12, a20, a21, a22;
+ float a00, a01, a02, a10, a11, a12, a20, a21, a22;
};
-__device__ __host__ Matrix make_matrix(float a00, float a01, float a02,
- float a10, float a11, float a12,
- float a20, float a21, float a22)
+__device__ Matrix
+make_matrix(float a00, float a01, float a02,
+ float a10, float a11, float a12,
+ float a20, float a21, float a22)
{
- Matrix m = {a00, a01, a02, a10, a11, a12, a20, a21, a22};
- return m;
+ Matrix m = {a00, a01, a02, a10, a11, a12, a20, a21, a22};
+ return m;
}
-__device__ __host__ Matrix make_matrix(const float3 &u1, const float3 &u2, const float3 &u3)
+__device__ Matrix
+make_matrix(const float3 &u1, const float3 &u2, const float3 &u3)
{
- Matrix m = {u1.x, u2.x, u3.x, u1.y, u2.y, u3.y, u1.z, u2.z, u3.z};
- return m;
+ Matrix m = {u1.x, u2.x, u3.x, u1.y, u2.y, u3.y, u1.z, u2.z, u3.z};
+ return m;
}
-__device__ __host__ Matrix operator- (const Matrix &m)
+__device__ Matrix
+operator- (const Matrix &m)
{
- return make_matrix(-m.a00, -m.a01, -m.a02,
- -m.a10, -m.a11, -m.a12,
- -m.a20, -m.a21, -m.a22);
+ return make_matrix(-m.a00, -m.a01, -m.a02,
+ -m.a10, -m.a11, -m.a12,
+ -m.a20, -m.a21, -m.a22);
}
-__device__ __host__ float3 operator* (const Matrix &m, const float3 &a)
+__device__ float3
+operator* (const Matrix &m, const float3 &a)
{
- return make_float3(m.a00*a.x + m.a01*a.y + m.a02*a.z,
- m.a10*a.x + m.a11*a.y + m.a12*a.z,
- m.a20*a.x + m.a21*a.y + m.a22*a.z);
+ return make_float3(m.a00*a.x + m.a01*a.y + m.a02*a.z,
+ m.a10*a.x + m.a11*a.y + m.a12*a.z,
+ m.a20*a.x + m.a21*a.y + m.a22*a.z);
}
-__device__ __host__ Matrix operator+ (const Matrix &m, const Matrix &n)
+__device__ Matrix
+operator+ (const Matrix &m, const Matrix &n)
{
- return make_matrix(m.a00+n.a00, m.a01+n.a01, m.a02+n.a02,
- m.a10+n.a10, m.a11+n.a11, m.a12+n.a12,
- m.a20+n.a20, m.a21+n.a21, m.a22+n.a22);
+ return make_matrix(m.a00+n.a00, m.a01+n.a01, m.a02+n.a02,
+ m.a10+n.a10, m.a11+n.a11, m.a12+n.a12,
+ m.a20+n.a20, m.a21+n.a21, m.a22+n.a22);
}
-__device__ __host__ void operator+= (Matrix &m, const Matrix &n)
+__device__ void
+operator+= (Matrix &m, const Matrix &n)
{
- m.a00 += n.a00;
- m.a01 += n.a01;
- m.a02 += n.a02;
- m.a10 += n.a10;
- m.a11 += n.a11;
- m.a12 += n.a12;
- m.a20 += n.a20;
- m.a21 += n.a21;
- m.a22 += n.a22;
+ m.a00 += n.a00;
+ m.a01 += n.a01;
+ m.a02 += n.a02;
+ m.a10 += n.a10;
+ m.a11 += n.a11;
+ m.a12 += n.a12;
+ m.a20 += n.a20;
+ m.a21 += n.a21;
+ m.a22 += n.a22;
}
-__device__ __host__ Matrix operator- (const Matrix &m, const Matrix &n)
+__device__ Matrix
+operator- (const Matrix &m, const Matrix &n)
{
- return make_matrix(m.a00-n.a00, m.a01-n.a01, m.a02-n.a02,
- m.a10-n.a10, m.a11-n.a11, m.a12-n.a12,
- m.a20-n.a20, m.a21-n.a21, m.a22-n.a22);
+ return make_matrix(m.a00-n.a00, m.a01-n.a01, m.a02-n.a02,
+ m.a10-n.a10, m.a11-n.a11, m.a12-n.a12,
+ m.a20-n.a20, m.a21-n.a21, m.a22-n.a22);
}
-__device__ __host__ void operator-= (Matrix &m, const Matrix& n)
+__device__ void
+operator-= (Matrix &m, const Matrix& n)
{
- m.a00 -= n.a00;
- m.a01 -= n.a01;
- m.a02 -= n.a02;
- m.a10 -= n.a10;
- m.a11 -= n.a11;
- m.a12 -= n.a12;
- m.a20 -= n.a20;
- m.a21 -= n.a21;
- m.a22 -= n.a22;
+ m.a00 -= n.a00;
+ m.a01 -= n.a01;
+ m.a02 -= n.a02;
+ m.a10 -= n.a10;
+ m.a11 -= n.a11;
+ m.a12 -= n.a12;
+ m.a20 -= n.a20;
+ m.a21 -= n.a21;
+ m.a22 -= n.a22;
}
-__device__ __host__ Matrix operator* (const Matrix &m, const Matrix &n)
+__device__ Matrix
+operator* (const Matrix &m, const Matrix &n)
{
- return make_matrix(m.a00*n.a00 + m.a01*n.a10 + m.a02*n.a20,
- m.a00*n.a01 + m.a01*n.a11 + m.a02*n.a21,
- m.a00*n.a02 + m.a01*n.a12 + m.a02*n.a22,
- m.a10*n.a00 + m.a11*n.a10 + m.a12*n.a20,
- m.a10*n.a01 + m.a11*n.a11 + m.a12*n.a21,
- m.a10*n.a02 + m.a11*n.a12 + m.a12*n.a22,
- m.a20*n.a00 + m.a21*n.a10 + m.a22*n.a20,
- m.a20*n.a01 + m.a21*n.a11 + m.a22*n.a21,
- m.a20*n.a02 + m.a21*n.a12 + m.a22*n.a22);
+ return make_matrix(m.a00*n.a00 + m.a01*n.a10 + m.a02*n.a20,
+ m.a00*n.a01 + m.a01*n.a11 + m.a02*n.a21,
+ m.a00*n.a02 + m.a01*n.a12 + m.a02*n.a22,
+ m.a10*n.a00 + m.a11*n.a10 + m.a12*n.a20,
+ m.a10*n.a01 + m.a11*n.a11 + m.a12*n.a21,
+ m.a10*n.a02 + m.a11*n.a12 + m.a12*n.a22,
+ m.a20*n.a00 + m.a21*n.a10 + m.a22*n.a20,
+ m.a20*n.a01 + m.a21*n.a11 + m.a22*n.a21,
+ m.a20*n.a02 + m.a21*n.a12 + m.a22*n.a22);
}
-__device__ __host__ Matrix operator+ (const Matrix &m, const float &c)
+__device__ Matrix
+operator+ (const Matrix &m, const float &c)
{
- return make_matrix(m.a00+c, m.a01+c, m.a02+c,
- m.a10+c, m.a11+c, m.a12+c,
- m.a20+c, m.a21+c, m.a22+c);
+ return make_matrix(m.a00+c, m.a01+c, m.a02+c,
+ m.a10+c, m.a11+c, m.a12+c,
+ m.a20+c, m.a21+c, m.a22+c);
}
-__device__ __host__ void operator+= (Matrix &m, const float &c)
+__device__ void
+operator+= (Matrix &m, const float &c)
{
- m.a00 += c;
- m.a01 += c;
- m.a02 += c;
- m.a10 += c;
- m.a11 += c;
- m.a12 += c;
- m.a20 += c;
- m.a21 += c;
- m.a22 += c;
+ m.a00 += c;
+ m.a01 += c;
+ m.a02 += c;
+ m.a10 += c;
+ m.a11 += c;
+ m.a12 += c;
+ m.a20 += c;
+ m.a21 += c;
+ m.a22 += c;
}
-__device__ __host__ Matrix operator+ (const float &c, const Matrix &m)
+__device__ Matrix
+operator+ (const float &c, const Matrix &m)
{
- return make_matrix(c+m.a00, c+m.a01, c+m.a02,
- c+m.a10, c+m.a11, c+m.a12,
- c+m.a20, c+m.a21, c+m.a22);
+ return make_matrix(c+m.a00, c+m.a01, c+m.a02,
+ c+m.a10, c+m.a11, c+m.a12,
+ c+m.a20, c+m.a21, c+m.a22);
}
-__device__ __host__ Matrix operator- (const Matrix &m, const float &c)
+__device__ Matrix
+operator- (const Matrix &m, const float &c)
{
- return make_matrix(m.a00-c, m.a01-c, m.a02-c,
- m.a10-c, m.a11-c, m.a12-c,
- m.a20-c, m.a21-c, m.a22-c);
+ return make_matrix(m.a00-c, m.a01-c, m.a02-c,
+ m.a10-c, m.a11-c, m.a12-c,
+ m.a20-c, m.a21-c, m.a22-c);
}
-__device__ __host__ void operator-= (Matrix &m, const float &c)
+__device__ void
+operator-= (Matrix &m, const float &c)
{
- m.a00 -= c;
- m.a01 -= c;
- m.a02 -= c;
- m.a10 -= c;
- m.a11 -= c;
- m.a12 -= c;
- m.a20 -= c;
- m.a21 -= c;
- m.a22 -= c;
+ m.a00 -= c;
+ m.a01 -= c;
+ m.a02 -= c;
+ m.a10 -= c;
+ m.a11 -= c;
+ m.a12 -= c;
+ m.a20 -= c;
+ m.a21 -= c;
+ m.a22 -= c;
}
-__device__ __host__ Matrix operator- (const float &c, const Matrix &m)
+__device__ Matrix
+operator- (const float &c, const Matrix &m)
{
- return make_matrix(c-m.a00, c-m.a01, c-m.a02,
- c-m.a10, c-m.a11, c-m.a12,
- c-m.a20, c-m.a21, c-m.a22);
+ return make_matrix(c-m.a00, c-m.a01, c-m.a02,
+ c-m.a10, c-m.a11, c-m.a12,
+ c-m.a20, c-m.a21, c-m.a22);
}
-__device__ __host__ Matrix operator* (const Matrix &m, const float &c)
+__device__ Matrix
+operator* (const Matrix &m, const float &c)
{
- return make_matrix(m.a00*c, m.a01*c, m.a02*c,
- m.a10*c, m.a11*c, m.a12*c,
- m.a20*c, m.a21*c, m.a22*c);
+ return make_matrix(m.a00*c, m.a01*c, m.a02*c,
+ m.a10*c, m.a11*c, m.a12*c,
+ m.a20*c, m.a21*c, m.a22*c);
}
-__device__ __host__ void operator*= (Matrix &m, const float &c)
+__device__ void
+operator*= (Matrix &m, const float &c)
{
- m.a00 *= c;
- m.a01 *= c;
- m.a02 *= c;
- m.a10 *= c;
- m.a11 *= c;
- m.a12 *= c;
- m.a20 *= c;
- m.a21 *= c;
- m.a22 *= c;
+ m.a00 *= c;
+ m.a01 *= c;
+ m.a02 *= c;
+ m.a10 *= c;
+ m.a11 *= c;
+ m.a12 *= c;
+ m.a20 *= c;
+ m.a21 *= c;
+ m.a22 *= c;
}
-__device__ __host__ Matrix operator* (const float &c, const Matrix &m)
+__device__ Matrix
+operator* (const float &c, const Matrix &m)
{
- return make_matrix(c*m.a00, c*m.a01, c*m.a02,
- c*m.a10, c*m.a11, c*m.a12,
- c*m.a20, c*m.a21, c*m.a22);
+ return make_matrix(c*m.a00, c*m.a01, c*m.a02,
+ c*m.a10, c*m.a11, c*m.a12,
+ c*m.a20, c*m.a21, c*m.a22);
}
-__device__ __host__ Matrix operator/ (const Matrix &m, const float &c)
+__device__ Matrix
+operator/ (const Matrix &m, const float &c)
{
- return make_matrix(m.a00/c, m.a01/c, m.a02/c,
- m.a10/c, m.a11/c, m.a12/c,
- m.a20/c, m.a21/c, m.a22/c);
+ return make_matrix(m.a00/c, m.a01/c, m.a02/c,
+ m.a10/c, m.a11/c, m.a12/c,
+ m.a20/c, m.a21/c, m.a22/c);
}
-__device__ __host__ void operator/= (Matrix &m, const float &c)
+__device__ void
+operator/= (Matrix &m, const float &c)
{
- m.a00 /= c;
- m.a01 /= c;
- m.a02 /= c;
- m.a10 /= c;
- m.a11 /= c;
- m.a12 /= c;
- m.a20 /= c;
- m.a21 /= c;
- m.a22 /= c;
+ m.a00 /= c;
+ m.a01 /= c;
+ m.a02 /= c;
+ m.a10 /= c;
+ m.a11 /= c;
+ m.a12 /= c;
+ m.a20 /= c;
+ m.a21 /= c;
+ m.a22 /= c;
}
-__device__ __host__ Matrix operator/ (const float &c, const Matrix &m)
+__device__ Matrix
+operator/ (const float &c, const Matrix &m)
{
- return make_matrix(c/m.a00, c/m.a01, c/m.a02,
- c/m.a10, c/m.a11, c/m.a12,
- c/m.a20, c/m.a21, c/m.a22);
+ return make_matrix(c/m.a00, c/m.a01, c/m.a02,
+ c/m.a10, c/m.a11, c/m.a12,
+ c/m.a20, c/m.a21, c/m.a22);
}
-__device__ __host__ float det(const Matrix &m)
+__device__ float
+det(const Matrix &m)
{
- return m.a00*(m.a11*m.a22 - m.a12*m.a21) - m.a10*(m.a01*m.a22 - m.a02*m.a21) + m.a20*(m.a01*m.a12 - m.a02*m.a11);
+ return m.a00*(m.a11*m.a22 - m.a12*m.a21) -
+ m.a10*(m.a01*m.a22 - m.a02*m.a21) +
+ m.a20*(m.a01*m.a12 - m.a02*m.a11);
}
-__device__ __host__ Matrix inv(const Matrix &m)
+__device__ Matrix
+inv(const Matrix &m)
{
- 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)/det(m);
+ 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)/det(m);
}
-__device__ __host__ Matrix outer(const float3 &a, const float3 &b)
+__device__ Matrix
+outer(const float3 &a, const float3 &b)
{
- return make_matrix(a.x*b.x, a.x*b.y, a.x*b.z,
- a.y*b.x, a.y*b.y, a.y*b.z,
- a.z*b.x, a.z*b.y, a.z*b.z);
+ return make_matrix(a.x*b.x, a.x*b.y, a.x*b.z,
+ a.y*b.x, a.y*b.y, a.y*b.z,
+ a.z*b.x, a.z*b.y, a.z*b.z);
}
#endif
generated by cgit (git 2.34.1) at 2025-05-07 15:02:00 +0000