From 22a6c8961f4d5ff64912f52acbd3ada41ce2dae0 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 1 Apr 2008 13:26:41 +0000 Subject: [PATCH] renamed Q3FACETYPE_POLYGON to Q3FACETYPE_FLAT git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8241 d7cf8633-e32d-0410-b094-e92efae38249 --- model_brush.c | 6 +++--- model_brush.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/model_brush.c b/model_brush.c index 6fba250c..140fb304 100644 --- a/model_brush.c +++ b/model_brush.c @@ -4569,7 +4569,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) { // check face type first type = LittleLong(in->type); - if (type != Q3FACETYPE_POLYGON + if (type != Q3FACETYPE_FLAT && type != Q3FACETYPE_PATCH && type != Q3FACETYPE_MESH && type != Q3FACETYPE_FLARE) @@ -4638,7 +4638,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) } switch(type) { - case Q3FACETYPE_POLYGON: + case Q3FACETYPE_FLAT: case Q3FACETYPE_MESH: // no processing necessary break; @@ -4703,7 +4703,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) out->num_firsttriangle = meshtriangles; switch(type) { - case Q3FACETYPE_POLYGON: + case Q3FACETYPE_FLAT: case Q3FACETYPE_MESH: // no processing necessary, except for lightmap merging for (j = 0;j < out->num_vertices;j++) diff --git a/model_brush.h b/model_brush.h index 8eaeddd3..a0a92687 100644 --- a/model_brush.h +++ b/model_brush.h @@ -508,7 +508,7 @@ typedef struct q3deffect_s } q3deffect_t; -#define Q3FACETYPE_POLYGON 1 // common +#define Q3FACETYPE_FLAT 1 // common #define Q3FACETYPE_PATCH 2 // common #define Q3FACETYPE_MESH 3 // common #define Q3FACETYPE_FLARE 4 // rare (is this ever used?) @@ -535,14 +535,14 @@ typedef struct q3dface_s unknown; struct { - // Q3FACETYPE_POLYGON - // polygon is simply a convex polygon, renderable as a mesh + // Q3FACETYPE_FLAT + // mesh is a collection of triangles on a plane, renderable as a mesh (NOT a polygon) float lightmap_origin[3]; float lightmap_vectors[2][3]; float normal[3]; int unused1[2]; } - polygon; + flat; struct { // Q3FACETYPE_PATCH -- 2.39.2