redesigned some of the model animation code, should be a speed gain (no longer proces...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6291 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_rmain.c b/gl_rmain.c
index e6cd203e78cb3db411968386a568a349acffdebb..dbcd18c08e828f3e19eb5a8bade91dfd83a3321c 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2456,40 +2456,29 @@ float *rsurface_svector3f;
 float *rsurface_tvector3f;
 float *rsurface_normal3f;
 float *rsurface_lightmapcolor4f;
-qboolean rsurface_generatevertex;
-qboolean rsurface_generatetangents;
-qboolean rsurface_generatenormals;
-qboolean rsurface_deformvertex;
-qboolean rsurface_dynamicvertex;
 vec3_t rsurface_modelorg;
 const entity_render_t *rsurface_entity;
 const model_t *rsurface_model;
 const texture_t *rsurface_texture;
 
-void RSurf_PrepareForBatch(const entity_render_t *ent, const texture_t *texture, const vec3_t modelorg)
+void RSurf_PrepareVerticesForBatch(const entity_render_t *ent, const texture_t *texture, const vec3_t modelorg, qboolean generatenormals, qboolean generatetangents, int texturenumsurfaces, msurface_t **texturesurfacelist)
 {
        VectorCopy(modelorg, rsurface_modelorg);
        rsurface_entity = ent;
        rsurface_model = ent->model;
        rsurface_texture = texture;
-}
-
-void RSurf_SetPointersForPass(qboolean generatenormals, qboolean generatetangents)
-{
        if (rsurface_array_size < rsurface_model->surfmesh.num_vertices)
                R_Mesh_ResizeArrays(rsurface_model->surfmesh.num_vertices);
        if ((rsurface_entity->frameblend[0].lerp != 1 || rsurface_entity->frameblend[0].frame != 0) && (rsurface_model->surfmesh.data_morphvertex3f || rsurface_model->surfmesh.data_vertexboneweights))
        {
-               rsurface_generatevertex = true;
-               rsurface_generatetangents = false;
-               rsurface_generatenormals = false;
                rsurface_vertex3f = rsurface_array_vertex3f;
+               Mod_Alias_GetMesh_Vertex3f(rsurface_model, rsurface_entity->frameblend, rsurface_array_vertex3f);
                if (generatetangents || (rsurface_texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)))
                {
-                       rsurface_generatetangents = true;
                        rsurface_svector3f = rsurface_array_svector3f;
                        rsurface_tvector3f = rsurface_array_tvector3f;
                        rsurface_normal3f = rsurface_array_normal3f;
+                       Mod_BuildTextureVectorsAndNormals(0, rsurface_model->surfmesh.num_vertices, rsurface_model->surfmesh.num_triangles, rsurface_array_vertex3f, rsurface_model->surfmesh.data_texcoordtexture2f, rsurface_model->surfmesh.data_element3i, rsurface_array_svector3f, rsurface_array_tvector3f, rsurface_array_normal3f, r_smoothnormals_areaweighting.integer);
                }
                else
                {
@@ -2497,8 +2486,8 @@ void RSurf_SetPointersForPass(qboolean generatenormals, qboolean generatetangent
                        rsurface_tvector3f = NULL;
                        if (generatenormals)
                        {
-                               rsurface_generatenormals = true;
                                rsurface_normal3f = rsurface_array_normal3f;
+                               Mod_BuildNormals(0, rsurface_model->surfmesh.num_vertices, rsurface_model->surfmesh.num_triangles, rsurface_array_vertex3f, rsurface_model->surfmesh.data_element3i, rsurface_array_normal3f, r_smoothnormals_areaweighting.integer);
                        }
                        else
                                rsurface_normal3f = NULL;
@@ -2506,9 +2495,6 @@ void RSurf_SetPointersForPass(qboolean generatenormals, qboolean generatetangent
        }
        else
        {
-               rsurface_generatevertex = false;
-               rsurface_generatetangents = false;
-               rsurface_generatenormals = false;
                rsurface_vertex3f = rsurface_model->surfmesh.data_vertex3f;
                rsurface_svector3f = rsurface_model->surfmesh.data_svector3f;
                rsurface_tvector3f = rsurface_model->surfmesh.data_tvector3f;
@@ -2516,82 +2502,51 @@ void RSurf_SetPointersForPass(qboolean generatenormals, qboolean generatetangent
        }
        if (rsurface_texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2))
        {
-               rsurface_deformvertex = true;
-               rsurface_vertex3f = rsurface_array_vertex3f;
-               rsurface_svector3f = rsurface_array_svector3f;
-               rsurface_tvector3f = rsurface_array_tvector3f;
-               rsurface_normal3f = rsurface_array_normal3f;
-       }
-       else
-               rsurface_deformvertex = false;
-       R_Mesh_VertexPointer(rsurface_vertex3f);
-       rsurface_dynamicvertex = rsurface_generatevertex || rsurface_deformvertex;
-}
-
-void RSurf_PrepareDynamicSurfaceVertices(const msurface_t *surface)
-{
-       float *vertex3f, *svector3f, *tvector3f, *normal3f;
-       model_t *model = rsurface_entity->model;
-       if (!rsurface_dynamicvertex)
-               return;
-       if (rsurface_generatevertex)
-       {
-               Mod_Alias_GetMesh_Vertex3f(model, rsurface_entity->frameblend, rsurface_array_vertex3f);
-               if (rsurface_generatetangents)
-                       Mod_BuildTextureVectorsAndNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, rsurface_vertex3f, model->surfmesh.data_texcoordtexture2f, model->surfmesh.data_element3i + surface->num_firsttriangle * 3, rsurface_array_svector3f, rsurface_array_tvector3f, rsurface_array_normal3f, r_smoothnormals_areaweighting.integer);
-               else if (rsurface_generatenormals)
-                       Mod_BuildNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, rsurface_array_vertex3f, model->surfmesh.data_element3i + 3 * surface->num_firsttriangle, rsurface_array_normal3f, r_smoothnormals_areaweighting.integer);
-       }
-       if (rsurface_deformvertex)
-       {
-               int i, j;
+               int texturesurfaceindex;
                float center[3], forward[3], right[3], up[3], v[4][3];
                matrix4x4_t matrix1, imatrix1;
-               if (rsurface_generatevertex)
-               {
-                       vertex3f = rsurface_array_vertex3f;
-                       svector3f = rsurface_array_svector3f;
-                       tvector3f = rsurface_array_tvector3f;
-                       normal3f = rsurface_array_normal3f;
-               }
-               else
-               {
-                       vertex3f = rsurface_vertex3f;
-                       svector3f = rsurface_svector3f;
-                       tvector3f = rsurface_tvector3f;
-                       normal3f = rsurface_normal3f;
-               }
                Matrix4x4_Transform(&rsurface_entity->inversematrix, r_viewforward, forward);
                Matrix4x4_Transform(&rsurface_entity->inversematrix, r_viewright, right);
                Matrix4x4_Transform(&rsurface_entity->inversematrix, r_viewup, up);
-               // a single autosprite surface can contain multiple sprites...
-               for (j = 0;j < surface->num_vertices - 3;j += 4)
+               if (rsurface_texture->textureflags & Q3TEXTUREFLAG_AUTOSPRITE2)
+               {
+                       forward[0] = rsurface_modelorg[0] - center[0];
+                       forward[1] = rsurface_modelorg[1] - center[1];
+                       forward[2] = 0;
+                       VectorNormalize(forward);
+                       right[0] = forward[1];
+                       right[1] = -forward[0];
+                       right[2] = 0;
+                       VectorSet(up, 0, 0, 1);
+               }
+               // make deformed versions of only the vertices used by the specified surfaces
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                {
-                       VectorClear(center);
-                       for (i = 0;i < 4;i++)
-                               VectorAdd(center, (vertex3f + 3 * surface->num_firstvertex) + (j+i) * 3, center);
-                       VectorScale(center, 0.25f, center);
-                       // FIXME: calculate vectors from triangle edges instead of using texture vectors as an easy way out?
-                       Matrix4x4_FromVectors(&matrix1, (normal3f + 3 * surface->num_firstvertex) + j*3, (svector3f + 3 * surface->num_firstvertex) + j*3, (tvector3f + 3 * surface->num_firstvertex) + j*3, center);
-                       Matrix4x4_Invert_Simple(&imatrix1, &matrix1);
-                       for (i = 0;i < 4;i++)
-                               Matrix4x4_Transform(&imatrix1, (vertex3f + 3 * surface->num_firstvertex) + (j+i)*3, v[i]);
-                       if (rsurface_texture->textureflags & Q3TEXTUREFLAG_AUTOSPRITE2)
+                       int i, j;
+                       const msurface_t *surface = texturesurfacelist[texturesurfaceindex];
+                       // a single autosprite surface can contain multiple sprites...
+                       for (j = 0;j < surface->num_vertices - 3;j += 4)
                        {
-                               forward[0] = rsurface_modelorg[0] - center[0];
-                               forward[1] = rsurface_modelorg[1] - center[1];
-                               forward[2] = 0;
-                               VectorNormalize(forward);
-                               right[0] = forward[1];
-                               right[1] = -forward[0];
-                               right[2] = 0;
-                               VectorSet(up, 0, 0, 1);
+                               VectorClear(center);
+                               for (i = 0;i < 4;i++)
+                                       VectorAdd(center, (rsurface_vertex3f + 3 * surface->num_firstvertex) + (j+i) * 3, center);
+                               VectorScale(center, 0.25f, center);
+                               // FIXME: calculate vectors from triangle edges instead of using texture vectors as an easy way out?
+                               Matrix4x4_FromVectors(&matrix1, (rsurface_normal3f + 3 * surface->num_firstvertex) + j*3, (rsurface_svector3f + 3 * surface->num_firstvertex) + j*3, (rsurface_tvector3f + 3 * surface->num_firstvertex) + j*3, center);
+                               Matrix4x4_Invert_Simple(&imatrix1, &matrix1);
+                               for (i = 0;i < 4;i++)
+                                       Matrix4x4_Transform(&imatrix1, (rsurface_vertex3f + 3 * surface->num_firstvertex) + (j+i)*3, v[i]);
+                               for (i = 0;i < 4;i++)
+                                       VectorMAMAMAM(1, center, v[i][0], forward, v[i][1], right, v[i][2], up, rsurface_array_vertex3f + (surface->num_firstvertex+i+j) * 3);
                        }
-                       for (i = 0;i < 4;i++)
-                               VectorMAMAMAM(1, center, v[i][0], forward, v[i][1], right, v[i][2], up, rsurface_array_vertex3f + (surface->num_firstvertex+i+j) * 3);
+                       Mod_BuildTextureVectorsAndNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, rsurface_array_vertex3f, rsurface_model->surfmesh.data_texcoordtexture2f, rsurface_model->surfmesh.data_element3i + surface->num_firsttriangle * 3, rsurface_array_svector3f, rsurface_array_tvector3f, rsurface_array_normal3f, r_smoothnormals_areaweighting.integer);
                }
-               Mod_BuildTextureVectorsAndNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, rsurface_array_vertex3f, model->surfmesh.data_texcoordtexture2f, model->surfmesh.data_element3i + surface->num_firsttriangle * 3, rsurface_array_svector3f, rsurface_array_tvector3f, rsurface_array_normal3f, r_smoothnormals_areaweighting.integer);
+               rsurface_vertex3f = rsurface_array_vertex3f;
+               rsurface_svector3f = rsurface_array_svector3f;
+               rsurface_tvector3f = rsurface_array_tvector3f;
+               rsurface_normal3f = rsurface_array_normal3f;
        }
+       R_Mesh_VertexPointer(rsurface_vertex3f);
 }
 
 static void RSurf_Draw(const msurface_t *surface)
@@ -2732,7 +2687,7 @@ static void RSurf_DrawLightmap(const msurface_t *surface, float r, float g, floa
        RSurf_Draw(surface);
 }
 
-static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *texture, int texturenumsurfaces, const msurface_t **texturesurfacelist, const vec3_t modelorg)
+static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *texture, int texturenumsurfaces, msurface_t **texturesurfacelist, const vec3_t modelorg)
 {
        int texturesurfaceindex;
        int lightmode;
@@ -2750,8 +2705,22 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
        GL_DepthTest(!(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST));
        if ((texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) || (ent->flags & RENDER_NOCULLFACE))
                qglDisable(GL_CULL_FACE);
-       RSurf_PrepareForBatch(ent, texture, modelorg);
-       if (texture->currentmaterialflags & MATERIALFLAG_SKY)
+       if (r_showsurfaces.integer)
+       {
+               GL_DepthMask(true);
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               memset(&m, 0, sizeof(m));
+               R_Mesh_State(&m);
+               RSurf_PrepareVerticesForBatch(ent, texture, modelorg, false, false, texturenumsurfaces, texturesurfacelist);
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       int k = (int)(((size_t)surface) / sizeof(msurface_t));
+                       GL_Color((k & 15) * (1.0f / 16.0f), ((k >> 4) & 15) * (1.0f / 16.0f), ((k >> 8) & 15) * (1.0f / 16.0f), 0.2f);
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       RSurf_Draw(surface);
+               }
+       }
+       else if (texture->currentmaterialflags & MATERIALFLAG_SKY)
        {
                // transparent sky would be ridiculous
                if (!(texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT))
@@ -2788,12 +2757,10 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                        // fog sky
                                        GL_BlendFunc(GL_ONE, GL_ZERO);
                                }
-                               RSurf_SetPointersForPass(false, false);
+                               RSurf_PrepareVerticesForBatch(ent, texture, modelorg, false, false, texturenumsurfaces, texturesurfacelist);
                                for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                                {
                                        surface = texturesurfacelist[texturesurfaceindex];
-                                       if (rsurface_dynamicvertex)
-                                               RSurf_PrepareDynamicSurfaceVertices(surface);
                                        RSurf_Draw(surface);
                                }
                                if (skyrendermasked)
@@ -2825,14 +2792,12 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                R_SetupSurfaceShader(ent, texture, modelorg, vec3_origin, lightmode == 2);
                if (!r_glsl_permutation)
                        return;
-               RSurf_SetPointersForPass(false, true);
+               RSurf_PrepareVerticesForBatch(ent, texture, modelorg, true, true, texturenumsurfaces, texturesurfacelist);
                if (lightmode == 2)
                {
                        for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                        {
                                surface = texturesurfacelist[texturesurfaceindex];
-                               if (rsurface_dynamicvertex)
-                                       RSurf_PrepareDynamicSurfaceVertices(surface);
                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
                                R_Mesh_TexCoordPointer(1, 3, rsurface_svector3f);
                                R_Mesh_TexCoordPointer(2, 3, rsurface_tvector3f);
@@ -2845,8 +2810,6 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                        for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                        {
                                surface = texturesurfacelist[texturesurfaceindex];
-                               if (rsurface_dynamicvertex)
-                                       RSurf_PrepareDynamicSurfaceVertices(surface);
                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
                                R_Mesh_TexCoordPointer(1, 3, rsurface_svector3f);
                                R_Mesh_TexCoordPointer(2, 3, rsurface_tvector3f);
@@ -2875,6 +2838,7 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
        {
                int layerindex;
                texturelayer_t *layer;
+               RSurf_PrepareVerticesForBatch(ent, texture, modelorg, true, false, texturenumsurfaces, texturesurfacelist);
                for (layerindex = 0, layer = texture->currentlayers;layerindex < texture->currentnumlayers;layerindex++, layer++)
                {
                        vec4_t layercolor;
@@ -2908,8 +2872,8 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                m.texmatrix[1] = layer->texmatrix;
                                m.texrgbscale[1] = layertexrgbscale;
                                m.pointer_color = rsurface_array_color4f;
+                               m.pointer_vertex = rsurface_vertex3f;
                                R_Mesh_State(&m);
-                               RSurf_SetPointersForPass(lightmode == 2, false);
                                if (lightmode == 2)
                                {
                                        for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
@@ -2918,8 +2882,6 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordlightmap2f);
                                                R_Mesh_TexCoordPointer(1, 2, model->surfmesh.data_texcoordtexture2f);
                                                R_Mesh_TexBind(0, R_GetTexture(r_texture_white));
-                                               if (rsurface_dynamicvertex)
-                                                       RSurf_PrepareDynamicSurfaceVertices(surface);
                                                RSurf_DrawLightmap(surface, layercolor[0], layercolor[1], layercolor[2], layercolor[3], 2, applycolor, applyfog);
                                        }
                                }
@@ -2930,8 +2892,6 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                                surface = texturesurfacelist[texturesurfaceindex];
                                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordlightmap2f);
                                                R_Mesh_TexCoordPointer(1, 2, model->surfmesh.data_texcoordtexture2f);
-                                               if (rsurface_dynamicvertex)
-                                                       RSurf_PrepareDynamicSurfaceVertices(surface);
                                                if (surface->lightmaptexture)
                                                {
                                                        R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture));
@@ -2951,8 +2911,8 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                m.texmatrix[0] = layer->texmatrix;
                                m.pointer_color = rsurface_array_color4f;
                                m.texrgbscale[0] = layertexrgbscale;
+                               m.pointer_vertex = rsurface_vertex3f;
                                R_Mesh_State(&m);
-                               RSurf_SetPointersForPass(lightmode == 2, false);
                                if (lightmode == 2)
                                {
                                        for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
@@ -2960,8 +2920,6 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                                surface = texturesurfacelist[texturesurfaceindex];
                                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordlightmap2f);
                                                R_Mesh_TexBind(0, R_GetTexture(r_texture_white));
-                                               if (rsurface_dynamicvertex)
-                                                       RSurf_PrepareDynamicSurfaceVertices(surface);
                                                RSurf_DrawLightmap(surface, 1, 1, 1, 1, 2, false, false);
                                        }
                                }
@@ -2971,8 +2929,6 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                        {
                                                surface = texturesurfacelist[texturesurfaceindex];
                                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordlightmap2f);
-                                               if (rsurface_dynamicvertex)
-                                                       RSurf_PrepareDynamicSurfaceVertices(surface);
                                                if (surface->lightmaptexture)
                                                {
                                                        R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture));
@@ -2991,14 +2947,12 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                m.texmatrix[0] = layer->texmatrix;
                                m.pointer_color = rsurface_array_color4f;
                                m.texrgbscale[0] = layertexrgbscale;
+                               m.pointer_vertex = rsurface_vertex3f;
                                R_Mesh_State(&m);
-                               RSurf_SetPointersForPass(false, false);
                                for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                                {
                                        surface = texturesurfacelist[texturesurfaceindex];
                                        R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
-                                       if (rsurface_dynamicvertex)
-                                               RSurf_PrepareDynamicSurfaceVertices(surface);
                                        RSurf_DrawLightmap(surface, layercolor[0], layercolor[1], layercolor[2], layercolor[3], 0, applycolor, false);
                                }
                                break;
@@ -3008,16 +2962,14 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                m.texmatrix[0] = layer->texmatrix;
                                m.texrgbscale[0] = layertexrgbscale;
                                m.pointer_color = rsurface_array_color4f;
+                               m.pointer_vertex = rsurface_vertex3f;
                                R_Mesh_State(&m);
-                               RSurf_SetPointersForPass(lightmode == 2, false);
                                if (lightmode == 2)
                                {
                                        for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                                        {
                                                surface = texturesurfacelist[texturesurfaceindex];
                                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
-                                               if (rsurface_dynamicvertex)
-                                                       RSurf_PrepareDynamicSurfaceVertices(surface);
                                                RSurf_DrawLightmap(surface, layercolor[0], layercolor[1], layercolor[2], layercolor[3], 2, applycolor, applyfog);
                                        }
                                }
@@ -3027,8 +2979,6 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                        {
                                                surface = texturesurfacelist[texturesurfaceindex];
                                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
-                                               if (rsurface_dynamicvertex)
-                                                       RSurf_PrepareDynamicSurfaceVertices(surface);
                                                RSurf_DrawLightmap(surface, layercolor[0], layercolor[1], layercolor[2], layercolor[3], 1, applycolor, applyfog);
                                        }
                                }
@@ -3039,14 +2989,12 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                m.texmatrix[0] = layer->texmatrix;
                                m.pointer_color = rsurface_array_color4f;
                                m.texrgbscale[0] = layertexrgbscale;
+                               m.pointer_vertex = rsurface_vertex3f;
                                R_Mesh_State(&m);
-                               RSurf_SetPointersForPass(false, false);
                                for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                                {
                                        surface = texturesurfacelist[texturesurfaceindex];
                                        R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
-                                       if (rsurface_dynamicvertex)
-                                               RSurf_PrepareDynamicSurfaceVertices(surface);
                                        RSurf_DrawLightmap(surface, layercolor[0], layercolor[1], layercolor[2], layercolor[3], 0, applycolor, applyfog);
                                }
                                break;
@@ -3057,8 +3005,8 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                        m.tex[0] = R_GetTexture(layer->texture);
                                        m.texmatrix[0] = layer->texmatrix;
                                }
+                               m.pointer_vertex = rsurface_vertex3f;
                                R_Mesh_State(&m);
-                               RSurf_SetPointersForPass(false, false);
                                for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                                {
                                        int i;
@@ -3067,8 +3015,6 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                        if (layer->texture)
                                                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
                                        R_Mesh_ColorPointer(rsurface_array_color4f);
-                                       if (rsurface_dynamicvertex)
-                                               RSurf_PrepareDynamicSurfaceVertices(surface);
                                        for (i = 0, v = (rsurface_vertex3f + 3 * surface->num_firstvertex), c = (rsurface_array_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4)
                                        {
                                                f = VERTEXFOGTABLE(VectorDistance(v, modelorg));
@@ -3091,13 +3037,11 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
                                GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
                                GL_Color(1, 1, 1, 1);
                                memset(&m, 0, sizeof(m));
+                               m.pointer_vertex = rsurface_vertex3f;
                                R_Mesh_State(&m);
-                               RSurf_SetPointersForPass(false, false);
                                for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                                {
                                        surface = texturesurfacelist[texturesurfaceindex];
-                                       if (rsurface_dynamicvertex)
-                                               RSurf_PrepareDynamicSurfaceVertices(surface);
                                        for (scale = 1;scale < layertexrgbscale;scale <<= 1)
                                                RSurf_Draw(surface);
                                }
@@ -3110,7 +3054,7 @@ static void R_DrawTextureSurfaceList(const entity_render_t *ent, texture_t *text
 
 static void R_DrawSurface_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight)
 {
-       const msurface_t *surface = ent->model->data_surfaces + surfacenumber;
+       msurface_t *surface = ent->model->data_surfaces + surfacenumber;
        vec3_t modelorg;
        texture_t *texture;
 
@@ -3124,7 +3068,7 @@ static void R_DrawSurface_TransparentCallback(const entity_render_t *ent, int su
        R_DrawTextureSurfaceList(ent, texture->currentframe, 1, &surface, modelorg);
 }
 
-void R_QueueTextureSurfaceList(entity_render_t *ent, texture_t *texture, int texturenumsurfaces, const msurface_t **texturesurfacelist, const vec3_t modelorg)
+void R_QueueTextureSurfaceList(entity_render_t *ent, texture_t *texture, int texturenumsurfaces, msurface_t **texturesurfacelist, const vec3_t modelorg)
 {
        int texturesurfaceindex;
        const msurface_t *surface;
@@ -3160,7 +3104,7 @@ void R_DrawSurfaces(entity_render_t *ent, qboolean skysurfaces)
        vec3_t modelorg;
        const int maxsurfacelist = 1024;
        int numsurfacelist = 0;
-       const msurface_t *surfacelist[1024];
+       msurface_t *surfacelist[1024];
        if (model == NULL)
                return;
        R_Mesh_Matrix(&ent->matrix);
@@ -3187,39 +3131,7 @@ void R_DrawSurfaces(entity_render_t *ent, qboolean skysurfaces)
        t = NULL;
        texture = NULL;
        numsurfacelist = 0;
-       if (r_showsurfaces.integer)
-       {
-               rmeshstate_t m;
-               GL_DepthTest(true);
-               GL_DepthMask(true);
-               GL_BlendFunc(GL_ONE, GL_ZERO);
-               memset(&m, 0, sizeof(m));
-               R_Mesh_State(&m);
-               t = NULL;
-               for (i = 0, j = model->firstmodelsurface, surface = model->data_surfaces + j;i < model->nummodelsurfaces;i++, j++, surface++)
-               {
-                       if (ent == r_refdef.worldentity && !r_worldsurfacevisible[j])
-                               continue;
-                       if (t != surface->texture)
-                       {
-                               t = surface->texture;
-                               texture = t->currentframe;
-                               RSurf_PrepareForBatch(ent, texture, modelorg);
-                               RSurf_SetPointersForPass(false, false);
-                       }
-                       if ((texture->currentmaterialflags & flagsmask) && surface->num_triangles)
-                       {
-                               int k = (int)(((size_t)surface) / sizeof(msurface_t));
-                               GL_Color((k & 15) * (1.0f / 16.0f), ((k >> 4) & 15) * (1.0f / 16.0f), ((k >> 8) & 15) * (1.0f / 16.0f), 0.2f);
-                               if (rsurface_dynamicvertex)
-                                       RSurf_PrepareDynamicSurfaceVertices(surface);
-                               RSurf_Draw(surface);
-                               renderstats.entities_triangles += surface->num_triangles;
-                       }
-                       renderstats.entities_surfaces++;
-               }
-       }
-       else if (ent == r_refdef.worldentity)
+       if (ent == r_refdef.worldentity)
        {
                for (i = 0, j = model->firstmodelsurface, surface = model->data_surfaces + j;i < model->nummodelsurfaces;i++, j++, surface++)
                {
@@ -3328,10 +3240,7 @@ void R_DrawSurfaces(entity_render_t *ent, qboolean skysurfaces)
                        texture = surface->texture->currentframe;
                        if ((texture->currentmaterialflags & flagsmask) && surface->num_triangles)
                        {
-                               RSurf_PrepareForBatch(ent, texture, modelorg);
-                               RSurf_SetPointersForPass(false, r_shownormals.integer != 0);
-                               if (rsurface_dynamicvertex)
-                                       RSurf_PrepareDynamicSurfaceVertices(surface);
+                               RSurf_PrepareVerticesForBatch(ent, texture, modelorg, false, r_shownormals.integer != 0, 1, &surface);
                                if (r_showtris.integer)
                                {
                                        if (!texture->currentlayers->depthmask)

diff --git a/gl_rsurf.c b/gl_rsurf.c
index e90680c252f4edc85fd70ab2658d92dcf0d879f0..8b5d8e50e51422ac8976ca65977b0ec9af773a19 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -706,14 +706,29 @@ void R_Q1BSP_CompileShadowVolume(entity_render_t *ent, vec3_t relativelightorigi
        r_shadow_compilingrtlight->static_meshchain_shadow = Mod_ShadowMesh_Finish(r_main_mempool, r_shadow_compilingrtlight->static_meshchain_shadow, false, false);
 }
 
-void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs)
+void R_Q1BSP_DrawShadowVolume_Batch(entity_render_t *ent, texture_t *texture, const vec3_t modelorg, const vec3_t relativelightorigin, const vec3_t lightmins, const vec3_t lightmaxs, int texturenumsurfaces, msurface_t **texturesurfacelist)
+{
+       int texturesurfaceindex;
+       RSurf_PrepareVerticesForBatch(ent, texture, modelorg, false, false, texturenumsurfaces, texturesurfacelist);
+       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+       {
+               msurface_t *surface = texturesurfacelist[texturesurfaceindex];
+               R_Shadow_MarkVolumeFromBox(surface->num_firsttriangle, surface->num_triangles, rsurface_vertex3f, rsurface_model->surfmesh.data_element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
+       }
+}
+
+void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const vec3_t lightmins, const vec3_t lightmaxs)
 {
        model_t *model = ent->model;
        msurface_t *surface;
-       int surfacelistindex;
+       int modelsurfacelistindex;
+       int f = 0;
        float projectdistance = lightradius + model->radius*2 + r_shadow_projectdistance.value;
        vec3_t modelorg;
-       texture_t *texture, *currentexture = NULL;
+       texture_t *t = NULL, *texture;
+       const int maxsurfacelist = 1024;
+       int numsurfacelist = 0;
+       msurface_t *surfacelist[1024];
        // check the box in modelspace, it was already checked in worldspace
        if (!BoxesOverlap(model->normalmins, model->normalmaxs, lightmins, lightmaxs))
                return;
@@ -721,9 +736,9 @@ void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin,
        if (model->brush.shadowmesh)
        {
                R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
-               for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+               for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
                {
-                       surface = model->data_surfaces + surfacelist[surfacelistindex];
+                       surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
                        texture = surface->texture->currentframe;
                        if ((texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL)
                                continue;
@@ -737,25 +752,28 @@ void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin,
        {
                projectdistance = lightradius + model->radius*2;
                Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-               for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+               R_Shadow_PrepareShadowMark(model->surfmesh.num_triangles);
+               // identify lit faces within the bounding box
+               for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
                {
-                       surface = model->data_surfaces + surfacelist[surfacelistindex];
-                       texture = surface->texture->currentframe;
-                       if (texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT) || !surface->num_triangles)
-                               continue;
-                       if (currentexture != texture)
+                       surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
+                       if (t != surface->texture || numsurfacelist >= maxsurfacelist)
                        {
-                               currentexture = texture;
-                               RSurf_PrepareForBatch(ent, texture, modelorg);
-                               RSurf_SetPointersForPass(false, false);
+                               if (numsurfacelist)
+                               {
+                                       R_Q1BSP_DrawShadowVolume_Batch(ent, texture, modelorg, relativelightorigin, lightmins, lightmaxs, numsurfacelist, surfacelist);
+                                       numsurfacelist = 0;
+                               }
+                               t = surface->texture;
+                               texture = t->currentframe;
+                               f = (texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) == MATERIALFLAG_WALL;
                        }
-                       if (rsurface_dynamicvertex)
-                               RSurf_PrepareDynamicSurfaceVertices(surface);
-                       // identify lit faces within the bounding box
-                       R_Shadow_PrepareShadowMark(model->surfmesh.num_triangles);
-                       R_Shadow_MarkVolumeFromBox(surface->num_firsttriangle, surface->num_triangles, rsurface_vertex3f, model->surfmesh.data_element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
-                       R_Shadow_VolumeFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, rsurface_vertex3f, model->surfmesh.data_element3i, model->surfmesh.data_neighbor3i, relativelightorigin, projectdistance, numshadowmark, shadowmarklist);
+                       if (!f && surface->num_triangles)
+                               surfacelist[numsurfacelist++] = surface;
                }
+               if (numsurfacelist)
+                       R_Q1BSP_DrawShadowVolume_Batch(ent, texture, modelorg, relativelightorigin, lightmins, lightmaxs, numsurfacelist, surfacelist);
+               R_Shadow_VolumeFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, rsurface_vertex3f, model->surfmesh.data_element3i, model->surfmesh.data_neighbor3i, relativelightorigin, projectdistance, numshadowmark, shadowmarklist);
        }
 }
 

diff --git a/r_shadow.c b/r_shadow.c
index dcfdef54285da3fd9d994f99d546c073de4858e0..d43bf7b466818cc9b3a8958cfeb90274df23ff1d 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -1241,12 +1241,10 @@ static void R_Shadow_RenderSurfacesLighting_VisibleLighting(const entity_render_
        GL_Color(0.1, 0.025, 0, 1);
        memset(&m, 0, sizeof(m));
        R_Mesh_State(&m);
-       RSurf_SetPointersForPass(false, false);
+       RSurf_PrepareVerticesForBatch(ent, texture, r_shadow_entityeyeorigin, false, false, numsurfaces, surfacelist);
        for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
        {
                const msurface_t *surface = surfacelist[surfacelistindex];
-               if (rsurface_dynamicvertex)
-                       RSurf_PrepareDynamicSurfaceVertices(surface);
                GL_LockArrays(surface->num_firstvertex, surface->num_vertices);
                R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, model->surfmesh.data_element3i + 3 * surface->num_firsttriangle);
                GL_LockArrays(0, 0);
@@ -1258,14 +1256,12 @@ static void R_Shadow_RenderSurfacesLighting_Light_GLSL(const entity_render_t *en
        // ARB2 GLSL shader path (GFFX5200, Radeon 9500)
        int surfacelistindex;
        model_t *model = ent->model;
+       RSurf_PrepareVerticesForBatch(ent, texture, r_shadow_entityeyeorigin, true, true, numsurfaces, surfacelist);
        R_SetupSurfaceShader(ent, texture, r_shadow_entityeyeorigin, lightcolorbase, false);
-       RSurf_SetPointersForPass(false, true);
        for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
        {
                const msurface_t *surface = surfacelist[surfacelistindex];
                const int *elements = model->surfmesh.data_element3i + surface->num_firsttriangle * 3;
-               if (rsurface_dynamicvertex)
-                       RSurf_PrepareDynamicSurfaceVertices(surface);
                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
                R_Mesh_TexCoordPointer(1, 3, rsurface_svector3f);
                R_Mesh_TexCoordPointer(2, 3, rsurface_tvector3f);
@@ -1821,12 +1817,10 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3(const entity_render_t *en
        qboolean dospecular = specularscale > 0;
        if (!doambient && !dodiffuse && !dospecular)
                return;
-       RSurf_SetPointersForPass(false, true);
+       RSurf_PrepareVerticesForBatch(ent, texture, r_shadow_entityeyeorigin, true, true, numsurfaces, surfacelist);
        for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
        {
                const msurface_t *surface = surfacelist[surfacelistindex];
-               if (rsurface_dynamicvertex)
-                       RSurf_PrepareDynamicSurfaceVertices(surface);
                if (doambient)
                        R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(ent, texture, surface, lightcolorbase, basetexture, r_shadow_rtlight->ambientscale);
                if (dodiffuse)
@@ -1951,12 +1945,10 @@ static void R_Shadow_RenderSurfacesLighting_Light_Vertex(const entity_render_t *
        }
        m.pointer_color = rsurface_array_color4f;
        R_Mesh_State(&m);
-       RSurf_SetPointersForPass(true, false);
+       RSurf_PrepareVerticesForBatch(ent, texture, r_shadow_entityeyeorigin, true, false, numsurfaces, surfacelist);
        for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
        {
                const msurface_t *surface = surfacelist[surfacelistindex];
-               if (rsurface_dynamicvertex)
-                       RSurf_PrepareDynamicSurfaceVertices(surface);
                // OpenGL 1.1 path (anything)
                R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f);
                R_Mesh_TexMatrix(0, &texture->currenttexmatrix);
@@ -1999,7 +1991,6 @@ void R_Shadow_RenderSurfacesLighting(const entity_render_t *ent, const texture_t
                qglDisable(GL_CULL_FACE);
        else
                qglEnable(GL_CULL_FACE);
-       RSurf_PrepareForBatch(ent, texture, r_shadow_entityeyeorigin);
        if (texture->colormapping)
        {
                qboolean dopants = texture->skin.pants != NULL && VectorLength2(ent->colormap_pantscolor) >= (1.0f / 1048576.0f);

diff --git a/render.h b/render.h
index 0fe33bc97554a287fc637d33db3858a51967f20e..6871818bf1888d94a7158f0330b0df5ae34cbace 100644 (file)
--- a/render.h
+++ b/render.h
@@ -275,11 +275,6 @@ extern float *rsurface_svector3f;
 extern float *rsurface_tvector3f;
 extern float *rsurface_normal3f;
 extern float *rsurface_lightmapcolor4f;
-extern qboolean rsurface_generatevertex;
-extern qboolean rsurface_generatetangents;
-extern qboolean rsurface_generatenormals;
-extern qboolean rsurface_deformvertex;
-extern qboolean rsurface_dynamicvertex;
 extern vec3_t rsurface_modelorg;
 extern const entity_render_t *rsurface_entity;
 extern const model_t *rsurface_model;
@@ -292,12 +287,10 @@ struct texture_s;
 struct msurface_s;
 void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t);
 void R_UpdateAllTextureInfo(entity_render_t *ent);
-void R_QueueTextureSurfaceList(entity_render_t *ent, struct texture_s *texture, int texturenumsurfaces, const struct msurface_s **texturesurfacelist, const vec3_t modelorg);
+void R_QueueTextureSurfaceList(entity_render_t *ent, struct texture_s *texture, int texturenumsurfaces, msurface_t **texturesurfacelist, const vec3_t modelorg);
 void R_DrawSurfaces(entity_render_t *ent, qboolean skysurfaces);
 
-void RSurf_PrepareForBatch(const entity_render_t *ent, const texture_t *texture, const vec3_t modelorg);
-void RSurf_SetPointersForPass(qboolean generatenormals, qboolean generatetangents);
-void RSurf_PrepareDynamicSurfaceVertices(const msurface_t *surface);
+void RSurf_PrepareVerticesForBatch(const entity_render_t *ent, const texture_t *texture, const vec3_t modelorg, qboolean generatenormals, qboolean generatetangents, int texturenumsurfaces, msurface_t **texturesurfacelist);
 
 #define SHADERPERMUTATION_MODE_LIGHTSOURCE (1<<0) // (lightsource) use directional pixel shading from light source (rtlight)
 #define SHADERPERMUTATION_MODE_LIGHTDIRECTIONMAP_MODELSPACE (1<<1) // (lightmap) use directional pixel shading from texture containing modelspace light directions (deluxemap)

diff --git a/todo b/todo
index 12b11b78c9eecdbc86e1944be9f8a2239b3fa52a..5da508278f2df0ffb74bcbaacb8173deae79061c 100644 (file)
--- a/todo
+++ b/todo
@@ -182,6 +182,7 @@
 0 feature dpmod: make run animation play back according to movement speed (along v_forward), instead of just playing a continuous loop based on time (Urre)
 0 feature dpmod: make spawning use viewzoom to start zoomed out 2.0 and then zoom in to 1.0 (Urre)
 0 feature dpmod: make teleport leave an EF_ADDITIVE clone of the player which fades out
+0 feature dpmod: merge alieninfestation speedmod into dpmod, especially the map
 0 feature dpmod: try making ball lightning mortar shamblers (scar3crow)
 0 feature dpmod: try not adding gravity when onground to see if it gets rid of ramp sliding (Midgar)
 0 feature dpmod: update stats to count monster kills in dm 7 and such (Sajt)