X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_shadow.h;h=82f5c88e0fe329174d4f2ca36a4905dcca6ee348;hp=da476484e4f8c1774216393e4abf6861e8fd6258;hb=2107b65205dbec9522df439f7639c6fe08e54a46;hpb=89a03d22b1150713885838429024a9df721d3bc5

diff --git a/r_shadow.h b/r_shadow.h
index da476484..82f5c88e 100644
--- a/r_shadow.h
+++ b/r_shadow.h
@@ -44,16 +44,23 @@ typedef struct r_shadow_bouncegrid_settings_s
 	qboolean bounceanglediffuse;
 	qboolean directionalshading;
 	qboolean includedirectlighting;
+	qboolean blur;
+	qboolean normalizevectors;
+	int floatcolors;
 	float dlightparticlemultiplier;
 	qboolean hitmodels;
 	float lightradiusscale;
 	int maxbounce;
+	float lightpathsize_initial;
+	float lightpathsize_conespread;
 	float particlebounceintensity;
 	float particleintensity;
 	int maxphotons;
-	float intensityperphoton;
+	float energyperphoton;
 	float spacing[3];
-	int stablerandom;
+	int rng_type;
+	int rng_seed;
+	float bounceminimumintensity2;
 }
 r_shadow_bouncegrid_settings_t;
 
@@ -73,8 +80,6 @@ typedef struct r_shadow_bouncegrid_state_s
 	int pixelbands;
 	int pixelsperband;
 	int bytesperband;
-	unsigned char *pixels;
-	float *highpixels;
 	float spacing[3];
 	float ispacing[3];
 	vec3_t mins;
@@ -85,6 +90,11 @@ typedef struct r_shadow_bouncegrid_state_s
 	// per-frame data that is very temporary
 	int numsplatpaths;
 	struct r_shadow_bouncegrid_splatpath_s *splatpaths;
+	int highpixels_index; // which one is active - this toggles when doing blur
+	float *highpixels; // equals blurpixels[highpixels_index]
+	float *blurpixels[2];
+	unsigned char *u8pixels; // temporary processing buffer when outputting to rgba8 format
+	unsigned short *fp16pixels; // temporary processing buffer when outputting to rgba16f format
 }
 r_shadow_bouncegrid_state_t;
 
@@ -103,8 +113,8 @@ void R_Shadow_RenderMode_Begin(void);
 void R_Shadow_RenderMode_ActiveLight(const rtlight_t *rtlight);
 void R_Shadow_RenderMode_Reset(void);
 void R_Shadow_RenderMode_StencilShadowVolumes(qboolean zpass);
-void R_Shadow_RenderMode_Lighting(qboolean stenciltest, qboolean transparent, qboolean shadowmapping);
-void R_Shadow_RenderMode_DrawDeferredLight(qboolean stenciltest, qboolean shadowmapping);
+void R_Shadow_RenderMode_Lighting(qboolean stenciltest, qboolean transparent, qboolean shadowmapping, qboolean noselfshadowpass);
+void R_Shadow_RenderMode_DrawDeferredLight(qboolean shadowmapping);
 void R_Shadow_RenderMode_VisibleShadowVolumes(void);
 void R_Shadow_RenderMode_VisibleLighting(qboolean stenciltest, qboolean transparent);
 void R_Shadow_RenderMode_End(void);
@@ -125,7 +135,8 @@ void R_RTLight_Update(rtlight_t *rtlight, int isstatic, matrix4x4_t *matrix, vec
 void R_RTLight_Compile(rtlight_t *rtlight);
 void R_RTLight_Uncompile(rtlight_t *rtlight);
 
-void R_Shadow_PrepareLights(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture);
+void R_Shadow_PrepareLights(void);
+void R_Shadow_ClearShadowMapTexture(void);
 void R_Shadow_DrawPrepass(void);
 void R_Shadow_DrawLights(void);
 void R_Shadow_DrawCoronas(void);
@@ -148,10 +159,9 @@ void R_Shadow_PrepareModelShadows(void);
 #define LP_LIGHTMAP		1
 #define LP_RTWORLD		2
 #define LP_DYNLIGHT		4
-void R_LightPoint(float *color, const vec3_t p, const int flags);
-void R_CompleteLightPoint(float *ambientcolor, float *diffusecolor, float *diffusenormal, const vec3_t p, const int flags);
+void R_CompleteLightPoint(float *ambient, float *diffuse, float *lightdir, const vec3_t p, const int flags, float lightmapintensity, float ambientintensity);
 
-void R_DrawModelShadowMaps(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture);
-void R_DrawModelShadows(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture);
+void R_Shadow_DrawShadowMaps(void);
+void R_Shadow_DrawModelShadows(void);
 
 #endif