izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Navigation WP] Properly using the vertical bounds of the collected tiles as the NavigationDataChunkActor bounds

Browse Source 
#review @Yoan.StAmant
#rb Yoan.StAmant
#fyi Richard.Malo, JeanFrancois.Dube
#jira none

[CL 14641645 by Aris Theophanidis in ue5-main branch]
This commit is contained in:
Aris Theophanidis
2020-11-03 10:20:13 -04:00
parent 887bed2c6a
commit 761fe05bad
11 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/NavigationSystem/Private/NavMesh/RecastNavMesh.cpp
+4 -3
View File
@@ -2092,13 +2092,13 @@ void ARecastNavMesh::ApplyWorldOffset(const FVector& InOffset, bool bWorldShift)
RequestDrawingUpdate();
}
void ARecastNavMesh::FillNavigationDataChunkActor(const FBox& Bounds, ANavigationDataChunkActor& DataChunkActor) const
void ARecastNavMesh::FillNavigationDataChunkActor(const FBox& QueryBounds, ANavigationDataChunkActor& DataChunkActor, FBox& OutTilesBounds) const
{
if (RecastNavMeshImpl)
{
UE_LOG(LogNavigation, Verbose, TEXT("%s Bounds pos: (%s) size: (%s)."), ANSI_TO_TCHAR(__FUNCTION__), *Bounds.GetCenter().ToString(), *Bounds.GetSize().ToString());
UE_LOG(LogNavigation, Verbose, TEXT("%s Bounds pos: (%s) size: (%s)."), ANSI_TO_TCHAR(__FUNCTION__), *QueryBounds.GetCenter().ToString(), *QueryBounds.GetSize().ToString());
const TArray<FBox> Boxes({ Bounds });
const TArray<FBox> Boxes({ QueryBounds });
TArray<int32> TileIndices;
RecastNavMeshImpl->GetNavMeshTilesIn(Boxes, TileIndices);
if (!TileIndices.IsEmpty())
@@ -2109,6 +2109,7 @@ void ARecastNavMesh::FillNavigationDataChunkActor(const FBox& Bounds, ANavigatio
DataChunkActor.GetMutableNavDataChunk().Add(DataChunk);
DataChunk->GetTiles(RecastNavMeshImpl, TileIndices, EGatherTilesCopyMode::CopyData);
DataChunk->GetTilesBounds(*RecastNavMeshImpl, TileIndices, OutTilesBounds);
}
}
}
Engine/Source/Runtime/NavigationSystem/Private/NavMesh/RecastNavMeshDataChunk.cpp
+15
View File
@@ -437,3 +437,18 @@ void URecastNavMeshDataChunk::GetTiles(const FPImplRecastNavMesh* NavMeshImpl, c
}
}
}
void URecastNavMeshDataChunk::GetTilesBounds(const FPImplRecastNavMesh& NavMeshImpl, const TArray<int32>& TileIndices, FBox& OutBounds) const
{
OutBounds.Init();
const dtNavMesh* NavMesh = NavMeshImpl.DetourNavMesh;
for (const int32 TileIdx : TileIndices)
{
const dtMeshTile* Tile = NavMesh->getTile(TileIdx);
if (Tile && Tile->header)
{
OutBounds += Recast2UnrealBox(Tile->header->bmin, Tile->header->bmax);
}
}
}