moved brushq3.submodel to brush, removed brushq3.data_thismodel (instead looking...

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

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 8e24bdfcd4a5c88a3e76426af7296931771b3e41..12916e6ec18a03ff98ae8c80f8564ee11ea42b4e 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -2112,10 +2112,10 @@ void R_Q3BSP_Draw(entity_render_t *ent)
                GL_DepthMask(false);
                GL_DepthTest(true);
                qglPolygonOffset(r_drawcollisionbrushes_polygonfactor.value, r_drawcollisionbrushes_polygonoffset.value);
-               for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
-                       if (model->brushq3.data_thismodel->firstbrush[i].colbrushf && model->brushq3.data_thismodel->firstbrush[i].colbrushf->numtriangles)
-                               R_DrawCollisionBrush(model->brushq3.data_thismodel->firstbrush[i].colbrushf);
-               for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
+               for (i = 0;i < model->brushq3.data_models[model->brush.submodel].numbrushes;i++)
+                       if (model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf && model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf->numtriangles)
+                               R_DrawCollisionBrush(model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf);
+               for (i = 0, face = model->brushq3.data_models[model->brush.submodel].firstface;i < model->brushq3.data_models[model->brush.submodel].numfaces;i++, face++)
                        if (face->mesh.num_collisiontriangles)
                                R_Q3BSP_DrawCollisionFace(ent, face);
                qglPolygonOffset(0, 0);

diff --git a/model_brush.c b/model_brush.c
index 46d5a3b695e872546db80d9ae4e991188b7ed2c1..44c41917a2cf0a326bd59003325800855cd0fdf3 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -3104,6 +3104,8 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
                        mod->mempool = NULL;
                }
 
+               mod->brush.submodel = i;
+
                if (loadmodel->brush.submodels)
                        loadmodel->brush.submodels[i] = mod;
 
@@ -5350,11 +5352,11 @@ static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const
                if (VectorCompare(boxstartmins, boxendmins))
                {
                        // point trace
-                       if (model->brushq3.submodel)
+                       if (model->brush.submodel)
                        {
-                               for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
-                                       if (model->brushq3.data_thismodel->firstbrush[i].colbrushf)
-                                               Collision_TracePointBrushFloat(trace, boxstartmins, model->brushq3.data_thismodel->firstbrush[i].colbrushf);
+                               for (i = 0;i < model->brushq3.data_models[model->brush.submodel].numbrushes;i++)
+                                       if (model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf)
+                                               Collision_TracePointBrushFloat(trace, boxstartmins, model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf);
                        }
                        else
                                Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace, model, model->brush.data_nodes, boxstartmins, ++markframe);
@@ -5362,16 +5364,16 @@ static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const
                else
                {
                        // line trace
-                       if (model->brushq3.submodel)
+                       if (model->brush.submodel)
                        {
-                               for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
-                                       if (model->brushq3.data_thismodel->firstbrush[i].colbrushf)
-                                               Collision_TraceLineBrushFloat(trace, boxstartmins, boxendmins, model->brushq3.data_thismodel->firstbrush[i].colbrushf, model->brushq3.data_thismodel->firstbrush[i].colbrushf);
+                               for (i = 0;i < model->brushq3.data_models[model->brush.submodel].numbrushes;i++)
+                                       if (model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf)
+                                               Collision_TraceLineBrushFloat(trace, boxstartmins, boxendmins, model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf, model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf);
                                if (mod_q3bsp_curves_collisions.integer)
                                {
-                                       for (i = 0;i < model->brushq3.data_thismodel->numfaces;i++)
+                                       for (i = 0;i < model->brushq3.data_models[model->brush.submodel].numfaces;i++)
                                        {
-                                               face = model->brushq3.data_thismodel->firstface + i;
+                                               face = model->brushq3.data_models[model->brush.submodel].firstface + i;
                                                if (face->mesh.num_collisiontriangles)
                                                        Collision_TraceLineTriangleMeshFloat(trace, boxstartmins, boxendmins, face->mesh.num_collisiontriangles, face->mesh.data_collisionelement3i, face->mesh.data_collisionvertex3f, face->texture->supercontents, segmentmins, segmentmaxs);
                                        }
@@ -5386,16 +5388,16 @@ static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const
                // box trace, performed as brush trace
                thisbrush_start = Collision_BrushForBox(&startmatrix, boxstartmins, boxstartmaxs);
                thisbrush_end = Collision_BrushForBox(&endmatrix, boxendmins, boxendmaxs);
-               if (model->brushq3.submodel)
+               if (model->brush.submodel)
                {
-                       for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
-                               if (model->brushq3.data_thismodel->firstbrush[i].colbrushf)
-                                       Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, model->brushq3.data_thismodel->firstbrush[i].colbrushf, model->brushq3.data_thismodel->firstbrush[i].colbrushf);
+                       for (i = 0;i < model->brushq3.data_models[model->brush.submodel].numbrushes;i++)
+                               if (model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf)
+                                       Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf, model->brushq3.data_models[model->brush.submodel].firstbrush[i].colbrushf);
                        if (mod_q3bsp_curves_collisions.integer)
                        {
-                               for (i = 0;i < model->brushq3.data_thismodel->numfaces;i++)
+                               for (i = 0;i < model->brushq3.data_models[model->brush.submodel].numfaces;i++)
                                {
-                                       face = model->brushq3.data_thismodel->firstface + i;
+                                       face = model->brushq3.data_models[model->brush.submodel].firstface + i;
                                        if (face->mesh.num_collisiontriangles)
                                                Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, face->mesh.num_collisiontriangles, face->mesh.data_collisionelement3i, face->mesh.data_collisionvertex3f, face->texture->supercontents, segmentmins, segmentmaxs);
                                }
@@ -5682,17 +5684,16 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer)
                        mod->brush.LightPoint = NULL;
                        mod->brush.FindNonSolidLocation = Mod_Q3BSP_FindNonSolidLocation;
                }
-               mod->brushq3.data_thismodel = loadmodel->brushq3.data_models + i;
-               mod->brushq3.submodel = i;
+               mod->brush.submodel = i;
 
                // make the model surface list (used by shadowing/lighting)
-               mod->nummodelsurfaces = mod->brushq3.data_thismodel->numfaces;
+               mod->nummodelsurfaces = mod->brushq3.data_models[i].numfaces;
                mod->surfacelist = Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->surfacelist));
                for (j = 0;j < mod->nummodelsurfaces;j++)
-                       mod->surfacelist[j] = (mod->brushq3.data_thismodel->firstface - mod->brushq3.data_faces) + j;
+                       mod->surfacelist[j] = (mod->brushq3.data_models[i].firstface - mod->brushq3.data_faces) + j;
 
-               VectorCopy(mod->brushq3.data_thismodel->mins, mod->normalmins);
-               VectorCopy(mod->brushq3.data_thismodel->maxs, mod->normalmaxs);
+               VectorCopy(mod->brushq3.data_models[i].mins, mod->normalmins);
+               VectorCopy(mod->brushq3.data_models[i].maxs, mod->normalmaxs);
                corner[0] = max(fabs(mod->normalmins[0]), fabs(mod->normalmaxs[0]));
                corner[1] = max(fabs(mod->normalmins[1]), fabs(mod->normalmaxs[1]));
                corner[2] = max(fabs(mod->normalmins[2]), fabs(mod->normalmaxs[2]));
@@ -5707,10 +5708,10 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer)
                mod->radius = modelradius;
                mod->radius2 = modelradius * modelradius;
 
-               for (j = 0;j < mod->brushq3.data_thismodel->numfaces;j++)
-                       if (mod->brushq3.data_thismodel->firstface[j].texture->surfaceflags & Q3SURFACEFLAG_SKY)
+               for (j = 0;j < mod->brushq3.data_models[i].numfaces;j++)
+                       if (mod->brushq3.data_models[i].firstface[j].texture->surfaceflags & Q3SURFACEFLAG_SKY)
                                break;
-               if (j < mod->brushq3.data_thismodel->numfaces)
+               if (j < mod->brushq3.data_models[i].numfaces)
                        mod->DrawSky = R_Q3BSP_DrawSky;
        }
 }

diff --git a/model_shared.h b/model_shared.h
index 34f511e4baddd7fb3194cf4bcd12e164d8d3e12b..964622fb9067b885b59f3057a8bb4bcd2ff73f2f 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -175,6 +175,11 @@ typedef struct model_brush_s
        qboolean ishlbsp;
        // string of entity definitions (.map format)
        char *entities;
+
+       // if non-zero this is a submodel
+       // (this is the number of the submodel, an index into submodels)
+       int submodel;
+
        // number of submodels in this map (just used by server to know how many
        // submodels to load)
        int numsubmodels;
@@ -295,17 +300,11 @@ model_brushq2_t;
 
 typedef struct model_brushq3_s
 {
-       // if non-zero this is a submodel
-       // (this is the number of the submodel, an index into data_models)
-       int submodel;
-
        int num_textures;
        q3mtexture_t *data_textures;
 
        int num_models;
        q3mmodel_t *data_models;
-       // each submodel gets its own model struct so this is different for each.
-       q3mmodel_t *data_thismodel;
 
        int num_brushes;
        q3mbrush_t *data_brushes;