X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_brush.h;h=d1d51fabd854e48edb53689763624e62bf071726;hb=ef9b48fe33bd373656f2c426ab3f8440d6490077;hp=1621b491b8c15d5d2ccfbaeb903e3fc339a97d5a;hpb=7f91ba9e5852abaa78e6a31c4e42f9916b6f0ae9;p=xonotic%2Fdarkplaces.git

diff --git a/model_brush.h b/model_brush.h
index 1621b491..d1d51fab 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -48,8 +48,15 @@ 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; // set by PlaneClassify()
 	int signbits; // set by PlaneClassify()
@@ -120,6 +127,8 @@ mplane_t;
 #define MATERIALFLAG_NORTLIGHT 134217728
 // alphagen vertex
 #define MATERIALFLAG_ALPHAGEN_VERTEX 268435456
+// use occlusion buffer for corona
+#define MATERIALFLAG_OCCLUDE 536870912
 // 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
@@ -225,6 +234,7 @@ svbspmesh_t;
 
 // Q2 bsp stuff
 
+#define Q2BSPMAGIC ('I' + 'B' * 256 + 'S' * 65536 + 'P' * 16777216)
 #define Q2BSPVERSION	38
 
 // leaffaces, leafbrushes, planes, and verts are still bounded by
@@ -323,9 +333,13 @@ typedef struct q2dmodel_s
 #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 q2dnode_s
 {
 	int			planenum;
@@ -336,13 +350,12 @@ typedef struct q2dnode_s
 	unsigned short	numfaces;	// counting both sides
 } q2dnode_t;
 
-
 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;
 
@@ -402,6 +415,7 @@ typedef struct q2darea_s
 	int		numareaportals;
 	int		firstareaportal;
 } q2darea_t;
+*/
 
 
 //Q3 bsp stuff