X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=render.h;h=41b1d65d76fac465f19f7b5be5825ade0a5a75b1;hp=7bf72d7cae249ef28e59ab91bf56ca9a7031b052;hb=621e9a6a36d11a2906817008ef4233cff86657cb;hpb=9e10334c3d85c0ff3630fe015f40b5c5a227668a

diff --git a/render.h b/render.h
index 7bf72d7c..41b1d65d 100644
--- a/render.h
+++ b/render.h
@@ -33,7 +33,7 @@ extern void FOG_clear(void);
 extern cvar_t r_sky;
 extern cvar_t r_skyscroll1;
 extern cvar_t r_skyscroll2;
-extern int skyrendernow, skyrendermasked;
+extern int skyrenderlater, skyrendermasked;
 extern int R_SetSkyBox(const char *sky);
 extern void R_SkyStartFrame(void);
 extern void R_Sky(void);
@@ -143,6 +143,7 @@ skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboole
 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_LoadInternal8bit(const char *name, int textureflags, const unsigned char *skindata, int width, int height, const unsigned int *palette, const unsigned int *alphapalette);
 skinframe_t *R_SkinFrame_LoadMissing(void);
 
 void R_View_WorldVisibility(qboolean forcenovis);
@@ -163,6 +164,7 @@ int R_CullBoxCustomPlanes(const vec3_t mins, const vec3_t maxs, int numplanes, c
 #include "r_lerpanim.h"
 
 extern cvar_t r_render;
+extern cvar_t r_renderview;
 extern cvar_t r_waterwarp;
 
 extern cvar_t r_textureunits;
@@ -175,6 +177,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;
@@ -309,8 +313,10 @@ typedef struct rsurfacestate_s
 	// colormapping state from entity (these are black if colormapping is off)
 	vec3_t colormap_pantscolor;
 	vec3_t colormap_shirtcolor;
+	// special coloring of glow textures
+	vec3_t glowmod;
 	// view location in model space
-	vec3_t modelorg; // TODO: rename this
+	vec3_t localvieworigin;
 	// polygon offset data for submodels
 	float basepolygonfactor;
 	float basepolygonoffset;
@@ -406,12 +412,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