Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-03-28 06:46:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix creating polygons in GenericTilePolygonEditor.

Browse Source
This commit is contained in:
Relintai 2024-03-09 10:33:18 +01:00
parent 5359053613
commit de33138e87
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/layered_tile_map/editor/layered_tile_data_editors.cpp
View File

@ -545,9 +545,7 @@ void GenericTilePolygonEditor::_base_control_gui_input(Ref<InputEvent> p_event)
if (!multiple_polygon_mode) { if (!multiple_polygon_mode) {
clear_polygons(); clear_polygons();
} }
int added = add_polygon(in_creation_polygon);
in_creation_polygon.clear();
button_edit->set_pressed(true); button_edit->set_pressed(true);
undo_redo->create_action(TTR("Edit Polygons")); undo_redo->create_action(TTR("Edit Polygons"));
if (!multiple_polygon_mode) { if (!multiple_polygon_mode) {
@ -555,10 +553,12 @@ void GenericTilePolygonEditor::_base_control_gui_input(Ref<InputEvent> p_event)
} }
undo_redo->add_do_method(this, "add_polygon", in_creation_polygon); undo_redo->add_do_method(this, "add_polygon", in_creation_polygon);
undo_redo->add_do_method(base_control, "update"); undo_redo->add_do_method(base_control, "update");
undo_redo->add_undo_method(this, "remove_polygon", added); undo_redo->add_undo_method(this, "remove_last_polygon");
undo_redo->add_undo_method(base_control, "update"); undo_redo->add_undo_method(base_control, "update");
undo_redo->commit_action(); undo_redo->commit_action();
emit_signal("polygons_changed"); emit_signal("polygons_changed");
in_creation_polygon.clear();
} else { } else {
// Create a new point. // Create a new point.
drag_type = DRAG_TYPE_CREATE_POINT; drag_type = DRAG_TYPE_CREATE_POINT;
@ -795,6 +795,10 @@ void GenericTilePolygonEditor::remove_polygon(int p_index) {
base_control->update(); base_control->update();
} }
void GenericTilePolygonEditor::remove_last_polygon() {
remove_polygon(polygons.size() - 1);
}
void GenericTilePolygonEditor::clear_polygons() { void GenericTilePolygonEditor::clear_polygons() {
polygons.clear(); polygons.clear();
base_control->update(); base_control->update();
@ -854,6 +858,7 @@ void GenericTilePolygonEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_polygon_count"), &GenericTilePolygonEditor::get_polygon_count); ClassDB::bind_method(D_METHOD("get_polygon_count"), &GenericTilePolygonEditor::get_polygon_count);
ClassDB::bind_method(D_METHOD("add_polygon", "polygon", "index"), &GenericTilePolygonEditor::add_polygon, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("add_polygon", "polygon", "index"), &GenericTilePolygonEditor::add_polygon, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("remove_polygon", "index"), &GenericTilePolygonEditor::remove_polygon); ClassDB::bind_method(D_METHOD("remove_polygon", "index"), &GenericTilePolygonEditor::remove_polygon);
ClassDB::bind_method(D_METHOD("remove_last_polygon"), &GenericTilePolygonEditor::remove_last_polygon);
ClassDB::bind_method(D_METHOD("clear_polygons"), &GenericTilePolygonEditor::clear_polygons); ClassDB::bind_method(D_METHOD("clear_polygons"), &GenericTilePolygonEditor::clear_polygons);
ClassDB::bind_method(D_METHOD("set_polygon", "index", "polygon"), &GenericTilePolygonEditor::set_polygon); ClassDB::bind_method(D_METHOD("set_polygon", "index", "polygon"), &GenericTilePolygonEditor::set_polygon);
ClassDB::bind_method(D_METHOD("get_polygon", "index"), &GenericTilePolygonEditor::get_polygon); ClassDB::bind_method(D_METHOD("get_polygon", "index"), &GenericTilePolygonEditor::get_polygon);

1
modules/layered_tile_map/editor/layered_tile_data_editors.h
View File

@ -189,6 +189,7 @@ public:
int get_polygon_count(); int get_polygon_count();
int add_polygon(const Vector<Point2> &p_polygon, int p_index = -1); int add_polygon(const Vector<Point2> &p_polygon, int p_index = -1);
void remove_polygon(int p_index); void remove_polygon(int p_index);
void remove_last_polygon();
void clear_polygons(); void clear_polygons();
void set_polygon(int p_polygon_index, const Vector<Point2> &p_polygon); void set_polygon(int p_polygon_index, const Vector<Point2> &p_polygon);
Vector<Point2> get_polygon(int p_polygon_index); Vector<Point2> get_polygon(int p_polygon_index);