X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_brush.h;h=9d29e4d8a8d5db12e8172cd2966f2084fde3ec1a;hp=56f34e33e9c9056d9da5cd9b6a5cb7e4f849abb3;hb=9a86055855339709591f493513e8192102db2998;hpb=deedc73420b17742f8a9bb1c5158fca5c0896240

diff --git a/model_brush.h b/model_brush.h
index 56f34e33..9d29e4d8 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -35,7 +35,7 @@ BRUSH MODELS
 //
 // in memory representation
 //
-typedef struct
+typedef struct mvertex_s
 {
 	vec3_t position;
 }
@@ -63,8 +63,6 @@ mplane_t;
 
 //#define SURF_PLANEBACK 2
 
-// set for anything to be transparent sorted
-#define MATERIALFLAG_TRANSPARENT 1
 // use alpha blend on this material
 #define MATERIALFLAG_ALPHA 2
 // use additive blend on this material
@@ -86,107 +84,33 @@ mplane_t;
 #define MATERIALFLAG_NODRAW 512
 // probably used only on q1bsp water
 #define MATERIALFLAG_LIGHTBOTHSIDES 1024
-
-struct entity_render_s;
-struct texture_s;
-struct msurface_s;
-
-typedef struct texture_s
-{
-	// q1bsp
-	// name
-	//char name[16];
-	// size
-	unsigned int width, height;
-	// SURF_ flags
-	//unsigned int flags;
-
-	// base material flags
-	int basematerialflags;
-	// current material flags (updated each bmodel render)
-	int currentmaterialflags;
-
-	// loaded the same as model skins
-	skinframe_t skin;
-
-	// total frames in sequence and alternate sequence
-	int anim_total[2];
-	// direct pointers to each of the frames in the sequences
-	// (indexed as [alternate][frame])
-	struct texture_s *anim_frames[2][10];
-	// set if animated or there is an alternate frame set
-	// (this is an optimization in the renderer)
-	int animated;
-	// the current texture frame in animation
-	struct texture_s *currentframe;
-	// current alpha of the texture
-	float currentalpha;
-
-	// q3bsp
-	char name[Q3PATHLENGTH];
-	char firstpasstexturename[Q3PATHLENGTH]; // used only during loading
-	int surfaceflags;
-	int supercontents;
-	int surfaceparms;
-	int textureflags;
-
-	//skinframe_t skin;
-}
-texture_t;
-
-typedef struct
+// use alpha test on this material
+#define MATERIALFLAG_ALPHATEST 2048
+// treat this material as a blended transparency (as opposed to an alpha test
+// transparency), this causes special fog behavior, and disables glDepthMask
+#define MATERIALFLAG_BLENDED 4096
+// render using a custom blendfunc
+#define MATERIALFLAG_CUSTOMBLEND 8192
+// do not cast shadows from this material
+#define MATERIALFLAG_NOSHADOW 16384
+// render using vertex alpha (q3bsp) as texture blend parameter between foreground (normal) skinframe and background skinframe
+#define MATERIALFLAG_VERTEXTEXTUREBLEND 32768
+// disables GL_CULL_FACE on this texture (making it double sided)
+#define MATERIALFLAG_NOCULLFACE 65536
+// render with a very short depth range (like 10% of normal), this causes entities to appear infront of most of the scene
+#define MATERIALFLAG_SHORTDEPTHRANGE 131072
+// combined mask of all attributes that require depth sorted rendering
+#define MATERIALFLAGMASK_DEPTHSORTED (MATERIALFLAG_BLENDED | MATERIALFLAG_NODEPTHTEST)
+
+typedef struct medge_s
 {
 	unsigned short v[2];
 }
 medge_t;
 
-typedef struct
-{
-	float vecs[2][4];
-	texture_t *texture;
-	int flags;
-}
-mtexinfo_t;
-
-struct q3deffect_s;
-typedef struct msurface_s
-{
-	// bounding box for onscreen checks
-	vec3_t mins;
-	vec3_t maxs;
-	// the texture to use on the surface
-	texture_t *texture;
-	// the lightmap texture fragment to use on the rendering mesh
-	rtexture_t *lightmaptexture;
-	// if lightmap settings changed, this forces update
-	int cached_dlight; // q1bsp
-	// mesh for rendering
-	surfmesh_t mesh;
-	// index into model->brush.shadowmesh
-	int num_firstshadowmeshtriangle;
-
-	// the node plane this is on, backwards if SURF_PLANEBACK flag set
-	//mplane_t *plane; // q1bsp
-	// SURF_ flags
-	//int flags; // q1bsp
-	// texture mapping properties used by this surface
-	mtexinfo_t *texinfo; // q1bsp
-	// index into d_lightstylevalue array, 255 means not used (black)
-	qbyte styles[MAXLIGHTMAPS]; // q1bsp
-	// RGB lighting data [numstyles][height][width][3]
-	qbyte *samples; // q1bsp
-	// stain to apply on lightmap (soot/dirt/blood/whatever)
-	qbyte *stainsamples; // q1bsp
-	// the stride when building lightmaps to comply with fragment update
-	int lightmaptexturestride; // q1bsp
-	int texturemins[2]; // q1bsp
-	int extents[2]; // q1bsp
-
-	struct q3deffect_s *effect; // q3bsp
-	// FIXME: collisionmarkframe should be kept in a separate array
-	int collisionmarkframe; // q3bsp // don't collide twice in one trace
-}
-msurface_t;
+struct entity_render_s;
+struct texture_s;
+struct msurface_s;
 
 typedef struct mnode_s
 {
@@ -197,6 +121,8 @@ typedef struct mnode_s
 	// for bounding box culling
 	vec3_t mins;
 	vec3_t maxs;
+	// supercontents from all brushes inside this node or leaf
+	int combinedsupercontents;
 
 	// this part unique to node
 	struct mnode_s *children[2];
@@ -216,22 +142,25 @@ typedef struct mleaf_s
 	// for bounding box culling
 	vec3_t mins;
 	vec3_t maxs;
+	// supercontents from all brushes inside this node or leaf
+	int combinedsupercontents;
 
 	// this part unique to leaf
 	// common
 	int clusterindex; // -1 is not in pvs, >= 0 is pvs bit number
 	int areaindex; // q3bsp
+	int containscollisionsurfaces; // indicates whether the leafsurfaces contains q3 patches
 	int numleafsurfaces;
 	int *firstleafsurface;
 	int numleafbrushes; // q3bsp
 	int *firstleafbrush; // q3bsp
-	qbyte ambient_sound_level[NUM_AMBIENTS]; // q1bsp
+	unsigned char ambient_sound_level[NUM_AMBIENTS]; // q1bsp
 	int contents; // q1bsp: // TODO: remove (only used temporarily during loading when making collision hull 0)
 	int portalmarkid; // q1bsp // used by see-polygon-through-portals visibility checker
 }
 mleaf_t;
 
-typedef struct
+typedef struct hull_s
 {
 	dclipnode_t *clipnodes;
 	mplane_t *planes;
@@ -265,49 +194,6 @@ typedef struct svbspmesh_s
 }
 svbspmesh_t;
 
-typedef struct mlight_s
-{
-	// location of light
-	vec3_t origin;
-	// distance attenuation scale (smaller is a larger light)
-	float falloff;
-	// color and brightness combined
-	vec3_t light;
-	// brightness bias, used for limiting radius without a hard edge
-	float subtract;
-	// spotlight direction
-	vec3_t spotdir;
-	// cosine of spotlight cone angle (or 0 if not a spotlight)
-	float spotcone;
-	// distance bias (larger value is softer and darker)
-	float distbias;
-	// light style controlling this light
-	int style;
-	// maximum extent of the light for shading purposes
-	float lightradius;
-	// maximum extent of the light for culling purposes
-	float cullradius;
-	float cullradius2;
-	/*
-	// surfaces this shines on
-	int numsurfaces;
-	msurface_t **surfaces;
-	// lit area
-	vec3_t mins, maxs;
-	// precomputed shadow volume meshs
-	//svbspmesh_t *shadowvolume;
-	//vec3_t shadowvolumemins, shadowvolumemaxs;
-	shadowmesh_t *shadowvolume;
-	*/
-}
-mlight_t;
-
-struct model_s;
-void Mod_Q1BSP_Load(struct model_s *mod, void *buffer);
-void Mod_IBSP_Load(struct model_s *mod, void *buffer);
-void Mod_MAP_Load(struct model_s *mod, void *buffer);
-void Mod_BrushInit(void);
-
 // Q2 bsp stuff
 
 #define Q2BSPVERSION	38
@@ -338,14 +224,14 @@ void Mod_BrushInit(void);
 #define	Q2LUMP_AREAPORTALS	18
 #define	Q2HEADER_LUMPS		19
 
-typedef struct
+typedef struct q2dheader_s
 {
 	int			ident;
 	int			version;
-	lump_t		lumps[HEADER_LUMPS];
+	lump_t		lumps[Q2HEADER_LUMPS];
 } q2dheader_t;
 
-typedef struct
+typedef struct q2dmodel_s
 {
 	float		mins[3], maxs[3];
 	float		origin[3];		// for sounds or lights
@@ -411,7 +297,7 @@ typedef struct
 
 
 
-typedef struct
+typedef struct q2dnode_s
 {
 	int			planenum;
 	int			children[2];	// negative numbers are -(leafs+1), not nodes
@@ -422,7 +308,7 @@ typedef struct
 } q2dnode_t;
 
 
-typedef struct
+typedef struct q2texinfo_s
 {
 	float		vecs[2][4];		// [s/t][xyz offset]
 	int			flags;			// miptex flags + overrides
@@ -431,7 +317,7 @@ typedef struct
 	int			nexttexinfo;	// for animations, -1 = end of chain
 } q2texinfo_t;
 
-typedef struct
+typedef struct q2dleaf_s
 {
 	int				contents;			// OR of all brushes (not needed?)
 
@@ -448,13 +334,13 @@ typedef struct
 	unsigned short	numleafbrushes;
 } q2dleaf_t;
 
-typedef struct
+typedef struct q2dbrushside_s
 {
 	unsigned short	planenum;		// facing out of the leaf
 	short	texinfo;
 } q2dbrushside_t;
 
-typedef struct
+typedef struct q2dbrush_s
 {
 	int			firstside;
 	int			numsides;
@@ -467,7 +353,7 @@ typedef struct
 // compressed bit vectors
 #define	Q2DVIS_PVS	0
 #define	Q2DVIS_PHS	1
-typedef struct
+typedef struct q2dvis_s
 {
 	int			numclusters;
 	int			bitofs[8][2];	// bitofs[numclusters][2]
@@ -476,13 +362,13 @@ typedef struct
 // each area has a list of portals that lead into other areas
 // when portals are closed, other areas may not be visible or
 // hearable even if the vis info says that it should be
-typedef struct
+typedef struct q2dareaportal_s
 {
 	int		portalnum;
 	int		otherarea;
 } q2dareaportal_t;
 
-typedef struct
+typedef struct q2darea_s
 {
 	int		numareaportals;
 	int		firstareaportal;
@@ -512,14 +398,14 @@ typedef struct
 #define	Q3LUMP_PVS			16 // potentially visible set; bit[clusters][clusters] (used by rendering)
 #define	Q3HEADER_LUMPS		17
 
-typedef struct
+typedef struct q3dheader_s
 {
 	int			ident;
 	int			version;
-	lump_t		lumps[HEADER_LUMPS];
+	lump_t		lumps[Q3HEADER_LUMPS];
 } q3dheader_t;
 
-typedef struct
+typedef struct q3dtexture_s
 {
 	char name[Q3PATHLENGTH];
 	int surfaceflags;
@@ -528,14 +414,14 @@ typedef struct
 q3dtexture_t;
 
 // note: planes are paired, the pair of planes with i and i ^ 1 are opposites.
-typedef struct
+typedef struct q3dplane_s
 {
 	float normal[3];
 	float dist;
 }
 q3dplane_t;
 
-typedef struct
+typedef struct q3dnode_s
 {
 	int planeindex;
 	int childrenindex[2];
@@ -544,7 +430,7 @@ typedef struct
 }
 q3dnode_t;
 
-typedef struct
+typedef struct q3dleaf_s
 {
 	int clusterindex; // pvs index
 	int areaindex; // area index
@@ -557,7 +443,7 @@ typedef struct
 }
 q3dleaf_t;
 
-typedef struct
+typedef struct q3dmodel_s
 {
 	float mins[3];
 	float maxs[3];
@@ -568,7 +454,7 @@ typedef struct
 }
 q3dmodel_t;
 
-typedef struct
+typedef struct q3dbrush_s
 {
 	int firstbrushside;
 	int numbrushsides;
@@ -576,14 +462,14 @@ typedef struct
 }
 q3dbrush_t;
 
-typedef struct
+typedef struct q3dbrushside_s
 {
 	int planeindex;
 	int textureindex;
 }
 q3dbrushside_t;
 
-typedef struct
+typedef struct q3dvertex_s
 {
 	float origin3f[3];
 	float texcoord2f[2];
@@ -593,7 +479,7 @@ typedef struct
 }
 q3dvertex_t;
 
-typedef struct
+typedef struct q3dmeshvertex_s
 {
 	int offset; // first vertex index of mesh
 }
@@ -612,7 +498,7 @@ q3deffect_t;
 #define Q3FACETYPE_MESH 3 // common
 #define Q3FACETYPE_FLARE 4 // rare (is this ever used?)
 
-typedef struct
+typedef struct q3dface_s
 {
 	int textureindex;
 	int effectindex; // -1 if none
@@ -683,13 +569,13 @@ typedef struct
 }
 q3dface_t;
 
-typedef struct
+typedef struct q3dlightmap_s
 {
 	unsigned char rgb[128*128*3];
 }
 q3dlightmap_t;
 
-typedef struct
+typedef struct q3dlightgrid_s
 {
 	unsigned char ambientrgb[3];
 	unsigned char diffusergb[3];
@@ -698,7 +584,7 @@ typedef struct
 }
 q3dlightgrid_t;
 
-typedef struct
+typedef struct q3dpvs_s
 {
 	int numclusters;
 	int chainlength;
@@ -757,15 +643,17 @@ q3dpvs_t;
 #define Q3SURFACEPARM_TRANS 16777216
 #define Q3SURFACEPARM_WATER 33554432
 #define Q3SURFACEPARM_POINTLIGHT 67108864
+#define Q3SURFACEPARM_HINT 134217728
+#define Q3SURFACEPARM_DUST 268435456
+#define Q3SURFACEPARM_BOTCLIP 536870912
+#define Q3SURFACEPARM_LIGHTGRID 1073741824
+#define Q3SURFACEPARM_ANTIPORTAL 2147483648u
 
-// various flags from shaders
+// various flags from shaders, used for special effects not otherwise classified
 #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
+#define Q3TEXTUREFLAG_AUTOSPRITE 2
+#define Q3TEXTUREFLAG_AUTOSPRITE2 4
+#define Q3TEXTUREFLAG_NOPICMIP 16
 
 typedef struct q3mbrush_s
 {