Skip to content

Commit 783728f

Browse files
aaronfrankeaaronfranke
committed
Capitalize global navigation constants
1 parent 1a1cc0f commit 783728f

13 files changed

+37
-37
lines changed

‎doc/classes/NavigationAgent2D.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
</member>
197197
<member name="radius" type="float" setter="set_radius" getter="get_radius" default="10.0">
198198
The radius of the avoidance agent. This is the "body" of the avoidance agent and not the avoidance maneuver starting radius (which is controlled by [member neighbor_distance]).
199-
Does not affect normal pathfinding. To change an actor's pathfinding radius bake [NavigationMesh] resources with a different [member NavigationMesh.agent_radius] property and use different navigation maps for each actor size.
199+
Does not affect normal pathfinding. To change an actor's pathfinding radius bake [NavigationPolygon] resources with a different [member NavigationPolygon.agent_radius] property and use different navigation maps for each actor size.
200200
</member>
201201
<member name="simplify_epsilon" type="float" setter="set_simplify_epsilon" getter="get_simplify_epsilon" default="0.0">
202202
The path simplification amount in worlds units.

‎modules/navigation_2d/nav_map_2d.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void NavMap2D::set_cell_size(real_t p_cell_size) {
7171
if (cell_size == p_cell_size) {
7272
return;
7373
}
74-
cell_size = MAX(p_cell_size, NavigationDefaults2D::navmesh_cell_size_min);
74+
cell_size = MAX(p_cell_size, NavigationDefaults2D::NAV_MESH_CELL_SIZE_MIN);
7575
_update_merge_rasterizer_cell_dimensions();
7676
map_settings_dirty = true;
7777
}
@@ -80,7 +80,7 @@ void NavMap2D::set_merge_rasterizer_cell_scale(float p_value) {
8080
if (merge_rasterizer_cell_scale == p_value) {
8181
return;
8282
}
83-
merge_rasterizer_cell_scale = MAX(p_value, NavigationDefaults2D::navmesh_cell_size_min);
83+
merge_rasterizer_cell_scale = MAX(p_value, NavigationDefaults2D::NAV_MESH_CELL_SIZE_MIN);
8484
_update_merge_rasterizer_cell_dimensions();
8585
map_settings_dirty = true;
8686
}

‎modules/navigation_2d/nav_map_2d.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class NavObstacle2D;
5050
class NavMap2D : public NavRid2D {
5151
/// To find the polygons edges the vertices are displaced in a grid where
5252
/// each cell has the following cell_size.
53-
real_t cell_size = NavigationDefaults2D::navmesh_cell_size;
53+
real_t cell_size = NavigationDefaults2D::NAV_MESH_CELL_SIZE;
5454

5555
// For the inter-region merging to work, internal rasterization is performed.
5656
Vector2 merge_rasterizer_cell_size = Vector2(cell_size, cell_size);
@@ -60,10 +60,10 @@ class NavMap2D : public NavRid2D {
6060

6161
bool use_edge_connections = true;
6262
/// This value is used to detect the near edges to connect.
63-
real_t edge_connection_margin = NavigationDefaults2D::edge_connection_margin;
63+
real_t edge_connection_margin = NavigationDefaults2D::EDGE_CONNECTION_MARGIN;
6464

6565
/// This value is used to limit how far links search to find polygons to connect to.
66-
real_t link_connection_radius = NavigationDefaults2D::link_connection_radius;
66+
real_t link_connection_radius = NavigationDefaults2D::LINK_CONNECTION_RADIUS;
6767

6868
bool map_settings_dirty = true;
6969

‎modules/navigation_3d/nav_map_3d.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void NavMap3D::set_cell_size(real_t p_cell_size) {
7979
if (cell_size == p_cell_size) {
8080
return;
8181
}
82-
cell_size = MAX(p_cell_size, NavigationDefaults3D::navmesh_cell_size_min);
82+
cell_size = MAX(p_cell_size, NavigationDefaults3D::NAV_MESH_CELL_SIZE_MIN);
8383
_update_merge_rasterizer_cell_dimensions();
8484
map_settings_dirty = true;
8585
}
@@ -88,7 +88,7 @@ void NavMap3D::set_cell_height(real_t p_cell_height) {
8888
if (cell_height == p_cell_height) {
8989
return;
9090
}
91-
cell_height = MAX(p_cell_height, NavigationDefaults3D::navmesh_cell_size_min);
91+
cell_height = MAX(p_cell_height, NavigationDefaults3D::NAV_MESH_CELL_SIZE_MIN);
9292
_update_merge_rasterizer_cell_dimensions();
9393
map_settings_dirty = true;
9494
}
@@ -97,7 +97,7 @@ void NavMap3D::set_merge_rasterizer_cell_scale(float p_value) {
9797
if (merge_rasterizer_cell_scale == p_value) {
9898
return;
9999
}
100-
merge_rasterizer_cell_scale = MAX(p_value, NavigationDefaults3D::navmesh_cell_size_min);
100+
merge_rasterizer_cell_scale = MAX(p_value, NavigationDefaults3D::NAV_MESH_CELL_SIZE_MIN);
101101
_update_merge_rasterizer_cell_dimensions();
102102
map_settings_dirty = true;
103103
}

‎modules/navigation_3d/nav_map_3d.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class NavMap3D : public NavRid3D {
5555

5656
/// To find the polygons edges the vertices are displaced in a grid where
5757
/// each cell has the following cell_size and cell_height.
58-
real_t cell_size = NavigationDefaults3D::navmesh_cell_size;
59-
real_t cell_height = NavigationDefaults3D::navmesh_cell_height;
58+
real_t cell_size = NavigationDefaults3D::NAV_MESH_CELL_SIZE;
59+
real_t cell_height = NavigationDefaults3D::NAV_MESH_CELL_HEIGHT;
6060

6161
// For the inter-region merging to work, internal rasterization is performed.
6262
Vector3 merge_rasterizer_cell_size = Vector3(cell_size, cell_height, cell_size);
@@ -66,10 +66,10 @@ class NavMap3D : public NavRid3D {
6666

6767
bool use_edge_connections = true;
6868
/// This value is used to detect the near edges to connect.
69-
real_t edge_connection_margin = NavigationDefaults3D::edge_connection_margin;
69+
real_t edge_connection_margin = NavigationDefaults3D::EDGE_CONNECTION_MARGIN;
7070

7171
/// This value is used to limit how far links search to find polygons to connect to.
72-
real_t link_connection_radius = NavigationDefaults3D::link_connection_radius;
72+
real_t link_connection_radius = NavigationDefaults3D::LINK_CONNECTION_RADIUS;
7373

7474
bool map_settings_dirty = true;
7575

‎scene/2d/navigation/navigation_region_2d.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ PackedStringArray NavigationRegion2D::get_configuration_warnings() const {
301301

302302
if (is_visible_in_tree() && is_inside_tree()) {
303303
if (navigation_polygon.is_null()) {
304-
warnings.push_back(RTR("A NavigationMesh resource must be set or created for this node to work. Please set a property or draw a polygon."));
304+
warnings.push_back(RTR("A NavigationPolygon resource must be set or created for this node to work. Please set a property or draw a polygon."));
305305
}
306306
}
307307

‎scene/2d/tile_map_layer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ void TileMapLayer::_navigation_update(bool p_force_cleanup) {
12511251
// Create a dedicated map for each layer.
12521252
RID new_layer_map = ns->map_create();
12531253
// Set the default NavigationPolygon cell_size on the new map as a mismatch causes an error.
1254-
ns->map_set_cell_size(new_layer_map, NavigationDefaults2D::navmesh_cell_size);
1254+
ns->map_set_cell_size(new_layer_map, NavigationDefaults2D::NAV_MESH_CELL_SIZE);
12551255
ns->map_set_active(new_layer_map, true);
12561256
navigation_map_override = new_layer_map;
12571257
}

‎scene/resources/2d/navigation_polygon.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ void NavigationPolygon::make_polygons_from_outlines() {
386386

387387
TPPLPartition tpart;
388388
if (tpart.ConvexPartition_HM(&in_poly, &out_poly) == 0) { //failed!
389-
ERR_PRINT("NavigationPolygon: Convex partition failed! Failed to convert outlines to a valid NavigationMesh."
389+
ERR_PRINT("NavigationPolygon: Convex partition failed! Failed to convert outlines to a valid NavigationPolygon."
390390
"\nNavigationPolygon outlines can not overlap vertices or edges inside same outline or with other outlines or have any intersections."
391391
"\nAdd the outmost and largest outline first. To add holes inside this outline add the smaller outlines with same winding order.");
392392
return;

‎scene/resources/2d/navigation_polygon.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class NavigationPolygon : public Resource {
5050
// Navigation mesh
5151
Ref<NavigationMesh> navigation_mesh;
5252

53-
real_t cell_size = NavigationDefaults2D::navmesh_cell_size;
53+
real_t cell_size = NavigationDefaults2D::NAV_MESH_CELL_SIZE;
5454
real_t border_size = 0.0f;
5555

5656
Rect2 baking_rect;

‎scene/resources/navigation_mesh.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ class NavigationMesh : public Resource {
7777
};
7878

7979
protected:
80-
float cell_size = NavigationDefaults3D::navmesh_cell_size;
81-
float cell_height = NavigationDefaults3D::navmesh_cell_height;
80+
float cell_size = NavigationDefaults3D::NAV_MESH_CELL_SIZE;
81+
float cell_height = NavigationDefaults3D::NAV_MESH_CELL_HEIGHT;
8282
float border_size = 0.0f;
8383
float agent_height = 1.5f;
8484
float agent_radius = 0.5f;

‎servers/navigation/navigation_globals.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ namespace NavigationDefaults3D {
3636

3737
// To find the polygons edges the vertices are displaced in a grid where
3838
// each cell has the following cell_size and cell_height.
39-
constexpr float navmesh_cell_size{ 0.25f }; // Must match ProjectSettings default 3D cell_size and NavigationMesh cell_size.
40-
constexpr float navmesh_cell_height{ 0.25f }; // Must match ProjectSettings default 3D cell_height and NavigationMesh cell_height.
41-
constexpr float navmesh_cell_size_min{ 0.01f };
42-
constexpr auto navmesh_cell_size_hint{ "0.001,100,0.001,or_greater" };
39+
constexpr float NAV_MESH_CELL_HEIGHT = 0.25f; // Must match ProjectSettings default 3D cell_height and NavigationMesh cell_height.
40+
constexpr float NAV_MESH_CELL_SIZE = 0.25f; // Must match ProjectSettings default 3D cell_size and NavigationMesh cell_size.
41+
constexpr float NAV_MESH_CELL_SIZE_MIN = 0.01f;
42+
constexpr const char *const NAV_MESH_CELL_SIZE_HINT = "0.001,100,0.001,or_greater";
4343

4444
// Map.
4545

46-
constexpr float edge_connection_margin{ 0.25f };
47-
constexpr float link_connection_radius{ 1.0f };
46+
constexpr float EDGE_CONNECTION_MARGIN = 0.25f;
47+
constexpr float LINK_CONNECTION_RADIUS = 1.0f;
4848

4949
} //namespace NavigationDefaults3D
5050

@@ -53,13 +53,13 @@ namespace NavigationDefaults2D {
5353
// Rasterization.
5454

5555
// Same as in 3D but larger since 1px is treated as 1m.
56-
constexpr float navmesh_cell_size{ 1.0f }; // Must match ProjectSettings default 2D cell_size.
57-
constexpr float navmesh_cell_size_min{ 0.01f };
58-
constexpr auto navmesh_cell_size_hint{ "0.001,100,0.001,or_greater" };
56+
constexpr float NAV_MESH_CELL_SIZE = 1.0f; // Must match ProjectSettings default 2D cell_size.
57+
constexpr float NAV_MESH_CELL_SIZE_MIN = 0.01f;
58+
constexpr const char *const NAV_MESH_CELL_SIZE_HINT = "0.001,100,0.001,or_greater";
5959

6060
// Map.
6161

62-
constexpr float edge_connection_margin{ 1.0f };
63-
constexpr float link_connection_radius{ 4.0f };
62+
constexpr float EDGE_CONNECTION_MARGIN = 1.0f;
63+
constexpr float LINK_CONNECTION_RADIUS = 4.0f;
6464

6565
} //namespace NavigationDefaults2D

‎servers/navigation_server_2d.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ NavigationServer2D::NavigationServer2D() {
217217
ERR_FAIL_COND(singleton != nullptr);
218218
singleton = this;
219219

220-
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_cell_size", PROPERTY_HINT_RANGE, NavigationDefaults2D::navmesh_cell_size_hint), NavigationDefaults2D::navmesh_cell_size);
220+
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_cell_size", PROPERTY_HINT_RANGE, NavigationDefaults2D::NAV_MESH_CELL_SIZE_HINT), NavigationDefaults2D::NAV_MESH_CELL_SIZE);
221221
GLOBAL_DEF("navigation/2d/use_edge_connections", true);
222-
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_edge_connection_margin", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults2D::edge_connection_margin);
223-
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_link_connection_radius", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults2D::link_connection_radius);
222+
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_edge_connection_margin", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults2D::EDGE_CONNECTION_MARGIN);
223+
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_link_connection_radius", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults2D::LINK_CONNECTION_RADIUS);
224224

225225
#ifdef DEBUG_ENABLED
226226
debug_navigation_edge_connection_color = GLOBAL_DEF("debug/shapes/navigation/2d/edge_connection_color", Color(1.0, 0.0, 1.0, 1.0));

‎servers/navigation_server_3d.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,13 @@ NavigationServer3D::NavigationServer3D() {
241241
ERR_FAIL_COND(singleton != nullptr);
242242
singleton = this;
243243

244-
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_cell_size", PROPERTY_HINT_RANGE, NavigationDefaults3D::navmesh_cell_size_hint), NavigationDefaults3D::navmesh_cell_size);
245-
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_cell_height", PROPERTY_HINT_RANGE, "0.001,100,0.001,or_greater"), NavigationDefaults3D::navmesh_cell_height);
244+
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_cell_size", PROPERTY_HINT_RANGE, NavigationDefaults3D::NAV_MESH_CELL_SIZE_HINT), NavigationDefaults3D::NAV_MESH_CELL_SIZE);
245+
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_cell_height", PROPERTY_HINT_RANGE, "0.001,100,0.001,or_greater"), NavigationDefaults3D::NAV_MESH_CELL_HEIGHT);
246246
GLOBAL_DEF("navigation/3d/default_up", Vector3(0, 1, 0));
247247
GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "navigation/3d/merge_rasterizer_cell_scale", PROPERTY_HINT_RANGE, "0.001,1,0.001,or_greater"), 1.0);
248248
GLOBAL_DEF("navigation/3d/use_edge_connections", true);
249-
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_edge_connection_margin", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults3D::edge_connection_margin);
250-
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_link_connection_radius", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults3D::link_connection_radius);
249+
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_edge_connection_margin", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults3D::EDGE_CONNECTION_MARGIN);
250+
GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_link_connection_radius", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults3D::LINK_CONNECTION_RADIUS);
251251

252252
#ifdef DEBUG_ENABLED
253253
#ifndef DISABLE_DEPRECATED

0 commit comments

Comments
 (0)