|
@@ -49,9 +49,7 @@
|
|
|
#include "scene/gui/separator.h"
|
|
|
#include "scene/gui/spin_box.h"
|
|
|
|
|
|
-#ifdef DEBUG_ENABLED
|
|
|
-#include "servers/navigation_server_3d.h"
|
|
|
-#endif // DEBUG_ENABLED
|
|
|
+#include "servers/navigation_server_2d.h"
|
|
|
|
|
|
void TileDataEditor::_tile_set_changed_plan_update() {
|
|
|
_tile_set_changed_update_needed = true;
|
|
@@ -2826,12 +2824,20 @@ Variant TileDataNavigationEditor::_get_painted_value() {
|
|
|
Ref<NavigationPolygon> nav_polygon;
|
|
|
nav_polygon.instantiate();
|
|
|
|
|
|
- for (int i = 0; i < polygon_editor->get_polygon_count(); i++) {
|
|
|
- Vector<Vector2> polygon = polygon_editor->get_polygon(i);
|
|
|
- nav_polygon->add_outline(polygon);
|
|
|
+ if (polygon_editor->get_polygon_count() > 0) {
|
|
|
+ Ref<NavigationMeshSourceGeometryData2D> source_geometry_data;
|
|
|
+ source_geometry_data.instantiate();
|
|
|
+ for (int i = 0; i < polygon_editor->get_polygon_count(); i++) {
|
|
|
+ Vector<Vector2> polygon = polygon_editor->get_polygon(i);
|
|
|
+ nav_polygon->add_outline(polygon);
|
|
|
+ source_geometry_data->add_traversable_outline(polygon);
|
|
|
+ }
|
|
|
+ nav_polygon->set_agent_radius(0.0);
|
|
|
+ NavigationServer2D::get_singleton()->bake_from_source_geometry_data(nav_polygon, source_geometry_data);
|
|
|
+ } else {
|
|
|
+ nav_polygon->clear();
|
|
|
}
|
|
|
|
|
|
- nav_polygon->make_polygons_from_outlines();
|
|
|
return nav_polygon;
|
|
|
}
|
|
|
|
|
@@ -2881,7 +2887,7 @@ void TileDataNavigationEditor::_notification(int p_what) {
|
|
|
switch (p_what) {
|
|
|
case NOTIFICATION_ENTER_TREE: {
|
|
|
#ifdef DEBUG_ENABLED
|
|
|
- polygon_editor->set_polygons_color(NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color());
|
|
|
+ polygon_editor->set_polygons_color(NavigationServer2D::get_singleton()->get_debug_navigation_geometry_face_color());
|
|
|
#endif // DEBUG_ENABLED
|
|
|
} break;
|
|
|
}
|
|
@@ -2909,7 +2915,7 @@ void TileDataNavigationEditor::draw_over_tile(CanvasItem *p_canvas_item, Transfo
|
|
|
|
|
|
Color color = Color(0.5, 1.0, 1.0, 1.0);
|
|
|
#ifdef DEBUG_ENABLED
|
|
|
- color = NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color();
|
|
|
+ color = NavigationServer2D::get_singleton()->get_debug_navigation_geometry_face_color();
|
|
|
#endif // DEBUG_ENABLED
|
|
|
if (p_selected) {
|
|
|
Color grid_color = EDITOR_GET("editors/tiles_editor/grid_color");
|