asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #27259 from humblers/fix-cpuparticles

Browse source 
Ensure non-emitting particles not processed on entering tree
This commit is contained in:
Rémi Verschelde 2019-03-27 16:39:03 +01:00 committed by GitHub
commit 2498151cd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/2d/cpu_particles_2d.cpp
View file

@ -37,7 +37,8 @@
void CPUParticles2D::set_emitting(bool p_emitting) { void CPUParticles2D::set_emitting(bool p_emitting) {
emitting = p_emitting; emitting = p_emitting;
set_process_internal(true); if (emitting)
set_process_internal(true);
} }
void CPUParticles2D::set_amount(int p_amount) { void CPUParticles2D::set_amount(int p_amount) {
@ -965,7 +966,7 @@ void CPUParticles2D::_update_render_thread() {
void CPUParticles2D::_notification(int p_what) { void CPUParticles2D::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE) { if (p_what == NOTIFICATION_ENTER_TREE) {
_set_redraw(true); set_process_internal(emitting);
} }
if (p_what == NOTIFICATION_EXIT_TREE) { if (p_what == NOTIFICATION_EXIT_TREE) {
@ -1001,7 +1002,6 @@ void CPUParticles2D::_notification(int p_what) {
float delta = get_process_delta_time(); float delta = get_process_delta_time();
if (emitting) { if (emitting) {
_set_redraw(true);
inactive_time = 0; inactive_time = 0;
} else { } else {
inactive_time += delta; inactive_time += delta;
@ -1017,6 +1017,7 @@ void CPUParticles2D::_notification(int p_what) {
return; return;
} }
} }
_set_redraw(true);
if (time == 0 && pre_process_time > 0.0) { if (time == 0 && pre_process_time > 0.0) {

10
scene/3d/cpu_particles.cpp
View file

@ -47,7 +47,8 @@ PoolVector<Face3> CPUParticles::get_faces(uint32_t p_usage_flags) const {
void CPUParticles::set_emitting(bool p_emitting) { void CPUParticles::set_emitting(bool p_emitting) {
emitting = p_emitting; emitting = p_emitting;
set_process_internal(true); if (emitting)
set_process_internal(true);
} }
void CPUParticles::set_amount(int p_amount) { void CPUParticles::set_amount(int p_amount) {
@ -1002,9 +1003,11 @@ void CPUParticles::_set_redraw(bool p_redraw) {
if (redraw) { if (redraw) {
VS::get_singleton()->connect("frame_pre_draw", this, "_update_render_thread"); VS::get_singleton()->connect("frame_pre_draw", this, "_update_render_thread");
VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true); VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true);
VS::get_singleton()->multimesh_set_visible_instances(multimesh, -1);
} else { } else {
VS::get_singleton()->disconnect("frame_pre_draw", this, "_update_render_thread"); VS::get_singleton()->disconnect("frame_pre_draw", this, "_update_render_thread");
VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, false); VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, false);
VS::get_singleton()->multimesh_set_visible_instances(multimesh, 0);
} }
#ifndef NO_THREADS #ifndef NO_THREADS
update_mutex->unlock(); update_mutex->unlock();
@ -1029,7 +1032,7 @@ void CPUParticles::_update_render_thread() {
void CPUParticles::_notification(int p_what) { void CPUParticles::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE) { if (p_what == NOTIFICATION_ENTER_TREE) {
_set_redraw(true); set_process_internal(emitting);
} }
if (p_what == NOTIFICATION_EXIT_TREE) { if (p_what == NOTIFICATION_EXIT_TREE) {
@ -1048,8 +1051,6 @@ void CPUParticles::_notification(int p_what) {
float delta = get_process_delta_time(); float delta = get_process_delta_time();
if (emitting) { if (emitting) {
_set_redraw(true);
inactive_time = 0; inactive_time = 0;
} else { } else {
inactive_time += delta; inactive_time += delta;
@ -1065,6 +1066,7 @@ void CPUParticles::_notification(int p_what) {
return; return;
} }
} }
_set_redraw(true);
bool processed = false; bool processed = false;