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

Merge pull request #61662 from smix8/navigation_map_cell_defaults_4.x

Browse Source
This commit is contained in:
Rémi Verschelde 2022-06-08 15:56:22 +02:00 committed by GitHub
commit 07029e94f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/ProjectSettings.xml
View File

@ -1384,10 +1384,10 @@
<member name="navigation/2d/default_edge_connection_margin" type="int" setter="" getter="" default="1"> <member name="navigation/2d/default_edge_connection_margin" type="int" setter="" getter="" default="1">
Default edge connection margin for 2D navigation maps. See [method NavigationServer2D.map_set_edge_connection_margin]. Default edge connection margin for 2D navigation maps. See [method NavigationServer2D.map_set_edge_connection_margin].
</member> </member>
<member name="navigation/3d/default_cell_size" type="float" setter="" getter="" default="0.3"> <member name="navigation/3d/default_cell_size" type="float" setter="" getter="" default="0.25">
Default cell size for 3D navigation maps. See [method NavigationServer3D.map_set_cell_size]. Default cell size for 3D navigation maps. See [method NavigationServer3D.map_set_cell_size].
</member> </member>
<member name="navigation/3d/default_edge_connection_margin" type="float" setter="" getter="" default="0.3"> <member name="navigation/3d/default_edge_connection_margin" type="float" setter="" getter="" default="0.25">
Default edge connection margin for 3D navigation maps. See [method NavigationServer3D.map_set_edge_connection_margin]. Default edge connection margin for 3D navigation maps. See [method NavigationServer3D.map_set_edge_connection_margin].
</member> </member>
<member name="network/limits/debugger/max_chars_per_second" type="int" setter="" getter="" default="32768"> <member name="network/limits/debugger/max_chars_per_second" type="int" setter="" getter="" default="32768">

4
modules/navigation/nav_map.h
View File

@ -50,10 +50,10 @@ class NavMap : public NavRid {
/// To find the polygons edges the vertices are displaced in a grid where /// To find the polygons edges the vertices are displaced in a grid where
/// each cell has the following cell_size. /// each cell has the following cell_size.
real_t cell_size = 0.3; real_t cell_size = 0.25;
/// This value is used to detect the near edges to connect. /// This value is used to detect the near edges to connect.
real_t edge_connection_margin = 5.0; real_t edge_connection_margin = 0.25;
bool regenerate_polygons = true; bool regenerate_polygons = true;
bool regenerate_links = true; bool regenerate_links = true;

4
scene/resources/world_3d.cpp
View File

@ -150,8 +150,8 @@ World3D::World3D() {
navigation_map = NavigationServer3D::get_singleton()->map_create(); navigation_map = NavigationServer3D::get_singleton()->map_create();
NavigationServer3D::get_singleton()->map_set_active(navigation_map, true); NavigationServer3D::get_singleton()->map_set_active(navigation_map, true);
NavigationServer3D::get_singleton()->map_set_cell_size(navigation_map, GLOBAL_DEF("navigation/3d/default_cell_size", 0.3)); NavigationServer3D::get_singleton()->map_set_cell_size(navigation_map, GLOBAL_DEF("navigation/3d/default_cell_size", 0.25));
NavigationServer3D::get_singleton()->map_set_edge_connection_margin(navigation_map, GLOBAL_DEF("navigation/3d/default_edge_connection_margin", 0.3)); NavigationServer3D::get_singleton()->map_set_edge_connection_margin(navigation_map, GLOBAL_DEF("navigation/3d/default_edge_connection_margin", 0.25));
} }
World3D::~World3D() { World3D::~World3D() {