X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=render.h;h=c267399d28c2b416f5702843faec0f3277a55f19;hb=7a96ec58916ceea50684acf4c00eaef551199fef;hp=bd3cd1bf2f81a6b7a386fed2c441421ed35ea546;hpb=3c1ca489dc7dd3e862e5de5b3c7e9996592e9cdc;p=xonotic%2Fdarkplaces.git

diff --git a/render.h b/render.h
index bd3cd1bf..c267399d 100644
--- a/render.h
+++ b/render.h
@@ -253,7 +253,9 @@ typedef struct rsurfacestate_s
 	int modeltexcoordlightmap2f_bufferobject;
 	size_t modeltexcoordlightmap2f_bufferoffset;
 	int *modelelement3i;
+	unsigned short *modelelement3s;
 	int modelelement3i_bufferobject;
+	int modelelement3s_bufferobject;
 	int *modellightmapoffsets;
 	int modelnum_vertices;
 	int modelnum_triangles;
@@ -365,26 +367,38 @@ rsurfacepass_t;
 
 typedef enum gl20_texunit_e
 {
+	// postprocess shaders, and generic shaders:
 	GL20TU_FIRST = 0,
 	GL20TU_SECOND = 1,
 	GL20TU_GAMMARAMPS = 2,
+	// standard material properties
 	GL20TU_NORMAL = 0,
 	GL20TU_COLOR = 1,
 	GL20TU_GLOSS = 2,
 	GL20TU_GLOW = 3,
+	// material properties for a second material
 	GL20TU_SECONDARY_NORMAL = 4,
 	GL20TU_SECONDARY_COLOR = 5,
 	GL20TU_SECONDARY_GLOSS = 6,
 	GL20TU_SECONDARY_GLOW = 7,
-	GL20TU_PANTS = 8,
-	GL20TU_SHIRT = 9,
-	GL20TU_FOGMASK = 10,
-	GL20TU_LIGHTMAP = 11,
-	GL20TU_DELUXEMAP = 12,
-	GL20TU_REFRACTION = 13,
-	GL20TU_REFLECTION = 14,
-	GL20TU_ATTENUATION = 3,
-	GL20TU_CUBE = 13,
+	// material properties for a colormapped material
+	// conflicts with secondary material
+	GL20TU_PANTS = 4,
+	GL20TU_SHIRT = 5,
+	// fog fade in the distance
+	GL20TU_FOGMASK = 8,
+	// compiled ambient lightmap and deluxemap
+	GL20TU_LIGHTMAP = 9,
+	GL20TU_DELUXEMAP = 10,
+	// refraction, used by water shaders
+	GL20TU_REFRACTION = 3,
+	// reflection, used by water shaders, also with normal material rendering
+	// conflicts with secondary material
+	GL20TU_REFLECTION = 7,
+	// rtlight attenuation (distance fade) and cubemap filter (projection texturing)
+	// conflicts with lightmap/deluxemap
+	GL20TU_ATTENUATION = 9,
+	GL20TU_CUBE = 10,
 }
 gl20_texunit;
 
@@ -393,5 +407,38 @@ void R_SetupGenericTwoTextureShader(int texturemode);
 void R_SetupDepthOrShadowShader(void);
 void R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass);
 
+typedef struct r_waterstate_waterplane_s
+{
+	rtexture_t *texture_refraction;
+	rtexture_t *texture_reflection;
+	mplane_t plane;
+	int materialflags; // combined flags of all water surfaces on this plane
+	unsigned char pvsbits[(32768+7)>>3]; // FIXME: buffer overflow on huge maps
+	qboolean pvsvalid;
+}
+r_waterstate_waterplane_t;
+
+#define MAX_WATERPLANES 16
+
+typedef struct r_waterstate_s
+{
+	qboolean enabled;
+
+	qboolean renderingscene; // true while rendering a refraction or reflection texture, disables water surfaces
+
+	int waterwidth, waterheight;
+	int texturewidth, textureheight;
+
+	int maxwaterplanes; // same as MAX_WATERPLANES
+	int numwaterplanes;
+	r_waterstate_waterplane_t waterplanes[MAX_WATERPLANES];
+
+	float screenscale[2];
+	float screencenter[2];
+}
+r_waterstate_t;
+
+extern r_waterstate_t r_waterstate;
+
 #endif