X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=00a11b2815340d17c7e74bc5061af8562e40d1e6;hb=344bc8403b50ad75ca3d876430a4a87faf9f9f41;hp=05075887a82908dfeb141c5822bf6e3b50746619;hpb=0cbb44e2f44f2107585e42ab0b4dde618c49b560;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index 05075887..00a11b28 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -84,11 +84,25 @@ shadowmeshvertexhash_t;
 
 typedef struct shadowmesh_s
 {
+	// next mesh in chain
 	struct shadowmesh_s *next;
+	// used for light mesh (NULL on shadow mesh)
+	rtexture_t *map_diffuse;
+	rtexture_t *map_specular;
+	rtexture_t *map_normal;
+	// buffer sizes
 	int numverts, maxverts;
 	int numtriangles, maxtriangles;
+	// used always
 	float *vertex3f;
+	// used for light mesh (NULL on shadow mesh)
+	float *svector3f;
+	float *tvector3f;
+	float *normal3f;
+	float *texcoord2f;
+	// used always
 	int *element3i;
+	// used for shadow mesh (NULL on light mesh)
 	int *neighbor3i;
 	// these are NULL after Mod_ShadowMesh_Finish is performed, only used
 	// while building meshes
@@ -152,13 +166,15 @@ typedef struct model_brush_s
 	// submodels to load)
 	int numsubmodels;
 	// common functions
-	void (*AmbientSoundLevelsForPoint)(struct model_s *model, const vec3_t p, qbyte *out, int outsize);
+	int (*SuperContentsFromNativeContents)(struct model_s *model, int nativecontents);
+	int (*NativeContentsFromSuperContents)(struct model_s *model, int supercontents);
+	qbyte *(*GetPVS)(struct model_s *model, const vec3_t p);
 	int (*FatPVS)(struct model_s *model, const vec3_t org, vec_t radius, qbyte *pvsbuffer, int pvsbufferlength);
 	int (*BoxTouchingPVS)(struct model_s *model, const qbyte *pvs, const vec3_t mins, const vec3_t maxs);
 	void (*LightPoint)(struct model_s *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal);
 	void (*FindNonSolidLocation)(struct model_s *model, const vec3_t in, vec3_t out, vec_t radius);
-	void (*TraceBox)(struct model_s *model, struct trace_s *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs);
-	// this is actually only found on brushq1, but NULL is handled gracefully
+	// these are actually only found on brushq1, but NULL is handled gracefully
+	void (*AmbientSoundLevelsForPoint)(struct model_s *model, const vec3_t p, qbyte *out, int outsize);
 	void (*RoundUpToHullSize)(struct model_s *cmodel, const vec3_t inmins, const vec3_t inmaxs, vec3_t outmins, vec3_t outmaxs);
 }
 model_brush_t;
@@ -199,7 +215,6 @@ typedef struct model_brushq1_s
 	int				*surfacepvsframes;
 	msurface_t		*surfacepvsnext;
 	surfmesh_t		*entiremesh;
-	surfmesh_t		*surfmeshes;
 
 	int				numsurfedges;
 	int				*surfedges;
@@ -250,7 +265,6 @@ typedef struct model_brushq1_s
 	int				*light_stylevalue;
 	msurface_t		***light_styleupdatechains;
 	msurface_t		**light_styleupdatechainsbuffer;
-	int				light_scalebit;
 	float			light_ambient;
 
 	mleaf_t *(*PointInLeaf)(struct model_s *model, const float *p);
@@ -265,11 +279,62 @@ typedef struct model_brushq2_s
 model_brushq2_t;
 */
 
+// surfaceflags from bsp
+#define Q3SURFACEFLAG_NODAMAGE 1
+#define Q3SURFACEFLAG_SLICK 2
+#define Q3SURFACEFLAG_SKY 4
+#define Q3SURFACEFLAG_LADDER 8
+#define Q3SURFACEFLAG_NOIMPACT 16
+#define Q3SURFACEFLAG_NOMARKS 32
+#define Q3SURFACEFLAG_FLESH 64
+#define Q3SURFACEFLAG_NODRAW 128
+#define Q3SURFACEFLAG_HINT 256
+#define Q3SURFACEFLAG_SKIP 512
+#define Q3SURFACEFLAG_NOLIGHTMAP 1024
+#define Q3SURFACEFLAG_POINTLIGHT 2048
+#define Q3SURFACEFLAG_METALSTEPS 4096
+#define Q3SURFACEFLAG_NOSTEPS 8192
+#define Q3SURFACEFLAG_NONSOLID 16384
+#define Q3SURFACEFLAG_LIGHTFILTER 32768
+#define Q3SURFACEFLAG_ALPHASHADOW 65536
+#define Q3SURFACEFLAG_NODLIGHT 131072
+#define Q3SURFACEFLAG_DUST 262144
+
+// surfaceparms from shaders
+#define Q3SURFACEPARM_ALPHASHADOW 1
+#define Q3SURFACEPARM_AREAPORTAL 2
+#define Q3SURFACEPARM_CLUSTERPORTAL 4
+#define Q3SURFACEPARM_DETAIL 8
+#define Q3SURFACEPARM_DONOTENTER 16
+#define Q3SURFACEPARM_FOG 32
+#define Q3SURFACEPARM_LAVA 64
+#define Q3SURFACEPARM_LIGHTFILTER 128
+#define Q3SURFACEPARM_METALSTEPS 256
+#define Q3SURFACEPARM_NODAMAGE 512
+#define Q3SURFACEPARM_NODLIGHT 1024
+#define Q3SURFACEPARM_NODRAW 2048
+#define Q3SURFACEPARM_NODROP 4096
+#define Q3SURFACEPARM_NOIMPACT 8192
+#define Q3SURFACEPARM_NOLIGHTMAP 16384
+#define Q3SURFACEPARM_NOMARKS 32768
+#define Q3SURFACEPARM_NOMIPMAPS 65536
+#define Q3SURFACEPARM_NONSOLID 131072
+#define Q3SURFACEPARM_ORIGIN 262144
+#define Q3SURFACEPARM_PLAYERCLIP 524288
+#define Q3SURFACEPARM_SKY 1048576
+#define Q3SURFACEPARM_SLICK 2197152
+#define Q3SURFACEPARM_SLIME 4194304
+#define Q3SURFACEPARM_STRUCTURAL 8388608
+#define Q3SURFACEPARM_TRANS 16777216
+#define Q3SURFACEPARM_WATER 33554432
+
 typedef struct q3mtexture_s
 {
 	char name[Q3PATHLENGTH];
 	int surfaceflags;
-	int contents;
+	int nativecontents;
+	int supercontents;
+	int surfaceparms;
 
 	int number;
 	skinframe_t skin;
@@ -278,25 +343,30 @@ q3mtexture_t;
 
 typedef struct q3mnode_s
 {
-	int isnode; // true
+	//this part shared between node and leaf
+	struct mplane_s *plane; // != NULL
 	struct q3mnode_s *parent;
-	struct mplane_s *plane;
+	vec3_t mins;
+	vec3_t maxs;
+	// this part unique to nodes
 	struct q3mnode_s *children[2];
 }
 q3mnode_t;
 
 typedef struct q3mleaf_s
 {
-	int isnode; // false
+	//this part shared between node and leaf
+	struct mplane_s *plane; // == NULL
 	struct q3mnode_s *parent;
+	vec3_t mins;
+	vec3_t maxs;
+	// this part unique to leafs
 	int clusterindex;
 	int areaindex;
 	int numleaffaces;
 	struct q3mface_s **firstleafface;
 	int numleafbrushes;
 	struct q3mbrush_s **firstleafbrush;
-	vec3_t mins;
-	vec3_t maxs;
 }
 q3mleaf_t;
 
@@ -340,13 +410,22 @@ typedef struct q3mface_s
 	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 numvertices;
 	int firstelement;
-	int numelements;
 	int patchsize[2];
+	// used for processing
+	int markframe;
+	// (world only) visframe == r_framecount means it is visible this frame
+	int visframe;
+	// bounding box for culling
+	float mins[3];
+	float maxs[3];
 
+	int num_vertices;
+	int num_triangles;
 	float *data_vertex3f;
 	float *data_texcoordtexture2f;
 	float *data_texcoordlightmap2f;
@@ -354,14 +433,20 @@ typedef struct q3mface_s
 	float *data_tvector3f;
 	float *data_normal3f;
 	float *data_color4f;
-	int numtriangles;
 	int *data_element3i;
 	int *data_neighbor3i;
+
+	// temporary use by light processing
+	int lighttemp_castshadow;
 }
 q3mface_t;
 
 typedef struct model_brushq3_s
 {
+	// if non-zero this is a submodel
+	// (this is the number of the submodel, an index into data_models)
+	int submodel;
+
 	int num_textures;
 	q3mtexture_t *data_textures;
 
@@ -488,12 +573,12 @@ typedef struct model_s
 	void(*DrawSky)(struct entity_render_s *ent);
 	// draw the model using lightmap/dlight shading
 	void(*Draw)(struct entity_render_s *ent);
-	// draw a fake shadow for the model
-	void(*DrawFakeShadow)(struct entity_render_s *ent);
 	// draw a shadow volume for the model based on light source
 	void(*DrawShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius);
 	// 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_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz);
+	// 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
 	model_alias_t	alias;
 	model_sprite_t	sprite;
@@ -505,6 +590,8 @@ typedef struct model_s
 	model_brushq3_t	brushq3;
 	// skin files can have different tags for each skin
 	overridetagnameset_t	*data_overridetagnamesforskin;
+	// flags this model for offseting sounds to the model center (used by brush models)
+	int soundfromcenter;
 }
 model_t;
 
@@ -517,6 +604,8 @@ extern rtexture_t *mod_shared_detailtextures[NUM_DETAILTEXTURES];
 // every texture must be in a pool...
 extern rtexturepool_t *mod_shared_texturepool;
 
+extern rtexture_t *mod_shared_distorttexture[64];
+
 // model loading
 extern model_t *loadmodel;
 extern qbyte *mod_base;
@@ -540,25 +629,27 @@ 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 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);
 
-shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts);
-shadowmesh_t *Mod_ShadowMesh_ReAlloc(mempool_t *mempool, shadowmesh_t *oldmesh);
-int Mod_ShadowMesh_AddVertex(shadowmesh_t *mesh, float *v);
-void Mod_ShadowMesh_AddTriangle(mempool_t *mempool, shadowmesh_t *mesh, float *vert0, float *vert1, float *vert2);
-void Mod_ShadowMesh_AddPolygon(mempool_t *mempool, shadowmesh_t *mesh, int numverts, float *verts);
-void Mod_ShadowMesh_AddMesh(mempool_t *mempool, shadowmesh_t *mesh, float *verts, int numtris, int *elements);
-shadowmesh_t *Mod_ShadowMesh_Begin(mempool_t *mempool, int initialnumtriangles);
-shadowmesh_t *Mod_ShadowMesh_Finish(mempool_t *mempool, shadowmesh_t *firstmesh);
+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);
+int Mod_ShadowMesh_AddVertex(shadowmesh_t *mesh, float *vertex14f);
+void Mod_ShadowMesh_AddTriangle(mempool_t *mempool, shadowmesh_t *mesh, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, float *vertex14f);
+void Mod_ShadowMesh_AddMesh(mempool_t *mempool, shadowmesh_t *mesh, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, float *vertex3f, float *svector3f, float *tvector3f, float *normal3f, float *texcoord2f, int numtris, int *element3i);
+shadowmesh_t *Mod_ShadowMesh_Begin(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_Finish(mempool_t *mempool, shadowmesh_t *firstmesh, int light, int neighbors);
 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);
 
 int Mod_LoadSkinFrame(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int usedetailtexture, int loadglowtexture);
 int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int usedetailtexture, int loadglowtexture, qbyte *skindata, int width, int height);
 
+// used for talking to the QuakeC mainly
+int Mod_Q1BSP_NativeContentsFromSuperContents(struct model_s *model, int supercontents);
+int Mod_Q1BSP_SuperContentsFromNativeContents(struct model_s *model, int nativecontents);
+
 extern cvar_t r_mipskins;
 
 typedef struct skinfileitem_s
@@ -580,5 +671,7 @@ skinfile_t *Mod_LoadSkinFiles(void);
 void Mod_FreeSkinFiles(skinfile_t *skinfile);
 int Mod_CountSkinFiles(skinfile_t *skinfile);
 
+int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f);
+
 #endif	// __MODEL__