godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29937 from clayjohn/particles-one-shot-bug

Browse Source 
Update emitting status on one-shot particles
This commit is contained in:
Rémi Verschelde
2019-06-27 17:29:40 +02:00
committed by GitHub
parent fca9f0bb7f d59dbda24f
commit 0636f709af
4 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scene/2d/particles_2d.cpp
View File

@@ -41,6 +41,12 @@
void Particles2D::set_emitting(bool p_emitting) {
VS::get_singleton()->particles_set_emitting(particles, p_emitting);
if (p_emitting && one_shot) {
set_process_internal(true);
} else if (!p_emitting) {
set_process_internal(false);
}
}
void Particles2D::set_amount(int p_amount) {
@@ -60,8 +66,16 @@ void Particles2D::set_one_shot(bool p_enable) {
one_shot = p_enable;
VS::get_singleton()->particles_set_one_shot(particles, one_shot);
if (!one_shot && is_emitting())
VisualServer::get_singleton()->particles_restart(particles);
if (is_emitting()) {
set_process_internal(true);
if (!one_shot)
VisualServer::get_singleton()->particles_restart(particles);
}
if (!one_shot)
set_process_internal(false);
}
void Particles2D::set_pre_process_time(float p_time) {
@@ -314,6 +328,14 @@ void Particles2D::_notification(int p_what) {
if (p_what == NOTIFICATION_TRANSFORM_CHANGED) {
_update_particle_emission_transform();
}
if (p_what == NOTIFICATION_INTERNAL_PROCESS) {
if (one_shot && !is_emitting()) {
_change_notify();
set_process_internal(false);
}
}
}
void Particles2D::_bind_methods() {