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

Merge pull request #109196 from smix8/pppedgecentered

Browse Source 
Fix path post-processing edgecentered
This commit is contained in:
Thaddeus Crews
2025-08-03 10:51:10 -05:00
parent a6e6d133ab a3f393a3e1
commit 0d6c1c37e2
6 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/navigation_2d/2d/nav_map_builder_2d.cpp
View File

@ -126,6 +126,7 @@ void NavMapBuilder2D::_build_step_find_edge_connection_pairs(NavMapIterationBuil
// Add the polygon/edge tuple to this key. // Add the polygon/edge tuple to this key.
Connection new_connection; Connection new_connection;
new_connection.polygon = &region->navmesh_polygons[connectable_edge.polygon_index]; new_connection.polygon = &region->navmesh_polygons[connectable_edge.polygon_index];
new_connection.edge = connectable_edge.edge;
new_connection.pathway_start = connectable_edge.pathway_start; new_connection.pathway_start = connectable_edge.pathway_start;
new_connection.pathway_end = connectable_edge.pathway_end; new_connection.pathway_end = connectable_edge.pathway_end;

1
modules/navigation_2d/2d/nav_region_builder_2d.cpp
View File

@ -241,6 +241,7 @@ void NavRegionBuilder2D::_build_step_merge_edge_connection_pairs(NavRegionIterat
ConnectableEdge ce; ConnectableEdge ce;
ce.ek = pair_it.key; ce.ek = pair_it.key;
ce.polygon_index = connection.polygon->id; ce.polygon_index = connection.polygon->id;
ce.edge = connection.edge;
ce.pathway_start = connection.pathway_start; ce.pathway_start = connection.pathway_start;
ce.pathway_end = connection.pathway_end; ce.pathway_end = connection.pathway_end;

1
modules/navigation_2d/nav_utils_2d.h
View File

@ -75,6 +75,7 @@ struct EdgeKey {
struct ConnectableEdge { struct ConnectableEdge {
EdgeKey ek; EdgeKey ek;
uint32_t polygon_index; uint32_t polygon_index;
int edge = -1;
Vector2 pathway_start; Vector2 pathway_start;
Vector2 pathway_end; Vector2 pathway_end;
}; };

1
modules/navigation_3d/3d/nav_map_builder_3d.cpp
View File

@ -127,6 +127,7 @@ void NavMapBuilder3D::_build_step_find_edge_connection_pairs(NavMapIterationBuil
// Add the polygon/edge tuple to this key. // Add the polygon/edge tuple to this key.
Connection new_connection; Connection new_connection;
new_connection.polygon = &region->navmesh_polygons[connectable_edge.polygon_index]; new_connection.polygon = &region->navmesh_polygons[connectable_edge.polygon_index];
new_connection.edge = connectable_edge.edge;
new_connection.pathway_start = connectable_edge.pathway_start; new_connection.pathway_start = connectable_edge.pathway_start;
new_connection.pathway_end = connectable_edge.pathway_end; new_connection.pathway_end = connectable_edge.pathway_end;

1
modules/navigation_3d/3d/nav_region_builder_3d.cpp
View File

@ -242,6 +242,7 @@ void NavRegionBuilder3D::_build_step_merge_edge_connection_pairs(NavRegionIterat
ConnectableEdge ce; ConnectableEdge ce;
ce.ek = pair_it.key; ce.ek = pair_it.key;
ce.polygon_index = connection.polygon->id; ce.polygon_index = connection.polygon->id;
ce.edge = connection.edge;
ce.pathway_start = connection.pathway_start; ce.pathway_start = connection.pathway_start;
ce.pathway_end = connection.pathway_end; ce.pathway_end = connection.pathway_end;

1
modules/navigation_3d/nav_utils_3d.h
View File

@ -76,6 +76,7 @@ struct EdgeKey {
struct ConnectableEdge { struct ConnectableEdge {
EdgeKey ek; EdgeKey ek;
uint32_t polygon_index; uint32_t polygon_index;
int edge = -1;
Vector3 pathway_start; Vector3 pathway_start;
Vector3 pathway_end; Vector3 pathway_end;
}; };