curves are now precomputed at load time, and all surfaces are treated as Q3FACETYPE_M...

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

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 8ac29f4ef845722fea9329334456faefac510696..2262d66f5723c274e152b4e611a4ad7c54e94bce 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -37,7 +37,6 @@ cvar_t r_testvis = {0, "r_testvis", "0"};
 cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"};
 cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"};
 cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "1"};
-cvar_t r_curves_subdivide_level = {0, "r_curves_subdivide_level", "0"};
 
 static int dlightdivtable[32768];
 
@@ -1912,9 +1911,11 @@ void R_DrawCollisionBrush(colbrushf_t *brush)
        R_Mesh_Draw(brush->numpoints, brush->numtriangles, brush->elements);
 }
 
-void R_Q3BSP_DrawFace_Mesh(entity_render_t *ent, q3mface_t *face)
+void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
 {
        rmeshstate_t m;
+       if ((face->texture->renderflags & Q3MTEXTURERENDERFLAGS_NODRAW) || !face->numtriangles)
+               return;
        memset(&m, 0, sizeof(m));
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_DepthMask(true);
@@ -1938,87 +1939,6 @@ void R_Q3BSP_DrawFace_Mesh(entity_render_t *ent, q3mface_t *face)
        R_Mesh_Draw(face->numvertices, face->numtriangles, face->data_element3i);
 }
 
-#include "curves.h"
-
-void R_Q3BSP_DrawFace_Patch(entity_render_t *ent, q3mface_t *face)
-{
-       int *e, row0, row1, finalwidth, finalheight, x, y, xlevel = r_curves_subdivide_level.integer, ylevel = r_curves_subdivide_level.integer;
-       rmeshstate_t m;
-
-       finalwidth = ((face->patchsize[0] - 1) << xlevel) + 1;
-       finalheight = ((face->patchsize[1] - 1) << ylevel) + 1;
-
-       // generate vertex arrays
-       QuadraticSplinePatchSubdivideFloatBuffer(face->patchsize[0], face->patchsize[1], xlevel, ylevel, 3, face->data_vertex3f, varray_vertex3f);
-       QuadraticSplinePatchSubdivideFloatBuffer(face->patchsize[0], face->patchsize[1], xlevel, ylevel, 2, face->data_texcoordtexture2f, varray_texcoord2f[0]);
-       if (face->lightmaptexture)
-               QuadraticSplinePatchSubdivideFloatBuffer(face->patchsize[0], face->patchsize[1], xlevel, ylevel, 2, face->data_texcoordlightmap2f, varray_texcoord2f[1]);
-       else
-               QuadraticSplinePatchSubdivideFloatBuffer(face->patchsize[0], face->patchsize[1], xlevel, ylevel, 4, face->data_color4f, varray_color4f);
-
-       // generate elements
-       e = earray_element3i;
-       for (y = 0;y < finalheight - 1;y++)
-       {
-               row0 = (y + 0) * finalwidth;
-               row1 = (y + 1) * finalwidth;
-               for (x = 0;x < finalwidth - 1;x++)
-               {
-                       *e++ = row0;
-                       *e++ = row1;
-                       *e++ = row0 + 1;
-                       *e++ = row1;
-                       *e++ = row1 + 1;
-                       *e++ = row0 + 1;
-                       row0++;
-                       row1++;
-               }
-       }
-       for (x = 0;x < (finalwidth-1)*(finalheight-1)*6;x++)
-               if ((unsigned int)earray_element3i[x] >= (unsigned int)(finalwidth*finalheight))
-                       Con_Printf("e[%i] = %i (> %i)\n", x, earray_element3i[x], finalwidth*finalheight);
-
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(face->texture->skin.base);
-       m.pointer_texcoord[0] = varray_texcoord2f[0];
-       if (face->lightmaptexture)
-       {
-               m.tex[1] = R_GetTexture(face->lightmaptexture);
-               m.pointer_texcoord[1] = varray_texcoord2f[1];
-               m.texrgbscale[1] = 2;
-               GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
-       }
-       else
-       {
-               m.texrgbscale[0] = 2;
-               GL_ColorPointer(varray_color4f);
-       }
-       R_Mesh_State_Texture(&m);
-       GL_VertexPointer(varray_vertex3f);
-       R_Mesh_Draw(finalwidth * finalheight, (finalwidth - 1) * (finalheight - 1) * 2, earray_element3i);
-}
-
-void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
-{
-       if (face->texture->renderflags & Q3MTEXTURERENDERFLAGS_NODRAW)
-               return;
-       switch(face->type)
-       {
-               case Q3FACETYPE_POLYGON:
-               case Q3FACETYPE_MESH:
-                       R_Q3BSP_DrawFace_Mesh(ent, face);
-                       break;
-               case Q3FACETYPE_PATCH:
-                       R_Q3BSP_DrawFace_Patch(ent, face);
-                       break;
-               case Q3FACETYPE_FLARE:
-                       break;
-       }
-}
-
 /*
 void R_Q3BSP_DrawSky(entity_render_t *ent)
 {
@@ -2135,7 +2055,6 @@ void GL_Surf_Init(void)
        Cvar_RegisterVariable(&r_floatbuildlightmap);
        Cvar_RegisterVariable(&r_detailtextures);
        Cvar_RegisterVariable(&r_surfaceworldnode);
-       Cvar_RegisterVariable(&r_curves_subdivide_level);
 
        R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
 }

diff --git a/model_brush.c b/model_brush.c
index 33f98bd9fd6d48c880a4c3187c90b22c9428ea41..582e4ab7c8452e0dc4cf6cc0ee9de74a855675c4 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "image.h"
 #include "r_shadow.h"
 #include "winding.h"
+#include "curves.h"
 
 // note: model_shared.c sets up r_notexture, and r_surf_notexture
 
@@ -34,6 +35,7 @@ cvar_t r_miplightmaps = {CVAR_SAVE, "r_miplightmaps", "0"};
 cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1"};
 cvar_t r_nosurftextures = {0, "r_nosurftextures", "0"};
 cvar_t r_sortsurfaces = {0, "r_sortsurfaces", "0"};
+cvar_t r_curves_subdivide_level = {0, "r_curves_subdivide_level", "2"};
 
 void Mod_BrushInit(void)
 {
@@ -44,6 +46,7 @@ void Mod_BrushInit(void)
        Cvar_RegisterVariable(&r_lightmaprgba);
        Cvar_RegisterVariable(&r_nosurftextures);
        Cvar_RegisterVariable(&r_sortsurfaces);
+       Cvar_RegisterVariable(&r_curves_subdivide_level);
        memset(mod_q1bsp_novis, 0xff, sizeof(mod_q1bsp_novis));
 }
 
@@ -3540,7 +3543,16 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 {
        q3dface_t *in;
        q3mface_t *out;
-       int i, j, n, count, invalidelements, patchsize[2];
+       int i, j, n, count, invalidelements, patchsize[2], finalwidth, finalheight, xlevel, ylevel, row0, row1, x, y, *e, finalvertices, finaltriangles;
+       //int *originalelement3i;
+       //int *originalneighbor3i;
+       float *originalvertex3f;
+       //float *originalsvector3f;
+       //float *originaltvector3f;
+       //float *originalnormal3f;
+       float *originalcolor4f;
+       float *originaltexcoordtexture2f;
+       float *originaltexcoordlightmap2f;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
@@ -3631,6 +3643,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
                {
                case Q3FACETYPE_POLYGON:
                case Q3FACETYPE_MESH:
+                       // no processing necessary
                        break;
                case Q3FACETYPE_PATCH:
                        patchsize[0] = LittleLong(in->specific.patch.patchsize[0]);
@@ -3641,18 +3654,66 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
                                out->type = 0; // error
                                continue;
                        }
-                       out->patchsize[0] = patchsize[0];
-                       out->patchsize[1] = patchsize[1];
-                       out->numelements = out->numtriangles = 0;
-                       // FIXME: convert patch to triangles here!
-                       //Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): Q3FACETYPE_PATCH not supported (yet)\n", i, out->texture->name);
-                       //out->type = 0;
-                       //continue;
+                       // convert patch to Q3FACETYPE_MESH
+                       xlevel = r_curves_subdivide_level.integer;
+                       ylevel = r_curves_subdivide_level.integer;
+                       finalwidth = ((patchsize[0] - 1) << xlevel) + 1;
+                       finalheight = ((patchsize[1] - 1) << ylevel) + 1;
+                       finalvertices = finalwidth * finalheight;
+                       finaltriangles = (finalwidth - 1) * (finalheight - 1) * 2;
+                       originalvertex3f = out->data_vertex3f;
+                       //originalsvector3f = out->data_svector3f;
+                       //originaltvector3f = out->data_tvector3f;
+                       //originalnormal3f = out->data_normal3f;
+                       originalcolor4f = out->data_color4f;
+                       originaltexcoordtexture2f = out->data_texcoordtexture2f;
+                       originaltexcoordlightmap2f = out->data_texcoordlightmap2f;
+                       //originalelement3i = out->data_element3i;
+                       //originalneighbor3i = out->data_neighbor3i;
+                       out->data_vertex3f = Mem_Alloc(loadmodel->mempool, sizeof(float[20]) * finalvertices + sizeof(int[6]) * finaltriangles);
+                       out->data_svector3f = out->data_vertex3f + finalvertices * 3;
+                       out->data_tvector3f = out->data_svector3f + finalvertices * 3;
+                       out->data_normal3f = out->data_tvector3f + finalvertices * 3;
+                       out->data_color4f = out->data_normal3f + finalvertices * 3;
+                       out->data_texcoordtexture2f = out->data_color4f + finalvertices * 4;
+                       out->data_texcoordlightmap2f = out->data_texcoordtexture2f + finalvertices * 2;
+                       out->data_element3i = (int *)(out->data_texcoordlightmap2f + finalvertices * 2);
+                       out->data_neighbor3i = out->data_element3i + finaltriangles * 3;
+                       out->type = Q3FACETYPE_MESH;
+                       out->firstvertex = -1;
+                       out->numvertices = finalvertices;
+                       out->firstelement = -1;
+                       out->numtriangles = finaltriangles;
+                       out->numelements = finaltriangles * 3;
+                       // generate geometry
+                       // (note: normals are skipped because they get recalculated)
+                       QuadraticSplinePatchSubdivideFloatBuffer(patchsize[0], patchsize[1], xlevel, ylevel, 3, originalvertex3f, out->data_vertex3f);
+                       QuadraticSplinePatchSubdivideFloatBuffer(patchsize[0], patchsize[1], xlevel, ylevel, 2, originaltexcoordtexture2f, out->data_texcoordtexture2f);
+                       QuadraticSplinePatchSubdivideFloatBuffer(patchsize[0], patchsize[1], xlevel, ylevel, 2, originaltexcoordlightmap2f, out->data_texcoordlightmap2f);
+                       QuadraticSplinePatchSubdivideFloatBuffer(patchsize[0], patchsize[1], xlevel, ylevel, 4, originalcolor4f, out->data_color4f);
+                       // generate elements
+                       e = out->data_element3i;
+                       for (y = 0;y < finalheight - 1;y++)
+                       {
+                               row0 = (y + 0) * finalwidth;
+                               row1 = (y + 1) * finalwidth;
+                               for (x = 0;x < finalwidth - 1;x++)
+                               {
+                                       *e++ = row0;
+                                       *e++ = row1;
+                                       *e++ = row0 + 1;
+                                       *e++ = row1;
+                                       *e++ = row1 + 1;
+                                       *e++ = row0 + 1;
+                                       row0++;
+                                       row1++;
+                               }
+                       }
                        break;
                case Q3FACETYPE_FLARE:
-                       Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): Q3FACETYPE_FLARE not supported (yet)\n", i, out->texture->name);
-                       //out->type = 0;
-                       //continue;
+                       Con_DPrintf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): Q3FACETYPE_FLARE not supported (yet)\n", i, out->texture->name);
+                       // don't render it
+                       out->numtriangles = 0;
                        break;
                }
                for (j = 0, invalidelements = 0;j < out->numelements;j++)
@@ -3669,6 +3730,10 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
                        }
                        Con_Printf("\n");
                }
+               // for shadow volumes
+               Mod_BuildTriangleNeighbors(out->data_neighbor3i, out->data_element3i, out->numtriangles);
+               // for per pixel lighting
+               Mod_BuildTextureVectorsAndNormals(out->numvertices, out->numtriangles, out->data_vertex3f, out->data_texcoordtexture2f, out->data_element3i, out->data_svector3f, out->data_tvector3f, out->data_normal3f);
        }
 }