godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-07 19:53:17 +00:00
Code Releases Wiki Activity

Particles2D: fix editing Visibility Rect from inspector

Browse Source 
+ renamed generate_aabb to generate_visibility_rect to prevent future confusions
This commit is contained in:
Natrim
2018-08-17 11:47:29 +02:00
parent 985ed5e55a
commit 6ad0f4ebe8
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
editor/plugins/particles_2d_editor_plugin.cpp
View File

@@ -58,8 +58,6 @@ void Particles2DEditorPlugin::make_visible(bool p_visible) {
void Particles2DEditorPlugin::_file_selected(const String &p_file) {
print_line("file: " + p_file);
source_emission_file = p_file;
emission_mask->popup_centered_minsize();
}
@@ -73,7 +71,7 @@ void Particles2DEditorPlugin::_menu_callback(int p_idx) {
generate_seconds->set_value(1.0);
else
generate_seconds->set_value(trunc(gen_time) + 1.0);
generate_aabb->popup_centered_minsize();
generate_visibility_rect->popup_centered_minsize();
} break;
case MENU_LOAD_EMISSION_MASK: {
@@ -93,7 +91,7 @@ void Particles2DEditorPlugin::_generate_visibility_rect() {
float running = 0.0;
EditorProgress ep("gen_aabb", TTR("Generating AABB"), int(time));
EditorProgress ep("gen_vrect", TTR("Generating Visibility Rect"), int(time));
bool was_emitting = particles->is_emitting();
if (!was_emitting) {
@@ -376,19 +374,19 @@ Particles2DEditorPlugin::Particles2DEditorPlugin(EditorNode *p_node) {
epoints->set_value(512);
file->get_vbox()->add_margin_child(TTR("Generated Point Count:"), epoints);
generate_aabb = memnew(ConfirmationDialog);
generate_aabb->set_title(TTR("Generate Visibility Rect"));
generate_visibility_rect = memnew(ConfirmationDialog);
generate_visibility_rect->set_title(TTR("Generate Visibility Rect"));
VBoxContainer *genvb = memnew(VBoxContainer);
generate_aabb->add_child(genvb);
generate_visibility_rect->add_child(genvb);
generate_seconds = memnew(SpinBox);
genvb->add_margin_child(TTR("Generation Time (sec):"), generate_seconds);
generate_seconds->set_min(0.1);
generate_seconds->set_max(25);
generate_seconds->set_value(2);
toolbar->add_child(generate_aabb);
toolbar->add_child(generate_visibility_rect);
generate_aabb->connect("confirmed", this, "_generate_visibility_rect");
generate_visibility_rect->connect("confirmed", this, "_generate_visibility_rect");
emission_mask = memnew(ConfirmationDialog);
emission_mask->set_title(TTR("Generate Visibility Rect"));