added snd_reload command to reload all sounds

[xonotic/darkplaces.git] / gl_backend.c

diff --git a/gl_backend.c b/gl_backend.c
index 348dd65567082291e4f82062f34d1f69d81dc30c..5770fb455e5e3517c2d5303befb1348f78aa496e 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -73,7 +73,6 @@ void SCR_ScreenShot_f (void);
 static matrix4x4_t backend_viewmatrix;
 static matrix4x4_t backend_modelmatrix;
 static matrix4x4_t backend_modelviewmatrix;
-static matrix4x4_t backend_glmodelviewmatrix;
 static matrix4x4_t backend_projectmatrix;
 
 static unsigned int backendunits, backendimageunits, backendarrayunits, backendactive;
@@ -270,22 +269,7 @@ void GL_SetupView_Mode_Perspective (double frustumx, double frustumy, double zNe
        // set view pyramid
        qglFrustum(-frustumx * zNear, frustumx * zNear, -frustumy * zNear, frustumy * zNear, zNear, zFar);CHECKGLERROR
        qglGetDoublev(GL_PROJECTION_MATRIX, m);CHECKGLERROR
-       backend_projectmatrix.m[0][0] = m[0];
-       backend_projectmatrix.m[1][0] = m[1];
-       backend_projectmatrix.m[2][0] = m[2];
-       backend_projectmatrix.m[3][0] = m[3];
-       backend_projectmatrix.m[0][1] = m[4];
-       backend_projectmatrix.m[1][1] = m[5];
-       backend_projectmatrix.m[2][1] = m[6];
-       backend_projectmatrix.m[3][1] = m[7];
-       backend_projectmatrix.m[0][2] = m[8];
-       backend_projectmatrix.m[1][2] = m[9];
-       backend_projectmatrix.m[2][2] = m[10];
-       backend_projectmatrix.m[3][2] = m[11];
-       backend_projectmatrix.m[0][3] = m[12];
-       backend_projectmatrix.m[1][3] = m[13];
-       backend_projectmatrix.m[2][3] = m[14];
-       backend_projectmatrix.m[3][3] = m[15];
+       Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m);
        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
        GL_SetupView_Orientation_Identity();
        CHECKGLERROR
@@ -321,22 +305,7 @@ void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double frustumx, double frust
        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
        GL_SetupView_Orientation_Identity();
        CHECKGLERROR
-       backend_projectmatrix.m[0][0] = m[0];
-       backend_projectmatrix.m[1][0] = m[1];
-       backend_projectmatrix.m[2][0] = m[2];
-       backend_projectmatrix.m[3][0] = m[3];
-       backend_projectmatrix.m[0][1] = m[4];
-       backend_projectmatrix.m[1][1] = m[5];
-       backend_projectmatrix.m[2][1] = m[6];
-       backend_projectmatrix.m[3][1] = m[7];
-       backend_projectmatrix.m[0][2] = m[8];
-       backend_projectmatrix.m[1][2] = m[9];
-       backend_projectmatrix.m[2][2] = m[10];
-       backend_projectmatrix.m[3][2] = m[11];
-       backend_projectmatrix.m[0][3] = m[12];
-       backend_projectmatrix.m[1][3] = m[13];
-       backend_projectmatrix.m[2][3] = m[14];
-       backend_projectmatrix.m[3][3] = m[15];
+       Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m);
 }
 
 void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double zNear, double zFar)
@@ -349,22 +318,7 @@ void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double
        qglLoadIdentity();CHECKGLERROR
        qglOrtho(x1, x2, y2, y1, zNear, zFar);CHECKGLERROR
        qglGetDoublev(GL_PROJECTION_MATRIX, m);CHECKGLERROR
-       backend_projectmatrix.m[0][0] = m[0];
-       backend_projectmatrix.m[1][0] = m[1];
-       backend_projectmatrix.m[2][0] = m[2];
-       backend_projectmatrix.m[3][0] = m[3];
-       backend_projectmatrix.m[0][1] = m[4];
-       backend_projectmatrix.m[1][1] = m[5];
-       backend_projectmatrix.m[2][1] = m[6];
-       backend_projectmatrix.m[3][1] = m[7];
-       backend_projectmatrix.m[0][2] = m[8];
-       backend_projectmatrix.m[1][2] = m[9];
-       backend_projectmatrix.m[2][2] = m[10];
-       backend_projectmatrix.m[3][2] = m[11];
-       backend_projectmatrix.m[0][3] = m[12];
-       backend_projectmatrix.m[1][3] = m[13];
-       backend_projectmatrix.m[2][3] = m[14];
-       backend_projectmatrix.m[3][3] = m[15];
+       Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m);
        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
        GL_SetupView_Orientation_Identity();
        CHECKGLERROR
@@ -387,6 +341,8 @@ gltextureunit_t;
 
 static struct gl_state_s
 {
+       int cullface;
+       int cullfaceenable;
        int blendfunc1;
        int blendfunc2;
        int blend;
@@ -513,6 +469,8 @@ void GL_Backend_ResetState(void)
        gl_state.lockrange_count = 0;
        gl_state.pointer_vertex = NULL;
        gl_state.pointer_color = NULL;
+       gl_state.cullface = GL_FRONT; // quake is backwards, this culls back faces
+       gl_state.cullfaceenable = true;
 
        CHECKGLERROR
 
@@ -521,7 +479,7 @@ void GL_Backend_ResetState(void)
        qglDisable(GL_ALPHA_TEST);CHECKGLERROR
        qglBlendFunc(gl_state.blendfunc1, gl_state.blendfunc2);CHECKGLERROR
        qglDisable(GL_BLEND);CHECKGLERROR
-       qglCullFace(GL_FRONT);CHECKGLERROR
+       qglCullFace(gl_state.cullface);CHECKGLERROR
        qglEnable(GL_CULL_FACE);CHECKGLERROR
        qglDepthFunc(GL_LEQUAL);CHECKGLERROR
        qglEnable(GL_DEPTH_TEST);CHECKGLERROR
@@ -629,6 +587,35 @@ void GL_DepthTest(int state)
        }
 }
 
+void GL_CullFace(int state)
+{
+       if (gl_state.cullface != state)
+       {
+               CHECKGLERROR
+               if (state != GL_NONE)
+               {
+                       if (!gl_state.cullfaceenable)
+                       {
+                               gl_state.cullfaceenable = true;
+                               qglEnable(GL_CULL_FACE);CHECKGLERROR
+                       }
+                       if (gl_state.cullface != state)
+                       {
+                               gl_state.cullface = state;
+                               qglCullFace(state);CHECKGLERROR
+                       }
+               }
+               else
+               {
+                       if (gl_state.cullfaceenable)
+                       {
+                               gl_state.cullfaceenable = false;
+                               qglDisable(GL_CULL_FACE);CHECKGLERROR
+                       }
+               }
+       }
+}
+
 void GL_AlphaTest(int state)
 {
        if (gl_state.alphatest != state)
@@ -1079,11 +1066,12 @@ void R_Mesh_Matrix(const matrix4x4_t *matrix)
 {
        if (memcmp(matrix, &backend_modelmatrix, sizeof(matrix4x4_t)))
        {
+               double glmatrix[16];
                backend_modelmatrix = *matrix;
                Matrix4x4_Concat(&backend_modelviewmatrix, &backend_viewmatrix, matrix);
-               Matrix4x4_Transpose(&backend_glmodelviewmatrix, &backend_modelviewmatrix);
+               Matrix4x4_ToArrayDoubleGL(&backend_modelviewmatrix, glmatrix);
                CHECKGLERROR
-               qglLoadMatrixf(&backend_glmodelviewmatrix.m[0][0]);CHECKGLERROR
+               qglLoadMatrixd(glmatrix);CHECKGLERROR
        }
 }
 
@@ -1556,14 +1544,14 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
                // texmatrix specified, check if it is different
                if (!unit->texmatrixenabled || memcmp(&unit->matrix, matrix, sizeof(matrix4x4_t)))
                {
-                       matrix4x4_t tempmatrix;
+                       double glmatrix[16];
                        unit->texmatrixenabled = true;
                        unit->matrix = *matrix;
                        CHECKGLERROR
-                       Matrix4x4_Transpose(&tempmatrix, &unit->matrix);
+                       Matrix4x4_ToArrayDoubleGL(&unit->matrix, glmatrix);
                        qglMatrixMode(GL_TEXTURE);CHECKGLERROR
                        GL_ActiveTexture(unitnum);
-                       qglLoadMatrixf(&tempmatrix.m[0][0]);CHECKGLERROR
+                       qglLoadMatrixd(glmatrix);CHECKGLERROR
                        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
                }
        }