fixed Mod_Q3BSP_BoxTouchingPVS to handle unvised maps properly

[xonotic/darkplaces.git] / matrixlib.c

diff --git a/matrixlib.c b/matrixlib.c
index 6edcf8a472a38d1846d8ad96109948216ea661f7..e983e78213a82eb6e2df7d482d968333415eb19c 100644 (file)
--- a/matrixlib.c
+++ b/matrixlib.c
@@ -126,15 +126,15 @@ void Matrix4x4_Invert_Simple (matrix4x4_t *out, const matrix4x4_t *in1)
 
        // invert the rotation by transposing and multiplying by the squared
        // recipricol of the input matrix scale as described above
-       out->m[0][0] = in1->m[0][0] * scale;
-       out->m[0][1] = in1->m[1][0] * scale;
-       out->m[0][2] = in1->m[2][0] * scale;
-       out->m[1][0] = in1->m[0][1] * scale;
-       out->m[1][1] = in1->m[1][1] * scale;
-       out->m[1][2] = in1->m[2][1] * scale;
-       out->m[2][0] = in1->m[0][2] * scale;
-       out->m[2][1] = in1->m[1][2] * scale;
-       out->m[2][2] = in1->m[2][2] * scale;
+       out->m[0][0] = (float)(in1->m[0][0] * scale);
+       out->m[0][1] = (float)(in1->m[1][0] * scale);
+       out->m[0][2] = (float)(in1->m[2][0] * scale);
+       out->m[1][0] = (float)(in1->m[0][1] * scale);
+       out->m[1][1] = (float)(in1->m[1][1] * scale);
+       out->m[1][2] = (float)(in1->m[2][1] * scale);
+       out->m[2][0] = (float)(in1->m[0][2] * scale);
+       out->m[2][1] = (float)(in1->m[1][2] * scale);
+       out->m[2][2] = (float)(in1->m[2][2] * scale);
 
        // invert the translate
        out->m[0][3] = -(in1->m[0][3] * out->m[0][0] + in1->m[1][3] * out->m[0][1] + in1->m[2][3] * out->m[0][2]);
@@ -194,14 +194,14 @@ void Matrix4x4_CreateRotate (matrix4x4_t *out, float angle, float x, float y, fl
 
        len = x*x+y*y+z*z;
        if (len != 0.0f)
-               len = 1.0f / sqrt(len);
+               len = 1.0f / (float)sqrt(len);
        x *= len;
        y *= len;
        z *= len;
 
-       angle *= -M_PI / 180.0;
-       c = cos(angle);
-       s = sin(angle);
+       angle *= (float)(-M_PI / 180.0);
+       c = (float)cos(angle);
+       s = (float)sin(angle);
 
        out->m[0][0]=x * x + c * (1 - x * x);
        out->m[0][1]=x * y * (1 - c) + z * s;
@@ -274,17 +274,17 @@ void Matrix4x4_CreateFromQuakeEntity(matrix4x4_t *out, float x, float y, float z
        angle = roll * (M_PI*2 / 360);
        sr = sin(angle);
        cr = cos(angle);
-       out->m[0][0] = (cp*cy) * scale;
-       out->m[0][1] = (sr*sp*cy+cr*-sy) * scale;
-       out->m[0][2] = (cr*sp*cy+-sr*-sy) * scale;
+       out->m[0][0] = (float)((cp*cy) * scale);
+       out->m[0][1] = (float)((sr*sp*cy+cr*-sy) * scale);
+       out->m[0][2] = (float)((cr*sp*cy+-sr*-sy) * scale);
        out->m[0][3] = x;
-       out->m[1][0] = (cp*sy) * scale;
-       out->m[1][1] = (sr*sp*sy+cr*cy) * scale;
-       out->m[1][2] = (cr*sp*sy+-sr*cy) * scale;
+       out->m[1][0] = (float)((cp*sy) * scale);
+       out->m[1][1] = (float)((sr*sp*sy+cr*cy) * scale);
+       out->m[1][2] = (float)((cr*sp*sy+-sr*cy) * scale);
        out->m[1][3] = y;
-       out->m[2][0] = (-sp) * scale;
-       out->m[2][1] = (sr*cp) * scale;
-       out->m[2][2] = (cr*cp) * scale;
+       out->m[2][0] = (float)((-sp) * scale);
+       out->m[2][1] = (float)((sr*cp) * scale);
+       out->m[2][2] = (float)((cr*cp) * scale);
        out->m[2][3] = z;
        out->m[3][0] = 0;
        out->m[3][1] = 0;
@@ -328,6 +328,28 @@ void Matrix4x4_FromVectors(matrix4x4_t *out, const float vx[3], const float vy[3
        out->m[3][3] = 1.0f;
 }
 
+void Matrix4x4_Blend (matrix4x4_t *out, const matrix4x4_t *in1, const matrix4x4_t *in2, float blend)
+{
+       float iblend = 1 - blend;
+       out->m[0][0] = in1->m[0][0] * iblend + in2->m[0][0] * blend;
+       out->m[0][1] = in1->m[0][1] * iblend + in2->m[0][1] * blend;
+       out->m[0][2] = in1->m[0][2] * iblend + in2->m[0][2] * blend;
+       out->m[0][3] = in1->m[0][3] * iblend + in2->m[0][3] * blend;
+       out->m[1][0] = in1->m[1][0] * iblend + in2->m[1][0] * blend;
+       out->m[1][1] = in1->m[1][1] * iblend + in2->m[1][1] * blend;
+       out->m[1][2] = in1->m[1][2] * iblend + in2->m[1][2] * blend;
+       out->m[1][3] = in1->m[1][3] * iblend + in2->m[1][3] * blend;
+       out->m[2][0] = in1->m[2][0] * iblend + in2->m[2][0] * blend;
+       out->m[2][1] = in1->m[2][1] * iblend + in2->m[2][1] * blend;
+       out->m[2][2] = in1->m[2][2] * iblend + in2->m[2][2] * blend;
+       out->m[2][3] = in1->m[2][3] * iblend + in2->m[2][3] * blend;
+       out->m[3][0] = in1->m[3][0] * iblend + in2->m[3][0] * blend;
+       out->m[3][1] = in1->m[3][1] * iblend + in2->m[3][1] * blend;
+       out->m[3][2] = in1->m[3][2] * iblend + in2->m[3][2] * blend;
+       out->m[3][3] = in1->m[3][3] * iblend + in2->m[3][3] * blend;
+}
+
+
 void Matrix4x4_Transform (const matrix4x4_t *in, const float v[3], float out[3])
 {
        out[0] = v[0] * in->m[0][0] + v[1] * in->m[0][1] + v[2] * in->m[0][2] + in->m[0][3];
@@ -399,3 +421,16 @@ void Matrix4x4_ConcatScale3 (matrix4x4_t *out, float x, float y, float z)
        Matrix4x4_Concat(out, &base, &temp);
 }
 
+void Matrix4x4_OriginFromMatrix (const matrix4x4_t *in, float *out)
+{
+       out[0] = in->m[0][3];
+       out[1] = in->m[1][3];
+       out[2] = in->m[2][3];
+}
+
+float Matrix4x4_ScaleFromMatrix (const matrix4x4_t *in)
+{
+       // we only support uniform scaling, so assume the first row is enough
+       return (float)sqrt(in->m[0][0] * in->m[0][0] + in->m[0][1] * in->m[0][1] + in->m[0][2] * in->m[0][2]);
+}
+