X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_shadow.h;h=685018a18279631dc8964da9050a2c6ba48dc236;hb=5872e7cf789b8dccecb3e9e11d1e207de6223380;hp=11dd8606165690af0b35b0981f61bc99f4acfbe2;hpb=78b6fb46fb00b5c74f08337becebc27e4e8688b8;p=xonotic%2Fdarkplaces.git

diff --git a/r_shadow.h b/r_shadow.h
index 11dd8606..685018a1 100644
--- a/r_shadow.h
+++ b/r_shadow.h
@@ -2,6 +2,8 @@
 #ifndef R_SHADOW_H
 #define R_SHADOW_H
 
+#define R_SHADOW_SHADOWMAP_NUMCUBEMAPS 8
+
 extern cvar_t r_shadow_bumpscale_basetexture;
 extern cvar_t r_shadow_bumpscale_bumpmap;
 extern cvar_t r_shadow_debuglight;
@@ -15,7 +17,6 @@ extern cvar_t r_shadow_lightattenuationpower;
 extern cvar_t r_shadow_lightattenuationscale;
 extern cvar_t r_shadow_lightintensityscale;
 extern cvar_t r_shadow_lightradiusscale;
-extern cvar_t r_shadow_portallight;
 extern cvar_t r_shadow_projectdistance;
 extern cvar_t r_shadow_frontsidecasting;
 extern cvar_t r_shadow_realtime_dlight;
@@ -30,27 +31,82 @@ extern cvar_t r_shadow_realtime_world_compileshadow;
 extern cvar_t r_shadow_realtime_world_compilesvbsp;
 extern cvar_t r_shadow_realtime_world_compileportalculling;
 extern cvar_t r_shadow_scissor;
-extern cvar_t r_shadow_culltriangles;
 extern cvar_t r_shadow_polygonfactor;
 extern cvar_t r_shadow_polygonoffset;
-extern cvar_t r_shadow_singlepassvolumegeneration;
 extern cvar_t r_shadow_texture3d;
 extern cvar_t gl_ext_separatestencil;
 extern cvar_t gl_ext_stenciltwoside;
 
+// used by shader for bouncegrid feature
+typedef struct r_shadow_bouncegrid_settings_s
+{
+	qboolean staticmode;
+	qboolean bounceanglediffuse;
+	qboolean directionalshading;
+	qboolean includedirectlighting;
+	qboolean blur;
+	int floatcolors;
+	float dlightparticlemultiplier;
+	qboolean hitmodels;
+	float lightradiusscale;
+	int maxbounce;
+	int lightpathsize;
+	float particlebounceintensity;
+	float particleintensity;
+	int maxphotons;
+	float energyperphoton;
+	float spacing[3];
+	int stablerandom;
+}
+r_shadow_bouncegrid_settings_t;
+
+typedef struct r_shadow_bouncegrid_state_s
+{
+	r_shadow_bouncegrid_settings_t settings;
+	qboolean capable;
+	qboolean allowdirectionalshading;
+	qboolean directional; // copied from settings.directionalshading after createtexture is decided
+	qboolean createtexture; // set to true to recreate the texture rather than updating it - happens when size changes or directional changes
+	rtexture_t *texture;
+	matrix4x4_t matrix;
+	vec_t intensity;
+	double lastupdatetime;
+	int resolution[3];
+	int numpixels;
+	int pixelbands;
+	int pixelsperband;
+	int bytesperband;
+	float spacing[3];
+	float ispacing[3];
+	vec3_t mins;
+	vec3_t maxs;
+	vec3_t size;
+	int maxsplatpaths;
+
+	// per-frame data that is very temporary
+	int numsplatpaths;
+	struct r_shadow_bouncegrid_splatpath_s *splatpaths;
+	float *highpixels;
+}
+r_shadow_bouncegrid_state_t;
+
+extern r_shadow_bouncegrid_state_t r_shadow_bouncegrid_state;
+
 void R_Shadow_Init(void);
+qboolean R_Shadow_ShadowMappingEnabled(void);
 void R_Shadow_VolumeFromList(int numverts, int numtris, const float *invertex3f, const int *elements, const int *neighbors, const vec3_t projectorigin, const vec3_t projectdirection, float projectdistance, int nummarktris, const int *marktris, vec3_t trismins, vec3_t trismaxs);
 void R_Shadow_ShadowMapFromList(int numverts, int numtris, const float *vertex3f, const int *elements, int numsidetris, const int *sidetotals, const unsigned char *sides, const int *sidetris);
 void R_Shadow_MarkVolumeFromBox(int firsttriangle, int numtris, const float *invertex3f, const int *elements, const vec3_t projectorigin, const vec3_t projectdirection, const vec3_t lightmins, const vec3_t lightmaxs, const vec3_t surfacemins, const vec3_t surfacemaxs);
 int R_Shadow_CalcTriangleSideMask(const vec3_t p1, const vec3_t p2, const vec3_t p3, float bias);
 int R_Shadow_CalcSphereSideMask(const vec3_t p1, float radius, float bias);
 int R_Shadow_ChooseSidesFromBox(int firsttriangle, int numtris, const float *invertex3f, const int *elements, const matrix4x4_t *worldtolight, const vec3_t projectorigin, const vec3_t projectdirection, const vec3_t lightmins, const vec3_t lightmaxs, const vec3_t surfacemins, const vec3_t surfacemaxs, int *totals);
-void R_Shadow_RenderLighting(int firstvertex, int numvertices, int firsttriangle, int numtriangles, const int *element3i, const unsigned short *element3s, int element3i_bufferobject, int element3s_bufferobject);
+void R_Shadow_RenderLighting(int texturenumsurfaces, const msurface_t **texturesurfacelist);
 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_VisibleShadowVolumes(void);
 void R_Shadow_RenderMode_VisibleLighting(qboolean stenciltest, qboolean transparent);
 void R_Shadow_RenderMode_End(void);
@@ -63,8 +119,6 @@ qboolean R_Shadow_ScissorForBBox(const float *mins, const float *maxs);
 extern matrix4x4_t matrix_attenuationxyz;
 extern matrix4x4_t matrix_attenuationz;
 
-rtexture_t *R_Shadow_Cubemap(const char *basename);
-
 void R_Shadow_UpdateWorldLightSelection(void);
 
 extern rtlight_t *r_shadow_compilingrtlight;
@@ -73,9 +127,10 @@ 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_PrepareRTLights(void);
-void R_ShadowVolumeLighting(qboolean visible);
-void R_DrawCoronas(void);
+void R_Shadow_PrepareLights(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture);
+void R_Shadow_DrawPrepass(void);
+void R_Shadow_DrawLights(void);
+void R_Shadow_DrawCoronas(void);
 
 extern int maxshadowmark;
 extern int numshadowmark;
@@ -90,6 +145,15 @@ extern unsigned char *shadowsides;
 extern int *shadowsideslist;
 void R_Shadow_PrepareShadowSides(int numtris);
 
-void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const vec3_t p, int dynamic);
+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_DrawModelShadowMaps(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture);
+void R_DrawModelShadows(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture);
 
 #endif