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

Merge remote-tracking branch 'origin/master' into 1.11

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-18 22:46:10 +02:00
parent bd2add7edd 6479a3d3c6
commit 68dce7e4dd
5 changed files with 188 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Engine/Navigation/NavMeshRuntime.cpp
View File

@@ -16,6 +16,19 @@
#define USE_DATA_LINK 0
#define USE_NAV_MESH_ALLOC 0
#if USE_NAV_MESH_ALLOC
#define GET_NAV_TILE_DATA(tile) \
const int32 dataSize = (tile).Data.Length(); \
const auto flags = DT_TILE_FREE_DATA; \
const auto data = (byte*)dtAlloc(dataSize, DT_ALLOC_PERM); \
Platform::MemoryCopy(data, (tile).Data.Get(), dataSize)
#else
#define GET_NAV_TILE_DATA(tile) \
const int32 dataSize = (tile).Data.Length(); \
const auto flags = 0; \
const auto data = (tile).Data.Get()
#endif
namespace
{
FORCE_INLINE void InitFilter(dtQueryFilter& filter)
@@ -355,15 +368,7 @@ void NavMeshRuntime::EnsureCapacity(int32 tilesToAddCount)
// Restore previous tiles
for (auto& tile : _tiles)
{
const int32 dataSize = tile.Data.Length();
#if USE_NAV_MESH_ALLOC
const auto flags = DT_TILE_FREE_DATA;
const auto data = (byte*)dtAlloc(dataSize, DT_ALLOC_PERM);
Platform::MemoryCopy(data, tile.Data.Get(), dataSize);
#else
const auto flags = 0;
const auto data = tile.Data.Get();
#endif
GET_NAV_TILE_DATA(tile);
const auto result = _navMesh->addTile(data, dataSize, flags, 0, nullptr);
if (dtStatusFailed(result))
{
@@ -665,15 +670,7 @@ void NavMeshRuntime::AddTileInternal(NavMesh* navMesh, NavMeshTileData& tileData
#endif
// Add tile to navmesh
const int32 dataSize = tile->Data.Length();
#if USE_NAV_MESH_ALLOC
const auto flags = DT_TILE_FREE_DATA;
const auto data = (byte*)dtAlloc(dataSize, DT_ALLOC_PERM);
Platform::MemoryCopy(data, tile->Data.Get(), dataSize);
#else
const auto flags = 0;
const auto data = tile->Data.Get();
#endif
GET_NAV_TILE_DATA(*tile);
const auto result = _navMesh->addTile(data, dataSize, flags, 0, nullptr);
if (dtStatusFailed(result))
{