godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Added a create rectangle button to the tileset editor.

Browse Source 
It makes easier to create collision shapes covering the full tile.
This commit is contained in:
MrCdK
2019-02-20 12:27:53 +01:00
parent f41439c84b
commit 7827c2fd57
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
editor/plugins/tile_set_editor_plugin.cpp
View File

@@ -232,6 +232,7 @@ void TileSetEditor::_notification(int p_what) {
tools[BITMASK_PASTE]->set_icon(get_icon("Override", "EditorIcons")); tools[BITMASK_PASTE]->set_icon(get_icon("Override", "EditorIcons"));
tools[BITMASK_CLEAR]->set_icon(get_icon("Clear", "EditorIcons")); tools[BITMASK_CLEAR]->set_icon(get_icon("Clear", "EditorIcons"));
tools[SHAPE_NEW_POLYGON]->set_icon(get_icon("CollisionPolygon2D", "EditorIcons")); tools[SHAPE_NEW_POLYGON]->set_icon(get_icon("CollisionPolygon2D", "EditorIcons"));
tools[SHAPE_NEW_RECTANGLE]->set_icon(get_icon("CollisionShape2D", "EditorIcons"));
tools[SHAPE_DELETE]->set_icon(get_icon("Remove", "EditorIcons")); tools[SHAPE_DELETE]->set_icon(get_icon("Remove", "EditorIcons"));
tools[SHAPE_KEEP_INSIDE_TILE]->set_icon(get_icon("Snap", "EditorIcons")); tools[SHAPE_KEEP_INSIDE_TILE]->set_icon(get_icon("Snap", "EditorIcons"));
tools[TOOL_GRID_SNAP]->set_icon(get_icon("SnapGrid", "EditorIcons")); tools[TOOL_GRID_SNAP]->set_icon(get_icon("SnapGrid", "EditorIcons"));
@@ -377,6 +378,12 @@ TileSetEditor::TileSetEditor(EditorNode *p_editor) {
tools[BITMASK_CLEAR]->connect("pressed", this, "_on_tool_clicked", varray(BITMASK_CLEAR)); tools[BITMASK_CLEAR]->connect("pressed", this, "_on_tool_clicked", varray(BITMASK_CLEAR));
toolbar->add_child(tools[BITMASK_CLEAR]); toolbar->add_child(tools[BITMASK_CLEAR]);
tools[SHAPE_NEW_RECTANGLE] = memnew(ToolButton);
toolbar->add_child(tools[SHAPE_NEW_RECTANGLE]);
tools[SHAPE_NEW_RECTANGLE]->set_toggle_mode(true);
tools[SHAPE_NEW_RECTANGLE]->set_button_group(tg);
tools[SHAPE_NEW_RECTANGLE]->set_tooltip(TTR("Create a new rectangle."));
tools[SHAPE_NEW_POLYGON] = memnew(ToolButton); tools[SHAPE_NEW_POLYGON] = memnew(ToolButton);
toolbar->add_child(tools[SHAPE_NEW_POLYGON]); toolbar->add_child(tools[SHAPE_NEW_POLYGON]);
tools[SHAPE_NEW_POLYGON]->set_toggle_mode(true); tools[SHAPE_NEW_POLYGON]->set_toggle_mode(true);
@@ -637,6 +644,7 @@ void TileSetEditor::_on_edit_mode_changed(int p_edit_mode) {
tools[BITMASK_PASTE]->hide(); tools[BITMASK_PASTE]->hide();
tools[BITMASK_CLEAR]->hide(); tools[BITMASK_CLEAR]->hide();
tools[SHAPE_NEW_POLYGON]->hide(); tools[SHAPE_NEW_POLYGON]->hide();
tools[SHAPE_NEW_RECTANGLE]->hide();
if (workspace_mode == WORKSPACE_EDIT) { if (workspace_mode == WORKSPACE_EDIT) {
separator_delete->show(); separator_delete->show();
@@ -666,6 +674,7 @@ void TileSetEditor::_on_edit_mode_changed(int p_edit_mode) {
tools[BITMASK_PASTE]->hide(); tools[BITMASK_PASTE]->hide();
tools[BITMASK_CLEAR]->hide(); tools[BITMASK_CLEAR]->hide();
tools[SHAPE_NEW_POLYGON]->show(); tools[SHAPE_NEW_POLYGON]->show();
tools[SHAPE_NEW_RECTANGLE]->show();
separator_delete->show(); separator_delete->show();
tools[SHAPE_DELETE]->show(); tools[SHAPE_DELETE]->show();
@@ -689,6 +698,7 @@ void TileSetEditor::_on_edit_mode_changed(int p_edit_mode) {
tools[BITMASK_PASTE]->show(); tools[BITMASK_PASTE]->show();
tools[BITMASK_CLEAR]->show(); tools[BITMASK_CLEAR]->show();
tools[SHAPE_NEW_POLYGON]->hide(); tools[SHAPE_NEW_POLYGON]->hide();
tools[SHAPE_NEW_RECTANGLE]->hide();
separator_delete->hide(); separator_delete->hide();
tools[SHAPE_DELETE]->hide(); tools[SHAPE_DELETE]->hide();
@@ -709,6 +719,7 @@ void TileSetEditor::_on_edit_mode_changed(int p_edit_mode) {
tools[BITMASK_PASTE]->hide(); tools[BITMASK_PASTE]->hide();
tools[BITMASK_CLEAR]->hide(); tools[BITMASK_CLEAR]->hide();
tools[SHAPE_NEW_POLYGON]->hide(); tools[SHAPE_NEW_POLYGON]->hide();
tools[SHAPE_NEW_RECTANGLE]->hide();
separator_delete->hide(); separator_delete->hide();
tools[SHAPE_DELETE]->hide(); tools[SHAPE_DELETE]->hide();
@@ -1430,6 +1441,20 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) {
workspace->update(); workspace->update();
} }
} }
} else if (tools[SHAPE_NEW_RECTANGLE]->is_pressed()) {
if (mb.is_valid()) {
if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
current_shape.resize(0);
current_shape.push_back(snap_point(shape_anchor));
current_shape.push_back(snap_point(shape_anchor + Vector2(current_tile_region.size.x, 0)));
current_shape.push_back(snap_point(shape_anchor + current_tile_region.size));
current_shape.push_back(snap_point(shape_anchor + Vector2(0, current_tile_region.size.y)));
close_shape(shape_anchor);
workspace->update();
} else if (mb->is_pressed() && mb->get_button_index() == BUTTON_RIGHT) {
workspace->update();
}
}
} }
} break; } break;
default: {} default: {}

1
editor/plugins/tile_set_editor_plugin.h
View File

@@ -81,6 +81,7 @@ class TileSetEditor : public HSplitContainer {
BITMASK_PASTE, BITMASK_PASTE,
BITMASK_CLEAR, BITMASK_CLEAR,
SHAPE_NEW_POLYGON, SHAPE_NEW_POLYGON,
SHAPE_NEW_RECTANGLE,
SHAPE_DELETE, SHAPE_DELETE,
SHAPE_KEEP_INSIDE_TILE, SHAPE_KEEP_INSIDE_TILE,
TOOL_GRID_SNAP, TOOL_GRID_SNAP,