GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix removing unused navmesh tiles on whole scene rebuild

Browse Source
This commit is contained in:
Wojtek Figat
2021-01-13 14:50:12 +01:00
parent 88bddfb141
commit d1a282e228
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Engine/Navigation/NavMeshBuilder.cpp
View File

@@ -635,7 +635,7 @@ void BuildTileAsync(NavMesh* navMesh, int32 x, int32 y, rcConfig& config, const
task->Start(); task->Start();
} }
void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBounds) void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBounds, bool rebuild)
{ {
const float tileSize = GetTileSize(); const float tileSize = GetTileSize();
NavMeshRuntime* runtime = navMesh->GetRuntime(); NavMeshRuntime* runtime = navMesh->GetRuntime();
@@ -655,12 +655,15 @@ void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBo
PROFILE_CPU_NAMED("Prepare"); PROFILE_CPU_NAMED("Prepare");
// Prepare scene data and navmesh // Prepare scene data and navmesh
if (Math::NotNearEqual(navMesh->Data.TileSize, tileSize)) rebuild |= Math::NotNearEqual(navMesh->Data.TileSize, tileSize);
if (rebuild)
{ {
// Remove all tiles from navmesh runtime
runtime->RemoveTiles(navMesh); runtime->RemoveTiles(navMesh);
runtime->SetTileSize(tileSize); runtime->SetTileSize(tileSize);
runtime->EnsureCapacity(tilesX * tilesY); runtime->EnsureCapacity(tilesX * tilesY);
// Remove all tiles from navmesh data
navMesh->Data.TileSize = tileSize; navMesh->Data.TileSize = tileSize;
navMesh->Data.Tiles.Clear(); navMesh->Data.Tiles.Clear();
navMesh->Data.Tiles.EnsureCapacity(tilesX * tilesX); navMesh->Data.Tiles.EnsureCapacity(tilesX * tilesX);
@@ -668,7 +671,7 @@ void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBo
} }
else else
{ {
// Prepare navmesh // Ensure to have enough memory for tiles
runtime->SetTileSize(tileSize); runtime->SetTileSize(tileSize);
runtime->EnsureCapacity(tilesX * tilesY); runtime->EnsureCapacity(tilesX * tilesY);
} }
@@ -700,7 +703,7 @@ void BuildDirtyBounds(Scene* scene, NavMesh* navMesh, const BoundingBox& dirtyBo
} }
} }
void BuildDirtyBounds(Scene* scene, const BoundingBox& dirtyBounds) void BuildDirtyBounds(Scene* scene, const BoundingBox& dirtyBounds, bool rebuild)
{ {
auto settings = NavigationSettings::Get(); auto settings = NavigationSettings::Get();
@@ -738,7 +741,7 @@ void BuildDirtyBounds(Scene* scene, const BoundingBox& dirtyBounds)
// Build all navmeshes on the scene // Build all navmeshes on the scene
for (NavMesh* navMesh : scene->NavigationMeshes) for (NavMesh* navMesh : scene->NavigationMeshes)
{ {
BuildDirtyBounds(scene, navMesh, dirtyBounds); BuildDirtyBounds(scene, navMesh, dirtyBounds, rebuild);
} }
// Remove unused navmeshes // Remove unused navmeshes
@@ -772,7 +775,7 @@ void BuildWholeScene(Scene* scene)
// Compute total navigation area bounds // Compute total navigation area bounds
const BoundingBox worldBounds = scene->GetNavigationBounds(); const BoundingBox worldBounds = scene->GetNavigationBounds();
BuildDirtyBounds(scene, worldBounds); BuildDirtyBounds(scene, worldBounds, true);
} }
void ClearNavigation(Scene* scene) void ClearNavigation(Scene* scene)
@@ -814,7 +817,7 @@ void NavMeshBuilder::Update()
} }
else else
{ {
BuildDirtyBounds(scene, req.DirtyBounds); BuildDirtyBounds(scene, req.DirtyBounds, false);
} }
} }
} }