fixed a mistake regarding clusterlist

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index d69cf2de2a226414aa85214dc05161db9003c6ff..011b44baec6f15762883e4d1a05699e2a7ffbee6 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -134,69 +134,48 @@ typedef struct
 }
 mtexinfo_t;
 
+struct q3deffect_s;
 typedef struct msurface_s
 {
        // bounding box for onscreen checks
-       vec3_t poly_mins;
-       vec3_t poly_maxs;
-
-       // the node plane this is on, backwards if SURF_PLANEBACK flag set
-       mplane_t *plane;
-       // SURF_ flags
-       int flags;
-       // texture mapping properties used by this surface
-       mtexinfo_t *texinfo;
-
+       vec3_t mins;
+       vec3_t maxs;
+       // the texture to use on the surface
+       texture_t *texture;
        // the lightmap texture fragment to use on the rendering mesh
        rtexture_t *lightmaptexture;
        // mesh for rendering
        surfmesh_t mesh;
-       // if lightmap settings changed, this forces update
-       int cached_dlight;
-
-       // surface number, to avoid having to do a divide to find the number of a surface from it's address
-       int number;
-
-       // center for sorting transparent meshes
-       vec3_t poly_center;
+       // index into model->brush.shadowmesh
+       int num_firstshadowmeshtriangle;
 
+       // the node plane this is on, backwards if SURF_PLANEBACK flag set
+       mplane_t *plane; // q1bsp
+       // SURF_ flags
+       int flags; // q1bsp
+       // texture mapping properties used by this surface
+       mtexinfo_t *texinfo; // q1bsp
+       // if lightmap settings changed, this forces update
+       int cached_dlight; // q1bsp
        // index into d_lightstylevalue array, 255 means not used (black)
-       qbyte styles[MAXLIGHTMAPS];
+       qbyte styles[MAXLIGHTMAPS]; // q1bsp
        // RGB lighting data [numstyles][height][width][3]
-       qbyte *samples;
+       qbyte *samples; // q1bsp
        // stain to apply on lightmap (soot/dirt/blood/whatever)
-       qbyte *stainsamples;
+       qbyte *stainsamples; // q1bsp
        // the stride when building lightmaps to comply with fragment update
-       int lightmaptexturestride;
-       int texturemins[2];
-       int extents[2];
-
+       int lightmaptexturestride; // q1bsp
+       int texturemins[2]; // q1bsp
+       int extents[2]; // q1bsp
        // if this == r_framecount there are dynamic lights on the surface
-       int dlightframe;
+       int dlightframe; // q1bsp
        // which dynamic lights are touching this surface
        // (only access this if dlightframe is current)
-       int dlightbits[8];
-       // avoid redundent addition of dlights
-       int lightframe;
-
-       // avoid multiple collision traces with a surface polygon
-       int colframe;
-
-       // these are just 3D points defining the outline of the polygon,
-       // no texcoord info (that can be generated from these)
-       int poly_numverts;
-       float *poly_verts;
+       int dlightbits[8]; // q1bsp
 
-       // index into model->brush.shadowmesh
-       int num_firstshadowmeshtriangle;
-
-       // neighboring surfaces (one per poly_numverts)
-       //struct msurface_s **neighborsurfaces;
-       // currently used only for generating static shadow volumes
-       int lighttemp_castshadow;
-
-       // avoid redundent surface shadows
-       int shadowmark;
+       struct q3deffect_s *effect; // q3bsp
+       // FIXME: collisionmarkframe should be kept in a separate array
+       int collisionmarkframe; // q3bsp // don't collide twice in one trace
 }
 msurface_t;
 
@@ -233,8 +212,8 @@ typedef struct mleaf_s
        // common
        int clusterindex; // -1 is not in pvs, >= 0 is pvs bit number
        int areaindex; // q3bsp
-       int numleaffaces;
-       int *firstleafface;
+       int numleafsurfaces;
+       int *firstleafsurface;
        int numleafbrushes; // q3bsp
        int *firstleafbrush; // q3bsp
        qbyte ambient_sound_level[NUM_AMBIENTS]; // q1bsp
@@ -614,7 +593,7 @@ typedef struct
 }
 q3dmeshvertex_t;
 
-typedef struct
+typedef struct q3deffect_s
 {
        char shadername[Q3PATHLENGTH];
        int brushindex;
@@ -782,19 +761,6 @@ q3dpvs_t;
 #define Q3TEXTUREFLAG_AUTOSPRITE2 32
 #define Q3TEXTUREFLAG_ALPHATEST 64
 
-struct q3msurface_s;
-
-typedef struct q3mmodel_s
-{
-       vec3_t mins;
-       vec3_t maxs;
-       int numfaces;
-       struct q3msurface_s *firstface;
-       int numbrushes;
-       struct q3mbrush_s *firstbrush;
-}
-q3mmodel_t;
-
 typedef struct q3mbrush_s
 {
        struct colbrushf_s *colbrushf;
@@ -811,37 +777,6 @@ typedef struct q3mbrushside_s
 }
 q3mbrushside_t;
 
-typedef struct q3meffect_s
-{
-       char shadername[Q3PATHLENGTH];
-       struct q3mbrush_s *brush;
-       int unknown; // 5 or -1
-}
-q3meffect_t;
-
-typedef struct q3msurface_s
-{
-       // FIXME: collisionmarkframe should be kept in a separate array
-       // FIXME: shadowmark should be kept in a separate array
-
-       struct texture_s *texture;
-       struct q3meffect_s *effect;
-       rtexture_t *lightmaptexture;
-       int collisionmarkframe; // don't collide twice in one trace
-       // bounding box for culling
-       float mins[3];
-       float maxs[3];
-
-       surfmesh_t mesh;
-
-       // index into model->brush.shadowmesh
-       int num_firstshadowmeshtriangle;
-
-       // used for shadow volume generation
-       int shadowmark;
-}
-q3msurface_t;
-
 #define CHECKPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] & (1 << ((b) & 7))) : false)
 #define SETPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] |= (1 << ((b) & 7))) : false)
 #define CLEARPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] &= ~(1 << ((b) & 7))) : false)