1 files changed, 64 insertions, 19 deletions

diff --git a/scene/resources/particles_material.h b/scene/resources/particles_material.h
index fd00c58468..116d8b7d06 100644
--- a/scene/resources/particles_material.h
+++ b/scene/resources/particles_material.h
@@ -58,6 +58,9 @@ public:
 		PARAM_HUE_VARIATION,
 		PARAM_ANIM_SPEED,
 		PARAM_ANIM_OFFSET,
+		PARAM_TURB_INFLUENCE_OVER_LIFE,
+		PARAM_TURB_VEL_INFLUENCE,
+		PARAM_TURB_INIT_DISPLACEMENT,
 		PARAM_MAX
 	};
 
@@ -73,6 +76,7 @@ public:
 	enum EmissionShape {
 		EMISSION_SHAPE_POINT,
 		EMISSION_SHAPE_SPHERE,
+		EMISSION_SHAPE_SPHERE_SURFACE,
 		EMISSION_SHAPE_BOX,
 		EMISSION_SHAPE_POINTS,
 		EMISSION_SHAPE_DIRECTED_POINTS,
@@ -104,9 +108,18 @@ private:
 			uint32_t attractor_enabled : 1;
 			uint32_t collision_enabled : 1;
 			uint32_t collision_scale : 1;
+			uint32_t turbulence_enabled : 1;
 		};
 
-		uint32_t key = 0;
+		uint64_t key = 0;
+
+		static uint32_t hash(const MaterialKey &p_key) {
+			return hash_murmur3_one_32(p_key.key);
+		}
+
+		bool operator==(const MaterialKey &p_key) const {
+			return key == p_key.key;
+		}
 
 		bool operator<(const MaterialKey &p_key) const {
 			return key < p_key.key;
@@ -118,7 +131,7 @@ private:
 		int users = 0;
 	};
 
-	static Map<MaterialKey, ShaderData> shader_map;
+	static HashMap<MaterialKey, ShaderData, MaterialKey> shader_map;
 
 	MaterialKey current_key;
 
@@ -143,6 +156,7 @@ private:
 		mk.collision_enabled = collision_enabled;
 		mk.attractor_enabled = attractor_interaction_enabled;
 		mk.collision_scale = collision_scale;
+		mk.turbulence_enabled = turbulence_enabled;
 
 		return mk;
 	}
@@ -207,6 +221,17 @@ private:
 		StringName emission_ring_radius;
 		StringName emission_ring_inner_radius;
 
+		StringName turbulence_enabled;
+		StringName turbulence_noise_strength;
+		StringName turbulence_noise_scale;
+		StringName turbulence_noise_speed;
+		StringName turbulence_noise_speed_random;
+		StringName turbulence_influence_over_life;
+		StringName turbulence_influence_min;
+		StringName turbulence_influence_max;
+		StringName turbulence_initial_displacement_min;
+		StringName turbulence_initial_displacement_max;
+
 		StringName gravity;
 
 		StringName lifetime_randomness;
@@ -229,11 +254,12 @@ private:
 
 	bool is_initialized = false;
 	Vector3 direction;
-	float spread;
-	float flatness;
+	float spread = 0.0f;
+	float flatness = 0.0f;
 
 	float params_min[PARAM_MAX];
 	float params_max[PARAM_MAX];
+	float params[PARAM_MAX];
 
 	Ref<Texture2D> tex_parameters[PARAM_MAX];
 	Color color;
@@ -243,38 +269,45 @@ private:
 	bool particle_flags[PARTICLE_FLAG_MAX];
 
 	EmissionShape emission_shape;
-	float emission_sphere_radius;
+	float emission_sphere_radius = 0.0f;
 	Vector3 emission_box_extents;
 	Ref<Texture2D> emission_point_texture;
 	Ref<Texture2D> emission_normal_texture;
 	Ref<Texture2D> emission_color_texture;
 	Vector3 emission_ring_axis;
-	real_t emission_ring_height;
-	real_t emission_ring_radius;
-	real_t emission_ring_inner_radius;
+	real_t emission_ring_height = 0.0f;
+	real_t emission_ring_radius = 0.0f;
+	real_t emission_ring_inner_radius = 0.0f;
 	int emission_point_count = 1;
 
-	bool anim_loop;
+	bool anim_loop = false;
+
+	bool turbulence_enabled;
+	Vector3 turbulence_noise_speed;
+	Ref<Texture2D> turbulence_color_ramp;
+	float turbulence_noise_strength = 0.0f;
+	float turbulence_noise_scale = 0.0f;
+	float turbulence_noise_speed_random = 0.0f;
 
 	Vector3 gravity;
 
-	double lifetime_randomness;
+	double lifetime_randomness = 0.0;
 
 	SubEmitterMode sub_emitter_mode;
-	double sub_emitter_frequency;
-	int sub_emitter_amount_at_end;
-	bool sub_emitter_keep_velocity;
+	double sub_emitter_frequency = 0.0;
+	int sub_emitter_amount_at_end = 0;
+	bool sub_emitter_keep_velocity = false;
 	//do not save emission points here
 
-	bool attractor_interaction_enabled;
-	bool collision_enabled;
-	bool collision_scale;
-	float collision_friction;
-	float collision_bounce;
+	bool attractor_interaction_enabled = false;
+	bool collision_enabled = false;
+	bool collision_scale = false;
+	float collision_friction = 0.0f;
+	float collision_bounce = 0.0f;
 
 protected:
 	static void _bind_methods();
-	virtual void _validate_property(PropertyInfo &property) const override;
+	void _validate_property(PropertyInfo &p_property) const;
 
 public:
 	void set_direction(Vector3 p_direction);
@@ -331,6 +364,18 @@ public:
 	real_t get_emission_ring_inner_radius() const;
 	int get_emission_point_count() const;
 
+	void set_turbulence_enabled(bool p_turbulence_enabled);
+	void set_turbulence_noise_strength(float p_turbulence_noise_strength);
+	void set_turbulence_noise_scale(float p_turbulence_noise_scale);
+	void set_turbulence_noise_speed_random(float p_turbulence_noise_speed_random);
+	void set_turbulence_noise_speed(const Vector3 &p_turbulence_noise_speed);
+
+	bool get_turbulence_enabled() const;
+	float get_turbulence_noise_strength() const;
+	float get_turbulence_noise_scale() const;
+	float get_turbulence_noise_speed_random() const;
+	Vector3 get_turbulence_noise_speed() const;
+
 	void set_gravity(const Vector3 &p_gravity);
 	Vector3 get_gravity() const;