Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #98866 from smix8/navmap_allocation

Browse Source 
Reduce allocations for NavMap synchronisation
This commit is contained in:
Thaddeus Crews 2024-11-10 12:12:37 -06:00
commit 95780d8104
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/navigation/3d/nav_mesh_queries_3d.cpp
View File

@ -234,7 +234,7 @@ Vector<Vector3> NavMeshQueries3D::polygons_get_path(const LocalVector<gd::Polygo
// Takes the current least_cost_poly neighbors (iterating over its edges) and compute the traveled_distance.
for (const gd::Edge &edge : navigation_polys[least_cost_id].poly->edges) {
// Iterate over connections in this edge, then compute the new optimized travel distance assigned to this polygon.
for (int connection_index = 0; connection_index < edge.connections.size(); connection_index++) {
for (uint32_t connection_index = 0; connection_index < edge.connections.size(); connection_index++) {
const gd::Edge::Connection &connection = edge.connections[connection_index];
// Only consider the connection to another polygon if this polygon is in a region with compatible layers.

9
modules/navigation/nav_map.cpp
View File

@ -426,13 +426,8 @@ void NavMap::sync() {
_new_pm_polygon_count = polygon_count;
struct ConnectionPair {
gd::Edge::Connection connections[2];
int size = 0;
};
// Group all edges per key.
HashMap<gd::EdgeKey, ConnectionPair, gd::EdgeKey> connection_pairs_map;
connection_pairs_map.clear();
connection_pairs_map.reserve(polygons.size());
int free_edges_count = 0; // How many ConnectionPairs have only one Connection.
@ -469,7 +464,7 @@ void NavMap::sync() {
}
}
LocalVector<gd::Edge::Connection> free_edges;
free_edges.clear();
free_edges.reserve(free_edges_count);
for (const KeyValue<gd::EdgeKey, ConnectionPair> &pair_it : connection_pairs_map) {

8
modules/navigation/nav_map.h
View File

@ -128,6 +128,14 @@ class NavMap : public NavRid {
HashMap<NavRegion *, LocalVector<gd::Edge::Connection>> region_external_connections;
struct ConnectionPair {
gd::Edge::Connection connections[2];
int size = 0;
};
HashMap<gd::EdgeKey, ConnectionPair, gd::EdgeKey> connection_pairs_map;
LocalVector<gd::Edge::Connection> free_edges;
public:
NavMap();
~NavMap();

2
modules/navigation/nav_utils.h
View File

@ -94,7 +94,7 @@ struct Edge {
};
/// Connections from this edge to other polygons.
Vector<Connection> connections;
LocalVector<Connection> connections;
};
struct Polygon {