diff options
Diffstat (limited to 'scene/2d/cpu_particles_2d.cpp')
| -rw-r--r-- | scene/2d/cpu_particles_2d.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index e04e6d7dce..9c9ba93b41 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -35,7 +35,6 @@ #include "scene/resources/curve_texture.h" #include "scene/resources/gradient_texture.h" #include "scene/resources/particle_process_material.h" -#include "scene/scene_string_names.h" void CPUParticles2D::set_emitting(bool p_emitting) { if (emitting == p_emitting) { @@ -753,10 +752,10 @@ void CPUParticles2D::_particles_process(double p_delta) { p.custom[0] = 0.0; // unused p.custom[1] = 0.0; // phase [0..1] p.custom[2] = tex_anim_offset * Math::lerp(parameters_min[PARAM_ANIM_OFFSET], parameters_max[PARAM_ANIM_OFFSET], p.anim_offset_rand); - p.custom[3] = 0.0; + p.custom[3] = (1.0 - Math::randf() * lifetime_randomness); p.transform = Transform2D(); p.time = 0; - p.lifetime = lifetime * (1.0 - Math::randf() * lifetime_randomness); + p.lifetime = lifetime * p.custom[3]; p.base_color = Color(1, 1, 1, 1); switch (emission_shape) { @@ -997,7 +996,7 @@ void CPUParticles2D::_particles_process(double p_delta) { } if (!Math::is_equal_approx(time, 0.0) && active && !should_be_active) { active = false; - emit_signal(SceneStringNames::get_singleton()->finished); + emit_signal(SceneStringName(finished)); } } |