From 15d156000c710dcbad5b2372e6ffbc0fddf7dde2 Mon Sep 17 00:00:00 2001 From: havoc Date: Wed, 14 Apr 2004 07:53:38 +0000 Subject: [PATCH] renamed q3mface_t to q3msurface_t git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4105 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rsurf.c | 40 ++++++++++++++++++++-------------------- model_brush.c | 14 +++++++------- model_shared.h | 6 +++--- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gl_rsurf.c b/gl_rsurf.c index 09c2fb9f..01fa9408 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -54,7 +54,7 @@ int r_q3bsp_nummarkleafs; q3mleaf_t *r_q3bsp_maxleaflist[65536]; int r_q3bsp_maxmarksurfaces; int r_q3bsp_nummarksurfaces; -q3mface_t *r_q3bsp_maxsurfacelist[65536]; +q3msurface_t *r_q3bsp_maxsurfacelist[65536]; */ static int dlightdivtable[32768]; @@ -1948,7 +1948,7 @@ void R_DrawCollisionBrush(colbrushf_t *brush) GL_LockArrays(0, 0); } -void R_Q3BSP_DrawCollisionFace(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawCollisionFace(entity_render_t *ent, q3msurface_t *face) { int i; rmeshstate_t m; @@ -1957,14 +1957,14 @@ void R_Q3BSP_DrawCollisionFace(entity_render_t *ent, q3mface_t *face) memset(&m, 0, sizeof(m)); m.pointer_vertex = face->data_collisionvertex3f; R_Mesh_State(&m); - i = ((int)face) / sizeof(q3mface_t); + i = ((int)face) / sizeof(q3msurface_t); GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f); GL_LockArrays(0, face->num_collisionvertices); R_Mesh_Draw(face->num_collisionvertices, face->num_collisiontriangles, face->data_collisionelement3i); GL_LockArrays(0, 0); } -void R_Q3BSP_DrawSkyFace(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawSkyFace(entity_render_t *ent, q3msurface_t *face) { rmeshstate_t m; if (!face->num_triangles) @@ -2006,7 +2006,7 @@ void R_Q3BSP_DrawSkyFace(entity_render_t *ent, q3mface_t *face) GL_ColorMask(1,1,1,1); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(entity_render_t *ent, q3msurface_t *face) { rmeshstate_t m; memset(&m, 0, sizeof(m)); @@ -2028,7 +2028,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(entity_render_t *ent, q3mface_t GL_LockArrays(0, 0); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(entity_render_t *ent, q3msurface_t *face) { rmeshstate_t m; memset(&m, 0, sizeof(m)); @@ -2048,7 +2048,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(entity_render_t *en GL_LockArrays(0, 0); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(entity_render_t *ent, q3msurface_t *face) { rmeshstate_t m; memset(&m, 0, sizeof(m)); @@ -2065,7 +2065,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(entity_render_t *ent, q3mface_t *f GL_LockArrays(0, 0); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(entity_render_t *ent, q3msurface_t *face) { rmeshstate_t m; memset(&m, 0, sizeof(m)); @@ -2082,7 +2082,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(entity_render_t *ent, q3mface_t * GL_LockArrays(0, 0); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_LightmapOnly(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_LightmapOnly(entity_render_t *ent, q3msurface_t *face) { rmeshstate_t m; memset(&m, 0, sizeof(m)); @@ -2102,7 +2102,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_LightmapOnly(entity_render_t *ent, q3mface GL_LockArrays(0, 0); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(entity_render_t *ent, q3msurface_t *face) { rmeshstate_t m; memset(&m, 0, sizeof(m)); @@ -2124,7 +2124,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(entity_render_t *ent, q3mface_t *face GL_LockArrays(0, 0); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(entity_render_t *ent, q3msurface_t *face) { int i; float mul; @@ -2163,7 +2163,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(entity_render_t *ent, q3mfac GL_LockArrays(0, 0); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_VertexOnly(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_VertexOnly(entity_render_t *ent, q3msurface_t *face) { int i; float mul; @@ -2195,7 +2195,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_VertexOnly(entity_render_t *ent, q3mface_t GL_LockArrays(0, 0); } -void R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(entity_render_t *ent, q3msurface_t *face) { rmeshstate_t m; memset(&m, 0, sizeof(m)); @@ -2215,7 +2215,7 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(entity_render_t *ent, q3 void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int facenumber) { const entity_render_t *ent = voident; - q3mface_t *face = ent->model->brushq3.data_faces + facenumber; + q3msurface_t *face = ent->model->brushq3.data_faces + facenumber; rmeshstate_t m; R_Mesh_Matrix(&ent->matrix); memset(&m, 0, sizeof(m)); @@ -2276,7 +2276,7 @@ void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int facenumber) qglEnable(GL_CULL_FACE); } -void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawFace(entity_render_t *ent, q3msurface_t *face) { if (!face->num_triangles) return; @@ -2381,7 +2381,7 @@ static int r_q3bsp_framecount = -1; void R_Q3BSP_DrawSky(entity_render_t *ent) { int i; - q3mface_t *face; + q3msurface_t *face; vec3_t modelorg; model_t *model; R_Mesh_Matrix(&ent->matrix); @@ -2411,7 +2411,7 @@ void R_Q3BSP_DrawSky(entity_render_t *ent) void R_Q3BSP_Draw(entity_render_t *ent) { int i; - q3mface_t *face; + q3msurface_t *face; vec3_t modelorg; model_t *model; qbyte *pvs; @@ -2460,7 +2460,7 @@ void R_Q3BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa int t, leafindex, marksurfaceindex, surfaceindex, triangleindex, outnumclusters = 0, outnumsurfaces = 0; const int *e; const float *v[3]; - q3mface_t *surface; + q3msurface_t *surface; q3mleaf_t *leaf; const qbyte *pvs; lightmins[0] = relativelightorigin[0] - lightradius; @@ -2543,7 +2543,7 @@ void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, { model_t *model = ent->model; vec3_t lightmins, lightmaxs; - q3mface_t *surface; + q3msurface_t *surface; int surfacelistindex, j, t; const int *e; const float *v[3]; @@ -2581,7 +2581,7 @@ void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t { model_t *model = ent->model; vec3_t lightmins, lightmaxs, modelorg; - q3mface_t *surface; + q3msurface_t *surface; int surfacelistindex; if (r_drawcollisionbrushes.integer < 2) { diff --git a/model_brush.c b/model_brush.c index 07490768..8f090d1e 100644 --- a/model_brush.c +++ b/model_brush.c @@ -3996,7 +3996,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l) static void Mod_Q3BSP_LoadFaces(lump_t *l) { q3dface_t *in; - q3mface_t *out; + q3msurface_t *out; int i, j, n, count, invalidelements, patchsize[2], finalwidth, finalheight, xlevel, ylevel, row0, row1, x, y, *e, finalvertices, finaltriangles; //int *originalelement3i; //int *originalneighbor3i; @@ -4467,7 +4467,7 @@ static void Mod_Q3BSP_LoadLeafBrushes(lump_t *l) static void Mod_Q3BSP_LoadLeafFaces(lump_t *l) { int *in; - q3mface_t **out; + q3msurface_t **out; int i, n, count; in = (void *)(mod_base + l->fileofs); @@ -4780,7 +4780,7 @@ static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, q3mnode_t *node int i, startside, endside; float dist1, dist2, midfrac, mid[3], nodesegmentmins[3], nodesegmentmaxs[3]; q3mleaf_t *leaf; - q3mface_t *face; + q3msurface_t *face; colbrushf_t *brush; if (startfrac > trace->realfraction) return; @@ -4864,7 +4864,7 @@ static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, q3mnode_t *nod float nodesegmentmins[3], nodesegmentmaxs[3]; q3mleaf_t *leaf; colbrushf_t *brush; - q3mface_t *face; + q3msurface_t *face; /* // find which nodes the line is in and recurse for them while (node->plane) @@ -5242,7 +5242,7 @@ static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const colbrushf_t *thisbrush_start, *thisbrush_end; matrix4x4_t startmatrix, endmatrix; static int markframe = 0; - q3mface_t *face; + q3msurface_t *face; memset(trace, 0, sizeof(*trace)); trace->fraction = 1; trace->realfraction = 1; @@ -5473,7 +5473,7 @@ void Mod_Q3BSP_RecursiveGetVisible(q3mnode_t *node, model_t *model, const vec3_t if ((pvs == NULL || CHECKPVSBIT(pvs, leaf->clusterindex))) { int marksurfacenum; - q3mface_t *surf; + q3msurface_t *surf; if (maxleafs && *numleafs < maxleafs) leaflist[(*numleaf)++] = leaf; if (maxsurfaces) @@ -5529,7 +5529,7 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer) int i, j, numshadowmeshtriangles; q3dheader_t *header; float corner[3], yawradius, modelradius; - q3mface_t *face; + q3msurface_t *face; mod->type = mod_brushq3; mod->numframes = 1; diff --git a/model_shared.h b/model_shared.h index d55334a7..04012cd5 100644 --- a/model_shared.h +++ b/model_shared.h @@ -462,7 +462,7 @@ typedef struct q3mface_s // temporary use by light processing int lighttemp_castshadow; } -q3mface_t; +q3msurface_t; typedef struct model_brushq3_s { @@ -486,7 +486,7 @@ typedef struct model_brushq3_s q3mbrush_t **data_leafbrushes; int num_leaffaces; - q3mface_t **data_leaffaces; + q3msurface_t **data_leaffaces; int num_models; q3mmodel_t *data_models; @@ -516,7 +516,7 @@ typedef struct model_brushq3_s q3meffect_t *data_effects; int num_faces; - q3mface_t *data_faces; + q3msurface_t *data_faces; // lightmap textures int num_lightmaps; -- 2.39.2