godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

[Navigation] Add some missing compile checks

Browse Source
This commit is contained in:
A Thousand Ships
2024-02-22 20:21:43 +01:00
parent b15105a358
commit 12cecf726f
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/navigation/godot_navigation_server.cpp
View File

@@ -1131,7 +1131,11 @@ void GodotNavigationServer::bake_from_source_geometry_data_async(const Ref<Navig
} }
bool GodotNavigationServer::is_baking_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh) const { bool GodotNavigationServer::is_baking_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh) const {
#ifdef _3D_DISABLED
return false;
#else
return NavMeshGenerator3D::get_singleton()->is_baking(p_navigation_mesh); return NavMeshGenerator3D::get_singleton()->is_baking(p_navigation_mesh);
#endif // _3D_DISABLED
} }
COMMAND_1(free, RID, p_object) { COMMAND_1(free, RID, p_object) {

4
modules/navigation/godot_navigation_server_2d.cpp
View File

@@ -222,7 +222,11 @@ void GodotNavigationServer2D::bake_from_source_geometry_data_async(const Ref<Nav
} }
bool GodotNavigationServer2D::is_baking_navigation_polygon(Ref<NavigationPolygon> p_navigation_polygon) const { bool GodotNavigationServer2D::is_baking_navigation_polygon(Ref<NavigationPolygon> p_navigation_polygon) const {
#ifdef CLIPPER2_ENABLED
return NavMeshGenerator2D::get_singleton()->is_baking(p_navigation_polygon); return NavMeshGenerator2D::get_singleton()->is_baking(p_navigation_polygon);
#else
return false;
#endif
} }
GodotNavigationServer2D::GodotNavigationServer2D() {} GodotNavigationServer2D::GodotNavigationServer2D() {}

4
modules/navigation/nav_mesh_generator_2d.cpp
View File

@@ -28,6 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/ /**************************************************************************/
#ifdef CLIPPER2_ENABLED
#include "nav_mesh_generator_2d.h" #include "nav_mesh_generator_2d.h"
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
@@ -902,3 +904,5 @@ void NavMeshGenerator2D::generator_bake_from_source_geometry_data(Ref<Navigation
p_navigation_mesh->add_polygon(new_polygons[i]); p_navigation_mesh->add_polygon(new_polygons[i]);
} }
} }
#endif // CLIPPER2_ENABLED

4
modules/navigation/nav_mesh_generator_2d.h
View File

@@ -31,6 +31,8 @@
#ifndef NAV_MESH_GENERATOR_2D_H #ifndef NAV_MESH_GENERATOR_2D_H
#define NAV_MESH_GENERATOR_2D_H #define NAV_MESH_GENERATOR_2D_H
#ifdef CLIPPER2_ENABLED
#include "core/object/class_db.h" #include "core/object/class_db.h"
#include "core/object/worker_thread_pool.h" #include "core/object/worker_thread_pool.h"
@@ -98,4 +100,6 @@ public:
~NavMeshGenerator2D(); ~NavMeshGenerator2D();
}; };
#endif // CLIPPER2_ENABLED
#endif // NAV_MESH_GENERATOR_2D_H #endif // NAV_MESH_GENERATOR_2D_H