seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move server files into their subfolders

Browse Source
This commit is contained in:
Aaron Franke
2024-03-11 20:27:45 -07:00
parent d705613db3
commit 3d1c9fd5de
393 changed files with 600 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/navigation_3d/3d/godot_navigation_server_3d.cpp
View File

@ -35,7 +35,7 @@
#include "nav_mesh_generator_3d.h"
using namespace NavigationUtilities;
using namespace NavigationDefaults3D;
/// Creates a struct for each function and a function that once called creates
/// an instance of that struct with the submitted parameters.

6
modules/navigation_3d/3d/godot_navigation_server_3d.h
View File

@ -39,9 +39,9 @@
#include "core/templates/local_vector.h"
#include "core/templates/rid.h"
#include "core/templates/rid_owner.h"
#include "servers/navigation/navigation_path_query_parameters_3d.h"
#include "servers/navigation/navigation_path_query_result_3d.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
#include "servers/navigation_3d/navigation_path_query_result_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
/// The commands are functions executed during the `sync` phase.

6
modules/navigation_3d/3d/nav_base_iteration_3d.h
View File

@ -33,7 +33,7 @@
#include "../nav_utils_3d.h"
#include "core/object/ref_counted.h"
#include "servers/navigation/navigation_utilities.h"
#include "servers/navigation_3d/navigation_constants_3d.h"
class NavBaseIteration3D : public RefCounted {
GDCLASS(NavBaseIteration3D, RefCounted);
@ -43,7 +43,7 @@ public:
uint32_t navigation_layers = 1;
real_t enter_cost = 0.0;
real_t travel_cost = 1.0;
NavigationUtilities::PathSegmentType owner_type;
NavigationEnums3D::PathSegmentType owner_type;
ObjectID owner_object_id;
RID owner_rid;
bool owner_use_edge_connections = false;
@ -51,7 +51,7 @@ public:
LocalVector<LocalVector<Nav3D::Connection>> internal_connections;
bool get_enabled() const { return enabled; }
NavigationUtilities::PathSegmentType get_type() const { return owner_type; }
NavigationEnums3D::PathSegmentType get_type() const { return owner_type; }
RID get_self() const { return owner_rid; }
ObjectID get_owner_id() const { return owner_object_id; }
uint32_t get_navigation_layers() const { return navigation_layers; }

2
modules/navigation_3d/3d/nav_mesh_generator_3d.h
View File

@ -33,7 +33,7 @@
#include "core/object/class_db.h"
#include "core/object/worker_thread_pool.h"
#include "core/templates/rid_owner.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
class Node;
class NavigationMesh;

7
modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
View File

@ -36,7 +36,6 @@
#include "core/math/geometry_2d.h"
#include "core/math/geometry_3d.h"
#include "servers/navigation/navigation_utilities.h"
using namespace Nav3D;
@ -151,7 +150,7 @@ void NavMeshQueries3D::map_query_path(NavMap3D *map, const Ref<NavigationPathQue
ERR_FAIL_COND(p_query_parameters.is_null());
ERR_FAIL_COND(p_query_result.is_null());
using namespace NavigationUtilities;
using namespace NavigationDefaults3D;
NavMeshQueries3D::NavMeshPathQueryTask3D query_task;
query_task.start_position = p_query_parameters->get_start_position();
@ -1297,7 +1296,7 @@ bool NavMeshQueries3D::_query_task_is_connection_owner_usable(const NavMeshPathQ
if (p_query_task.exclude_regions || p_query_task.include_regions) {
switch (p_owner->get_type()) {
case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION: {
case NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_REGION: {
if (p_query_task.exclude_regions && p_query_task.excluded_regions.has(p_owner->get_self())) {
// Not usable. Exclude region filter is active and this region is excluded.
owner_usable = false;
@ -1306,7 +1305,7 @@ bool NavMeshQueries3D::_query_task_is_connection_owner_usable(const NavMeshPathQ
owner_usable = false;
}
} break;
case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK: {
case NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_LINK: {
const LocalVector<Polygon> &link_polygons = p_owner->get_navmesh_polygons();
if (link_polygons.size() != 2) {
// Not usable. Whatever this is, it is not a valid connected link.

11
modules/navigation_3d/3d/nav_mesh_queries_3d.h
View File

@ -34,12 +34,13 @@
#include "core/templates/a_hash_map.h"
#include "servers/navigation/navigation_globals.h"
#include "servers/navigation/navigation_path_query_parameters_3d.h"
#include "servers/navigation/navigation_path_query_result_3d.h"
#include "servers/navigation/navigation_utilities.h"
#include "servers/nav_heap.h"
#include "servers/navigation_3d/navigation_constants_3d.h"
#include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
#include "servers/navigation_3d/navigation_path_query_result_3d.h"
using namespace NavigationUtilities;
using namespace NavigationDefaults3D;
using namespace NavigationEnums3D;
class NavMap3D;
struct NavMapIteration3D;

2
modules/navigation_3d/3d/navigation_mesh_generator.cpp
View File

@ -31,7 +31,7 @@
#include "navigation_mesh_generator.h"
#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
NavigationMeshGenerator *NavigationMeshGenerator::singleton = nullptr;

2
modules/navigation_3d/editor/navigation_link_3d_gizmo_plugin.cpp
View File

@ -33,7 +33,7 @@
#include "editor/editor_undo_redo_manager.h"
#include "editor/scene/3d/node_3d_editor_plugin.h"
#include "scene/3d/navigation/navigation_link_3d.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
NavigationLink3DGizmoPlugin::NavigationLink3DGizmoPlugin() {
create_material("navigation_link_material", NavigationServer3D::get_singleton()->get_debug_navigation_link_connection_color());

2
modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
View File

@ -39,7 +39,7 @@
#include "scene/3d/navigation/navigation_obstacle_3d.h"
#include "scene/gui/button.h"
#include "scene/gui/dialogs.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
bool NavigationObstacle3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
return Object::cast_to<NavigationObstacle3D>(p_spatial) != nullptr;

2
modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp
View File

@ -39,7 +39,7 @@
#include "scene/gui/button.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/label.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
void NavigationRegion3DEditor::_node_removed(Node *p_node) {
if (selected_regions.is_empty()) {

2
modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.cpp
View File

@ -32,7 +32,7 @@
#include "core/math/random_pcg.h"
#include "scene/3d/navigation/navigation_region_3d.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
NavigationRegion3DGizmoPlugin::NavigationRegion3DGizmoPlugin() {
create_material("face_material", NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color(), false, false, true);

2
modules/navigation_3d/nav_agent_3d.h
View File

@ -34,7 +34,7 @@
#include "core/object/class_db.h"
#include "core/templates/self_list.h"
#include "servers/navigation/navigation_globals.h"
#include "servers/navigation_3d/navigation_constants_3d.h"
#include <Agent2d.h>
#include <Agent3d.h>

6
modules/navigation_3d/nav_base_3d.h
View File

@ -33,7 +33,7 @@
#include "nav_rid_3d.h"
#include "nav_utils_3d.h"
#include "servers/navigation/navigation_utilities.h"
#include "servers/navigation_3d/navigation_constants_3d.h"
class NavMap3D;
@ -43,10 +43,10 @@ protected:
real_t enter_cost = 0.0;
real_t travel_cost = 1.0;
ObjectID owner_id;
NavigationUtilities::PathSegmentType type;
NavigationEnums3D::PathSegmentType type;
public:
NavigationUtilities::PathSegmentType get_type() const { return type; }
NavigationEnums3D::PathSegmentType get_type() const { return type; }
virtual void set_use_edge_connections(bool p_enabled) {}
virtual bool get_use_edge_connections() const { return false; }

2
modules/navigation_3d/nav_link_3d.cpp
View File

@ -203,7 +203,7 @@ Ref<NavLinkIteration3D> NavLink3D::get_iteration() {
NavLink3D::NavLink3D() :
sync_dirty_request_list_element(this) {
type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK;
type = NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_LINK;
iteration.instantiate();
}

2
modules/navigation_3d/nav_map_3d.cpp
View File

@ -40,7 +40,7 @@
#include "core/config/project_settings.h"
#include "core/object/worker_thread_pool.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
#include <Obstacle2d.h>

2
modules/navigation_3d/nav_map_3d.h
View File

@ -37,7 +37,7 @@
#include "core/math/math_defs.h"
#include "core/object/worker_thread_pool.h"
#include "servers/navigation/navigation_globals.h"
#include "servers/navigation_3d/navigation_constants_3d.h"
#include <KdTree2d.h>
#include <KdTree3d.h>

2
modules/navigation_3d/nav_region_3d.cpp
View File

@ -356,7 +356,7 @@ bool NavRegion3D::get_use_async_iterations() const {
NavRegion3D::NavRegion3D() :
sync_dirty_request_list_element(this), async_list_element(this) {
type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION;
type = NavigationEnums3D::PathSegmentType::PATH_SEGMENT_TYPE_REGION;
iteration_build.region = this;
iteration.instantiate();

4
modules/navigation_3d/nav_utils_3d.h
View File

@ -34,8 +34,8 @@
#include "core/object/ref_counted.h"
#include "core/templates/hash_map.h"
#include "core/templates/hashfuncs.h"
#include "servers/navigation/nav_heap.h"
#include "servers/navigation/navigation_utilities.h"
#include "core/templates/local_vector.h"
#include "servers/navigation_3d/navigation_constants_3d.h"
class NavBaseIteration3D;

2
modules/navigation_3d/register_types.cpp
View File

@ -43,7 +43,7 @@
#endif
#include "core/config/engine.h"
#include "servers/navigation_server_3d.h"
#include "servers/navigation_3d/navigation_server_3d.h"
#ifndef DISABLE_DEPRECATED
NavigationMeshGenerator *_nav_mesh_generator = nullptr;