X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=model_brush.h;h=3e90e25304ca614f8934cfee6ed5a50b9ba52a4e;hb=556467b184719f636ebc0bea884afe808a238c4b;hp=b4cce7b7030fe37e7908205aba2ad4bad8e770da;hpb=75fa0c6042136f0d314fcddc724d531d0bd454b3;p=xonotic%2Fdarkplaces.git

diff --git a/model_brush.h b/model_brush.h
index b4cce7b7..3e90e253 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -72,13 +72,13 @@ mplane_t;
 #define MATERIALFLAG_WATERALPHA 16
 // draw with no lighting
 #define MATERIALFLAG_FULLBRIGHT 32
-// drawn as a normal lightmapped wall
+// drawn as a normal surface (alternative to SKY)
 #define MATERIALFLAG_WALL 64
-// swirling water effect
-#define MATERIALFLAG_WATER 128
-// this surface shows the sky
+// this surface shows the sky in its place, alternative to WALL
 // skipped if transparent
-#define MATERIALFLAG_SKY 256
+#define MATERIALFLAG_SKY 128
+// swirling water effect (used with MATERIALFLAG_WALL)
+#define MATERIALFLAG_WATERSCROLL 256
 // skips drawing the surface
 #define MATERIALFLAG_NODRAW 512
 // probably used only on q1bsp water
@@ -98,12 +98,20 @@ mplane_t;
 #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
-// render refraction and reflection (note: this is always opaque, the shader does the alpha effect)
+// render water, comprising refraction and reflection (note: this is always opaque, the shader does the alpha effect)
 #define MATERIALFLAG_WATERSHADER 262144
-// render reflection only
-#define MATERIALFLAG_REFLECTION 524288
+// render refraction (note: this is just a way to distort the background, otherwise useless)
+#define MATERIALFLAG_REFRACTION 524288
+// render reflection
+#define MATERIALFLAG_REFLECTION 1048576
+// use model lighting on this material (q1bsp lightmap sampling or q3bsp lightgrid, implies FULLBRIGHT is false)
+#define MATERIALFLAG_MODELLIGHT 4194304
+// add directional model lighting to this material (q3bsp lightgrid only)
+#define MATERIALFLAG_MODELLIGHT_DIRECTIONAL 8388608
 // 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
 {
@@ -387,6 +395,8 @@ typedef struct q2darea_s
 //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)
@@ -406,12 +416,15 @@ typedef struct q2darea_s
 #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
 
 typedef struct q3dheader_s
 {
 	int			ident;
 	int			version;
-	lump_t		lumps[Q3HEADER_LUMPS];
+	lump_t		lumps[Q3HEADER_LUMPS_MAX];
 } q3dheader_t;
 
 typedef struct q3dtexture_s
@@ -478,6 +491,14 @@ typedef struct q3dbrushside_s
 }
 q3dbrushside_t;
 
+typedef struct q3dbrushside_ig_s
+{
+	int planeindex;
+	int textureindex;
+	int surfaceflags;
+}
+q3dbrushside_ig_t;
+
 typedef struct q3dvertex_s
 {
 	float origin3f[3];
@@ -502,7 +523,7 @@ typedef struct q3deffect_s
 }
 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?)
@@ -529,14 +550,14 @@ typedef struct q3dface_s
 		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
@@ -646,7 +667,7 @@ 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