shadows cascades

Author: malytomas

externals/cage

@@ -11,7 +11,6 @@
 #include <cage-engine/guiBuilder.h>
 #include <cage-engine/scene.h>
 #include <cage-engine/sceneScreenSpaceEffects.h>
-#include <cage-engine/sceneShadowmapFitting.h>
 #include <cage-engine/window.h>
 #include <cage-simple/engine.h>
 #include <cage-simple/fpsCamera.h>
@@ -170,16 +169,6 @@ void update()
 		sceneReload();
 		sceneIndexLoaded = sceneIndexCurrent;
 	}
-
-	// update shadowmaps
-	for (int i = 0; i < directionalLightsCount; i++)
-	{
-		ShadowmapFittingConfig cfg;
-		cfg.assets = engineAssets();
-		cfg.light = directionalLights[i];
-		cfg.camera = engineEntities()->get(1);
-		shadowmapFitting(cfg);
-	}
 }
 
 void actionPrev(input::GuiValue)

sources/scenes/game.cpp

@@ -53,23 +53,23 @@ void update()
 			GuiCheckBoxComponent &cb = e->value<GuiCheckBoxComponent>();
 			enableEffect(ScreenSpaceEffectsFlags::AmbientOcclusion, cb.state == CheckBoxStateEnum::Checked);
 		}
-		{ // world radius
+		{ // rays length
 			Entity *e = ents->get(baseName + 1);
 			GuiInputComponent &in = e->value<GuiInputComponent>();
 			if (in.valid)
-				eff.ssao.worldRadius = toFloat(in.value);
+				eff.ssao.raysLength = toFloat(in.value);
 		}
 		{ // strength
 			Entity *e = ents->get(baseName + 2);
 			GuiInputComponent &in = e->value<GuiInputComponent>();
 			if (in.valid)
 				eff.ssao.strength = toFloat(in.value);
 		}
-		{ // bias
+		{ // threshold
 			Entity *e = ents->get(baseName + 3);
 			GuiInputComponent &in = e->value<GuiInputComponent>();
 			if (in.valid)
-				eff.ssao.bias = toFloat(in.value);
+				eff.ssao.threshold = toFloat(in.value);
 		}
 		{ // power
 			Entity *e = ents->get(baseName + 4);
@@ -351,9 +351,9 @@ void initializeGui()
 			table->value<GuiLayoutTableComponent>();
 		}
 		sint32 childIndex = 1;
-		genInputFloat(table, childIndex, baseName, "World radius:", 0.1, 3, 0.05, ScreenSpaceEffectsComponent().ssao.worldRadius);
+		genInputFloat(table, childIndex, baseName, "Rays length:", 0.1, 3, 0.05, ScreenSpaceEffectsComponent().ssao.raysLength);
 		genInputFloat(table, childIndex, baseName, "Strength:", 0, 3, 0.1, ScreenSpaceEffectsComponent().ssao.strength);
-		genInputFloat(table, childIndex, baseName, "Bias:", -0.5, 0.5, 0.01, ScreenSpaceEffectsComponent().ssao.bias);
+		genInputFloat(table, childIndex, baseName, "Threshold:", -0.5, 0.5, 0.01, ScreenSpaceEffectsComponent().ssao.threshold);
 		genInputFloat(table, childIndex, baseName, "Power:", 0.1, 2, 0.02, ScreenSpaceEffectsComponent().ssao.power);
 		genInputInt(table, childIndex, baseName, "Samples:", 1, 128, 1, ScreenSpaceEffectsComponent().ssao.samplesCount);
 		genInputInt(table, childIndex, baseName, "Blur passes:", 0, 10, 1, ScreenSpaceEffectsComponent().ssao.blurPasses);
@@ -619,6 +619,7 @@ int main(int argc, char *args[])
 			c.ambientIntensity = 0.05;
 			c.near = 0.1;
 			c.far = 100;
+			c.shadowmapFrustumDepthFraction = 0.5;
 			e->value<ScreenSpaceEffectsComponent>();
 		}
 		{ // skybox
@@ -634,8 +635,9 @@ int main(int argc, char *args[])
 			e->value<LightComponent>().lightType = LightTypeEnum::Directional;
 			e->value<ColorComponent>().intensity = 3;
 			ShadowmapComponent &s = e->value<ShadowmapComponent>();
-			s.resolution = 2048;
-			s.directionalWorldSize = 30;
+			s.resolution = 1024;
+			s.cascadesPaddingDistance = 20;
+			s.cascadesSplitLogFactor = 0.6;
 		}
 		{ // floor
 			Entity *e = ents->createAnonymous();

sources/simple/cameraEffects.cpp

@@ -123,7 +123,7 @@ int main(int argc, char *args[])
 			e->value<ColorComponent>().intensity = 4;
 			ShadowmapComponent &s = e->value<ShadowmapComponent>();
 			s.resolution = 4096;
-			s.directionalWorldSize = 30;
+			s.cascadesPaddingDistance = 30;
 		}
 		{ // floor
 			Entity *e = ents->createAnonymous();

sources/simple/dynamicResolution.cpp

@@ -78,7 +78,7 @@ int main(int argc, char *args[])
 			e->value<ColorComponent>().intensity = 3;
 			ShadowmapComponent &s = e->value<ShadowmapComponent>();
 			s.resolution = 2048;
-			s.directionalWorldSize = 30;
+			s.cascadesPaddingDistance = 30;
 		}
 		{ // floor
 			Entity *e = ents->createAnonymous();

sources/simple/guiInWorld.cpp

@@ -173,7 +173,7 @@ int main(int argc, char *args[])
 			e->value<ColorComponent>().intensity = 0.5;
 			ShadowmapComponent &s = e->value<ShadowmapComponent>();
 			s.resolution = 4096;
-			s.directionalWorldSize = 50;
+			s.cascadesPaddingDistance = 50;
 		}
 		{ // floor
 			Entity *e = ents->createUnique();

sources/simple/keybinds.cpp

@@ -49,7 +49,7 @@ int main(int argc, char *args[])
 			e->value<LightComponent>().lightType = LightTypeEnum::Directional;
 			ShadowmapComponent &s = e->value<ShadowmapComponent>();
 			s.resolution = 1024;
-			s.directionalWorldSize = 20;
+			s.cascadesPaddingDistance = 20;
 		}
 		{ // camera
 			Entity *e = ents->create(10);

sources/simple/lods.cpp

@@ -109,7 +109,7 @@ int main(int argc, char *args[])
 			e->value<ColorComponent>().color = Vec3(1, 1, 0.5);
 			ShadowmapComponent &s = e->value<ShadowmapComponent>();
 			s.resolution = 4096;
-			s.directionalWorldSize = 20;
+			s.cascadesPaddingDistance = 20;
 		}
 		{ // green floor
 			Entity *e = ents->create(5);
@@ -148,7 +148,7 @@ int main(int argc, char *args[])
 			e->value<ColorComponent>() = { Vec3(i == 0, i == 1, i == 2), 3 };
 			ShadowmapComponent &s = e->value<ShadowmapComponent>();
 			s.resolution = 4096;
-			s.directionalWorldSize = 500;
+			s.cascadesPaddingDistance = 500;
 		}
 		// point lights
 		for (uint32 i = 0; i < 500; i++)

sources/simple/manyLights.cpp

@@ -37,7 +37,7 @@ void init()
 		e->value<LightComponent>().lightType = LightTypeEnum::Directional;
 		ShadowmapComponent &s = e->value<ShadowmapComponent>();
 		s.resolution = 4096;
-		s.directionalWorldSize = 200;
+		s.cascadesPaddingDistance = 200;
 	}
 
 	{ // floor

sources/simple/music.cpp

@@ -71,7 +71,7 @@ void generate()
 		if (shadowEnabled)
 		{
 			ShadowmapComponent &s = e->value<ShadowmapComponent>();
-			s.directionalWorldSize = 20;
+			s.cascadesPaddingDistance = 20;
 			s.resolution = 4096;
 		}
 	}