Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-26 19:09:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ported: Fix TileSetEditor wrong NavigationPolygon format

Browse Source 
TileSets created and stored NavigationPolyons in a format that did not work for Navigation.
- smix8
1bac95b166
This commit is contained in:
Relintai 2022-07-28 10:58:21 +02:00
parent c6fa9ce87d
commit 1ffafee7b1
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
modules/rtile_map/tile_set_editor_plugin.cpp
View File

@ -1676,16 +1676,20 @@ void RTileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) {
w.release(); w.release();
undo_redo->create_action(TTR("Edit Navigation Polygon")); edited_navigation_shape->clear_outlines();
undo_redo->add_do_method(edited_navigation_shape.ptr(), "set_vertices", polygon); edited_navigation_shape->add_outline(polygon);
undo_redo->add_undo_method(edited_navigation_shape.ptr(), "set_vertices", edited_navigation_shape->get_vertices()); edited_navigation_shape->make_polygons_from_outlines();
undo_redo->add_do_method(edited_navigation_shape.ptr(), "clear_polygons"); // FIXME Couldn't figure out the undo_redo quagmire
undo_redo->add_undo_method(edited_navigation_shape.ptr(), "clear_polygons"); //undo_redo->create_action(TTR("Edit Navigation Polygon"));
undo_redo->add_do_method(edited_navigation_shape.ptr(), "add_polygon", indices); //undo_redo->add_do_method(edited_navigation_shape.ptr(), "set_vertices", polygon);
undo_redo->add_undo_method(edited_navigation_shape.ptr(), "add_polygon", edited_navigation_shape->get_polygon(0)); //undo_redo->add_undo_method(edited_navigation_shape.ptr(), "set_vertices", edited_navigation_shape->get_vertices());
undo_redo->add_do_method(this, "_select_edited_shape_coord"); //undo_redo->add_do_method(edited_navigation_shape.ptr(), "clear_polygons");
undo_redo->add_undo_method(this, "_select_edited_shape_coord"); //undo_redo->add_undo_method(edited_navigation_shape.ptr(), "clear_polygons");
undo_redo->commit_action(); //undo_redo->add_do_method(edited_navigation_shape.ptr(), "add_polygon", indices);
//undo_redo->add_undo_method(edited_navigation_shape.ptr(), "add_polygon", edited_navigation_shape->get_polygon(0));
//undo_redo->add_do_method(this, "_select_edited_shape_coord");
//undo_redo->add_undo_method(this, "_select_edited_shape_coord");
//undo_redo->commit_action()::;
} }
} }
} }
@ -2815,11 +2819,14 @@ void RTileSetEditor::draw_polygon_shapes() {
colors.push_back(c_bg); colors.push_back(c_bg);
} }
} else { } else {
PoolVector<Vector2> vertices = shape->get_vertices(); for (int outline_idx = 0; outline_idx < shape->get_outline_count(); outline_idx++) {
for (int j = 0; j < shape->get_polygon(0).size(); j++) { PoolVector<Vector2> outline_vertices = shape->get_outline(outline_idx);
polygon.push_back(vertices[shape->get_polygon(0)[j]] + anchor); for (int vertex_idx = 0; vertex_idx < outline_vertices.size(); vertex_idx++) {
colors.push_back(c_bg); polygon.push_back(outline_vertices[vertex_idx] + anchor);
}
} }
colors.resize(polygon.size());
colors.fill(c_bg);
} }
workspace->draw_polygon(polygon, colors); workspace->draw_polygon(polygon, colors);
@ -2863,11 +2870,14 @@ void RTileSetEditor::draw_polygon_shapes() {
colors.push_back(c_bg); colors.push_back(c_bg);
} }
} else { } else {
PoolVector<Vector2> vertices = shape->get_vertices(); for (int outline_idx = 0; outline_idx < shape->get_outline_count(); outline_idx++) {
for (int j = 0; j < shape->get_polygon(0).size(); j++) { PoolVector<Vector2> outline_vertices = shape->get_outline(outline_idx);
polygon.push_back(vertices[shape->get_polygon(0)[j]] + anchor); for (int vertex_idx = 0; vertex_idx < outline_vertices.size(); vertex_idx++) {
colors.push_back(c_bg); polygon.push_back(outline_vertices[vertex_idx] + anchor);
}
} }
colors.resize(polygon.size());
colors.fill(c_bg);
} }
workspace->draw_polygon(polygon, colors); workspace->draw_polygon(polygon, colors);
@ -2989,8 +2999,9 @@ void RTileSetEditor::close_shape(const Vector2 &shape_anchor) {
} }
w.release(); w.release();
shape->set_vertices(polygon); shape->clear_outlines();
shape->add_polygon(indices); shape->add_outline(polygon);
shape->make_polygons_from_outlines();
undo_redo->create_action(TTR("Create Navigation Polygon")); undo_redo->create_action(TTR("Create Navigation Polygon"));
if (tileset->tile_get_tile_mode(get_current_tile()) == RTileSet::AUTO_TILE || tileset->tile_get_tile_mode(get_current_tile()) == RTileSet::ATLAS_TILE) { if (tileset->tile_get_tile_mode(get_current_tile()) == RTileSet::AUTO_TILE || tileset->tile_get_tile_mode(get_current_tile()) == RTileSet::ATLAS_TILE) {
@ -3044,10 +3055,10 @@ void RTileSetEditor::select_coord(const Vector2 &coord) {
} else if (edit_mode == EDITMODE_NAVIGATION) { } else if (edit_mode == EDITMODE_NAVIGATION) {
current_shape.resize(0); current_shape.resize(0);
if (edited_navigation_shape.is_valid()) { if (edited_navigation_shape.is_valid()) {
if (edited_navigation_shape->get_polygon_count() > 0) { for (int outline_idx = 0; outline_idx < edited_navigation_shape->get_outline_count(); outline_idx++) {
PoolVector<Vector2> vertices = edited_navigation_shape->get_vertices(); PoolVector<Vector2> outline_vertices = edited_navigation_shape->get_outline(outline_idx);
for (int i = 0; i < edited_navigation_shape->get_polygon(0).size(); i++) { for (int vertex_inx = 0; vertex_inx < outline_vertices.size(); vertex_inx++) {
current_shape.push_back(vertices[edited_navigation_shape->get_polygon(0)[i]] + current_tile_region.position); current_shape.push_back(outline_vertices[vertex_inx] + current_tile_region.position);
} }
} }
} }
@ -3097,10 +3108,10 @@ void RTileSetEditor::select_coord(const Vector2 &coord) {
} else if (edit_mode == EDITMODE_NAVIGATION) { } else if (edit_mode == EDITMODE_NAVIGATION) {
current_shape.resize(0); current_shape.resize(0);
if (edited_navigation_shape.is_valid()) { if (edited_navigation_shape.is_valid()) {
if (edited_navigation_shape->get_polygon_count() > 0) { for (int outline_idx = 0; outline_idx < edited_navigation_shape->get_outline_count(); outline_idx++) {
PoolVector<Vector2> vertices = edited_navigation_shape->get_vertices(); PoolVector<Vector2> outline_vertices = edited_navigation_shape->get_outline(outline_idx);
for (int i = 0; i < edited_navigation_shape->get_polygon(0).size(); i++) { for (int vertex_inx = 0; vertex_inx < outline_vertices.size(); vertex_inx++) {
current_shape.push_back(vertices[edited_navigation_shape->get_polygon(0)[i]] + shape_anchor); current_shape.push_back(outline_vertices[vertex_inx] + shape_anchor)::;
} }
} }
} }