X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=c7472b1165a115fa6eb94afbf463df8e33aa977b;hb=a2445d85eccf4d0c5766f44f02cd04a600c4bad4;hp=779da1f64bb18a9c8fcefd7429dc360b8c9b0ca3;hpb=0e6ee75ea28c1f0f9027b698779d945c71e65213;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index 779da1f6..c7472b11 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -179,6 +179,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 +330,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 +382,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 +394,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 +424,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 +458,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 +472,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 +489,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 +547,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)
@@ -549,8 +565,6 @@ typedef struct model_s
 	int				flags;
 	// engine calculated flags, ones that can not be set in the file
 	int				flags2;
-	// LordHavoc: if true (normally only for sprites) the model/sprite/bmodel is always rendered fullbright
-	int				fullbright;
 	// number of QC accessible frame(group)s in the model
 	int				numframes;
 	// number of QC accessible skin(group)s in the model
@@ -585,7 +599,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
@@ -628,7 +642,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);
@@ -641,6 +654,7 @@ extern char loadname[32];	// for hunk tags
 int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, int numvertices, int *remapvertices);
 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_BuildNormals(int numverts, int numtriangles, const float *vertex3f, const int *elements, float *normal3f);
 void Mod_BuildTextureVectorsAndNormals(int numverts, int numtriangles, const float *vertex, const float *texcoord, const int *elements, float *svectors, float *tvectors, float *normals);
 
 shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtriangles, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, int light, int neighbors, int expandable);
@@ -681,6 +695,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