Merge pull request #41240 from reduz/fog

Restored fog (non volumetric).

2 files changed, 82 insertions, 219 deletions

diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 526d101389..a174c3eebe 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -694,150 +694,59 @@ bool Environment::is_fog_enabled() const {
 	return fog_enabled;
 }
 
-void Environment::set_fog_color(const Color &p_color) {
-	fog_color = p_color;
+void Environment::set_fog_light_color(const Color &p_light_color) {
+	fog_light_color = p_light_color;
 	_update_fog();
 }
-
-Color Environment::get_fog_color() const {
-	return fog_color;
+Color Environment::get_fog_light_color() const {
+	return fog_light_color;
 }
-
-void Environment::set_fog_sun_color(const Color &p_color) {
-	fog_sun_color = p_color;
+void Environment::set_fog_light_energy(float p_amount) {
+	fog_light_energy = p_amount;
 	_update_fog();
 }
-
-Color Environment::get_fog_sun_color() const {
-	return fog_sun_color;
+float Environment::get_fog_light_energy() const {
+	return fog_light_energy;
 }
-
-void Environment::set_fog_sun_amount(float p_amount) {
-	fog_sun_amount = p_amount;
+void Environment::set_fog_sun_scatter(float p_amount) {
+	fog_sun_scatter = p_amount;
 	_update_fog();
 }
-
-float Environment::get_fog_sun_amount() const {
-	return fog_sun_amount;
-}
-
-void Environment::_update_fog() {
-	RS::get_singleton()->environment_set_fog(
-			environment,
-			fog_enabled,
-			fog_color,
-			fog_sun_color,
-			fog_sun_amount);
-}
-
-void Environment::set_fog_depth_enabled(bool p_enabled) {
-	fog_depth_enabled = p_enabled;
-	_update_fog_depth();
-}
-
-bool Environment::is_fog_depth_enabled() const {
-	return fog_depth_enabled;
-}
-
-void Environment::set_fog_depth_begin(float p_distance) {
-	fog_depth_begin = p_distance;
-	_update_fog_depth();
-}
-
-float Environment::get_fog_depth_begin() const {
-	return fog_depth_begin;
-}
-
-void Environment::set_fog_depth_end(float p_distance) {
-	fog_depth_end = p_distance;
-	_update_fog_depth();
-}
-
-float Environment::get_fog_depth_end() const {
-	return fog_depth_end;
+float Environment::get_fog_sun_scatter() const {
+	return fog_sun_scatter;
 }
-
-void Environment::set_fog_depth_curve(float p_curve) {
-	fog_depth_curve = p_curve;
-	_update_fog_depth();
-}
-
-float Environment::get_fog_depth_curve() const {
-	return fog_depth_curve;
-}
-
-void Environment::set_fog_transmit_enabled(bool p_enabled) {
-	fog_transmit_enabled = p_enabled;
-	_update_fog_depth();
-}
-
-bool Environment::is_fog_transmit_enabled() const {
-	return fog_transmit_enabled;
-}
-
-void Environment::set_fog_transmit_curve(float p_curve) {
-	fog_transmit_curve = p_curve;
-	_update_fog_depth();
-}
-
-float Environment::get_fog_transmit_curve() const {
-	return fog_transmit_curve;
-}
-
-void Environment::_update_fog_depth() {
-	RS::get_singleton()->environment_set_fog_depth(
-			environment,
-			fog_depth_enabled,
-			fog_depth_begin,
-			fog_depth_end,
-			fog_depth_curve,
-			fog_transmit_enabled,
-			fog_transmit_curve);
-}
-
-void Environment::set_fog_height_enabled(bool p_enabled) {
-	fog_height_enabled = p_enabled;
-	_update_fog_height();
-}
-
-bool Environment::is_fog_height_enabled() const {
-	return fog_height_enabled;
-}
-
-void Environment::set_fog_height_min(float p_distance) {
-	fog_height_min = p_distance;
-	_update_fog_height();
+void Environment::set_fog_density(float p_amount) {
+	fog_density = p_amount;
+	_update_fog();
 }
-
-float Environment::get_fog_height_min() const {
-	return fog_height_min;
+float Environment::get_fog_density() const {
+	return fog_density;
 }
-
-void Environment::set_fog_height_max(float p_distance) {
-	fog_height_max = p_distance;
-	_update_fog_height();
+void Environment::set_fog_height(float p_amount) {
+	fog_height = p_amount;
+	_update_fog();
 }
-
-float Environment::get_fog_height_max() const {
-	return fog_height_max;
+float Environment::get_fog_height() const {
+	return fog_height;
 }
-
-void Environment::set_fog_height_curve(float p_distance) {
-	fog_height_curve = p_distance;
-	_update_fog_height();
+void Environment::set_fog_height_density(float p_amount) {
+	fog_height_density = p_amount;
+	_update_fog();
 }
-
-float Environment::get_fog_height_curve() const {
-	return fog_height_curve;
+float Environment::get_fog_height_density() const {
+	return fog_height_density;
 }
 
-void Environment::_update_fog_height() {
-	RS::get_singleton()->environment_set_fog_height(
+void Environment::_update_fog() {
+	RS::get_singleton()->environment_set_fog(
 			environment,
-			fog_height_enabled,
-			fog_height_min,
-			fog_height_max,
-			fog_height_curve);
+			fog_enabled,
+			fog_light_color,
+			fog_light_energy,
+			fog_sun_scatter,
+			fog_density,
+			fog_height,
+			fog_height_density);
 }
 
 // Volumetric Fog
@@ -1003,6 +912,7 @@ void Environment::_validate_property(PropertyInfo &property) const {
 
 	static const char *hide_prefixes[] = {
 		"fog_",
+		"volumetric_fog_",
 		"auto_exposure_",
 		"ss_reflections_",
 		"ssao_",
@@ -1290,52 +1200,31 @@ void Environment::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_fog_enabled", "enabled"), &Environment::set_fog_enabled);
 	ClassDB::bind_method(D_METHOD("is_fog_enabled"), &Environment::is_fog_enabled);
-	ClassDB::bind_method(D_METHOD("set_fog_color", "color"), &Environment::set_fog_color);
-	ClassDB::bind_method(D_METHOD("get_fog_color"), &Environment::get_fog_color);
-	ClassDB::bind_method(D_METHOD("set_fog_sun_color", "color"), &Environment::set_fog_sun_color);
-	ClassDB::bind_method(D_METHOD("get_fog_sun_color"), &Environment::get_fog_sun_color);
-	ClassDB::bind_method(D_METHOD("set_fog_sun_amount", "amount"), &Environment::set_fog_sun_amount);
-	ClassDB::bind_method(D_METHOD("get_fog_sun_amount"), &Environment::get_fog_sun_amount);
-
-	ClassDB::bind_method(D_METHOD("set_fog_depth_enabled", "enabled"), &Environment::set_fog_depth_enabled);
-	ClassDB::bind_method(D_METHOD("is_fog_depth_enabled"), &Environment::is_fog_depth_enabled);
-	ClassDB::bind_method(D_METHOD("set_fog_depth_begin", "distance"), &Environment::set_fog_depth_begin);
-	ClassDB::bind_method(D_METHOD("get_fog_depth_begin"), &Environment::get_fog_depth_begin);
-	ClassDB::bind_method(D_METHOD("set_fog_depth_end", "distance"), &Environment::set_fog_depth_end);
-	ClassDB::bind_method(D_METHOD("get_fog_depth_end"), &Environment::get_fog_depth_end);
-	ClassDB::bind_method(D_METHOD("set_fog_depth_curve", "curve"), &Environment::set_fog_depth_curve);
-	ClassDB::bind_method(D_METHOD("get_fog_depth_curve"), &Environment::get_fog_depth_curve);
-	ClassDB::bind_method(D_METHOD("set_fog_transmit_enabled", "enabled"), &Environment::set_fog_transmit_enabled);
-	ClassDB::bind_method(D_METHOD("is_fog_transmit_enabled"), &Environment::is_fog_transmit_enabled);
-	ClassDB::bind_method(D_METHOD("set_fog_transmit_curve", "curve"), &Environment::set_fog_transmit_curve);
-	ClassDB::bind_method(D_METHOD("get_fog_transmit_curve"), &Environment::get_fog_transmit_curve);
-
-	ClassDB::bind_method(D_METHOD("set_fog_height_enabled", "enabled"), &Environment::set_fog_height_enabled);
-	ClassDB::bind_method(D_METHOD("is_fog_height_enabled"), &Environment::is_fog_height_enabled);
-	ClassDB::bind_method(D_METHOD("set_fog_height_min", "height"), &Environment::set_fog_height_min);
-	ClassDB::bind_method(D_METHOD("get_fog_height_min"), &Environment::get_fog_height_min);
-	ClassDB::bind_method(D_METHOD("set_fog_height_max", "height"), &Environment::set_fog_height_max);
-	ClassDB::bind_method(D_METHOD("get_fog_height_max"), &Environment::get_fog_height_max);
-	ClassDB::bind_method(D_METHOD("set_fog_height_curve", "curve"), &Environment::set_fog_height_curve);
-	ClassDB::bind_method(D_METHOD("get_fog_height_curve"), &Environment::get_fog_height_curve);
-
-	ADD_GROUP("Fixed Fog", "fog_");
+	ClassDB::bind_method(D_METHOD("set_fog_light_color", "light_color"), &Environment::set_fog_light_color);
+	ClassDB::bind_method(D_METHOD("get_fog_light_color"), &Environment::get_fog_light_color);
+	ClassDB::bind_method(D_METHOD("set_fog_light_energy", "light_energy"), &Environment::set_fog_light_energy);
+	ClassDB::bind_method(D_METHOD("get_fog_light_energy"), &Environment::get_fog_light_energy);
+	ClassDB::bind_method(D_METHOD("set_fog_sun_scatter", "sun_scatter"), &Environment::set_fog_sun_scatter);
+	ClassDB::bind_method(D_METHOD("get_fog_sun_scatter"), &Environment::get_fog_sun_scatter);
+
+	ClassDB::bind_method(D_METHOD("set_fog_density", "density"), &Environment::set_fog_density);
+	ClassDB::bind_method(D_METHOD("get_fog_density"), &Environment::get_fog_density);
+
+	ClassDB::bind_method(D_METHOD("set_fog_height", "height"), &Environment::set_fog_height);
+	ClassDB::bind_method(D_METHOD("get_fog_height"), &Environment::get_fog_height);
+
+	ClassDB::bind_method(D_METHOD("set_fog_height_density", "height_density"), &Environment::set_fog_height_density);
+	ClassDB::bind_method(D_METHOD("get_fog_height_density"), &Environment::get_fog_height_density);
+
+	ADD_GROUP("Fog", "fog_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fog_enabled"), "set_fog_enabled", "is_fog_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "fog_color"), "set_fog_color", "get_fog_color");
-	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "fog_sun_color"), "set_fog_sun_color", "get_fog_sun_color");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_sun_amount", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_fog_sun_amount", "get_fog_sun_amount");
-
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fog_depth_enabled"), "set_fog_depth_enabled", "is_fog_depth_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_depth_begin", PROPERTY_HINT_RANGE, "0,4000,0.1"), "set_fog_depth_begin", "get_fog_depth_begin");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_depth_end", PROPERTY_HINT_RANGE, "0,4000,0.1,or_greater"), "set_fog_depth_end", "get_fog_depth_end");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_depth_curve", PROPERTY_HINT_EXP_EASING), "set_fog_depth_curve", "get_fog_depth_curve");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fog_transmit_enabled"), "set_fog_transmit_enabled", "is_fog_transmit_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_transmit_curve", PROPERTY_HINT_EXP_EASING), "set_fog_transmit_curve", "get_fog_transmit_curve");
-
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fog_height_enabled"), "set_fog_height_enabled", "is_fog_height_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_height_min", PROPERTY_HINT_RANGE, "-4000,4000,0.1,or_lesser,or_greater"), "set_fog_height_min", "get_fog_height_min");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_height_max", PROPERTY_HINT_RANGE, "-4000,4000,0.1,or_lesser,or_greater"), "set_fog_height_max", "get_fog_height_max");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_height_curve", PROPERTY_HINT_EXP_EASING), "set_fog_height_curve", "get_fog_height_curve");
+	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "fog_light_color", PROPERTY_HINT_COLOR_NO_ALPHA), "set_fog_light_color", "get_fog_light_color");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_light_energy", PROPERTY_HINT_RANGE, "0,16,0.01,or_greater"), "set_fog_light_energy", "get_fog_light_energy");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_sun_scatter", PROPERTY_HINT_RANGE, "0,1,0.01,or_greater"), "set_fog_sun_scatter", "get_fog_sun_scatter");
+
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_density", PROPERTY_HINT_RANGE, "0,16,0.0001"), "set_fog_density", "get_fog_density");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_height", PROPERTY_HINT_RANGE, "-1024,1024,0.01,or_lesser,or_greater"), "set_fog_height", "get_fog_height");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fog_height_density", PROPERTY_HINT_RANGE, "0,128,0.001,or_greater"), "set_fog_height_density", "get_fog_height_density");
 
 	ClassDB::bind_method(D_METHOD("set_volumetric_fog_enabled", "enabled"), &Environment::set_volumetric_fog_enabled);
 	ClassDB::bind_method(D_METHOD("is_volumetric_fog_enabled"), &Environment::is_volumetric_fog_enabled);
@@ -1444,8 +1333,6 @@ Environment::Environment() {
 	_update_sdfgi();
 	_update_glow();
 	_update_fog();
-	_update_fog_depth();
-	_update_fog_height();
 	_update_adjustment();
 	_update_volumetric_fog();
 	_change_notify();
diff --git a/scene/resources/environment.h b/scene/resources/environment.h
index 6edb54b187..d4d84f31aa 100644
--- a/scene/resources/environment.h
+++ b/scene/resources/environment.h
@@ -184,24 +184,14 @@ private:
 
 	// Fog
 	bool fog_enabled = false;
-	Color fog_color = Color(0.5, 0.6, 0.7);
-	Color fog_sun_color = Color(1.0, 0.9, 0.7);
-	float fog_sun_amount = 0.0;
-	void _update_fog();
-
-	bool fog_depth_enabled = true;
-	float fog_depth_begin = 10.0;
-	float fog_depth_end = 100.0;
-	float fog_depth_curve = 1.0;
-	bool fog_transmit_enabled = false;
-	float fog_transmit_curve = 1.0;
-	void _update_fog_depth();
+	Color fog_light_color = Color(0.5, 0.6, 0.7);
+	float fog_light_energy = 1.0;
+	float fog_sun_scatter = 0.0;
+	float fog_density = 0.001;
+	float fog_height = 0.0;
+	float fog_height_density = 0.0; //can be negative to invert effect
 
-	bool fog_height_enabled = false;
-	float fog_height_min = 10.0;
-	float fog_height_max = 0.0;
-	float fog_height_curve = 1.0;
-	void _update_fog_height();
+	void _update_fog();
 
 	// Volumetric Fog
 	bool volumetric_fog_enabled = false;
@@ -362,36 +352,22 @@ public:
 	float get_glow_hdr_luminance_cap() const;
 
 	// Fog
+
 	void set_fog_enabled(bool p_enabled);
 	bool is_fog_enabled() const;
-	void set_fog_color(const Color &p_color);
-	Color get_fog_color() const;
-	void set_fog_sun_color(const Color &p_color);
-	Color get_fog_sun_color() const;
-	void set_fog_sun_amount(float p_amount);
-	float get_fog_sun_amount() const;
-
-	void set_fog_depth_enabled(bool p_enabled);
-	bool is_fog_depth_enabled() const;
-	void set_fog_depth_begin(float p_distance);
-	float get_fog_depth_begin() const;
-	void set_fog_depth_end(float p_distance);
-	float get_fog_depth_end() const;
-	void set_fog_depth_curve(float p_curve);
-	float get_fog_depth_curve() const;
-	void set_fog_transmit_enabled(bool p_enabled);
-	bool is_fog_transmit_enabled() const;
-	void set_fog_transmit_curve(float p_curve);
-	float get_fog_transmit_curve() const;
-
-	void set_fog_height_enabled(bool p_enabled);
-	bool is_fog_height_enabled() const;
-	void set_fog_height_min(float p_distance);
-	float get_fog_height_min() const;
-	void set_fog_height_max(float p_distance);
-	float get_fog_height_max() const;
-	void set_fog_height_curve(float p_distance);
-	float get_fog_height_curve() const;
+	void set_fog_light_color(const Color &p_light_color);
+	Color get_fog_light_color() const;
+	void set_fog_light_energy(float p_amount);
+	float get_fog_light_energy() const;
+	void set_fog_sun_scatter(float p_amount);
+	float get_fog_sun_scatter() const;
+
+	void set_fog_density(float p_amount);
+	float get_fog_density() const;
+	void set_fog_height(float p_amount);
+	float get_fog_height() const;
+	void set_fog_height_density(float p_amount);
+	float get_fog_height_density() const;
 
 	// Volumetric Fog
 	void set_volumetric_fog_enabled(bool p_enable);