fix decals bug introduced by transition to matrix use

[xonotic/darkplaces.git] / matrixlib.h

diff --git a/matrixlib.h b/matrixlib.h
index 2315017980359d5aed3286ca50cf421a6d27323c..87b09f84dc123cb19bd30dae48c84a963ec4ac4d 100644 (file)
--- a/matrixlib.h
+++ b/matrixlib.h
@@ -2,6 +2,10 @@
 #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];
@@ -55,6 +59,9 @@ void Matrix4x4_ToVectors(const matrix4x4_t *in, float vx[3], float vy[3], float
 // 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]);
 
+// blends two matrices together, at a given percentage (blend controls percentage of in2)
+void Matrix4x4_Blend (matrix4x4_t *out, const matrix4x4_t *in1, const matrix4x4_t *in2, float blend);
+
 // transforms a 3D vector through a matrix4x4
 void Matrix4x4_Transform (const matrix4x4_t *in, const float v[3], float out[3]);
 // transforms a 4D vector through a matrix4x4
@@ -78,4 +85,9 @@ 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);
 
+// extracts origin vector (translate) from matrix
+void Matrix4x4_OriginFromMatrix (const matrix4x4_t *in, float *out);
+// extracts scaling factor from matrix (only works for uniform scaling)
+float Matrix4x4_ScaleFromMatrix (const matrix4x4_t *in);
+
 #endif