lightmap update checking is now handled very differently; each brush model has a...

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index 7ae603fe3084028a946ae4b773679d397f431cf1..8870e9654e46ed5d1a47fdc33a4cf2e57b12da51 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;
 
@@ -127,9 +130,10 @@ typedef struct texture_s
        // set if animated or there is an alternate frame set
        // (this is an optimization in the renderer)
        int animated;
-       // the current texture frames in animation
-       // (index with entity frame != 0)
-       struct texture_s *currentframe[2];
+       // the current texture frame in animation
+       struct texture_s *currentframe;
+       // current alpha of the texture
+       float currentalpha;
 }
 texture_t;
 
@@ -152,18 +156,18 @@ typedef struct surfmesh_s
 {
        // can be multiple meshs per surface
        struct surfmesh_s *chain;
-       int numverts;
-       int numtriangles;
-       float *verts;
-       float *svectors;
-       float *tvectors;
-       float *normals;
-       int *lightmapoffsets;
-       float *str;
-       float *uvw;
-       float *abc;
-       int *index;
-       int *triangleneighbors;
+       int numverts; // number of vertices in the mesh
+       int numtriangles; // number of triangles in the mesh
+       float *verts; // float[verts*4] vertex locations
+       float *svectors; // float[verts*4] direction of 'S' (right) texture axis for each vertex
+       float *tvectors; // float[verts*4] direction of 'T' (down) texture axis for each vertex
+       float *normals; // float[verts*4] direction of 'R' (out) texture axis for each vertex
+       int *lightmapoffsets; // index into surface's lightmap samples for vertex lighting
+       float *str; // float[verts*4] texcoords for surface texture
+       float *uvw; // float[verts*4] texcoords for lightmap texture
+       float *abc; // float[verts*4] texcoords for detail texture
+       int *index; // int[tris*3] triangles of the mesh, 3 indices into vertex arrays for each
+       int *triangleneighbors; // int[tris*3] neighboring triangle on each edge (-1 if none)
 }
 surfmesh_t;
 
@@ -182,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;
@@ -215,17 +217,18 @@ typedef struct msurface_s
        float *poly_verts;
        // bounding box for onscreen checks, and center for sorting
        vec3_t poly_mins, poly_maxs, poly_center;
-       // bounding sphere radius (around poly_center)
-       float poly_radius, poly_radius2;
 
        // 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;
@@ -356,6 +359,7 @@ typedef struct mlight_s
        // maximum extent of the light for culling purposes
        float cullradius;
        float cullradius2;
+       /*
        // surfaces this shines on
        int numsurfaces;
        msurface_t **surfaces;
@@ -365,6 +369,7 @@ typedef struct mlight_s
        //svbspmesh_t *shadowvolume;
        //vec3_t shadowvolumemins, shadowvolumemaxs;
        shadowmesh_t *shadowvolume;
+       */
 }
 mlight_t;
 
@@ -379,6 +384,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