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

Merge pull request #21067 from natrim/Particles2D_AABB

Browse source 
Particles2D: set emitting if not set before generating Visibility Rect
This commit is contained in:
Rémi Verschelde 2018-08-16 18:27:23 +02:00 committed by GitHub
commit e06825ba4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
editor/plugins/particles_2d_editor_plugin.cpp
View file

@ -68,6 +68,11 @@ void Particles2DEditorPlugin::_menu_callback(int p_idx) {
switch (p_idx) { switch (p_idx) {
case MENU_GENERATE_VISIBILITY_RECT: { case MENU_GENERATE_VISIBILITY_RECT: {
float gen_time = particles->get_lifetime();
if (gen_time < 1.0)
generate_seconds->set_value(1.0);
else
generate_seconds->set_value(trunc(gen_time) + 1.0);
generate_aabb->popup_centered_minsize(); generate_aabb->popup_centered_minsize();
} break; } break;
case MENU_LOAD_EMISSION_MASK: { case MENU_LOAD_EMISSION_MASK: {
@ -90,6 +95,12 @@ void Particles2DEditorPlugin::_generate_visibility_rect() {
EditorProgress ep("gen_aabb", TTR("Generating AABB"), int(time)); EditorProgress ep("gen_aabb", TTR("Generating AABB"), int(time));
bool was_emitting = particles->is_emitting();
if (!was_emitting) {
particles->set_emitting(true);
OS::get_singleton()->delay_usec(1000);
}
Rect2 rect; Rect2 rect;
while (running < time) { while (running < time) {
@ -106,6 +117,10 @@ void Particles2DEditorPlugin::_generate_visibility_rect() {
running += (OS::get_singleton()->get_ticks_usec() - ticks) / 1000000.0; running += (OS::get_singleton()->get_ticks_usec() - ticks) / 1000000.0;
} }
if (!was_emitting) {
particles->set_emitting(false);
}
particles->set_visibility_rect(rect); particles->set_visibility_rect(rect);
} }

1
editor/plugins/particles_editor_plugin.cpp
View file

@ -335,7 +335,6 @@ void ParticlesEditor::_generate_aabb() {
OS::get_singleton()->delay_usec(1000); OS::get_singleton()->delay_usec(1000);
} }
running = 0.0;
AABB rect; AABB rect;
while (running < time) { while (running < time) {