decals added back due to popular demand, currently not at all optimized (they're...

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 745f2ce5e4dcdf45d73a1049a9e5e654f250e1a9..fb9bc566b40c90a54b970fa15cfd51bec7ed2ada 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -188,8 +188,6 @@ typedef struct model_s
        int                             numtextures;
        texture_t               *textures;
 
-       msurface_t              **texturesurfacechains;
-
        qbyte                   *visdata;
        qbyte                   *lightdata;
        char                    *entities;
@@ -203,11 +201,6 @@ typedef struct model_s
        int                             numlights;
        mlight_t                *lights;
 
-       // used only for casting dynamic shadow volumes
-       shadowmesh_t    *shadowmesh;
-       vec3_t                  shadowmesh_mins, shadowmesh_maxs, shadowmesh_center;
-       float                   shadowmesh_radius;
-
        // pvs visibility marking
        mleaf_t                 *pvsviewleaf;
        int                             pvsviewleafnovis;
@@ -215,6 +208,20 @@ typedef struct model_s
        mleaf_t                 *pvsleafchain;
        int                             *pvssurflist;
        int                             pvssurflistlength;
+       // these get rebuilt as the player moves around if this is the world,
+       // otherwise they are left alone (no pvs for bmodels)
+       msurface_t              ***pvstexturechains;
+       msurface_t              **pvstexturechainsbuffer;
+       int                             *pvstexturechainslength;
+
+       // lightmap update chains for light styles
+       int                             light_styles;
+       qbyte                   *light_style;
+       int                             *light_stylevalue;
+       msurface_t              ***light_styleupdatechains;
+       msurface_t              **light_styleupdatechainsbuffer;
+       int                             light_scalebit;
+       float                   light_ambient;
 
        // skin animation info
        animscene_t             *skinscenes; // [numskins]
@@ -223,12 +230,9 @@ typedef struct model_s
 
        animscene_t             *animscenes; // [numframes]
 
-       // Q1 and Q2 models are the same after loading
-       int                             *mdlmd2data_indices;
-       float                   *mdlmd2data_texcoords;
-       md2frame_t              *mdlmd2data_frames;
-       trivertx_t              *mdlmd2data_pose;
-       int                             *mdlmd2data_triangleneighbors;
+       // mdl/md2/md3 models are the same after loading
+       int                             aliasnum_meshes;
+       aliasmesh_t             *aliasdata_meshes;
 
        // for Zymotic models
        int                             zymnum_verts;
@@ -301,7 +305,7 @@ void Mod_LoadModels(void);
 extern model_t *loadmodel;
 extern char loadname[32];      // for hunk tags
 
-int Mod_FindTriangleWithEdge(const int *elements, int numtriangles, int start, int end);
+int Mod_FindTriangleWithEdge(const int *elements, int numtriangles, int start, int end, int ignore);
 void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtriangles);
 void Mod_ValidateElements(const int *elements, int numtriangles, int numverts, const char *filename, int fileline);
 void Mod_BuildTextureVectorsAndNormals(int numverts, int numtriangles, const float *vertex, const float *texcoord, const int *elements, float *svectors, float *tvectors, float *normals);