1 files changed, 10 insertions, 17 deletions

diff --git a/scene/resources/material.h b/scene/resources/material.h
index c6be1b8766..b3c2159e70 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -84,17 +84,6 @@ class ShaderMaterial : public Material {
 
 	HashMap<StringName, Variant> param_cache;
 
-	struct UniformProp {
-		String str;
-		PropertyInfo info;
-	};
-
-	struct UniformPropComparator {
-		bool operator()(const UniformProp &p_a, const UniformProp &p_b) const {
-			return p_a.str.naturalnocasecmp_to(p_b.str) < 0;
-		}
-	};
-
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
 	bool _get(const StringName &p_name, Variant &r_ret) const;
@@ -115,8 +104,8 @@ public:
 	void set_shader(const Ref<Shader> &p_shader);
 	Ref<Shader> get_shader() const;
 
-	void set_shader_uniform(const StringName &p_param, const Variant &p_value);
-	Variant get_shader_uniform(const StringName &p_param) const;
+	void set_shader_parameter(const StringName &p_param, const Variant &p_value);
+	Variant get_shader_parameter(const StringName &p_param) const;
 
 	virtual Shader::Mode get_shader_mode() const override;
 
@@ -467,7 +456,8 @@ private:
 	float metallic = 0.0f;
 	float roughness = 0.0f;
 	Color emission;
-	float emission_energy = 0.0f;
+	float emission_energy_multiplier = 1.0f;
+	float emission_intensity = 1000.0f; // In nits, equivalent to indoor lighting.
 	float normal_scale = 0.0f;
 	float rim = 0.0f;
 	float rim_tint = 0.0f;
@@ -573,8 +563,11 @@ public:
 	void set_emission(const Color &p_emission);
 	Color get_emission() const;
 
-	void set_emission_energy(float p_emission_energy);
-	float get_emission_energy() const;
+	void set_emission_energy_multiplier(float p_emission_energy_multiplier);
+	float get_emission_energy_multiplier() const;
+
+	void set_emission_intensity(float p_emission_intensity);
+	float get_emission_intensity() const;
 
 	void set_normal_scale(float p_normal_scale);
 	float get_normal_scale() const;
@@ -726,7 +719,7 @@ public:
 
 	void set_on_top_of_alpha();
 
-	void set_proximity_fade(bool p_enable);
+	void set_proximity_fade_enabled(bool p_enable);
 	bool is_proximity_fade_enabled() const;
 
 	void set_proximity_fade_distance(float p_distance);