X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=render.h;h=f2b617b921ca53576f22784b3a853a71c153c10a;hp=d89e274c6b8590bc17fcf3a3912b2473f49aa05c;hb=f5c01d29320e5e45965d995a164291c2cc071578;hpb=bb84273fe855ec05959ae0c64b77b6d31d230e7f

diff --git a/render.h b/render.h
index d89e274c..f2b617b9 100644
--- a/render.h
+++ b/render.h
@@ -140,6 +140,7 @@ void R_SkinFrame_Purge(void);
 skinframe_t *R_SkinFrame_FindNextByName( skinframe_t *last, const char *name );
 skinframe_t *R_SkinFrame_Find(const char *name, int textureflags, int comparewidth, int compareheight, int comparecrc, qboolean add);
 skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboolean complain);
+skinframe_t *R_SkinFrame_LoadExternal_CheckAlpha(const char *name, int textureflags, qboolean complain, qboolean *has_alpha);
 skinframe_t *R_SkinFrame_LoadInternalBGRA(const char *name, int textureflags, const unsigned char *skindata, int width, int height);
 skinframe_t *R_SkinFrame_LoadInternalQuake(const char *name, int textureflags, int loadpantsandshirt, int loadglowtexture, const unsigned char *skindata, int width, int height);
 skinframe_t *R_SkinFrame_LoadMissing(void);
@@ -190,6 +191,11 @@ extern rtexture_t *r_texture_normalizationcube;
 extern rtexture_t *r_texture_fogattenuation;
 //extern rtexture_t *r_texture_fogintensity;
 
+#define R_MAX_OCCLUSION_QUERIES 4096
+extern unsigned int r_queries[R_MAX_OCCLUSION_QUERIES];
+extern unsigned int r_numqueries;
+extern unsigned int r_maxqueries;
+
 void R_TimeReport(char *name);
 
 // r_stain
@@ -253,7 +259,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;
@@ -314,7 +322,7 @@ typedef struct rsurfacestate_s
 
 	// rtlight rendering
 	// light currently being rendered
-	rtlight_t *rtlight;
+	const rtlight_t *rtlight;
 	// current light's cull box (copied out of an rtlight or calculated by GetLightInfo)
 	vec3_t rtlight_cullmins;
 	vec3_t rtlight_cullmaxs;
@@ -365,25 +373,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;
 
@@ -392,5 +413,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