renamed Q3FACETYPE_POLYGON to Q3FACETYPE_FLAT

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

diff --git a/model_brush.c b/model_brush.c
index 6fba250c2581ff9a999f3be39d6b200014c0bcd2..140fb3047a3e860ef2d0e1ac39bcf414fff58c07 100644 (file)
--- 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 8eaeddd36c13eeebe2551831e2d14af8a3a1d55d..a0a92687fb5da962b2e71c5b86ed1472f2417bef 100644 (file)
--- 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