X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=3ca435b291b5f7e45a56922a23aaee31d56e4a58;hb=1fd37f5239fe019e4d53c3e19b6fa9ff67da12e1;hp=aca35010df227e0076f047ea8d09970e2eebdee0;hpb=cf128c9b9699145be0cb515a5e91e0b95b45b42f;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index aca35010..3ca435b2 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -356,6 +356,7 @@ q3shaderinfo_deform_t;
 typedef struct q3shaderinfo_s
 {
 	char name[Q3PATHLENGTH];
+#define Q3SHADERINFO_COMPARE_START surfaceparms
 	int surfaceparms;
 	int textureflags;
 	int numlayers;
@@ -381,6 +382,7 @@ typedef struct q3shaderinfo_s
 	float reflectfactor; // amount of reflection distort (1.0 = like the cvar specifies)
 	vec4_t reflectcolor4f; // color tint of reflection (including alpha factor)
 	float r_water_wateralpha; // additional wateralpha to apply when r_water is active
+#define Q3SHADERINFO_COMPARE_END r_water_wateralpha
 }
 q3shaderinfo_t;
 
@@ -456,18 +458,23 @@ typedef struct texture_s
 	// (this is an optimization in the renderer)
 	int animated;
 
+	// renderer checks if this texture needs updating...
+	int update_lastrenderframe;
+	void *update_lastrenderentity;
 	// the current alpha of this texture (may be affected by r_wateralpha)
 	float currentalpha;
 	// the current texture frame in animation
 	struct texture_s *currentframe;
 	// current texture transform matrix (used for water scrolling)
 	matrix4x4_t currenttexmatrix;
+	matrix4x4_t currentbackgroundtexmatrix;
 
 	// various q3 shader features
 	q3shaderinfo_layer_rgbgen_t rgbgen;
 	q3shaderinfo_layer_alphagen_t alphagen;
 	q3shaderinfo_layer_tcgen_t tcgen;
 	q3shaderinfo_layer_tcmod_t tcmods[Q3MAXTCMODS];
+	q3shaderinfo_layer_tcmod_t backgroundtcmods[Q3MAXTCMODS];
 	q3shaderinfo_deform_t deforms[Q3MAXDEFORMS];
 
 	qboolean colormapping;
@@ -567,6 +574,12 @@ typedef struct msurface_s
 	struct q3deffect_s *effect; // q3bsp
 	// FIXME: collisionmarkframe should be kept in a separate array
 	int collisionmarkframe; // q3bsp // don't collide twice in one trace
+
+	// optimization...
+	float *data_collisionbbox6f; // collision optimization - contains combined bboxes of every data_collisionstride triangles
+	int num_collisionbboxstride;
+	float *data_bbox6f; // collision optimization - contains combined bboxes of every data_collisionstride triangles
+	int num_bboxstride;
 }
 msurface_t;
 
@@ -601,14 +614,15 @@ typedef struct model_brush_s
 	// string of entity definitions (.map format)
 	char *entities;
 
-	// if non-zero this is a submodel
+	// if not NULL this is a submodel
+	struct model_s *parentmodel;
 	// (this is the number of the submodel, an index into submodels)
 	int submodel;
 
 	// 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
+	// pointers to each of the submodels
 	struct model_s **submodels;
 
 	int num_planes;
@@ -766,8 +780,6 @@ typedef struct model_brushq3_s
 	int num_lightgrid_imins[3];
 	int num_lightgrid_imaxs[3];
 	int num_lightgrid_isize[3];
-	// indexing/clamping
-	int num_lightgrid_dimensions[3];
 	// transform modelspace coordinates to lightgrid index
 	matrix4x4_t num_lightgrid_indexfromworld;
 
@@ -794,8 +806,6 @@ typedef struct model_s
 	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)
-	qboolean		isworldmodel;
 	// CRC of the file this model was loaded from, to reload if changed
 	unsigned int	crc;
 	// mod_brush, mod_alias, mod_sprite
@@ -829,6 +839,7 @@ typedef struct model_s
 	// range of surface numbers in this (sub)model
 	int				firstmodelsurface;
 	int				nummodelsurfaces;
+	int				*sortedmodelsurfaces;
 	// range of collision brush numbers in this (sub)model
 	int				firstmodelbrush;
 	int				nummodelbrushes;
@@ -906,9 +917,9 @@ extern cvar_t r_fullbrights;
 
 void Mod_Init (void);
 void Mod_Reload (void);
-dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel);
-dp_model_t *Mod_FindName (const char *name);
-dp_model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel);
+dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk);
+dp_model_t *Mod_FindName (const char *name, const char *parentname);
+dp_model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, const char *parentname);
 void Mod_UnloadModel (dp_model_t *mod);
 
 void Mod_ClearUsed(void);
@@ -925,6 +936,7 @@ void Mod_BuildNormals(int firstvertex, int numvertices, int numtriangles, const
 void Mod_BuildTextureVectorsFromNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const float *texcoord2f, const float *normal3f, const int *elements, float *svector3f, float *tvector3f, qboolean areaweighting);
 
 void Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors);
+void Mod_MakeSortedSurfaces(dp_model_t *mod);
 
 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);
 shadowmesh_t *Mod_ShadowMesh_ReAlloc(mempool_t *mempool, shadowmesh_t *oldmesh, int light, int neighbors);
@@ -936,6 +948,7 @@ shadowmesh_t *Mod_ShadowMesh_Finish(mempool_t *mempool, shadowmesh_t *firstmesh,
 void Mod_ShadowMesh_CalcBBox(shadowmesh_t *firstmesh, vec3_t mins, vec3_t maxs, vec3_t center, float *radius);
 void Mod_ShadowMesh_Free(shadowmesh_t *mesh);
 
+void Mod_FreeQ3Shaders(void);
 void Mod_LoadQ3Shaders(void);
 q3shaderinfo_t *Mod_LookupQ3Shader(const char *name);
 qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qboolean warnmissing, qboolean fallback, int defaulttexflags);
@@ -997,6 +1010,7 @@ void Mod_SpriteInit(void);
 void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend);
 void Mod_IBSP_Load(dp_model_t *mod, void *buffer, void *bufferend);
 void Mod_MAP_Load(dp_model_t *mod, void *buffer, void *bufferend);
+void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend);
 void Mod_IDP0_Load(dp_model_t *mod, void *buffer, void *bufferend);
 void Mod_IDP2_Load(dp_model_t *mod, void *buffer, void *bufferend);
 void Mod_IDP3_Load(dp_model_t *mod, void *buffer, void *bufferend);