volumetric: cleaning

Warzone2100 · Mar 3, 2024 · 649c022 · 649c022
1 parent 875250d
commit 649c022
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/data/base/shaders/pointlights.frag b/data/base/shaders/pointlights.frag
@@ -1,7 +1,7 @@
 #define WZ_MAX_POINT_LIGHTS 0
 #define WZ_MAX_INDEXED_POINT_LIGHTS 0
 #define WZ_BUCKET_DIMENSION 0
-#define WZ_VOLUMETRIC_LIGHTING_ENABLED 1
+#define WZ_VOLUMETRIC_LIGHTING_ENABLED 0
 
 uniform vec4 PointLightsPosition[WZ_MAX_POINT_LIGHTS];
 uniform vec4 PointLightsColorAndEnergy[WZ_MAX_POINT_LIGHTS];
@@ -148,7 +148,7 @@ vec4 volumetricLights(
 	vec3 transMittance = vec3(1);
 
 
-#define STEPS 64
+#define STEPS (WZ_VOLUMETRIC_LIGHTING_ENABLED * 16)
 	for (int i = 0; i < STEPS; i++)
 	{
 

diff --git a/data/base/shaders/tcmask_instanced.frag b/data/base/shaders/tcmask_instanced.frag
@@ -407,7 +407,7 @@ void main()
 		fragColour.a = 0.66 + 0.66 * graphicsCycle;
 	}
 
-	if (WZ_VOLUMETRIC_LIGHTING_ENABLED == 1) {
+	if (WZ_VOLUMETRIC_LIGHTING_ENABLED != 0) {
 		vec2 clipSpaceCoord = gl_FragCoord.xy / vec2(viewportWidth, viewportHeight);
 		vec4 volumetric = volumetricLights(clipSpaceCoord, cameraPos.xyz, fragPos, diffuse.xyz);
 		fragColour.xyz = toneMap(fragColour.xyz * volumetric.a + volumetric.xyz);

diff --git a/data/base/shaders/terrain_combined_high.frag b/data/base/shaders/terrain_combined_high.frag
@@ -190,7 +190,7 @@ void main()
 {
 	vec4 fragColor = main_bumpMapping();
 
-	if (WZ_VOLUMETRIC_LIGHTING_ENABLED == 1) {
+	if (WZ_VOLUMETRIC_LIGHTING_ENABLED != 1) {
 		vec2 clipSpaceCoord = gl_FragCoord.xy / vec2(viewportWidth, viewportHeight);	
 		vec4 volumetric = volumetricLights(clipSpaceCoord, cameraPos.xyz, fragPos, diffuseLight.xyz);
 		fragColor.xyz = toneMap(fragColor.xyz * volumetric.a + volumetric.xyz);

diff --git a/data/base/shaders/vk/terrain_combined_high.frag b/data/base/shaders/vk/terrain_combined_high.frag
@@ -130,7 +130,7 @@ void main()
 {
 	vec4 fragColor = main_bumpMapping();
 
-	if (WZ_VOLUMETRIC_LIGHTING_ENABLED == 1) {
+	if (WZ_VOLUMETRIC_LIGHTING_ENABLED != 1) {
 		vec2 clipSpaceCoord = gl_FragCoord.xy / vec2(viewportWidth, viewportHeight);	
 		vec4 volumetric = volumetricLights(clipSpaceCoord, cameraPos.xyz, frag.fragPos, diffuseLight.xyz);
 		fragColor.xyz = toneMap(fragColor.xyz * volumetric.a + volumetric.xyz);