X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_brush.h;h=511c56f0c75f5eecf554f3942de80e266dc9d382;hb=9e0a39f4d5add83a1c31892e0d523098979c5612;hp=6a48ef5939085f2f1b23991a5522446fb74e1d08;hpb=3a1e31d2cbf35505278d48bc9bf9d5e3902fd3b7;p=xonotic%2Fdarkplaces.git

diff --git a/model_brush.h b/model_brush.h
index 6a48ef59..511c56f0 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -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
@@ -97,6 +95,12 @@ mplane_t;
 #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 after the normal scene
+#define MATERIALFLAG_VIEWMODEL 131072
+// combined mask of all attributes that require depth sorted rendering
+#define MATERIALFLAGMASK_DEPTHSORTED (MATERIALFLAG_BLENDED | MATERIALFLAG_NODEPTHTEST | MATERIALFLAG_VIEWMODEL)
 
 typedef struct medge_s
 {
@@ -117,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];
@@ -136,11 +142,14 @@ 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
@@ -638,7 +647,7 @@ q3dpvs_t;
 #define Q3SURFACEPARM_DUST 268435456
 #define Q3SURFACEPARM_BOTCLIP 536870912
 #define Q3SURFACEPARM_LIGHTGRID 1073741824
-#define Q3SURFACEPARM_ANTIPORTAL 2147483648
+#define Q3SURFACEPARM_ANTIPORTAL 2147483648u
 
 // various flags from shaders, used for special effects not otherwise classified
 #define Q3TEXTUREFLAG_TWOSIDED 1