Merge pull request #76212 from smix8/fix_heightmap_navmesh_4,x

Fix NavigationMesh baking for HeightMapShape
godotengine · Apr 18, 2023 · 1b4b893 · 1b4b893
2 parents 5bb46d6 + 71c453a
commit 1b4b893
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/modules/navigation/navigation_mesh_generator.cpp b/modules/navigation/navigation_mesh_generator.cpp
@@ -293,8 +293,8 @@ void NavigationMeshGenerator::_parse_geometry(const Transform3D &p_navmesh_trans
 							vertex_array.resize((heightmap_depth - 1) * (heightmap_width - 1) * 6);
 							int map_data_current_index = 0;
 
-							for (int d = 0; d < heightmap_depth - 1; d++) {
-								for (int w = 0; w < heightmap_width - 1; w++) {
+							for (int d = 0; d < heightmap_depth; d++) {
+								for (int w = 0; w < heightmap_width; w++) {
 									if (map_data_current_index + 1 + heightmap_depth < map_data.size()) {
 										float top_left_height = map_data[map_data_current_index];
 										float top_right_height = map_data[map_data_current_index + 1];
@@ -422,8 +422,8 @@ void NavigationMeshGenerator::_parse_geometry(const Transform3D &p_navmesh_trans
 							vertex_array.resize((heightmap_depth - 1) * (heightmap_width - 1) * 6);
 							int map_data_current_index = 0;
 
-							for (int d = 0; d < heightmap_depth - 1; d++) {
-								for (int w = 0; w < heightmap_width - 1; w++) {
+							for (int d = 0; d < heightmap_depth; d++) {
+								for (int w = 0; w < heightmap_width; w++) {
 									if (map_data_current_index + 1 + heightmap_depth < map_data.size()) {
 										float top_left_height = map_data[map_data_current_index];
 										float top_right_height = map_data[map_data_current_index + 1];