X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=matrixlib.h;h=1ab8262d07a4d6047616b064424be43f1d7ce044;hp=eb926a107ef1451f3dffcd0f3ed2390d0a9276a0;hb=f4fad9dbeda77dc25174c242f04c5abe88fafaf9;hpb=9d6f4496fec74ad0fe7c794666138b6495dc9405 diff --git a/matrixlib.h b/matrixlib.h index eb926a10..1ab8262d 100644 --- a/matrixlib.h +++ b/matrixlib.h @@ -10,7 +10,7 @@ typedef struct matrix4x4_s { - float m[4][4]; + vec_t m[4][4]; } matrix4x4_t; @@ -80,11 +80,13 @@ void Matrix4x4_CreateScale (matrix4x4_t *out, double x); void Matrix4x4_CreateScale3 (matrix4x4_t *out, double x, double y, double z); // creates a matrix for a quake entity void Matrix4x4_CreateFromQuakeEntity(matrix4x4_t *out, double x, double y, double z, double pitch, double yaw, double roll, double scale); +// creates a duke3d view matrix for a quake view matrix ;) +void Matrix4x4_QuakeToDuke3D(const matrix4x4_t *in, matrix4x4_t *out, double maxShearAngle); // converts a matrix4x4 to a set of 3D vectors for the 3 axial directions, and the translate -void Matrix4x4_ToVectors(const matrix4x4_t *in, float vx[3], float vy[3], float vz[3], float t[3]); +void Matrix4x4_ToVectors(const matrix4x4_t *in, vec_t vx[3], vec_t vy[3], vec_t vz[3], vec_t t[3]); // creates a matrix4x4 from a set of 3D vectors for axial directions, and translate -void Matrix4x4_FromVectors(matrix4x4_t *out, const float vx[3], const float vy[3], const float vz[3], const float t[3]); +void Matrix4x4_FromVectors(matrix4x4_t *out, const vec_t vx[3], const vec_t vy[3], const vec_t vz[3], const vec_t t[3]); // converts a matrix4x4 to a double[16] array in the OpenGL orientation void Matrix4x4_ToArrayDoubleGL(const matrix4x4_t *in, double out[16]); @@ -129,21 +131,21 @@ void Matrix4x4_ToBonePose7s(const matrix4x4_t *m, float origininvscale, short *p void Matrix4x4_Blend (matrix4x4_t *out, const matrix4x4_t *in1, const matrix4x4_t *in2, double blend); // transforms a 3D vector through a matrix4x4 -void Matrix4x4_Transform (const matrix4x4_t *in, const float v[3], float out[3]); +void Matrix4x4_Transform (const matrix4x4_t *in, const vec_t v[3], vec_t out[3]); // transforms a 4D vector through a matrix4x4 // (warning: if you don't know why you would need this, you don't need it) // (warning: the 4th component of the vector should be 1.0) -void Matrix4x4_Transform4 (const matrix4x4_t *in, const float v[4], float out[4]); +void Matrix4x4_Transform4 (const matrix4x4_t *in, const vec_t v[4], vec_t out[4]); // reverse transforms a 3D vector through a matrix4x4, at least for *simple* // cases (rotation and translation *ONLY*), this attempts to undo the results // of Transform -//void Matrix4x4_SimpleUntransform (const matrix4x4_t *in, const float v[3], float out[3]); +//void Matrix4x4_SimpleUntransform (const matrix4x4_t *in, const vec_t v[3], vec_t out[3]); // transforms a direction vector through the rotation part of a matrix -void Matrix4x4_Transform3x3 (const matrix4x4_t *in, const float v[3], float out[3]); +void Matrix4x4_Transform3x3 (const matrix4x4_t *in, const vec_t v[3], vec_t out[3]); // transforms a positive distance plane (A*x+B*y+C*z-D=0) through a rotation or translation matrix -void Matrix4x4_TransformPositivePlane (const matrix4x4_t *in, float x, float y, float z, float d, float *o); +void Matrix4x4_TransformPositivePlane (const matrix4x4_t *in, vec_t x, vec_t y, vec_t z, vec_t d, vec_t *o); // transforms a standard plane (A*x+B*y+C*z+D=0) through a rotation or translation matrix -void Matrix4x4_TransformStandardPlane (const matrix4x4_t *in, float x, float y, float z, float d, float *o); +void Matrix4x4_TransformStandardPlane (const matrix4x4_t *in, vec_t x, vec_t y, vec_t z, vec_t d, vec_t *o); // ease of use functions // immediately applies a Translate to the matrix @@ -156,7 +158,7 @@ void Matrix4x4_ConcatScale (matrix4x4_t *out, double x); void Matrix4x4_ConcatScale3 (matrix4x4_t *out, double x, double y, double z); // extracts origin vector (translate) from matrix -void Matrix4x4_OriginFromMatrix (const matrix4x4_t *in, float *out); +void Matrix4x4_OriginFromMatrix (const matrix4x4_t *in, vec_t *out); // extracts scaling factor from matrix (only works for uniform scaling) double Matrix4x4_ScaleFromMatrix (const matrix4x4_t *in);