godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement zooming using Ctrl + Mouse wheel in the TileMap editor 

This was previously implemented in the GridMap editor. This makes
the same feature available in the TileMap editor.

(cherry picked from commit def2059d67)
This commit is contained in:
Hugo Locurcio 2020-05-30 12:08:30 +02:00 committed by Rémi Verschelde
parent c1f6854ada
commit 6bbfed6400
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/plugins/tile_map_editor_plugin.cpp
View File

@ -205,6 +205,21 @@ void TileMapEditor::_palette_multi_selected(int index, bool selected) {
_update_palette(); _update_palette();
} }
void TileMapEditor::_palette_input(const Ref<InputEvent> &p_event) {
const Ref<InputEventMouseButton> mb = p_event;
// Zoom in/out using Ctrl + mouse wheel.
if (mb.is_valid() && mb->is_pressed() && mb->get_command()) {
if (mb->is_pressed() && mb->get_button_index() == BUTTON_WHEEL_UP) {
size_slider->set_value(size_slider->get_value() + 0.2);
}
if (mb->is_pressed() && mb->get_button_index() == BUTTON_WHEEL_DOWN) {
size_slider->set_value(size_slider->get_value() - 0.2);
}
}
}
void TileMapEditor::_canvas_mouse_enter() { void TileMapEditor::_canvas_mouse_enter() {
mouse_over = true; mouse_over = true;
@ -1834,6 +1849,7 @@ void TileMapEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_clear_transform"), &TileMapEditor::_clear_transform); ClassDB::bind_method(D_METHOD("_clear_transform"), &TileMapEditor::_clear_transform);
ClassDB::bind_method(D_METHOD("_palette_selected"), &TileMapEditor::_palette_selected); ClassDB::bind_method(D_METHOD("_palette_selected"), &TileMapEditor::_palette_selected);
ClassDB::bind_method(D_METHOD("_palette_multi_selected"), &TileMapEditor::_palette_multi_selected); ClassDB::bind_method(D_METHOD("_palette_multi_selected"), &TileMapEditor::_palette_multi_selected);
ClassDB::bind_method(D_METHOD("_palette_input"), &TileMapEditor::_palette_input);
ClassDB::bind_method(D_METHOD("_fill_points"), &TileMapEditor::_fill_points); ClassDB::bind_method(D_METHOD("_fill_points"), &TileMapEditor::_fill_points);
ClassDB::bind_method(D_METHOD("_erase_points"), &TileMapEditor::_erase_points); ClassDB::bind_method(D_METHOD("_erase_points"), &TileMapEditor::_erase_points);
@ -1996,6 +2012,7 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
palette->add_constant_override("vseparation", 8 * EDSCALE); palette->add_constant_override("vseparation", 8 * EDSCALE);
palette->connect("item_selected", this, "_palette_selected"); palette->connect("item_selected", this, "_palette_selected");
palette->connect("multi_selected", this, "_palette_multi_selected"); palette->connect("multi_selected", this, "_palette_multi_selected");
palette->connect("gui_input", this, "_palette_input");
palette_container->add_child(palette); palette_container->add_child(palette);
// Add message for when no texture is selected. // Add message for when no texture is selected.

1
editor/plugins/tile_map_editor_plugin.h
View File

@ -192,6 +192,7 @@ class TileMapEditor : public VBoxContainer {
void _menu_option(int p_option); void _menu_option(int p_option);
void _palette_selected(int index); void _palette_selected(int index);
void _palette_multi_selected(int index, bool selected); void _palette_multi_selected(int index, bool selected);
void _palette_input(const Ref<InputEvent> &p_event);
Dictionary _create_cell_dictionary(int tile, bool flip_x, bool flip_y, bool transpose, Vector2 autotile_coord); Dictionary _create_cell_dictionary(int tile, bool flip_x, bool flip_y, bool transpose, Vector2 autotile_coord);
void _start_undo(const String &p_action); void _start_undo(const String &p_action);