Allow using between 1 and 8 cascades for SDFGI

This provides more flexibility between performance and quality
adjustments, especially when using SDFGI for small-scale levels
(which can be useful for procedurally generated scenes).

2 files changed, 10 insertions, 25 deletions

diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 7e71ad8986..0afe040f33 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -496,13 +496,13 @@ bool Environment::is_sdfgi_enabled() const {
 	return sdfgi_enabled;
 }
 
-void Environment::set_sdfgi_cascades(SDFGICascades p_cascades) {
-	ERR_FAIL_INDEX(p_cascades, SDFGI_CASCADES_8 + 1);
+void Environment::set_sdfgi_cascades(int p_cascades) {
+	ERR_FAIL_COND_MSG(p_cascades < 1 || p_cascades > 8, "Invalid number of SDFGI cascades (must be between 1 and 8).");
 	sdfgi_cascades = p_cascades;
 	_update_sdfgi();
 }
 
-Environment::SDFGICascades Environment::get_sdfgi_cascades() const {
+int Environment::get_sdfgi_cascades() const {
 	return sdfgi_cascades;
 }
 
@@ -517,9 +517,7 @@ float Environment::get_sdfgi_min_cell_size() const {
 
 void Environment::set_sdfgi_max_distance(float p_distance) {
 	p_distance /= 64.0;
-	int cc[3] = { 4, 6, 8 };
-	int cascades = cc[sdfgi_cascades];
-	for (int i = 0; i < cascades; i++) {
+	for (int i = 0; i < sdfgi_cascades; i++) {
 		p_distance *= 0.5; //halve for each cascade
 	}
 	sdfgi_min_cell_size = p_distance;
@@ -529,9 +527,7 @@ void Environment::set_sdfgi_max_distance(float p_distance) {
 float Environment::get_sdfgi_max_distance() const {
 	float md = sdfgi_min_cell_size;
 	md *= 64.0;
-	int cc[3] = { 4, 6, 8 };
-	int cascades = cc[sdfgi_cascades];
-	for (int i = 0; i < cascades; i++) {
+	for (int i = 0; i < sdfgi_cascades; i++) {
 		md *= 2.0;
 	}
 	return md;
@@ -612,7 +608,7 @@ void Environment::_update_sdfgi() {
 	RS::get_singleton()->environment_set_sdfgi(
 			environment,
 			sdfgi_enabled,
-			RS::EnvironmentSDFGICascades(sdfgi_cascades),
+			sdfgi_cascades,
 			sdfgi_min_cell_size,
 			RS::EnvironmentSDFGIYScale(sdfgi_y_scale),
 			sdfgi_use_occlusion,
@@ -1303,7 +1299,7 @@ void Environment::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "sdfgi_use_occlusion"), "set_sdfgi_use_occlusion", "is_sdfgi_using_occlusion");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "sdfgi_read_sky_light"), "set_sdfgi_read_sky_light", "is_sdfgi_reading_sky_light");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_bounce_feedback", PROPERTY_HINT_RANGE, "0,1.99,0.01"), "set_sdfgi_bounce_feedback", "get_sdfgi_bounce_feedback");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "sdfgi_cascades", PROPERTY_HINT_ENUM, "4 Cascades,6 Cascades,8 Cascades"), "set_sdfgi_cascades", "get_sdfgi_cascades");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "sdfgi_cascades", PROPERTY_HINT_RANGE, "1,8,1"), "set_sdfgi_cascades", "get_sdfgi_cascades");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_min_cell_size", PROPERTY_HINT_RANGE, "0.01,64,0.01"), "set_sdfgi_min_cell_size", "get_sdfgi_min_cell_size");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_cascade0_distance", PROPERTY_HINT_RANGE, "0.1,16384,0.1,or_greater"), "set_sdfgi_cascade0_distance", "get_sdfgi_cascade0_distance");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sdfgi_max_distance", PROPERTY_HINT_RANGE, "0.1,16384,0.1,or_greater"), "set_sdfgi_max_distance", "get_sdfgi_max_distance");
@@ -1480,10 +1476,6 @@ void Environment::_bind_methods() {
 	BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_REPLACE);
 	BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_MIX);
 
-	BIND_ENUM_CONSTANT(SDFGI_CASCADES_4);
-	BIND_ENUM_CONSTANT(SDFGI_CASCADES_6);
-	BIND_ENUM_CONSTANT(SDFGI_CASCADES_8);
-
 	BIND_ENUM_CONSTANT(SDFGI_Y_SCALE_DISABLED);
 	BIND_ENUM_CONSTANT(SDFGI_Y_SCALE_75_PERCENT);
 	BIND_ENUM_CONSTANT(SDFGI_Y_SCALE_50_PERCENT);
diff --git a/scene/resources/environment.h b/scene/resources/environment.h
index 98e755c336..3f05315013 100644
--- a/scene/resources/environment.h
+++ b/scene/resources/environment.h
@@ -70,12 +70,6 @@ public:
 		TONE_MAPPER_ACES,
 	};
 
-	enum SDFGICascades {
-		SDFGI_CASCADES_4,
-		SDFGI_CASCADES_6,
-		SDFGI_CASCADES_8,
-	};
-
 	enum SDFGIYScale {
 		SDFGI_Y_SCALE_DISABLED,
 		SDFGI_Y_SCALE_75_PERCENT,
@@ -153,7 +147,7 @@ private:
 
 	// SDFGI
 	bool sdfgi_enabled = false;
-	SDFGICascades sdfgi_cascades = SDFGI_CASCADES_6;
+	int sdfgi_cascades = 6;
 	float sdfgi_min_cell_size = 0.2;
 	SDFGIYScale sdfgi_y_scale = SDFGI_Y_SCALE_DISABLED;
 	bool sdfgi_use_occlusion = false;
@@ -320,8 +314,8 @@ public:
 	// SDFGI
 	void set_sdfgi_enabled(bool p_enabled);
 	bool is_sdfgi_enabled() const;
-	void set_sdfgi_cascades(SDFGICascades p_cascades);
-	SDFGICascades get_sdfgi_cascades() const;
+	void set_sdfgi_cascades(int p_cascades);
+	int get_sdfgi_cascades() const;
 	void set_sdfgi_min_cell_size(float p_size);
 	float get_sdfgi_min_cell_size() const;
 	void set_sdfgi_max_distance(float p_distance);
@@ -433,7 +427,6 @@ VARIANT_ENUM_CAST(Environment::BGMode)
 VARIANT_ENUM_CAST(Environment::AmbientSource)
 VARIANT_ENUM_CAST(Environment::ReflectionSource)
 VARIANT_ENUM_CAST(Environment::ToneMapper)
-VARIANT_ENUM_CAST(Environment::SDFGICascades)
 VARIANT_ENUM_CAST(Environment::SDFGIYScale)
 VARIANT_ENUM_CAST(Environment::GlowBlendMode)