X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=render.h;h=6115f5bc0cecdeb7169e30076ad68f9e2420e0d5;hb=7ec183b732d0354d167f545a90c9bd53383b32fa;hp=aa90252bbf6ade5cdde8b60c420a2f1761528c66;hpb=c3edd749ac26c6322eafa8303e592df3c32ffd25;p=xonotic%2Fdarkplaces.git

diff --git a/render.h b/render.h
index aa90252b..6115f5bc 100644
--- a/render.h
+++ b/render.h
@@ -114,6 +114,8 @@ extern cvar_t r_showdisabledepthtest;
 // view origin
 //
 extern cvar_t r_drawentities;
+extern cvar_t r_draw2d;
+extern qboolean r_draw2d_force;
 extern cvar_t r_drawviewmodel;
 extern cvar_t r_drawworld;
 extern cvar_t r_speeds;
@@ -218,7 +220,7 @@ extern unsigned int r_queries[MAX_OCCLUSION_QUERIES];
 extern unsigned int r_numqueries;
 extern unsigned int r_maxqueries;
 
-void R_TimeReport(char *name);
+void R_TimeReport(const char *name);
 
 // r_stain
 void R_Stain(const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2);
@@ -410,6 +412,9 @@ typedef struct rsurfacestate_s
 	// this transforms only the Z to S, and T is always 0.5
 	matrix4x4_t entitytoattenuationz;
 
+	// user wavefunc parameters (from csqc)
+	float userwavefunc_param[Q3WAVEFUNC_USER_COUNT];
+
 	// pointer to an entity_render_t used only by R_GetCurrentTexture and
 	// RSurf_ActiveWorldEntity/RSurf_ActiveModelEntity as a unique id within
 	// each frame (see r_frame also)
@@ -457,7 +462,7 @@ typedef enum rsurfacepass_e
 	RSURFPASS_BASE,
 	RSURFPASS_BACKGROUND,
 	RSURFPASS_RTLIGHT,
-	RSURFPASS_DEFERREDGEOMETRY,
+	RSURFPASS_DEFERREDGEOMETRY
 }
 rsurfacepass_t;
 
@@ -495,13 +500,8 @@ typedef enum gl20_texunit_e
 	// conflicts with lightmap/deluxemap
 	GL20TU_ATTENUATION = 9,
 	GL20TU_CUBE = 10,
-	GL20TU_SHADOWMAPRECT = 11,
-	GL20TU_SHADOWMAPCUBE = 11,
-	GL20TU_SHADOWMAP2D = 11,
+	GL20TU_SHADOWMAP2D = 15,
 	GL20TU_CUBEPROJECTION = 12,
-	// orthographic-projection shadowmapping
-	GL20TU_SHADOWMAPORTHORECT = 15,
-	GL20TU_SHADOWMAPORTHO2D = 15,
 	// rtlight prepass data (screenspace depth and normalmap)
 	GL20TU_SCREENDEPTH = 13,
 	GL20TU_SCREENNORMALMAP = 14,
@@ -518,7 +518,7 @@ gl20_texunit;
 void R_SetupShader_Generic(rtexture_t *first, rtexture_t *second, int texturemode, int rgbscale);
 void R_SetupShader_DepthOrShadow(void);
 void R_SetupShader_ShowDepth(void);
-void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass, int texturenumsurfaces, const msurface_t **texturesurfacelist);
+void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass, int texturenumsurfaces, const msurface_t **texturesurfacelist, void *waterplane);
 void R_SetupShader_DeferredLight(const rtlight_t *rtlight);
 
 typedef struct r_waterstate_waterplane_s
@@ -531,6 +531,7 @@ typedef struct r_waterstate_waterplane_s
 	unsigned char pvsbits[(MAX_MAP_LEAFS+7)>>3]; // FIXME: buffer overflow on huge maps
 	qboolean pvsvalid;
 	int camera_entity;
+	vec3_t mins, maxs;
 }
 r_waterstate_waterplane_t;