summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmix8 <52464204+smix8@users.noreply.github.com>2023-07-14 21:59:47 +0200
committersmix8 <52464204+smix8@users.noreply.github.com>2023-07-14 22:36:06 +0200
commit2852fb43f707789bc05083302b1f2d6a19edec42 (patch)
tree54b881829b1bd69b66371cf5c7d5abf71e63f3cd
parenta7583881af5477cd73110cc859fecf7ceaf39bd7 (diff)
downloadredot-engine-2852fb43f707789bc05083302b1f2d6a19edec42.tar.gz
Change 2D navigation ProjectSettings from integers to floats
Changes 2D navigation ProjectSettings from integers to floats.
-rw-r--r--doc/classes/ProjectSettings.xml6
-rw-r--r--servers/navigation_server_3d.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 744c72af4d..0c78525e45 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -1943,13 +1943,13 @@
<member name="memory/limits/multithreaded_server/rid_pool_prealloc" type="int" setter="" getter="" default="60">
This is used by servers when used in multi-threading mode (servers and visual). RIDs are preallocated to avoid stalling the server requesting them on threads. If servers get stalled too often when loading resources in a thread, increase this number.
</member>
- <member name="navigation/2d/default_cell_size" type="int" setter="" getter="" default="1">
+ <member name="navigation/2d/default_cell_size" type="float" setter="" getter="" default="1.0">
Default cell size for 2D navigation maps. See [method NavigationServer2D.map_set_cell_size].
</member>
- <member name="navigation/2d/default_edge_connection_margin" type="int" setter="" getter="" default="1">
+ <member name="navigation/2d/default_edge_connection_margin" type="float" setter="" getter="" default="1.0">
Default edge connection margin for 2D navigation maps. See [method NavigationServer2D.map_set_edge_connection_margin].
</member>
- <member name="navigation/2d/default_link_connection_radius" type="int" setter="" getter="" default="4">
+ <member name="navigation/2d/default_link_connection_radius" type="float" setter="" getter="" default="4.0">
Default link connection radius for 2D navigation maps. See [method NavigationServer2D.map_set_link_connection_radius].
</member>
<member name="navigation/2d/use_edge_connections" type="bool" setter="" getter="" default="true">
diff --git a/servers/navigation_server_3d.cpp b/servers/navigation_server_3d.cpp
index 3b26945c86..4da479639d 100644
--- a/servers/navigation_server_3d.cpp
+++ b/servers/navigation_server_3d.cpp
@@ -185,10 +185,10 @@ NavigationServer3D::NavigationServer3D() {
ERR_FAIL_COND(singleton != nullptr);
singleton = this;
- GLOBAL_DEF_BASIC("navigation/2d/default_cell_size", 1);
+ GLOBAL_DEF_BASIC("navigation/2d/default_cell_size", 1.0);
GLOBAL_DEF("navigation/2d/use_edge_connections", true);
- GLOBAL_DEF_BASIC("navigation/2d/default_edge_connection_margin", 1);
- GLOBAL_DEF_BASIC("navigation/2d/default_link_connection_radius", 4);
+ GLOBAL_DEF_BASIC("navigation/2d/default_edge_connection_margin", 1.0);
+ GLOBAL_DEF_BASIC("navigation/2d/default_link_connection_radius", 4.0);
GLOBAL_DEF_BASIC("navigation/3d/default_cell_size", 0.25);
GLOBAL_DEF_BASIC("navigation/3d/default_cell_height", 0.25);