Browse Source

Move 2D-only navigation code to its own subfolder

Aaron Franke 1 year ago
parent
commit
fd582dca62

+ 0 - 0
modules/navigation/godot_navigation_server_2d.cpp → modules/navigation/2d/godot_navigation_server_2d.cpp


+ 5 - 5
modules/navigation/godot_navigation_server_2d.h → modules/navigation/2d/godot_navigation_server_2d.h

@@ -31,11 +31,11 @@
 #ifndef GODOT_NAVIGATION_SERVER_2D_H
 #ifndef GODOT_NAVIGATION_SERVER_2D_H
 #define GODOT_NAVIGATION_SERVER_2D_H
 #define GODOT_NAVIGATION_SERVER_2D_H
 
 
-#include "nav_agent.h"
-#include "nav_link.h"
-#include "nav_map.h"
-#include "nav_obstacle.h"
-#include "nav_region.h"
+#include "../nav_agent.h"
+#include "../nav_link.h"
+#include "../nav_map.h"
+#include "../nav_obstacle.h"
+#include "../nav_region.h"
 
 
 #include "servers/navigation_server_2d.h"
 #include "servers/navigation_server_2d.h"
 
 

+ 0 - 0
modules/navigation/nav_mesh_generator_2d.cpp → modules/navigation/2d/nav_mesh_generator_2d.cpp


+ 0 - 0
modules/navigation/nav_mesh_generator_2d.h → modules/navigation/2d/nav_mesh_generator_2d.h


+ 1 - 0
modules/navigation/SCsub

@@ -74,6 +74,7 @@ env.modules_sources += thirdparty_obj
 module_obj = []
 module_obj = []
 
 
 env_navigation.add_source_files(module_obj, "*.cpp")
 env_navigation.add_source_files(module_obj, "*.cpp")
+env_navigation.add_source_files(module_obj, "2d/*.cpp")
 if env.editor_build:
 if env.editor_build:
     env_navigation.add_source_files(module_obj, "editor/*.cpp")
     env_navigation.add_source_files(module_obj, "editor/*.cpp")
 env.modules_sources += module_obj
 env.modules_sources += module_obj

+ 1 - 1
modules/navigation/register_types.cpp

@@ -30,8 +30,8 @@
 
 
 #include "register_types.h"
 #include "register_types.h"
 
 
+#include "2d/godot_navigation_server_2d.h"
 #include "godot_navigation_server.h"
 #include "godot_navigation_server.h"
-#include "godot_navigation_server_2d.h"
 
 
 #ifndef DISABLE_DEPRECATED
 #ifndef DISABLE_DEPRECATED
 #ifndef _3D_DISABLED
 #ifndef _3D_DISABLED