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

Merge pull request #6228 from manokara/tilemap-someinfo

Browse source 
Add mouse position information in TileMap.
This commit is contained in:
Rémi Verschelde 2016-08-31 07:42:14 +02:00 committed by GitHub
commit ace2ad961c
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/editor/plugins/tile_map_editor_plugin.cpp
View file

@ -798,6 +798,13 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
canvas_item_editor->update();
}
int tile_under = node->get_cell(over_tile.x, over_tile.y);
String tile_name = "none";
if (node->get_tileset()->has_tile(tile_under))
tile_name = node->get_tileset()->tile_get_name(tile_under);
tile_info->set_text(String::num(over_tile.x)+", "+String::num(over_tile.y)+" ["+tile_name+"]");
if (tool==TOOL_PAINTING) {
int id = get_selected_tile();
@ -1370,6 +1377,10 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
toolbar->set_alignment(BoxContainer::ALIGN_END);
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(toolbar);
// Tile position
tile_info = memnew( Label );
toolbar->add_child(tile_info);
options = memnew( MenuButton );
options->set_text("Tile Map");
options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("TileMap", "EditorIcons"));

2
tools/editor/plugins/tile_map_editor_plugin.h
View file

@ -36,6 +36,7 @@
#include "scene/gui/line_edit.h"
#include "scene/gui/tool_button.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/label.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
@ -81,6 +82,7 @@ class TileMapEditor : public VBoxContainer {
HBoxContainer *toolbar;
Label *tile_info;
MenuButton *options;
ToolButton *transp;
ToolButton *mirror_x;