got rid of all the (no longer used) cached_ fields in the msurface_t struct, except...

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index a034185d53e17b7e0f56cf9279bb0e4fc7ec4304..339c699efdf003956ecb141f3fceaac47153e5e0 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -82,7 +82,7 @@ struct msurface_s;
 // change this stuff when real shaders are added
 typedef struct Cshader_s
 {
-       void (*shaderfunc[SHADERSTAGE_COUNT])(const struct entity_render_s *ent, const struct texture_s *texture, const struct msurface_s *firstsurf);
+       void (*shaderfunc[SHADERSTAGE_COUNT])(const struct entity_render_s *ent, const struct texture_s *texture, struct msurface_s **surfchain);
        int flags;
 }
 Cshader_t;
@@ -100,6 +100,9 @@ typedef struct texture_s
        // SURF_ flags
        unsigned int flags;
 
+       // position in the model's textures array
+       int number;
+
        // type of rendering (SURFRENDER_ value)
        int rendertype;
 
@@ -183,8 +186,6 @@ typedef struct msurface_s
        mplane_t *plane;
        // SURF_ flags
        int flags;
-       // rendering chain
-       struct msurface_s *texturechain;
 
        // look up in model->surfedges[], negative numbers are backwards edges
        int firstedge;
@@ -218,28 +219,22 @@ typedef struct msurface_s
        vec3_t poly_mins, poly_maxs, poly_center;
 
        // neighboring surfaces (one per poly_numverts)
-       struct msurface_s **neighborsurfaces;
+       //struct msurface_s **neighborsurfaces;
        // currently used only for generating static shadow volumes
        int castshadow;
 
        // these are regenerated every frame
        // lighting info
+       // if this == r_framecount there are dynamic lights on the surface
        int dlightframe;
+       // which dynamic lights are touching this surface
+       // (only access this if dlightframe is current)
        int dlightbits[8];
        // avoid redundent addition of dlights
        int lightframe;
-       // only render each surface once
-       //int worldnodeframe;
-
-       // these cause lightmap updates if regenerated
-       // values currently used in lightmap
-       unsigned short cached_light[MAXLIGHTMAPS];
-       // if lightmap was lit by dynamic lights, force update on next frame
-       short cached_dlight;
-       // to cause lightmap to be rerendered when v_overbrightbits changes
-       short cached_lightmapscalebit;
-       // rerender lightmaps when r_ambient changes
-       float cached_ambient;
+
+       // if lightmap settings changed, this forces update
+       int cached_dlight;
 }
 msurface_t;
 
@@ -380,6 +375,7 @@ void Mod_FindNonSolidLocation(vec3_t pos, struct model_s *mod);
 mleaf_t *Mod_PointInLeaf (const float *p, struct model_s *model);
 int Mod_PointContents (const float *p, struct model_s *model);
 qbyte *Mod_LeafPVS (mleaf_t *leaf, struct model_s *model);
+void Mod_BuildPVSTextureChains(struct model_s *model);
 
 #endif