Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #105718 from aaronfranke/nav-const-caps

Browse source 
Capitalize global navigation constants
This commit is contained in:
Thaddeus Crews 2025-05-06 08:38:07 -05:00
commit fd1168620f
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
13 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/navigation_2d/nav_map_2d.cpp
View file

@ -71,7 +71,7 @@ void NavMap2D::set_cell_size(real_t p_cell_size) {
if (cell_size == p_cell_size) {
return;
}
cell_size = MAX(p_cell_size, NavigationDefaults2D::navmesh_cell_size_min);
cell_size = MAX(p_cell_size, NavigationDefaults2D::NAV_MESH_CELL_SIZE_MIN);
_update_merge_rasterizer_cell_dimensions();
map_settings_dirty = true;
}
@ -80,7 +80,7 @@ void NavMap2D::set_merge_rasterizer_cell_scale(float p_value) {
if (merge_rasterizer_cell_scale == p_value) {
return;
}
merge_rasterizer_cell_scale = MAX(p_value, NavigationDefaults2D::navmesh_cell_size_min);
merge_rasterizer_cell_scale = MAX(p_value, NavigationDefaults2D::NAV_MESH_CELL_SIZE_MIN);
_update_merge_rasterizer_cell_dimensions();
map_settings_dirty = true;
}

6
modules/navigation_2d/nav_map_2d.h
View file

@ -50,7 +50,7 @@ class NavObstacle2D;
class NavMap2D : public NavRid2D {
/// To find the polygons edges the vertices are displaced in a grid where
/// each cell has the following cell_size.
real_t cell_size = NavigationDefaults2D::navmesh_cell_size;
real_t cell_size = NavigationDefaults2D::NAV_MESH_CELL_SIZE;
// For the inter-region merging to work, internal rasterization is performed.
Vector2 merge_rasterizer_cell_size = Vector2(cell_size, cell_size);
@ -60,10 +60,10 @@ class NavMap2D : public NavRid2D {
bool use_edge_connections = true;
/// This value is used to detect the near edges to connect.
real_t edge_connection_margin = NavigationDefaults2D::edge_connection_margin;
real_t edge_connection_margin = NavigationDefaults2D::EDGE_CONNECTION_MARGIN;
/// This value is used to limit how far links search to find polygons to connect to.
real_t link_connection_radius = NavigationDefaults2D::link_connection_radius;
real_t link_connection_radius = NavigationDefaults2D::LINK_CONNECTION_RADIUS;
bool map_settings_dirty = true;