From 888072256543f495805f75a55482528f691e78ca Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 5 Sep 2023 11:57:34 +0200 Subject: [PATCH] Removed cell height getters and setters from the Navigation2DServer. --- modules/navigation/pandemonium_navigation_2d_server.cpp | 3 --- modules/navigation/pandemonium_navigation_2d_server.h | 4 ---- modules/navigation_dummy/dummy_navigation_2d_server.h | 2 -- scene/resources/world_2d.cpp | 1 - servers/navigation_2d_server.cpp | 2 -- servers/navigation_2d_server.h | 4 ---- 6 files changed, 16 deletions(-) diff --git a/modules/navigation/pandemonium_navigation_2d_server.cpp b/modules/navigation/pandemonium_navigation_2d_server.cpp index 7575017c1..5ca977640 100644 --- a/modules/navigation/pandemonium_navigation_2d_server.cpp +++ b/modules/navigation/pandemonium_navigation_2d_server.cpp @@ -252,9 +252,6 @@ real_t FORWARD_1_C(map_get_cell_size, RID, p_map, rid_to_rid); void FORWARD_2(map_set_use_edge_connections, RID, p_map, bool, p_enabled, rid_to_rid, bool_to_bool); bool FORWARD_1_C(map_get_use_edge_connections, RID, p_map, rid_to_rid); -void FORWARD_2(map_set_cell_height, RID, p_map, real_t, p_cell_height, rid_to_rid, real_to_real); -real_t FORWARD_1_C(map_get_cell_height, RID, p_map, rid_to_rid); - void FORWARD_2(map_set_edge_connection_margin, RID, p_map, real_t, p_connection_margin, rid_to_rid, real_to_real); real_t FORWARD_1_C(map_get_edge_connection_margin, RID, p_map, rid_to_rid); diff --git a/modules/navigation/pandemonium_navigation_2d_server.h b/modules/navigation/pandemonium_navigation_2d_server.h index 02660a299..18289fd39 100644 --- a/modules/navigation/pandemonium_navigation_2d_server.h +++ b/modules/navigation/pandemonium_navigation_2d_server.h @@ -66,10 +66,6 @@ public: virtual void map_set_use_edge_connections(RID p_map, bool p_enabled); virtual bool map_get_use_edge_connections(RID p_map) const; - /// Set the map cell height used to weld the navigation mesh polygons. - virtual void map_set_cell_height(RID p_map, real_t p_cell_height); - virtual real_t map_get_cell_height(RID p_map) const; - /// Set the map edge connection margin used to weld the compatible region edges. virtual void map_set_edge_connection_margin(RID p_map, real_t p_connection_margin); diff --git a/modules/navigation_dummy/dummy_navigation_2d_server.h b/modules/navigation_dummy/dummy_navigation_2d_server.h index 73037c3d2..3d3a66586 100644 --- a/modules/navigation_dummy/dummy_navigation_2d_server.h +++ b/modules/navigation_dummy/dummy_navigation_2d_server.h @@ -16,8 +16,6 @@ public: virtual bool map_is_active(RID p_map) const { return false; } virtual void map_set_cell_size(RID p_map, real_t p_cell_size) {} virtual real_t map_get_cell_size(RID p_map) const { return 0; } - virtual void map_set_cell_height(RID p_map, real_t p_cell_height) {} - virtual real_t map_get_cell_height(RID p_map) const { return 0; } virtual void map_set_use_edge_connections(RID p_map, bool p_enabled) {} virtual bool map_get_use_edge_connections(RID p_map) const { return false; } virtual void map_set_edge_connection_margin(RID p_map, real_t p_connection_margin) {} diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp index 0e3c14623..c437249b4 100644 --- a/scene/resources/world_2d.cpp +++ b/scene/resources/world_2d.cpp @@ -382,7 +382,6 @@ World2D::World2D() { navigation_map = Navigation2DServer::get_singleton()->map_create(); Navigation2DServer::get_singleton()->map_set_active(navigation_map, true); Navigation2DServer::get_singleton()->map_set_cell_size(navigation_map, GLOBAL_DEF("navigation/2d/default_cell_size", 1.0)); - Navigation2DServer::get_singleton()->map_set_cell_height(navigation_map, GLOBAL_DEF("navigation/2d/default_cell_height", 1.0)); Navigation2DServer::get_singleton()->map_set_edge_connection_margin(navigation_map, GLOBAL_DEF("navigation/2d/default_edge_connection_margin", 1.0)); Navigation2DServer::get_singleton()->map_set_link_connection_radius(navigation_map, GLOBAL_DEF("navigation/2d/default_link_connection_radius", 4.0)); Navigation2DServer::get_singleton()->map_set_use_edge_connections(navigation_map, GLOBAL_DEF("navigation/2d/use_edge_connections", true)); diff --git a/servers/navigation_2d_server.cpp b/servers/navigation_2d_server.cpp index 40dd6eed7..9d1f85529 100644 --- a/servers/navigation_2d_server.cpp +++ b/servers/navigation_2d_server.cpp @@ -47,8 +47,6 @@ void Navigation2DServer::_bind_methods() { ClassDB::bind_method(D_METHOD("map_get_cell_size", "map"), &Navigation2DServer::map_get_cell_size); ClassDB::bind_method(D_METHOD("map_set_use_edge_connections", "map", "enabled"), &Navigation2DServer::map_set_use_edge_connections); ClassDB::bind_method(D_METHOD("map_get_use_edge_connections", "map"), &Navigation2DServer::map_get_use_edge_connections); - ClassDB::bind_method(D_METHOD("map_set_cell_height", "map", "cell_height"), &Navigation2DServer::map_set_cell_size); - ClassDB::bind_method(D_METHOD("map_get_cell_height", "map"), &Navigation2DServer::map_get_cell_size); ClassDB::bind_method(D_METHOD("map_set_edge_connection_margin", "map", "margin"), &Navigation2DServer::map_set_edge_connection_margin); ClassDB::bind_method(D_METHOD("map_get_edge_connection_margin", "map"), &Navigation2DServer::map_get_edge_connection_margin); ClassDB::bind_method(D_METHOD("map_set_link_connection_radius", "map", "radius"), &Navigation2DServer::map_set_link_connection_radius); diff --git a/servers/navigation_2d_server.h b/servers/navigation_2d_server.h index 994b57e6d..ce1bd50f8 100644 --- a/servers/navigation_2d_server.h +++ b/servers/navigation_2d_server.h @@ -73,10 +73,6 @@ public: virtual void map_set_use_edge_connections(RID p_map, bool p_enabled) = 0; virtual bool map_get_use_edge_connections(RID p_map) const = 0; - /// Set the map cell height used to weld the navigation mesh polygons. - virtual void map_set_cell_height(RID p_map, real_t p_cell_height) = 0; - virtual real_t map_get_cell_height(RID p_map) const = 0; - /// Set the map edge connection margin used to weld the compatible region edges. virtual void map_set_edge_connection_margin(RID p_map, real_t p_connection_margin) = 0;