X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=render.h;h=af979e901364f946dc61c35e043b16d1243d2b65;hp=bc43037674e04463fd97535c9a9ce2b9923164d7;hb=7005b675fc7c9bc7bddac999caec0f47385c32d9;hpb=cc3473e216fce052672ec4600896124584866e52

diff --git a/render.h b/render.h
index bc430376..af979e90 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);
@@ -174,6 +175,8 @@ extern cvar_t r_glsl_deluxemapping;
 extern cvar_t gl_polyblend;
 extern cvar_t gl_dither;
 
+extern cvar_t cl_deathfade;
+
 extern cvar_t r_smoothnormals_areaweighting;
 
 extern cvar_t r_test;
@@ -190,6 +193,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
@@ -295,7 +303,7 @@ typedef struct rsurfacestate_s
 	matrix4x4_t matrix;
 	matrix4x4_t inversematrix;
 	// animation blending state from entity
-	frameblend_t frameblend[4];
+	frameblend_t frameblend[MAX_FRAMEBLENDS];
 	// directional model shading state from entity
 	vec3_t modellight_ambient;
 	vec3_t modellight_diffuse;
@@ -334,6 +342,11 @@ typedef struct rsurfacestate_s
 	matrix4x4_t entitytoattenuationxyz;
 	// this transforms only the Z to S, and T is always 0.5
 	matrix4x4_t entitytoattenuationz;
+
+	// 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)
+	entity_render_t *entity;
 }
 rsurfacestate_t;
 
@@ -345,14 +358,10 @@ void RSurf_SetupDepthAndCulling(void);
 
 void R_Mesh_ResizeArrays(int newvertices);
 
-struct entity_render_s;
-struct texture_s;
-struct msurface_s;
-void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t);
-void R_UpdateAllTextureInfo(entity_render_t *ent);
-void R_QueueTextureSurfaceList(int texturenumsurfaces, msurface_t **texturesurfacelist);
-void R_DrawWorldSurfaces(qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean addwaterplanes, qboolean debug);
-void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean addwaterplanes, qboolean debug);
+texture_t *R_GetCurrentTexture(texture_t *t);
+void R_DrawWorldSurfaces(qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug);
+void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug);
+void R_AddWaterPlanes(entity_render_t *ent);
 
 void RSurf_PrepareVerticesForBatch(qboolean generatenormals, qboolean generatetangents, int texturenumsurfaces, msurface_t **texturesurfacelist);
 void RSurf_DrawBatch_Simple(int texturenumsurfaces, msurface_t **texturesurfacelist);
@@ -399,12 +408,17 @@ 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_CUBEPROJECTION = 12
 }
 gl20_texunit;
 
 void R_SetupGenericShader(qboolean usetexture);
 void R_SetupGenericTwoTextureShader(int texturemode);
 void R_SetupDepthOrShadowShader(void);
+void R_SetupShowDepthShader(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