added a comment describing GL triangle strip order (why add it to this? convenience)

[xonotic/darkplaces.git] / gl_backend.c

diff --git a/gl_backend.c b/gl_backend.c
index 7de9f388d5261e6c7b175632c5599ff9941e7c5b..bf28711ae54a57735a366bd9800dd8f5150d8900 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -1,5 +1,6 @@
 
 #include "quakedef.h"
+#include "image.h"
 
 cvar_t gl_mesh_maxverts = {0, "gl_mesh_maxverts", "1024"};
 cvar_t gl_mesh_floatcolors = {0, "gl_mesh_floatcolors", "1"};
@@ -84,6 +85,23 @@ static int backendunits, backendactive;
 static qbyte *varray_bcolor;
 static mempool_t *gl_backend_mempool;
 
+/*
+note: here's strip order for a terrain row:
+0--1--2--3--4
+|\ |\ |\ |\ |
+| \| \| \| \|
+A--B--C--D--E
+
+A0B, 01B, B1C, 12C, C2D, 23D, D3E, 34E
+
+*elements++ = i + row;
+*elements++ = i;
+*elements++ = i + row + 1;
+*elements++ = i;
+*elements++ = i + 1;
+*elements++ = i + row + 1;
+*/
+
 int polygonelements[768];
 
 void GL_Backend_AllocArrays(void)
@@ -221,7 +239,7 @@ void GL_SetupView_Orientation_FromEntity (vec3_t origin, vec3_t angles)
        memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
 }
 
-void GL_SetupView_Mode_Perspective (double aspect, double fovx, double fovy, double zNear, double zFar)
+void GL_SetupView_Mode_Perspective (double fovx, double fovy, double zNear, double zFar)
 {
        double xmax, ymax;
 
@@ -240,6 +258,39 @@ void GL_SetupView_Mode_Perspective (double aspect, double fovx, double fovy, dou
        GL_SetupView_Orientation_Identity();
 }
 
+void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double fovx, double fovy, double zNear)
+{
+       double nudge, m[16];
+
+       if (!r_render.integer)
+               return;
+
+       // set up viewpoint
+       qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+       qglLoadIdentity ();CHECKGLERROR
+       // set view pyramid
+       nudge = 1.0 - 1.0 / (1<<23);
+       m[ 0] = 1.0 / tan(fovx * M_PI / 360.0);
+       m[ 1] = 0;
+       m[ 2] = 0;
+       m[ 3] = 0;
+       m[ 4] = 0;
+       m[ 5] = 1.0 / tan(fovy * M_PI / 360.0);
+       m[ 6] = 0;
+       m[ 7] = 0;
+       m[ 8] = 0;
+       m[ 9] = 0;
+       m[10] = -1 * nudge;
+       m[11] = -1 * nudge;
+       m[12] = 0;
+       m[13] = 0;
+       m[14] = -2 * zNear * nudge;
+       m[15] = 0;
+       qglLoadMatrixd(m);
+       qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+       GL_SetupView_Orientation_Identity();
+}
+
 void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double zNear, double zFar)
 {
        if (!r_render.integer)
@@ -257,7 +308,8 @@ typedef struct gltextureunit_s
 {
        unsigned int t1d, t2d, t3d, tcubemap;
        unsigned int arrayenabled;
-       float rgbscale;
+       float rgbscale, alphascale;
+       int combinergb, combinealpha;
        // FIXME: add more combine stuff
 }
 gltextureunit_t;
@@ -292,6 +344,9 @@ void GL_SetupTextureState(void)
                unit->t3d = 0;
                unit->tcubemap = 0;
                unit->rgbscale = 1;
+               unit->alphascale = 1;
+               unit->combinergb = GL_MODULATE;
+               unit->combinealpha = GL_MODULATE;
                unit->arrayenabled = false;
                qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
                if (gl_texture3d)
@@ -444,7 +499,7 @@ void GL_ConvertColorsFloatToByte(int numverts)
        }
 }
 
-void GL_DrawRangeElements(int firstvert, int endvert, int indexcount, int *index)
+void GL_DrawRangeElements(int firstvert, int endvert, int indexcount, const int *index)
 {
        int arraylocked = false;
        c_meshs++;
@@ -461,9 +516,9 @@ void GL_DrawRangeElements(int firstvert, int endvert, int indexcount, int *index
                arraylocked = true;
        }
        if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
-               qglDrawRangeElements(GL_TRIANGLES, firstvert, endvert, indexcount, GL_UNSIGNED_INT, (GLuint *) index);
+               qglDrawRangeElements(GL_TRIANGLES, firstvert, endvert, indexcount, GL_UNSIGNED_INT, (const GLuint *) index);
        else
-               qglDrawElements(GL_TRIANGLES, indexcount, GL_UNSIGNED_INT, (GLuint *) index);
+               qglDrawElements(GL_TRIANGLES, indexcount, GL_UNSIGNED_INT, (const GLuint *) index);
        CHECKGLERROR
        if (arraylocked)
        {
@@ -485,7 +540,7 @@ void _R_Mesh_ResizeCheck(int numverts)
 }
 
 // renders the mesh
-void R_Mesh_Draw(int numverts, int numtriangles, int *elements)
+void R_Mesh_Draw(int numverts, int numtriangles, const int *elements)
 {
        BACKENDACTIVECHECK
 
@@ -525,6 +580,7 @@ void R_Mesh_Finish(void)
                if (gl_combine.integer)
                {
                        qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1);CHECKGLERROR
                }
        }
        qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
@@ -599,8 +655,8 @@ void R_Mesh_MainState(const rmeshstate_t *m)
 
 void R_Mesh_TextureState(const rmeshstate_t *m)
 {
-       int i;
-       float rgbscale;
+       int i, combinergb, combinealpha;
+       float scale;
        gltextureunit_t *unit;
 
        BACKENDACTIVECHECK
@@ -644,6 +700,32 @@ void R_Mesh_TextureState(const rmeshstate_t *m)
                                        qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
                                }
                        }
+                       combinergb = m->texcombinergb[i];
+                       combinealpha = m->texcombinealpha[i];
+                       if (!combinergb)
+                               combinergb = GL_MODULATE;
+                       if (!combinealpha)
+                               combinealpha = GL_MODULATE;
+                       if (unit->combinergb != combinergb)
+                       {
+                               unit->combinergb = combinergb;
+                               if (gl_combine.integer)
+                               {
+                                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR
+                               }
+                               else
+                               {
+                                       qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR
+                               }
+                       }
+                       if (unit->combinealpha != combinealpha)
+                       {
+                               unit->combinealpha = combinealpha;
+                               if (gl_combine.integer)
+                               {
+                                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR
+                               }
+                       }
                        if (unit->t1d != m->tex1d[i])
                        {
                                if (m->tex1d[i])
@@ -701,14 +783,23 @@ void R_Mesh_TextureState(const rmeshstate_t *m)
                                qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, (unit->tcubemap = m->texcubemap[i]));CHECKGLERROR
                        }
                }
-               rgbscale = max(m->texrgbscale[i], 1);
-               if (gl_state.units[i].rgbscale != rgbscale)
+               scale = max(m->texrgbscale[i], 1);
+               if (gl_state.units[i].rgbscale != scale)
+               {
+                       if (gl_state.unit != i)
+                       {
+                               qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR
+                       }
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (gl_state.units[i].rgbscale = scale));CHECKGLERROR
+               }
+               scale = max(m->texalphascale[i], 1);
+               if (gl_state.units[i].alphascale != scale)
                {
                        if (gl_state.unit != i)
                        {
                                qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR
                        }
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (gl_state.units[i].rgbscale = rgbscale));CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (gl_state.units[i].alphascale = scale));CHECKGLERROR
                }
        }
 }
@@ -760,7 +851,7 @@ void R_ClearScreen(void)
                // clear to black
                qglClearColor(0,0,0,0);CHECKGLERROR
                // clear the screen
-               qglClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);CHECKGLERROR
+               qglClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0));CHECKGLERROR
                // set dithering mode
                if (gl_dither.integer)
                {