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

Fix memory leak on recast objects when building NavMesh tile

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-17 23:28:15 +02:00
parent bcd2b1f0f2
commit 9cfcbfa9d2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@
#include "NavModifierVolume.h" #include "NavModifierVolume.h"
#include "NavMeshRuntime.h" #include "NavMeshRuntime.h"
#include "Engine/Core/Log.h" #include "Engine/Core/Log.h"
#include "Engine/Core/ScopeExit.h"
#include "Engine/Core/Math/BoundingBox.h" #include "Engine/Core/Math/BoundingBox.h"
#include "Engine/Core/Math/Vector3.h" #include "Engine/Core/Math/Vector3.h"
#include "Engine/Physics/Colliders/BoxCollider.h" #include "Engine/Physics/Colliders/BoxCollider.h"
@@ -422,6 +423,7 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
LOG(Warning, "Could not generate navmesh: Out of memory for heightfield."); LOG(Warning, "Could not generate navmesh: Out of memory for heightfield.");
return true; return true;
} }
SCOPE_EXIT{ rcFreeHeightField(heightfield); };
if (!rcCreateHeightfield(&context, *heightfield, config.width, config.height, config.bmin, config.bmax, config.cs, config.ch)) if (!rcCreateHeightfield(&context, *heightfield, config.width, config.height, config.bmin, config.bmax, config.cs, config.ch))
{ {
LOG(Warning, "Could not generate navmesh: Could not create solid heightfield."); LOG(Warning, "Could not generate navmesh: Could not create solid heightfield.");
@@ -475,6 +477,7 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
LOG(Warning, "Could not generate navmesh: Out of memory compact heightfield."); LOG(Warning, "Could not generate navmesh: Out of memory compact heightfield.");
return true; return true;
} }
SCOPE_EXIT{ rcFreeCompactHeightfield(compactHeightfield); };
{ {
PROFILE_CPU_NAMED("CompactHeightfield"); PROFILE_CPU_NAMED("CompactHeightfield");
if (!rcBuildCompactHeightfield(&context, config.walkableHeight, config.walkableClimb, *heightfield, *compactHeightfield)) if (!rcBuildCompactHeightfield(&context, config.walkableHeight, config.walkableClimb, *heightfield, *compactHeightfield))
@@ -483,7 +486,6 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
return true; return true;
} }
} }
rcFreeHeightField(heightfield);
{ {
PROFILE_CPU_NAMED("ErodeWalkableArea"); PROFILE_CPU_NAMED("ErodeWalkableArea");
if (!rcErodeWalkableArea(&context, config.walkableRadius, *compactHeightfield)) if (!rcErodeWalkableArea(&context, config.walkableRadius, *compactHeightfield))
@@ -528,6 +530,7 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
LOG(Warning, "Could not generate navmesh: Out of memory for contour set."); LOG(Warning, "Could not generate navmesh: Out of memory for contour set.");
return true; return true;
} }
SCOPE_EXIT{ rcFreeContourSet(contourSet); };
{ {
PROFILE_CPU_NAMED("BuildContours"); PROFILE_CPU_NAMED("BuildContours");
if (!rcBuildContours(&context, *compactHeightfield, config.maxSimplificationError, config.maxEdgeLen, *contourSet)) if (!rcBuildContours(&context, *compactHeightfield, config.maxSimplificationError, config.maxEdgeLen, *contourSet))
@@ -543,6 +546,7 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
LOG(Warning, "Could not generate navmesh: Out of memory for poly mesh."); LOG(Warning, "Could not generate navmesh: Out of memory for poly mesh.");
return true; return true;
} }
SCOPE_EXIT{ rcFreePolyMesh(polyMesh); };
{ {
PROFILE_CPU_NAMED("BuildPolyMesh"); PROFILE_CPU_NAMED("BuildPolyMesh");
if (!rcBuildPolyMesh(&context, *contourSet, config.maxVertsPerPoly, *polyMesh)) if (!rcBuildPolyMesh(&context, *contourSet, config.maxVertsPerPoly, *polyMesh))
@@ -558,6 +562,7 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
LOG(Warning, "Could not generate navmesh: Out of memory for detail mesh."); LOG(Warning, "Could not generate navmesh: Out of memory for detail mesh.");
return true; return true;
} }
SCOPE_EXIT{ rcFreePolyMeshDetail(detailMesh); };
{ {
PROFILE_CPU_NAMED("BuildPolyMeshDetail"); PROFILE_CPU_NAMED("BuildPolyMeshDetail");
if (!rcBuildPolyMeshDetail(&context, *polyMesh, *compactHeightfield, config.detailSampleDist, config.detailSampleMaxError, *detailMesh)) if (!rcBuildPolyMeshDetail(&context, *polyMesh, *compactHeightfield, config.detailSampleDist, config.detailSampleMaxError, *detailMesh))
@@ -567,9 +572,6 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
} }
} }
rcFreeCompactHeightfield(compactHeightfield);
rcFreeContourSet(contourSet);
for (int i = 0; i < polyMesh->npolys; i++) for (int i = 0; i < polyMesh->npolys; i++)
polyMesh->flags[i] = polyMesh->areas[i] != RC_NULL_AREA ? 1 : 0; polyMesh->flags[i] = polyMesh->areas[i] != RC_NULL_AREA ? 1 : 0;
if (polyMesh->nverts == 0) if (polyMesh->nverts == 0)
@@ -661,7 +663,6 @@ bool GenerateTile(NavMesh* navMesh, NavMeshRuntime* runtime, int32 x, int32 y, B
{ {
PROFILE_CPU_NAMED("CreateTiles"); PROFILE_CPU_NAMED("CreateTiles");
ScopeLock lock(runtime->Locker); ScopeLock lock(runtime->Locker);
navMesh->IsDataDirty = true; navMesh->IsDataDirty = true;