moved cl_visedicts to r_refdef.entities

[xonotic/darkplaces.git] / mathlib.c

diff --git a/mathlib.c b/mathlib.c
index 7fdda6b3a5f22f93441f48b1a25071e71e4a2f97..d528451002f535b93ff6623fd691ab7f1eda60f0 100644 (file)
--- a/mathlib.c
+++ b/mathlib.c
@@ -297,6 +297,22 @@ void VectorVectors(const vec3_t forward, vec3_t right, vec3_t up)
        right[1] = -forward[0];
        right[2] = forward[1];
 
+       d = DotProduct(forward, right);
+       right[0] -= d * forward[0];
+       right[1] -= d * forward[1];
+       right[2] -= d * forward[2];
+       VectorNormalizeFast(right);
+       CrossProduct(right, forward, up);
+}
+
+void VectorVectorsDouble(const double *forward, double *right, double *up)
+{
+       double d;
+
+       right[0] = forward[2];
+       right[1] = -forward[0];
+       right[2] = forward[1];
+
        d = DotProduct(forward, right);
        right[0] -= d * forward[0];
        right[1] -= d * forward[1];
@@ -580,58 +596,115 @@ void PlaneClassify(mplane_t *p)
 
 void AngleVectors (vec3_t angles, vec3_t forward, vec3_t right, vec3_t up)
 {
-       float           angle;
-       float           sr, sp, sy, cr, cp, cy;
-       
+       double angle, sr, sp, sy, cr, cp, cy;
+
        angle = angles[YAW] * (M_PI*2 / 360);
        sy = sin(angle);
        cy = cos(angle);
        angle = angles[PITCH] * (M_PI*2 / 360);
        sp = sin(angle);
        cp = cos(angle);
-       // LordHavoc: this is only to hush up gcc complaining about 'might be used uninitialized' variables
-       // (they are NOT used uninitialized, but oh well)
-       cr = 0;
-       sr = 0;
+       if (forward)
+       {
+               forward[0] = cp*cy;
+               forward[1] = cp*sy;
+               forward[2] = -sp;
+       }
        if (right || up)
        {
                angle = angles[ROLL] * (M_PI*2 / 360);
                sr = sin(angle);
                cr = cos(angle);
+               if (right)
+               {
+                       right[0] = -1*(sr*sp*cy+cr*-sy);
+                       right[1] = -1*(sr*sp*sy+cr*cy);
+                       right[2] = -1*(sr*cp);
+               }
+               if (up)
+               {
+                       up[0] = (cr*sp*cy+-sr*-sy);
+                       up[1] = (cr*sp*sy+-sr*cy);
+                       up[2] = cr*cp;
+               }
        }
+}
 
+void AngleVectorsFLU (vec3_t angles, vec3_t forward, vec3_t left, vec3_t up)
+{
+       double angle, sr, sp, sy, cr, cp, cy;
+
+       angle = angles[YAW] * (M_PI*2 / 360);
+       sy = sin(angle);
+       cy = cos(angle);
+       angle = angles[PITCH] * (M_PI*2 / 360);
+       sp = sin(angle);
+       cp = cos(angle);
        if (forward)
        {
                forward[0] = cp*cy;
                forward[1] = cp*sy;
                forward[2] = -sp;
        }
-       if (right)
-       {
-               right[0] = (-1*sr*sp*cy+-1*cr*-sy);
-               right[1] = (-1*sr*sp*sy+-1*cr*cy);
-               right[2] = -1*sr*cp;
-       }
-       if (up)
+       if (left || up)
        {
-               up[0] = (cr*sp*cy+-sr*-sy);
-               up[1] = (cr*sp*sy+-sr*cy);
-               up[2] = cr*cp;
+               angle = angles[ROLL] * (M_PI*2 / 360);
+               sr = sin(angle);
+               cr = cos(angle);
+               if (left)
+               {
+                       left[0] = sr*sp*cy+cr*-sy;
+                       left[1] = sr*sp*sy+cr*cy;
+                       left[2] = sr*cp;
+               }
+               if (up)
+               {
+                       up[0] = cr*sp*cy+-sr*-sy;
+                       up[1] = cr*sp*sy+-sr*cy;
+                       up[2] = cr*cp;
+               }
        }
 }
 
+void AngleMatrix (vec3_t angles, vec3_t translate, vec_t matrix[][4])
+{
+       double angle, sr, sp, sy, cr, cp, cy;
+
+       angle = angles[YAW] * (M_PI*2 / 360);
+       sy = sin(angle);
+       cy = cos(angle);
+       angle = angles[PITCH] * (M_PI*2 / 360);
+       sp = sin(angle);
+       cp = cos(angle);
+       angle = angles[ROLL] * (M_PI*2 / 360);
+       sr = sin(angle);
+       cr = cos(angle);
+       matrix[0][0] = cp*cy;
+       matrix[0][1] = sr*sp*cy+cr*-sy;
+       matrix[0][2] = cr*sp*cy+-sr*-sy;
+       matrix[0][3] = translate[0];
+       matrix[1][0] = cp*sy;
+       matrix[1][1] = sr*sp*sy+cr*cy;
+       matrix[1][2] = cr*sp*sy+-sr*cy;
+       matrix[1][3] = translate[1];
+       matrix[2][0] = -sp;
+       matrix[2][1] = sr*cp;
+       matrix[2][2] = cr*cp;
+       matrix[2][3] = translate[2];
+}
+
 int VectorCompare (vec3_t v1, vec3_t v2)
 {
        int             i;
-       
+
        for (i=0 ; i<3 ; i++)
                if (v1[i] != v2[i])
                        return 0;
-                       
+
        return 1;
 }
 
-void VectorMA (vec3_t veca, float scale, vec3_t vecb, vec3_t vecc)
+void VectorMASlow (vec3_t veca, float scale, vec3_t vecb, vec3_t vecc)
 {
        vecc[0] = veca[0] + scale*vecb[0];
        vecc[1] = veca[1] + scale*vecb[1];
@@ -899,4 +972,4 @@ void Mathlib_Init(void)
        ixtable[0] = 0;
        for (a = 1;a < 4096;a++)
                ixtable[a] = 1.0f / a;
-}
\ No newline at end of file
+}