-Fixed a bug in drawstring - it used maxlen instead of len in a validity check

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 516cf45f805e04889cd7d5576da1a67af66f7d97..ddb6e1e0f7b2f5df4893bb43c59c46564e766713 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -154,6 +154,8 @@ typedef struct model_brush_s
        // number of submodels in this map (just used by server to know how many
        // submodels to load)
        int numsubmodels;
+       // pointers to each of the submodels if .isworldmodel is true
+       struct model_s **submodels;
 
        // pvs
        int num_pvsclusters;
@@ -179,6 +181,9 @@ typedef struct model_brush_s
        void (*RoundUpToHullSize)(struct model_s *cmodel, const vec3_t inmins, const vec3_t inmaxs, vec3_t outmins, vec3_t outmaxs);
 
        char skybox[64];
+
+       rtexture_t *solidskytexture;
+       rtexture_t *alphaskytexture;
 }
 model_brush_t;
 
@@ -327,16 +332,32 @@ model_brushq2_t;
 #define Q3SURFACEPARM_TRANS 16777216
 #define Q3SURFACEPARM_WATER 33554432
 
+// various flags from shaders
+#define Q3TEXTUREFLAG_TWOSIDED 1
+#define Q3TEXTUREFLAG_ADDITIVE 2
+#define Q3TEXTUREFLAG_NOMIPMAPS 4
+#define Q3TEXTUREFLAG_NOPICMIP 8
+#define Q3TEXTUREFLAG_AUTOSPRITE 16
+#define Q3TEXTUREFLAG_AUTOSPRITE2 32
+#define Q3TEXTUREFLAG_ALPHATEST 64
+
+struct q3msurface_s;
 typedef struct q3mtexture_s
 {
        char name[Q3PATHLENGTH];
+       char firstpasstexturename[Q3PATHLENGTH];
        int surfaceflags;
        int nativecontents;
        int supercontents;
        int surfaceparms;
+       int textureflags;
 
        int number;
        skinframe_t skin;
+
+       int numfaces;
+       struct q3msurface_s **facelist;
+       int *facenumlist;
 }
 q3mtexture_t;
 
@@ -363,7 +384,8 @@ typedef struct q3mleaf_s
        int clusterindex;
        int areaindex;
        int numleaffaces;
-       struct q3mface_s **firstleafface;
+       struct q3msurface_s **firstleafface;
+       int *firstleaffacenum;
        int numleafbrushes;
        struct q3mbrush_s **firstleafbrush;
 }
@@ -374,7 +396,7 @@ typedef struct q3mmodel_s
        vec3_t mins;
        vec3_t maxs;
        int numfaces;
-       struct q3mface_s *firstface;
+       struct q3msurface_s *firstface;
        int numbrushes;
        struct q3mbrush_s *firstbrush;
 }
@@ -404,21 +426,17 @@ typedef struct q3meffect_s
 }
 q3meffect_t;
 
-typedef struct q3mface_s
+typedef struct q3msurface_s
 {
+       // FIXME: collisionmarkframe should be kept in a separate array
+       // FIXME: visframe should be kept in a separate array
+       // FIXME: shadowmark should be kept in a separate array
+
        struct q3mtexture_s *texture;
        struct q3meffect_s *effect;
        rtexture_t *lightmaptexture;
-       int collisions; // performs per triangle collisions on this surface
        int collisionmarkframe; // don't collide twice in one trace
-       int type;
-       int firstvertex;
-       int firstelement;
-       int patchsize[2];
-       // used for processing
-       int markframe;
-       // (world only) visframe == r_framecount means it is visible this frame
-       int visframe;
+       int visframe; // visframe == r_framecount means it is visible this frame
        // bounding box for culling
        float mins[3];
        float maxs[3];
@@ -442,12 +460,9 @@ typedef struct q3mface_s
 
        // index into model->brush.shadowmesh
        int num_firstshadowmeshtriangle;
-       
+
        // used for shadow volume generation
        int shadowmark;
-
-       // temporary use by light processing
-       int lighttemp_castshadow;
 }
 q3msurface_t;
 
@@ -459,6 +474,8 @@ typedef struct model_brushq3_s
 
        int num_textures;
        q3mtexture_t *data_textures;
+       q3msurface_t **data_texturefaces;
+       int *data_texturefacenums;
 
        int num_planes;
        mplane_t *data_planes;
@@ -474,6 +491,7 @@ typedef struct model_brushq3_s
 
        int num_leaffaces;
        q3msurface_t **data_leaffaces;
+       int *data_leaffacenums;
 
        int num_models;
        q3mmodel_t *data_models;
@@ -531,8 +549,8 @@ typedef struct model_s
 {
        // name and path of model, for example "progs/player.mdl"
        char                    name[MAX_QPATH];
-       // model needs to be loaded if this is true
-       qboolean                needload;
+       // model needs to be loaded if this is false
+       qboolean                loaded;
        // set if the model is used in current map, models which are not, are purged
        qboolean                used;
        // true if this is the world model (I.E. defines what sky to use, and may contain submodels)
@@ -583,7 +601,7 @@ typedef struct model_s
        // draw a shadow volume for the model based on light source
        void(*DrawShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist);
        // draw the lighting on a model (through stencil)
-       void(*DrawLight)(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, int numsurfaces, const int *surfacelist);
+       void(*DrawLight)(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist);
        // trace a box against this model
        void (*TraceBox)(struct model_s *model, int frame, struct trace_s *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs, int hitsupercontentsmask);
        // fields belonging to each type of model
@@ -626,7 +644,6 @@ void Mod_CheckLoaded (model_t *mod);
 void Mod_ClearAll (void);
 model_t *Mod_FindName (const char *name);
 model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel);
-void Mod_TouchModel (const char *name);
 void Mod_UnloadModel (model_t *mod);
 
 void Mod_ClearUsed(void);
@@ -680,6 +697,7 @@ skinfile_t *Mod_LoadSkinFiles(void);
 void Mod_FreeSkinFiles(skinfile_t *skinfile);
 int Mod_CountSkinFiles(skinfile_t *skinfile);
 
+void Mod_SnapVertices(int numcomponents, int numvertices, float *vertices, float snap);
 int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f);
 
 #endif // MODEL_SHARED_H