Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-22 20:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved the navigation relatred resources into subfolders.

Browse Source
This commit is contained in:
Relintai 2023-12-10 14:23:24 +01:00
parent 2cc42b045a
commit 4cbc387c53
48 changed files with 82 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/import/resource_importer_scene.cpp
View File

@ -43,7 +43,7 @@
#include "scene/animation/animation.h" #include "scene/animation/animation.h"
#include "scene/resources/shapes/box_shape.h" #include "scene/resources/shapes/box_shape.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/shapes/plane_shape.h" #include "scene/resources/shapes/plane_shape.h"
#include "scene/resources/shapes/ray_shape.h" #include "scene/resources/shapes/ray_shape.h"

2
editor/plugins/mesh_instance_editor_plugin.cpp
View File

@ -60,7 +60,7 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/shapes/shape.h" #include "scene/resources/shapes/shape.h"
#include "spatial_editor_plugin.h" #include "spatial_editor_plugin.h"

2
editor/spatial_editor_gizmos.cpp
View File

@ -93,7 +93,7 @@
#include "scene/resources/shapes/cylinder_shape.h" #include "scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/height_map_shape.h" #include "scene/resources/shapes/height_map_shape.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/occluder_shape.h" #include "scene/resources/occluder_shape.h"
#include "scene/resources/occluder_shape_polygon.h" #include "scene/resources/occluder_shape_polygon.h"
#include "scene/resources/shapes/plane_shape.h" #include "scene/resources/shapes/plane_shape.h"

4
modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp
View File

@ -30,8 +30,8 @@
#include "csgshape3d_navigation_geometry_parser_3d.h" #include "csgshape3d_navigation_geometry_parser_3d.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "modules/csg/csg_shape.h" #include "modules/csg/csg_shape.h"

4
modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
View File

@ -41,8 +41,8 @@
#include "scene/resources/shapes/convex_polygon_shape.h" #include "scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h" #include "scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/height_map_shape.h" #include "scene/resources/shapes/height_map_shape.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/shapes/plane_shape.h" #include "scene/resources/shapes/plane_shape.h"
#include "scene/resources/primitive_meshes.h" #include "scene/resources/primitive_meshes.h"
#include "scene/resources/shapes/shape.h" #include "scene/resources/shapes/shape.h"

2
modules/gridmap/grid_map.cpp
View File

@ -41,7 +41,7 @@
#include "servers/navigation_server.h" #include "servers/navigation_server.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"
bool GridMap::_set(const StringName &p_name, const Variant &p_value) { bool GridMap::_set(const StringName &p_name, const Variant &p_value) {

2
modules/gridmap/mesh_library.cpp
View File

@ -31,7 +31,7 @@
#include "mesh_library.h" #include "mesh_library.h"
#include "scene/resources/shapes/box_shape.h" #include "scene/resources/shapes/box_shape.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
MeshLibrary::Item::Item() { MeshLibrary::Item::Item() {
navigation_layers = 1; navigation_layers = 1;

2
modules/gridmap/mesh_library_editor_plugin.cpp
View File

@ -49,7 +49,7 @@
#include "mesh_library.h" #include "mesh_library.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
void MeshLibraryEditor::edit(const Ref<MeshLibrary> &p_mesh_library) { void MeshLibraryEditor::edit(const Ref<MeshLibrary> &p_mesh_library) {
mesh_library = p_mesh_library; mesh_library = p_mesh_library;

2
modules/navigation/nav_map.cpp
View File

@ -37,7 +37,7 @@
#include "nav_obstacle.h" #include "nav_obstacle.h"
#include "nav_region.h" #include "nav_region.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include <Obstacle2d.h> #include <Obstacle2d.h>

2
modules/navigation/nav_region.h
View File

@ -35,7 +35,7 @@
#include "nav_utils.h" #include "nav_utils.h"
#include "scene/3d/navigation.h" #include "scene/3d/navigation.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
class NavRegion : public NavBase { class NavRegion : public NavBase {
NavMap *map; NavMap *map;

2
modules/navigation/pandemonium_navigation_2d_server.cpp
View File

@ -32,7 +32,7 @@
#include "core/math/transform.h" #include "core/math/transform.h"
#include "core/math/transform_2d.h" #include "core/math/transform_2d.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "servers/navigation_server.h" #include "servers/navigation_server.h"
#define FORWARD_0(FUNC_NAME) \ #define FORWARD_0(FUNC_NAME) \

2
modules/navigation/pandemonium_navigation_2d_server.h
View File

@ -33,7 +33,7 @@
#include "core/containers/rid.h" #include "core/containers/rid.h"
#include "core/object/object.h" #include "core/object/object.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
#include "servers/navigation_2d_server.h" #include "servers/navigation_2d_server.h"
// This server exposes the 3D `NavigationServer` features in the 2D world. // This server exposes the 3D `NavigationServer` features in the 2D world.

2
modules/navigation/pandemonium_navigation_server.cpp
View File

@ -35,7 +35,7 @@
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
//#include "navigation_mesh_generator.h" //#include "navigation_mesh_generator.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#endif #endif
using namespace NavigationUtilities; using namespace NavigationUtilities;

2
modules/navigation_dummy/dummy_navigation_2d_server.cpp
View File

@ -30,7 +30,7 @@
#include "dummy_navigation_2d_server.h" #include "dummy_navigation_2d_server.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
void DummyNavigation2DServer::region_set_navigation_polygon(RID p_region, Ref<NavigationPolygon> p_navigation_mesh) { void DummyNavigation2DServer::region_set_navigation_polygon(RID p_region, Ref<NavigationPolygon> p_navigation_mesh) {
} }

2
modules/navigation_dummy/dummy_navigation_server.cpp
View File

@ -1,7 +1,7 @@
#include "dummy_navigation_server.h" #include "dummy_navigation_server.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
void DummyNavigationServer::region_set_navigation_mesh(RID p_region, Ref<NavigationMesh> p_navigation_mesh) { void DummyNavigationServer::region_set_navigation_mesh(RID p_region, Ref<NavigationMesh> p_navigation_mesh) {
} }

4
modules/navigation_geometry_parsers/geometry_parser_2d/meshinstance2d_navigation_geometry_parser_2d.cpp
View File

@ -33,8 +33,8 @@
#include "scene/2d/mesh_instance_2d.h" #include "scene/2d/mesh_instance_2d.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
bool MeshInstance2DNavigationGeometryParser2D::parses_node(Node *p_node) { bool MeshInstance2DNavigationGeometryParser2D::parses_node(Node *p_node) {
return (Object::cast_to<MeshInstance2D>(p_node) != nullptr); return (Object::cast_to<MeshInstance2D>(p_node) != nullptr);

4
modules/navigation_geometry_parsers/geometry_parser_2d/multimeshinstance2d_navigation_geometry_parser_2d.cpp
View File

@ -34,8 +34,8 @@
#include "scene/2d/multimesh_instance_2d.h" #include "scene/2d/multimesh_instance_2d.h"
#include "scene/resources/multimesh.h" #include "scene/resources/multimesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
bool MultiMeshInstance2DNavigationGeometryParser2D::parses_node(Node *p_node) { bool MultiMeshInstance2DNavigationGeometryParser2D::parses_node(Node *p_node) {
return (Object::cast_to<MultiMeshInstance2D>(p_node) != nullptr); return (Object::cast_to<MultiMeshInstance2D>(p_node) != nullptr);

4
modules/navigation_geometry_parsers/geometry_parser_2d/polygon2d_navigation_geometry_parser_2d.cpp
View File

@ -32,8 +32,8 @@
#include "scene/2d/polygon_2d.h" #include "scene/2d/polygon_2d.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
bool Polygon2DNavigationGeometryParser2D::parses_node(Node *p_node) { bool Polygon2DNavigationGeometryParser2D::parses_node(Node *p_node) {
return (Object::cast_to<Polygon2D>(p_node) != nullptr); return (Object::cast_to<Polygon2D>(p_node) != nullptr);

4
modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp
View File

@ -40,8 +40,8 @@
#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
bool StaticBody2DNavigationGeometryParser2D::parses_node(Node *p_node) { bool StaticBody2DNavigationGeometryParser2D::parses_node(Node *p_node) {
return (Object::cast_to<StaticBody2D>(p_node) != nullptr); return (Object::cast_to<StaticBody2D>(p_node) != nullptr);

4
modules/navigation_geometry_parsers/geometry_parser_3d/meshinstance3d_navigation_geometry_parser_3d.cpp
View File

@ -32,8 +32,8 @@
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
bool MeshInstance3DNavigationGeometryParser3D::parses_node(Node *p_node) { bool MeshInstance3DNavigationGeometryParser3D::parses_node(Node *p_node) {
return (Object::cast_to<MeshInstance>(p_node) != nullptr); return (Object::cast_to<MeshInstance>(p_node) != nullptr);

4
modules/navigation_geometry_parsers/geometry_parser_3d/multimeshinstance3d_navigation_geometry_parser_3d.cpp
View File

@ -33,8 +33,8 @@
#include "scene/3d/multimesh_instance.h" #include "scene/3d/multimesh_instance.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/multimesh.h" #include "scene/resources/multimesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
bool MultiMeshInstance3DNavigationGeometryParser3D::parses_node(Node *p_node) { bool MultiMeshInstance3DNavigationGeometryParser3D::parses_node(Node *p_node) {
return (Object::cast_to<MultiMeshInstance>(p_node) != nullptr); return (Object::cast_to<MultiMeshInstance>(p_node) != nullptr);

4
modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
View File

@ -44,8 +44,8 @@
#include "scene/resources/shapes/shape.h" #include "scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "scene/resources/shapes/sphere_shape.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
bool StaticBody3DNavigationGeometryParser3D::parses_node(Node *p_node) { bool StaticBody3DNavigationGeometryParser3D::parses_node(Node *p_node) {
return (Object::cast_to<StaticBody>(p_node) != nullptr); return (Object::cast_to<StaticBody>(p_node) != nullptr);

4
modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.cpp
View File

@ -41,8 +41,8 @@
#include "scene/gui/button.h" #include "scene/gui/button.h"
#include "scene/gui/dialogs.h" #include "scene/gui/dialogs.h"
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#include "servers/navigation/navigation_mesh_generator.h" #include "servers/navigation/navigation_mesh_generator.h"
#include "scene/gui/separator.h" #include "scene/gui/separator.h"

4
modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.cpp
View File

@ -40,8 +40,8 @@
#include "scene/gui/dialogs.h" #include "scene/gui/dialogs.h"
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/gui/option_button.h" #include "scene/gui/option_button.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
#include "servers/navigation/navigation_mesh_generator.h" #include "servers/navigation/navigation_mesh_generator.h"
#include "scene/gui/separator.h" #include "scene/gui/separator.h"

6
modules/navigation_mesh_generator/pandemonium_navigation_mesh_generator.cpp
View File

@ -36,9 +36,9 @@
#include "scene/2d/navigation_geometry_parser_2d.h" #include "scene/2d/navigation_geometry_parser_2d.h"
#include "scene/3d/navigation_geometry_parser_3d.h" #include "scene/3d/navigation_geometry_parser_3d.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"

4
modules/tile_map/geometry_parser/tilemap_navigation_geometry_parser_2d.cpp
View File

@ -34,8 +34,8 @@
#include "modules/tile_map/tile_map.h" #include "modules/tile_map/tile_map.h"
#include "modules/tile_map/tile_set.h" #include "modules/tile_map/tile_set.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h"

2
modules/tile_map/tile_set.h
View File

@ -37,7 +37,7 @@
#include "scene/2d/light_occluder_2d.h" #include "scene/2d/light_occluder_2d.h"
#include "scene/2d/navigation_polygon_instance.h" #include "scene/2d/navigation_polygon_instance.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"

2
modules/tile_map/tile_set_editor_plugin.cpp
View File

@ -47,7 +47,7 @@
#include "scene/gui/scroll_container.h" #include "scene/gui/scroll_container.h"
#include "scene/gui/separator.h" #include "scene/gui/separator.h"
#include "scene/gui/spin_box.h" #include "scene/gui/spin_box.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "servers/navigation/navigation_mesh_generator.h" #include "servers/navigation/navigation_mesh_generator.h"
#include "scene/gui/check_box.h" #include "scene/gui/check_box.h"

2
scene/2d/navigation_2d.cpp
View File

@ -31,7 +31,7 @@
#include "navigation_2d.h" #include "navigation_2d.h"
#include "scene/2d/navigation_polygon_instance.h" #include "scene/2d/navigation_polygon_instance.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
#include "servers/navigation_2d_server.h" #include "servers/navigation_2d_server.h"
void Navigation2D::_bind_methods() { void Navigation2D::_bind_methods() {

4
scene/2d/navigation_geometry_parser_2d.cpp
View File

@ -32,8 +32,8 @@
#include "scene/2d/node_2d.h" #include "scene/2d/node_2d.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
bool NavigationGeometryParser2D::parses_node(Node *p_node) { bool NavigationGeometryParser2D::parses_node(Node *p_node) {
if (Object::cast_to<Node2D>(p_node)) { if (Object::cast_to<Node2D>(p_node)) {

6
scene/2d/navigation_polygon_instance.cpp
View File

@ -38,9 +38,9 @@
#include "core/os/os.h" #include "core/os/os.h"
#include "navigation_2d.h" #include "navigation_2d.h"
#include "scene/2d/navigation_obstacle_2d.h" #include "scene/2d/navigation_obstacle_2d.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
#include "scene/resources/world_2d.h" #include "scene/resources/world_2d.h"
#include "servers/navigation/navigation_mesh_generator.h" #include "servers/navigation/navigation_mesh_generator.h"
#include "servers/navigation_2d_server.h" #include "servers/navigation_2d_server.h"

4
scene/3d/navigation_geometry_parser_3d.cpp
View File

@ -32,8 +32,8 @@
#include "spatial.h" #include "spatial.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
bool NavigationGeometryParser3D::parses_node(Node *p_node) { bool NavigationGeometryParser3D::parses_node(Node *p_node) {

4
scene/3d/navigation_mesh_instance.cpp
View File

@ -35,8 +35,8 @@
#include "mesh_instance.h" #include "mesh_instance.h"
#include "navigation.h" #include "navigation.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"
#include "servers/navigation/navigation_mesh_generator.h" #include "servers/navigation/navigation_mesh_generator.h"
#include "servers/navigation_server.h" #include "servers/navigation_server.h"

8
scene/register_scene_types.cpp
View File

@ -159,10 +159,10 @@
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/mesh_data_tool.h" #include "scene/resources/mesh_data_tool.h"
#include "scene/resources/multimesh.h" #include "scene/resources/multimesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/particles_material.h" #include "scene/resources/particles_material.h"
#include "scene/resources/physics_material.h" #include "scene/resources/physics_material.h"

14
scene/resources/SCsub
View File

@ -32,6 +32,20 @@ env.add_source_files(shapes_3d_obj, "shapes/*.cpp")
for o in shapes_3d_obj: for o in shapes_3d_obj:
scene_obj.append(o) scene_obj.append(o)
# 2d navigation
navigation_2d_obj = []
env.add_source_files(navigation_2d_obj, "navigation_2d/*.cpp")
for o in navigation_2d_obj:
scene_obj.append(o)
# 3d navigation
navigation_obj = []
env.add_source_files(navigation_obj, "navigation/*.cpp")
for o in navigation_obj:
scene_obj.append(o)
env.scene_sources += scene_obj env.scene_sources += scene_obj
# Needed to force rebuilding the scene files when the thirdparty code is updated. # Needed to force rebuilding the scene files when the thirdparty code is updated.

2
scene/resources/importer_mesh.h
View File

@ -36,7 +36,7 @@
#include "scene/resources/shapes/concave_polygon_shape.h" #include "scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include <cstdint> #include <cstdint>

0
scene/resources/navigation_mesh.cpp → scene/resources/navigation/navigation_mesh.cpp
View File

0
scene/resources/navigation_mesh.h → scene/resources/navigation/navigation_mesh.h
View File

0
scene/resources/navigation_mesh_source_geometry_data_3d.cpp → scene/resources/navigation/navigation_mesh_source_geometry_data_3d.cpp
View File

2
scene/resources/navigation_mesh_source_geometry_data_3d.h → scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h
View File

@ -35,7 +35,7 @@
#include "core/math/transform.h" #include "core/math/transform.h"
#include "mesh.h" #include "scene/resources/mesh.h"
class NavigationMeshSourceGeometryData3D : public Resource { class NavigationMeshSourceGeometryData3D : public Resource {
GDCLASS(NavigationMeshSourceGeometryData3D, Resource); GDCLASS(NavigationMeshSourceGeometryData3D, Resource);

0
scene/resources/navigation_mesh_source_geometry_data_2d.cpp → scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.cpp
View File

2
scene/resources/navigation_mesh_source_geometry_data_2d.h → scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h
View File

@ -32,7 +32,7 @@
/**************************************************************************/ /**************************************************************************/
#include "scene/2d/node_2d.h" #include "scene/2d/node_2d.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
class NavigationMeshSourceGeometryData2D : public Resource { class NavigationMeshSourceGeometryData2D : public Resource {
GDCLASS(NavigationMeshSourceGeometryData2D, Resource); GDCLASS(NavigationMeshSourceGeometryData2D, Resource);

2
scene/resources/navigation_polygon.cpp → scene/resources/navigation_2d/navigation_polygon.cpp
View File

@ -34,7 +34,7 @@
#include "core/core_string_names.h" #include "core/core_string_names.h"
#include "core/os/mutex.h" #include "core/os/mutex.h"
#include "scene/2d/navigation_2d.h" #include "scene/2d/navigation_2d.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/world_2d.h" #include "scene/resources/world_2d.h"
#include "servers/navigation/navigation_mesh_generator.h" #include "servers/navigation/navigation_mesh_generator.h"
#include "servers/navigation_2d_server.h" #include "servers/navigation_2d_server.h"

0
scene/resources/navigation_polygon.h → scene/resources/navigation_2d/navigation_polygon.h
View File

6
servers/navigation/navigation_mesh_generator.cpp
View File

@ -37,10 +37,10 @@
#include "scene/3d/navigation_geometry_parser_3d.h" #include "scene/3d/navigation_geometry_parser_3d.h"
#endif // _3D_DISABLED #endif // _3D_DISABLED
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#endif // _3D_DISABLED #endif // _3D_DISABLED
NavigationMeshGenerator *NavigationMeshGenerator::singleton = nullptr; NavigationMeshGenerator *NavigationMeshGenerator::singleton = nullptr;

6
servers/navigation/navigation_mesh_generator_dummy.cpp
View File

@ -8,10 +8,10 @@
#include "scene/3d/navigation_geometry_parser_3d.h" #include "scene/3d/navigation_geometry_parser_3d.h"
#endif // _3D_DISABLED #endif // _3D_DISABLED
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#endif // _3D_DISABLED #endif // _3D_DISABLED
void NavigationMeshGeneratorDummy::cleanup() {} void NavigationMeshGeneratorDummy::cleanup() {}

2
servers/navigation_2d_server.h
View File

@ -36,7 +36,7 @@
#include "navigation/navigation_utilities.h" #include "navigation/navigation_utilities.h"
#include "scene/2d/navigation_polygon_instance.h" #include "scene/2d/navigation_polygon_instance.h"
#include "scene/resources/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
class NavigationPathQueryParameters2D; class NavigationPathQueryParameters2D;
class NavigationPathQueryResult2D; class NavigationPathQueryResult2D;

2
servers/navigation_server.cpp
View File

@ -34,7 +34,7 @@
#include "navigation/navigation_path_query_parameters_3d.h" #include "navigation/navigation_path_query_parameters_3d.h"
#include "navigation/navigation_path_query_result_3d.h" #include "navigation/navigation_path_query_result_3d.h"
#include "scene/3d/navigation_mesh_instance.h" #include "scene/3d/navigation_mesh_instance.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
#include "core/config/engine.h" #include "core/config/engine.h"