diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-19 09:44:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 09:44:43 +0100 |
| commit | 772eaf156fb0c571f4e9b339db2a06d4834d31f4 (patch) | |
| tree | 5818365088ef914e6cc575fdcbf530b3eb1109ae | |
| parent | 6db60c03a9942ba766f52f6a4ae5f157e2edbd42 (diff) | |
| parent | 7c356a9c0514bdb184aac651117f0e542baccfc4 (diff) | |
Merge pull request #16755 from KidRigger/master
Gridmap editor now lists plane instead of floor when not horizontal
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 20 | ||||
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.h | 1 |
2 files changed, 18 insertions, 3 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index 7b7bc0fa2a..34d51b51e2 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -99,6 +99,20 @@ void GridMapEditor::_menu_option(int p_option) { int idx = options->get_popup()->get_item_index(MENU_OPTION_X_AXIS + i); options->get_popup()->set_item_checked(idx, i == new_axis); } + + if (edit_axis != new_axis) { + int item1 = options->get_popup()->get_item_id(MENU_OPTION_NEXT_LEVEL); + int item2 = options->get_popup()->get_item_id(MENU_OPTION_PREV_LEVEL); + if (edit_axis == Vector3::AXIS_Y) { + options->get_popup()->set_item_text(item1, TTR("Next Plane")); + options->get_popup()->set_item_text(item2, TTR("Previous Plane")); + spin_box_label->set_text(TTR("Plane:")); + } else if (new_axis == Vector3::AXIS_Y) { + options->get_popup()->set_item_text(item1, TTR("Next Floor")); + options->get_popup()->set_item_text(item2, TTR("Previous Floor")); + spin_box_label->set_text(TTR("Floor:")); + } + } edit_axis = Vector3::Axis(new_axis); update_grid(); _update_clip(); @@ -998,9 +1012,9 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { spatial_editor_hb->set_alignment(BoxContainer::ALIGN_END); SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb); - Label *fl = memnew(Label); - fl->set_text(TTR("Floor:")); - spatial_editor_hb->add_child(fl); + spin_box_label = memnew(Label); + spin_box_label->set_text(TTR("Floor:")); + spatial_editor_hb->add_child(spin_box_label); floor = memnew(SpinBox); floor->set_min(-32767); diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h index 3fc92bf7aa..9651770528 100644 --- a/modules/gridmap/grid_map_editor_plugin.h +++ b/modules/gridmap/grid_map_editor_plugin.h @@ -82,6 +82,7 @@ class GridMapEditor : public VBoxContainer { ConfirmationDialog *settings_dialog; VBoxContainer *settings_vbc; SpinBox *settings_pick_distance; + Label *spin_box_label; struct SetItem { |