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

Add more improvements to usability of memory profiler

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-06 22:40:43 +02:00
parent e8b60060ab
commit 091f76bbf2
8 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Engine/Terrain/TerrainPatch.cpp
View File

@@ -6,6 +6,7 @@
#include "Engine/Core/Log.h"
#include "Engine/Core/Math/Color32.h"
#include "Engine/Profiler/ProfilerCPU.h"
#include "Engine/Profiler/ProfilerMemory.h"
#include "Engine/Physics/Physics.h"
#include "Engine/Physics/PhysicsScene.h"
#include "Engine/Physics/PhysicsBackend.h"
@@ -66,6 +67,7 @@ TerrainPatch::TerrainPatch(const SpawnParams& params)
void TerrainPatch::Init(Terrain* terrain, int16 x, int16 z)
{
PROFILE_MEM(LevelTerrain);
ScopeLock lock(_collisionLocker);
_terrain = terrain;
@@ -823,6 +825,7 @@ bool ModifyCollision(TerrainDataUpdateInfo& info, TextureBase::InitData* initDat
bool TerrainPatch::SetupHeightMap(int32 heightMapLength, const float* heightMap, const byte* holesMask, bool forceUseVirtualStorage)
{
PROFILE_CPU_NAMED("Terrain.Setup");
PROFILE_MEM(LevelTerrain);
if (heightMap == nullptr)
{
LOG(Warning, "Cannot create terrain without a heightmap specified.");
@@ -1034,6 +1037,7 @@ bool TerrainPatch::SetupHeightMap(int32 heightMapLength, const float* heightMap,
bool TerrainPatch::SetupSplatMap(int32 index, int32 splatMapLength, const Color32* splatMap, bool forceUseVirtualStorage)
{
PROFILE_CPU_NAMED("Terrain.SetupSplatMap");
PROFILE_MEM(LevelTerrain);
CHECK_RETURN(index >= 0 && index < TERRAIN_MAX_SPLATMAPS_COUNT, true);
if (splatMap == nullptr)
{
@@ -1182,6 +1186,7 @@ bool TerrainPatch::SetupSplatMap(int32 index, int32 splatMapLength, const Color3
bool TerrainPatch::InitializeHeightMap()
{
PROFILE_CPU_NAMED("Terrain.InitializeHeightMap");
PROFILE_MEM(LevelTerrain);
const auto heightmapSize = _terrain->GetChunkSize() * Terrain::ChunksCountEdge + 1;
Array<float> heightmap;
heightmap.Resize(heightmapSize * heightmapSize);
@@ -1248,6 +1253,7 @@ void TerrainPatch::ClearCache()
void TerrainPatch::CacheHeightData()
{
PROFILE_CPU_NAMED("Terrain.CacheHeightData");
PROFILE_MEM(LevelTerrain);
const TerrainDataUpdateInfo info(this);
// Ensure that heightmap data is all loaded
@@ -1313,6 +1319,7 @@ void TerrainPatch::CacheHeightData()
void TerrainPatch::CacheSplatData()
{
PROFILE_CPU_NAMED("Terrain.CacheSplatData");
PROFILE_MEM(LevelTerrain);
const TerrainDataUpdateInfo info(this);
// Cache all the splatmaps
@@ -1396,6 +1403,7 @@ bool TerrainPatch::ModifyHeightMap(const float* samples, const Int2& modifiedOff
return true;
}
PROFILE_CPU_NAMED("Terrain.ModifyHeightMap");
PROFILE_MEM(LevelTerrain);
// Check if has no heightmap
if (Heightmap == nullptr)
@@ -1490,6 +1498,7 @@ bool TerrainPatch::ModifyHolesMask(const byte* samples, const Int2& modifiedOffs
return true;
}
PROFILE_CPU_NAMED("Terrain.ModifyHolesMask");
PROFILE_MEM(LevelTerrain);
// Check if has no heightmap
if (Heightmap == nullptr)
@@ -1567,6 +1576,7 @@ bool TerrainPatch::ModifySplatMap(int32 index, const Color32* samples, const Int
return true;
}
PROFILE_CPU_NAMED("Terrain.ModifySplatMap");
PROFILE_MEM(LevelTerrain);
// Get the current data to modify it
Color32* splatMap = GetSplatMapData(index);
@@ -1738,6 +1748,7 @@ bool TerrainPatch::ModifySplatMap(int32 index, const Color32* samples, const Int
bool TerrainPatch::UpdateHeightData(TerrainDataUpdateInfo& info, const Int2& modifiedOffset, const Int2& modifiedSize, bool wasHeightRangeChanged, bool wasHeightChanged)
{
PROFILE_CPU();
PROFILE_MEM(LevelTerrain);
float* heightMap = GetHeightmapData();
byte* holesMask = GetHolesMaskData();
ASSERT(heightMap && holesMask);
@@ -2126,6 +2137,7 @@ void TerrainPatch::UpdatePostManualDeserialization()
void TerrainPatch::CreateCollision()
{
PROFILE_CPU();
PROFILE_MEM(LevelTerrain);
ASSERT(!HasCollision());
if (CreateHeightField())
return;
@@ -2241,6 +2253,7 @@ void TerrainPatch::DestroyCollision()
void TerrainPatch::CacheDebugLines()
{
PROFILE_CPU();
PROFILE_MEM(LevelTerrain);
ASSERT(_physicsHeightField);
_debugLinesDirty = false;
if (!_debugLines)
@@ -2322,6 +2335,7 @@ void TerrainPatch::DrawPhysicsDebug(RenderView& view)
const BoundingBox bounds(_bounds.Minimum - view.Origin, _bounds.Maximum - view.Origin);
if (!_physicsShape || !view.CullingFrustum.Intersects(bounds))
return;
PROFILE_MEM(LevelTerrain);
if (view.Mode == ViewMode::PhysicsColliders)
{
const auto& triangles = GetCollisionTriangles();
@@ -2378,6 +2392,7 @@ const Array<Vector3>& TerrainPatch::GetCollisionTriangles()
if (!_physicsShape || _collisionTriangles.HasItems())
return _collisionTriangles;
PROFILE_CPU();
PROFILE_MEM(LevelTerrain);
int32 rows, cols;
PhysicsBackend::GetHeightFieldSize(_physicsHeightField, rows, cols);
@@ -2428,6 +2443,7 @@ const Array<Vector3>& TerrainPatch::GetCollisionTriangles()
void TerrainPatch::GetCollisionTriangles(const BoundingSphere& bounds, Array<Vector3>& result)
{
PROFILE_CPU();
PROFILE_MEM(LevelTerrain);
result.Clear();
// Skip if no intersection with patch
@@ -2525,6 +2541,7 @@ void TerrainPatch::GetCollisionTriangles(const BoundingSphere& bounds, Array<Vec
void TerrainPatch::ExtractCollisionGeometry(Array<Float3>& vertexBuffer, Array<int32>& indexBuffer)
{
PROFILE_CPU();
PROFILE_MEM(LevelTerrain);
vertexBuffer.Clear();
indexBuffer.Clear();