fixed another stack overflow on win32, apparently a 64k packet buffer on the stack...

[xonotic/darkplaces.git] / matrixlib.h

diff --git a/matrixlib.h b/matrixlib.h
index 81364c68e2de344284f21b478a19c2ea5bc67af6..c54764435a3d73f5b0b60540f091b2efa07912e3 100644 (file)
--- a/matrixlib.h
+++ b/matrixlib.h
@@ -2,18 +2,16 @@
 #ifndef MATRIXLIB_H
 #define MATRIXLIB_H
 
+#ifndef M_PI
+#define M_PI           3.14159265358979323846  // matches value in gcc v2 math.h
+#endif
+
 typedef struct matrix4x4_s
 {
        float m[4][4];
 }
 matrix4x4_t;
 
-typedef struct matrix3x4_s
-{
-       float m[3][4];
-}
-matrix3x4_t;
-
 // functions for manipulating 4x4 matrices
 
 // copy a matrix4x4
@@ -22,8 +20,6 @@ void Matrix4x4_Copy (matrix4x4_t *out, const matrix4x4_t *in);
 void Matrix4x4_CopyRotateOnly (matrix4x4_t *out, const matrix4x4_t *in);
 // copy only the translate portion of a matrix4x4
 void Matrix4x4_CopyTranslateOnly (matrix4x4_t *out, const matrix4x4_t *in);
-// make a matrix4x4 from a matrix3x4
-void Matrix4x4_FromMatrix3x4 (matrix4x4_t *out, const matrix3x4_t *in);
 // multiply two matrix4x4 together, combining their transformations
 // (warning: order matters - Concat(a, b, c) != Concat(a, c, b))
 void Matrix4x4_Concat (matrix4x4_t *out, const matrix4x4_t *in1, const matrix4x4_t *in2);
@@ -73,6 +69,8 @@ void Matrix4x4_Transform4 (const matrix4x4_t *in, const float v[4], float out[4]
 // 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]);
+// 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]);
 
 // ease of use functions
 // immediately applies a Translate to the matrix
@@ -84,74 +82,4 @@ void Matrix4x4_ConcatScale (matrix4x4_t *out, float x);
 // immediately applies a Scale3 to the matrix
 void Matrix4x4_ConcatScale3 (matrix4x4_t *out, float x, float y, float z);
 
-// print a matrix to the console
-void Matrix4x4_Print(const matrix4x4_t *in);
-
-
-// functions for manipulating 3x4 matrices
-
-// copy a matrix3x4
-void Matrix3x4_Copy (matrix3x4_t *out, const matrix3x4_t *in);
-// copy only the rotation portion of a matrix3x4
-void Matrix3x4_CopyRotateOnly (matrix3x4_t *out, const matrix3x4_t *in);
-// copy only the translate portion of a matrix3x4
-void Matrix3x4_CopyTranslateOnly (matrix3x4_t *out, const matrix3x4_t *in);
-// make a matrix3x4 from a matrix4x4
-void Matrix3x4_FromMatrix4x4 (matrix3x4_t *out, const matrix4x4_t *in);
-// multiply two matrix3x4 together, combining their transformations
-// (warning: order matters - Concat(a, b, c) != Concat(a, c, b))
-void Matrix3x4_Concat (matrix3x4_t *out, const matrix3x4_t *in1, const matrix3x4_t *in2);
-// swaps the rows and columns of the rotation matrix
-// (inverting the rotation, but leaving everything else the same)
-void Matrix3x4_Transpose3x3 (matrix3x4_t *out, const matrix3x4_t *in1);
-// creates a matrix that does the opposite of the matrix provided
-// only supports translate, rotate, scale (not scale3) matrices
-void Matrix3x4_Invert_Simple (matrix3x4_t *out, const matrix3x4_t *in1);
-
-// creates an identity matrix
-// (a matrix which does nothing)
-void Matrix3x4_CreateIdentity (matrix3x4_t *out);
-// creates a translate matrix
-// (moves vectors)
-void Matrix3x4_CreateTranslate (matrix3x4_t *out, float x, float y, float z);
-// creates a rotate matrix
-// (rotates vectors)
-void Matrix3x4_CreateRotate (matrix3x4_t *out, float angle, float x, float y, float z);
-// creates a scaling matrix
-// (expands or contracts vectors)
-// (warning: do not apply this kind of matrix to direction vectors)
-void Matrix3x4_CreateScale (matrix3x4_t *out, float x);
-// creates a squishing matrix
-// (expands or contracts vectors differently in different axis)
-// (warning: this is not reversed by Invert_Simple)
-// (warning: do not apply this kind of matrix to direction vectors)
-void Matrix3x4_CreateScale3 (matrix3x4_t *out, float x, float y, float z);
-// creates a matrix for a quake entity
-void Matrix3x4_CreateFromQuakeEntity(matrix3x4_t *out, float x, float y, float z, float pitch, float yaw, float roll, float scale);
-
-// converts a matrix3x4 to a set of 3D vectors for the 3 axial directions, and the translate
-void Matrix3x4_ToVectors(const matrix3x4_t *in, float vx[3], float vy[3], float vz[3], float t[3]);
-// creates a matrix3x4 from a set of 3D vectors for axial directions, and translate
-void Matrix3x4_FromVectors(matrix3x4_t *out, const float vx[3], const float vy[3], const float vz[3], const float t[3]);
-
-// transforms a 3D vector through a matrix3x4
-void Matrix3x4_Transform (const matrix3x4_t *in, const float v[3], float out[3]);
-// reverse transforms a 3D vector through a matrix3x4, at least for *simple*
-// cases (rotation and translation *ONLY*), this attempts to undo the results
-// of Transform
-void Matrix3x4_SimpleUntransform (const matrix3x4_t *in, const float v[3], float out[3]);
-
-// ease of use functions
-// immediately applies a Translate to the matrix
-void Matrix3x4_ConcatTranslate (matrix3x4_t *out, float x, float y, float z);
-// immediately applies a Rotate to the matrix
-void Matrix3x4_ConcatRotate (matrix3x4_t *out, float angle, float x, float y, float z);
-// immediately applies a Scale to the matrix
-void Matrix3x4_ConcatScale (matrix3x4_t *out, float x);
-// immediately applies a Scale3 to the matrix
-void Matrix3x4_ConcatScale3 (matrix3x4_t *out, float x, float y, float z);
-
-// print a matrix to the console
-void Matrix3x4_Print(const matrix3x4_t *in);
-
 #endif