X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_brush.h;h=9eae6abb9022ce2b19ef2907672da2067dd2be7f;hb=f070d358e31542df4f016558be6bf30dfb07aa84;hp=c7898863df1bfe9ccb9ceba63e268184e91d5764;hpb=a1b97cecd99cb34b92104c9a56bad59b77fa5b9a;p=xonotic%2Fdarkplaces.git

diff --git a/model_brush.h b/model_brush.h
index c7898863..9eae6abb 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -30,10 +30,11 @@ BRUSH MODELS
 */
 
 
+
 //
 // in memory representation
 //
-typedef struct
+typedef struct mvertex_s
 {
 	vec3_t position;
 }
@@ -47,11 +48,18 @@ mvertex_t;
 // plane_t structure
 typedef struct mplane_s
 {
-	vec3_t normal;
-	float dist;
+	union
+	{
+		struct
+		{
+			vec3_t normal;
+			vec_t dist;
+		};
+		vec4_t normal_and_dist;
+	};
 	// for texture axis selection and fast side tests
-	int type;
-	int signbits;
+	int type; // set by PlaneClassify()
+	int signbits; // set by PlaneClassify()
 }
 mplane_t;
 
@@ -59,137 +67,83 @@ mplane_t;
 #define SHADERSTAGE_NORMAL 1
 #define SHADERSTAGE_COUNT 2
 
-#define SURF_PLANEBACK 2
-#define SURF_DRAWSKY 4
-#define SURF_DRAWTURB 0x10
-#define SURF_LIGHTMAP 0x20
-#define SURF_DRAWNOALPHA 0x100
-#define SURF_DRAWFULLBRIGHT 0x200
-#define SURF_LIGHTBOTHSIDES 0x400
-#define SURF_WATERALPHA 0x4000 // this polygon's alpha is modulated by r_wateralpha
-#define SURF_SOLIDCLIP 0x8000 // this polygon blocks movement
-
-#define SURFRENDER_OPAQUE 0
-#define SURFRENDER_ALPHA 1
-#define SURFRENDER_ADD 2
+//#define SURF_PLANEBACK 2
+
+// indicates that all triangles of the surface should be added to the BIH collision system
+#define MATERIALFLAG_MESHCOLLISIONS 0x00000001
+// use alpha blend on this material
+#define MATERIALFLAG_ALPHA 0x00000002
+// use additive blend on this material
+#define MATERIALFLAG_ADD 0x00000004
+// turn off depth test on this material
+#define MATERIALFLAG_NODEPTHTEST 0x00000008
+// multiply alpha by r_wateralpha cvar
+#define MATERIALFLAG_WATERALPHA 0x00000010
+// draw with no lighting
+#define MATERIALFLAG_FULLBRIGHT 0x00000020
+// drawn as a normal surface (alternative to SKY)
+#define MATERIALFLAG_WALL 0x00000040
+// this surface shows the sky in its place, alternative to WALL
+// skipped if transparent
+#define MATERIALFLAG_SKY 0x00000080
+// swirling water effect (used with MATERIALFLAG_WALL)
+#define MATERIALFLAG_WATERSCROLL 0x00000100
+// skips drawing the surface
+#define MATERIALFLAG_NODRAW 0x00000200
+// probably used only on q1bsp water
+#define MATERIALFLAG_LIGHTBOTHSIDES 0x00000400
+// use alpha test on this material
+#define MATERIALFLAG_ALPHATEST 0x00000800
+// 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 0x00001000
+// render using a custom blendfunc
+#define MATERIALFLAG_CUSTOMBLEND 0x00002000
+// do not cast shadows from this material
+#define MATERIALFLAG_NOSHADOW 0x00004000
+// render using vertex alpha (q3bsp) as texture blend parameter between foreground (normal) skinframe and background skinframe
+#define MATERIALFLAG_VERTEXTEXTUREBLEND 0x00008000
+// disables GL_CULL_FACE on this texture (making it double sided)
+#define MATERIALFLAG_NOCULLFACE 0x00010000
+// 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 0x00020000
+// render water, comprising refraction and reflection (note: this is always opaque, the shader does the alpha effect)
+#define MATERIALFLAG_WATERSHADER 0x00040000
+// render refraction (note: this is just a way to distort the background, otherwise useless)
+#define MATERIALFLAG_REFRACTION 0x00080000
+// render reflection
+#define MATERIALFLAG_REFLECTION 0x00100000
+// use model lighting on this material (q1bsp lightmap sampling or q3bsp lightgrid, implies FULLBRIGHT is false)
+#define MATERIALFLAG_MODELLIGHT 0x00200000
+// causes RSurf_GetCurrentTexture to leave alone certain fields
+#define MATERIALFLAG_CUSTOMSURFACE 0x00800000
+// causes MATERIALFLAG_BLENDED to render a depth pass before rendering, hiding backfaces and other hidden geometry
+#define MATERIALFLAG_TRANSDEPTH 0x01000000
+// like refraction, but doesn't distort etc.
+#define MATERIALFLAG_CAMERA 0x02000000
+// disable rtlight on surface - does not disable other types of lighting (LIGHTMAP, MODELLIGHT)
+#define MATERIALFLAG_NORTLIGHT 0x04000000
+// alphagen vertex
+#define MATERIALFLAG_ALPHAGEN_VERTEX 0x08000000
+// use occlusion buffer for corona
+#define MATERIALFLAG_OCCLUDE 0x10000000
+// use vertex color instead of lighting (e.g. particles and other glowy stuff), use with MATERIALFLAG_FULLBRIGHT
+#define MATERIALFLAG_VERTEXCOLOR 0x20000000
+// combined mask of all attributes that require depth sorted rendering
+#define MATERIALFLAGMASK_DEPTHSORTED (MATERIALFLAG_BLENDED | MATERIALFLAG_NODEPTHTEST)
+// combined mask of all attributes that cause some sort of transparency
+#define MATERIALFLAGMASK_TRANSLUCENT (MATERIALFLAG_WATERALPHA | MATERIALFLAG_SKY | MATERIALFLAG_NODRAW | MATERIALFLAG_ALPHATEST | MATERIALFLAG_BLENDED | MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION)
+
+typedef struct medge_s
+{
+	unsigned int v[2];
+}
+medge_t;
 
 struct entity_render_s;
 struct texture_s;
 struct msurface_s;
 
-typedef struct texture_s
-{
-	// name
-	char name[16];
-	// size
-	unsigned int width, height;
-	// SURF_ flags
-	unsigned int flags;
-
-	// position in the model's textures array
-	int number;
-
-	// type of rendering (SURFRENDER_ value)
-	int rendertype;
-
-	// 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;
-}
-texture_t;
-
-typedef struct
-{
-	unsigned short v[2];
-}
-medge_t;
-
-typedef struct
-{
-	float vecs[2][4];
-	texture_t *texture;
-	int flags;
-}
-mtexinfo_t;
-
-typedef struct msurface_s
-{
-	// bounding box for onscreen checks
-	vec3_t poly_mins;
-	vec3_t poly_maxs;
-
-	// the node plane this is on, backwards if SURF_PLANEBACK flag set
-	mplane_t *plane;
-	// SURF_ flags
-	int flags;
-	// texture mapping properties used by this surface
-	mtexinfo_t *texinfo;
-
-	// the lightmap texture fragment to use on the rendering mesh
-	rtexture_t *lightmaptexture;
-	// mesh for rendering
-	surfmesh_t mesh;
-	// if lightmap settings changed, this forces update
-	int cached_dlight;
-
-	// surface number, to avoid having to do a divide to find the number of a surface from it's address
-	int number;
-
-	// center for sorting transparent meshes
-	vec3_t poly_center;
-
-	// index into d_lightstylevalue array, 255 means not used (black)
-	qbyte styles[MAXLIGHTMAPS];
-	// RGB lighting data [numstyles][height][width][3]
-	qbyte *samples;
-	// stain to apply on lightmap (soot/dirt/blood/whatever)
-	qbyte *stainsamples;
-	// the stride when building lightmaps to comply with fragment update
-	int lightmaptexturestride;
-	int texturemins[2];
-	int extents[2];
-
-	// if this == r_framecount there are dynamic lights on the surface
-	int dlightframe;
-	// which dynamic lights are touching this surface
-	// (only access this if dlightframe is current)
-	int dlightbits[8];
-	// avoid redundent addition of dlights
-	int lightframe;
-
-	// avoid multiple collision traces with a surface polygon
-	int colframe;
-
-	// these are just 3D points defining the outline of the polygon,
-	// no texcoord info (that can be generated from these)
-	int poly_numverts;
-	float *poly_verts;
-
-	// index into model->brush.shadowmesh
-	int num_firstshadowmeshtriangle;
-
-	// neighboring surfaces (one per poly_numverts)
-	//struct msurface_s **neighborsurfaces;
-	// currently used only for generating static shadow volumes
-	int lighttemp_castshadow;
-
-	// avoid redundent surface shadows
-	int shadowmark;
-}
-msurface_t;
-
 typedef struct mnode_s
 {
 	//this part shared between node and leaf
@@ -199,13 +153,15 @@ 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];
 
 	// q1bsp specific
-	unsigned short firstsurface;
-	unsigned short numsurfaces;
+	unsigned int firstsurface;
+	unsigned int numsurfaces;
 }
 mnode_t;
 
@@ -218,24 +174,33 @@ 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 numleaffaces;
-	int *firstleafface;
+	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 mclipnode_s
+{
+	int			planenum;
+	int			children[2];	// negative numbers are contents
+} mclipnode_t;
+
+typedef struct hull_s
 {
-	dclipnode_t *clipnodes;
+	mclipnode_t *clipnodes;
 	mplane_t *planes;
 	int firstclipnode;
 	int lastclipnode;
@@ -254,6 +219,7 @@ typedef struct mportal_s
 	mvertex_t *points;
 	vec3_t mins, maxs; // culling
 	mplane_t plane;
+	double tracetime; // refreshed to realtime by traceline tests
 }
 mportal_t;
 
@@ -267,54 +233,9 @@ 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;
-
-extern rtexture_t *r_notexture;
-extern texture_t r_notexture_mip;
-
-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 Q2BSPMAGIC ('I' + 'B' * 256 + 'S' * 65536 + 'P' * 16777216)
 #define Q2BSPVERSION	38
 
 // leaffaces, leafbrushes, planes, and verts are still bounded by
@@ -343,14 +264,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
@@ -413,10 +334,14 @@ typedef struct
 #define	Q2SURF_FLOWING	0x40	// scroll towards angle
 #define	Q2SURF_NODRAW		0x80	// don't bother referencing the texture
 
+#define Q2SURF_HINT		0x100   // make a primary bsp splitter
+#define Q2SURF_SKIP		0x200   // completely ignore, allowing non-closed brushes
 
+#define Q2SURF_ALPHATEST 0x02000000	// alpha test masking of color 255 in wal textures (supported by modded engines)
 
 
-typedef struct
+/*
+typedef struct q2dnode_s
 {
 	int			planenum;
 	int			children[2];	// negative numbers are -(leafs+1), not nodes
@@ -426,17 +351,16 @@ typedef struct
 	unsigned short	numfaces;	// counting both sides
 } q2dnode_t;
 
-
-typedef struct
+typedef struct q2texinfo_s
 {
 	float		vecs[2][4];		// [s/t][xyz offset]
 	int			flags;			// miptex flags + overrides
 	int			value;			// light emission, etc
-	char		texture[32];	// texture name (textures/*.wal)
+	char		texture[32];	// texture name (textures/something.wal)
 	int			nexttexinfo;	// for animations, -1 = end of chain
 } q2texinfo_t;
 
-typedef struct
+typedef struct q2dleaf_s
 {
 	int				contents;			// OR of all brushes (not needed?)
 
@@ -453,13 +377,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;
@@ -472,7 +396,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]
@@ -481,22 +405,25 @@ 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;
 } q2darea_t;
+*/
 
 
 //Q3 bsp stuff
 
 #define Q3BSPVERSION	46
+#define Q3BSPVERSION_LIVE 47
+#define Q3BSPVERSION_IG	48
 
 #define	Q3LUMP_ENTITIES		0 // entities to spawn (used by server and client)
 #define	Q3LUMP_TEXTURES		1 // textures used (used by faces)
@@ -516,17 +443,18 @@ typedef struct
 #define	Q3LUMP_LIGHTGRID	15 // lighting as a voxel grid (used by rendering)
 #define	Q3LUMP_PVS			16 // potentially visible set; bit[clusters][clusters] (used by rendering)
 #define	Q3HEADER_LUMPS		17
+#define	Q3LUMP_ADVERTISEMENTS 17 // quake live stuff written by zeroradiant's q3map2 (ignored by DP)
+#define	Q3HEADER_LUMPS_LIVE	18
+#define	Q3HEADER_LUMPS_MAX	18
 
-#define Q3PATHLENGTH 64
-
-typedef struct
+typedef struct q3dheader_s
 {
 	int			ident;
 	int			version;
-	lump_t		lumps[HEADER_LUMPS];
+	lump_t		lumps[Q3HEADER_LUMPS_MAX];
 } q3dheader_t;
 
-typedef struct
+typedef struct q3dtexture_s
 {
 	char name[Q3PATHLENGTH];
 	int surfaceflags;
@@ -535,14 +463,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];
@@ -551,7 +479,7 @@ typedef struct
 }
 q3dnode_t;
 
-typedef struct
+typedef struct q3dleaf_s
 {
 	int clusterindex; // pvs index
 	int areaindex; // area index
@@ -564,7 +492,7 @@ typedef struct
 }
 q3dleaf_t;
 
-typedef struct
+typedef struct q3dmodel_s
 {
 	float mins[3];
 	float maxs[3];
@@ -575,7 +503,7 @@ typedef struct
 }
 q3dmodel_t;
 
-typedef struct
+typedef struct q3dbrush_s
 {
 	int firstbrushside;
 	int numbrushsides;
@@ -583,14 +511,22 @@ typedef struct
 }
 q3dbrush_t;
 
-typedef struct
+typedef struct q3dbrushside_s
 {
 	int planeindex;
 	int textureindex;
 }
 q3dbrushside_t;
 
-typedef struct
+typedef struct q3dbrushside_ig_s
+{
+	int planeindex;
+	int textureindex;
+	int surfaceflags;
+}
+q3dbrushside_ig_t;
+
+typedef struct q3dvertex_s
 {
 	float origin3f[3];
 	float texcoord2f[2];
@@ -600,13 +536,13 @@ typedef struct
 }
 q3dvertex_t;
 
-typedef struct
+typedef struct q3dmeshvertex_s
 {
 	int offset; // first vertex index of mesh
 }
 q3dmeshvertex_t;
 
-typedef struct
+typedef struct q3deffect_s
 {
 	char shadername[Q3PATHLENGTH];
 	int brushindex;
@@ -614,12 +550,12 @@ typedef struct
 }
 q3deffect_t;
 
-#define Q3FACETYPE_POLYGON 1 // common
+#define Q3FACETYPE_FLAT 1 // common
 #define Q3FACETYPE_PATCH 2 // common
 #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
@@ -641,14 +577,14 @@ typedef struct
 		unknown;
 		struct
 		{
-			// Q3FACETYPE_POLYGON
-			// polygon is simply a convex polygon, renderable as a mesh
+			// Q3FACETYPE_FLAT
+			// mesh is a collection of triangles on a plane, renderable as a mesh (NOT a polygon)
 			float lightmap_origin[3];
 			float lightmap_vectors[2][3];
 			float normal[3];
 			int unused1[2];
 		}
-		polygon;
+		flat;
 		struct
 		{
 			// Q3FACETYPE_PATCH
@@ -690,13 +626,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];
@@ -705,7 +641,7 @@ typedef struct
 }
 q3dlightgrid_t;
 
-typedef struct
+typedef struct q3dpvs_s
 {
 	int numclusters;
 	int chainlength;
@@ -719,17 +655,17 @@ q3dpvs_t;
 #define Q3SURFACEFLAG_NODAMAGE 1
 #define Q3SURFACEFLAG_SLICK 2
 #define Q3SURFACEFLAG_SKY 4
-#define Q3SURFACEFLAG_LADDER 8
+#define Q3SURFACEFLAG_LADDER 8 // has no surfaceparm
 #define Q3SURFACEFLAG_NOIMPACT 16
 #define Q3SURFACEFLAG_NOMARKS 32
-#define Q3SURFACEFLAG_FLESH 64
+#define Q3SURFACEFLAG_FLESH 64 // has no surfaceparm
 #define Q3SURFACEFLAG_NODRAW 128
 #define Q3SURFACEFLAG_HINT 256
-#define Q3SURFACEFLAG_SKIP 512
+#define Q3SURFACEFLAG_SKIP 512 // has no surfaceparm
 #define Q3SURFACEFLAG_NOLIGHTMAP 1024
 #define Q3SURFACEFLAG_POINTLIGHT 2048
 #define Q3SURFACEFLAG_METALSTEPS 4096
-#define Q3SURFACEFLAG_NOSTEPS 8192
+#define Q3SURFACEFLAG_NOSTEPS 8192 // has no surfaceparm
 #define Q3SURFACEFLAG_NONSOLID 16384
 #define Q3SURFACEFLAG_LIGHTFILTER 32768
 #define Q3SURFACEFLAG_ALPHASHADOW 65536
@@ -758,102 +694,38 @@ q3dpvs_t;
 #define Q3SURFACEPARM_ORIGIN 262144
 #define Q3SURFACEPARM_PLAYERCLIP 524288
 #define Q3SURFACEPARM_SKY 1048576
-#define Q3SURFACEPARM_SLICK 2197152
+#define Q3SURFACEPARM_SLICK 2097152
 #define Q3SURFACEPARM_SLIME 4194304
 #define Q3SURFACEPARM_STRUCTURAL 8388608
 #define Q3SURFACEPARM_TRANS 16777216
 #define Q3SURFACEPARM_WATER 33554432
 #define Q3SURFACEPARM_POINTLIGHT 67108864
-
-// 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 supercontents;
-	int surfaceparms;
-	int textureflags;
-
-	int number;
-	skinframe_t skin;
-
-	int numfaces;
-	struct q3msurface_s **facelist;
-	int *facenumlist;
-}
-q3mtexture_t;
-
-typedef struct q3mmodel_s
-{
-	vec3_t mins;
-	vec3_t maxs;
-	int numfaces;
-	struct q3msurface_s *firstface;
-	int numbrushes;
-	struct q3mbrush_s *firstbrush;
-}
-q3mmodel_t;
+#define Q3SURFACEPARM_HINT 134217728
+#define Q3SURFACEPARM_DUST 268435456
+#define Q3SURFACEPARM_BOTCLIP 536870912
+#define Q3SURFACEPARM_LIGHTGRID 1073741824
+#define Q3SURFACEPARM_ANTIPORTAL 2147483648u
 
 typedef struct q3mbrush_s
 {
 	struct colbrushf_s *colbrushf;
 	int numbrushsides;
 	struct q3mbrushside_s *firstbrushside;
-	struct q3mtexture_s *texture;
+	struct texture_s *texture;
 }
 q3mbrush_t;
 
 typedef struct q3mbrushside_s
 {
 	struct mplane_s *plane;
-	struct q3mtexture_s *texture;
+	struct texture_s *texture;
 }
 q3mbrushside_t;
 
-typedef struct q3meffect_s
-{
-	char shadername[Q3PATHLENGTH];
-	struct q3mbrush_s *brush;
-	int unknown; // 5 or -1
-}
-q3meffect_t;
-
-typedef struct q3msurface_s
-{
-	// FIXME: collisionmarkframe 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 collisionmarkframe; // don't collide twice in one trace
-	// bounding box for culling
-	float mins[3];
-	float maxs[3];
-
-	surfmesh_t mesh;
-
-	// index into model->brush.shadowmesh
-	int num_firstshadowmeshtriangle;
-
-	// used for shadow volume generation
-	int shadowmark;
-}
-q3msurface_t;
-
-#define CHECKPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] & (1 << ((b) & 7))) : false)
-#define SETPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] |= (1 << ((b) & 7))) : false)
-#define CLEARPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] &= ~(1 << ((b) & 7))) : false)
+// the first cast is to shut up a stupid warning by clang, the second cast is to make both sides have the same type
+#define CHECKPVSBIT(pvs,b) ((b) >= 0 ? (unsigned char) ((pvs)[(b) >> 3] & (1 << ((b) & 7))) : (unsigned char) false)
+#define SETPVSBIT(pvs,b) (void) ((b) >= 0 ? (unsigned char) ((pvs)[(b) >> 3] |= (1 << ((b) & 7))) : (unsigned char) false)
+#define CLEARPVSBIT(pvs,b) (void) ((b) >= 0 ? (unsigned char) ((pvs)[(b) >> 3] &= ~(1 << ((b) & 7))) : (unsigned char) false)
 
 #endif