Skip to content

Commit

Permalink
Move NavigationMeshSourceGeometryData(2D/3D) to the 2D/3D subfolders
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaronfranke
aaronfranke committed Apr 16, 2024
1 parent 4728ff3 commit 77e35cf
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 16 deletions.
4 changes: 2 additions & 2 deletions modules/navigation/2d/nav_mesh_generator_2d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
#include "scene/resources/2d/circle_shape_2d.h"
#include "scene/resources/2d/concave_polygon_shape_2d.h"
#include "scene/resources/2d/convex_polygon_shape_2d.h"
#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/2d/navigation_polygon.h"
#include "scene/resources/2d/rectangle_shape_2d.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h"

#include "thirdparty/clipper2/include/clipper2/clipper.h"
#include "thirdparty/misc/polypartition.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/navigation/3d/nav_mesh_generator_3d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
#include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/3d/cylinder_shape_3d.h"
#include "scene/resources/3d/height_map_shape_3d.h"
#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/3d/primitive_meshes.h"
#include "scene/resources/3d/shape_3d.h"
#include "scene/resources/3d/sphere_shape_3d.h"
#include "scene/resources/3d/world_boundary_shape_3d.h"
#include "scene/resources/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"

#include "modules/modules_enabled.gen.h" // For csg, gridmap.

Expand Down
2 changes: 1 addition & 1 deletion modules/navigation/3d/navigation_mesh_generator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "navigation_mesh_generator.h"

#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
#include "servers/navigation_server_3d.h"

NavigationMeshGenerator *NavigationMeshGenerator::singleton = nullptr;
Expand Down
1 change: 0 additions & 1 deletion modules/navigation/editor/navigation_mesh_editor_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include "scene/gui/button.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/label.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"

void NavigationMeshEditor::_node_removed(Node *p_node) {
if (p_node == node) {
Expand Down
2 changes: 1 addition & 1 deletion scene/2d/navigation_region_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef NAVIGATION_REGION_2D_H
#define NAVIGATION_REGION_2D_H

#include "scene/resources/navigation_polygon.h"
#include "scene/resources/2d/navigation_polygon.h"

class NavigationRegion2D : public Node2D {
GDCLASS(NavigationRegion2D, Node2D);
Expand Down
2 changes: 1 addition & 1 deletion scene/3d/navigation_region_3d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "navigation_region_3d.h"

#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
#include "servers/navigation_server_3d.h"

RID NavigationRegion3D::get_rid() const {
Expand Down
8 changes: 4 additions & 4 deletions scene/register_scene_types.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@
#include "scene/resources/mesh_texture.h"
#include "scene/resources/multimesh.h"
#include "scene/resources/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/navigation_polygon.h"
#include "scene/resources/packed_scene.h"
#include "scene/resources/particle_process_material.h"
#include "scene/resources/physics_material.h"
Expand Down Expand Up @@ -213,6 +210,8 @@
#include "scene/resources/2d/circle_shape_2d.h"
#include "scene/resources/2d/concave_polygon_shape_2d.h"
#include "scene/resources/2d/convex_polygon_shape_2d.h"
#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/2d/navigation_polygon.h"
#include "scene/resources/2d/polygon_path_finder.h"
#include "scene/resources/2d/rectangle_shape_2d.h"
#include "scene/resources/2d/segment_shape_2d.h"
Expand Down Expand Up @@ -299,6 +298,7 @@
#include "scene/resources/3d/height_map_shape_3d.h"
#include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/3d/mesh_library.h"
#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/3d/primitive_meshes.h"
#include "scene/resources/3d/separation_ray_shape_3d.h"
#include "scene/resources/3d/sky_material.h"
Expand Down Expand Up @@ -883,6 +883,7 @@ void register_scene_types() {
BaseMaterial3D::init_shaders();

GDREGISTER_CLASS(MeshLibrary);
GDREGISTER_CLASS(NavigationMeshSourceGeometryData3D);

OS::get_singleton()->yield(); // may take time to init

Expand Down Expand Up @@ -1004,7 +1005,6 @@ void register_scene_types() {

GDREGISTER_CLASS(NavigationMesh);
GDREGISTER_CLASS(NavigationMeshSourceGeometryData2D);
GDREGISTER_CLASS(NavigationMeshSourceGeometryData3D);
GDREGISTER_CLASS(NavigationPolygon);
GDREGISTER_CLASS(NavigationRegion2D);
GDREGISTER_CLASS(NavigationAgent2D);
Expand Down
0 ...vigation_mesh_source_geometry_data_2d.cpp → ...vigation_mesh_source_geometry_data_2d.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...navigation_mesh_source_geometry_data_2d.h → ...navigation_mesh_source_geometry_data_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include "core/os/rw_lock.h"
#include "scene/2d/node_2d.h"
#include "scene/resources/navigation_polygon.h"
#include "scene/resources/2d/navigation_polygon.h"

class NavigationMeshSourceGeometryData2D : public Resource {
GDCLASS(NavigationMeshSourceGeometryData2D, Resource);
Expand Down
0 scene/resources/navigation_polygon.cpp → scene/resources/2d/navigation_polygon.cpp
View file
File renamed without changes.
0 scene/resources/navigation_polygon.h → scene/resources/2d/navigation_polygon.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion scene/resources/2d/tile_set.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#include "scene/2d/light_occluder_2d.h"
#include "scene/main/canvas_item.h"
#include "scene/resources/2d/convex_polygon_shape_2d.h"
#include "scene/resources/2d/navigation_polygon.h"
#include "scene/resources/image_texture.h"
#include "scene/resources/navigation_polygon.h"
#include "scene/resources/packed_scene.h"
#include "scene/resources/physics_material.h"

Expand Down
0 ...vigation_mesh_source_geometry_data_3d.cpp → ...vigation_mesh_source_geometry_data_3d.cpp
View file
File renamed without changes.
0 ...navigation_mesh_source_geometry_data_3d.h → ...navigation_mesh_source_geometry_data_3d.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions servers/navigation_server_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include "core/object/class_db.h"
#include "core/templates/rid.h"

#include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_polygon.h"
#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/2d/navigation_polygon.h"
#include "servers/navigation/navigation_path_query_parameters_2d.h"
#include "servers/navigation/navigation_path_query_result_2d.h"

Expand Down
2 changes: 2 additions & 0 deletions servers/navigation_server_3d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,12 @@ void NavigationServer3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("obstacle_set_avoidance_layers", "obstacle", "layers"), &NavigationServer3D::obstacle_set_avoidance_layers);
ClassDB::bind_method(D_METHOD("obstacle_get_avoidance_layers", "obstacle"), &NavigationServer3D::obstacle_get_avoidance_layers);

#ifndef _3D_DISABLED
ClassDB::bind_method(D_METHOD("parse_source_geometry_data", "navigation_mesh", "source_geometry_data", "root_node", "callback"), &NavigationServer3D::parse_source_geometry_data, DEFVAL(Callable()));
ClassDB::bind_method(D_METHOD("bake_from_source_geometry_data", "navigation_mesh", "source_geometry_data", "callback"), &NavigationServer3D::bake_from_source_geometry_data, DEFVAL(Callable()));
ClassDB::bind_method(D_METHOD("bake_from_source_geometry_data_async", "navigation_mesh", "source_geometry_data", "callback"), &NavigationServer3D::bake_from_source_geometry_data_async, DEFVAL(Callable()));
ClassDB::bind_method(D_METHOD("is_baking_navigation_mesh", "navigation_mesh"), &NavigationServer3D::is_baking_navigation_mesh);
#endif // _3D_DISABLED

ClassDB::bind_method(D_METHOD("simplify_path", "path", "epsilon"), &NavigationServer3D::simplify_path);

Expand Down
4 changes: 3 additions & 1 deletion servers/navigation_server_3d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include "core/object/class_db.h"
#include "core/templates/rid.h"

#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
#include "servers/navigation/navigation_path_query_parameters_3d.h"
#include "servers/navigation/navigation_path_query_result_3d.h"

Expand Down Expand Up @@ -344,10 +344,12 @@ class NavigationServer3D : public Object {

virtual NavigationUtilities::PathQueryResult _query_path(const NavigationUtilities::PathQueryParameters &p_parameters) const = 0;

#ifndef _3D_DISABLED
virtual void parse_source_geometry_data(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, Node *p_root_node, const Callable &p_callback = Callable()) = 0;
virtual void bake_from_source_geometry_data(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, const Callable &p_callback = Callable()) = 0;
virtual void bake_from_source_geometry_data_async(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, const Callable &p_callback = Callable()) = 0;
virtual bool is_baking_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh) const = 0;
#endif // _3D_DISABLED

virtual Vector<Vector3> simplify_path(const Vector<Vector3> &p_path, real_t p_epsilon) = 0;

Expand Down
2 changes: 2 additions & 0 deletions servers/navigation_server_3d_dummy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,12 @@ class NavigationServer3DDummy : public NavigationServer3D {
void obstacle_set_avoidance_layers(RID p_obstacle, uint32_t p_layers) override {}
uint32_t obstacle_get_avoidance_layers(RID p_obstacle) const override { return 0; }

#ifndef _3D_DISABLED
void parse_source_geometry_data(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, Node *p_root_node, const Callable &p_callback = Callable()) override {}
void bake_from_source_geometry_data(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, const Callable &p_callback = Callable()) override {}
void bake_from_source_geometry_data_async(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, const Callable &p_callback = Callable()) override {}
bool is_baking_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh) const override { return false; }
#endif // _3D_DISABLED

Vector<Vector3> simplify_path(const Vector<Vector3> &p_path, real_t p_epsilon) override { return Vector<Vector3>(); }

Expand Down

0 comments on commit 77e35cf

Please sign in to comment.