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

Simplify splatmap data management #1739

Browse Source
This commit is contained in:
Wojtek Figat
2024-02-17 11:24:56 +01:00
parent cc157b172d
commit 368dac5e4b
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Editor/Tools/Terrain/PaintTerrainGizmoMode.cs
View File

@@ -36,35 +36,26 @@ namespace FlaxEditor.Tools.Terrain
"Layer 7",
};
private class SplatmapData
private struct SplatmapData
{
public IntPtr DataPtr { get; set; } = IntPtr.Zero;
public int Size { get; set; } = 0;
public SplatmapData(int size)
{
EnsureCapacity(size);
}
public IntPtr DataPtr;
public int Size;
public void EnsureCapacity(int size)
{
if (Size < size)
{
if (DataPtr != IntPtr.Zero)
{
Marshal.FreeHGlobal(DataPtr);
}
DataPtr = Marshal.AllocHGlobal(size);
Size = size;
}
}
/// <inheritdoc />
public void Free()
{
if (DataPtr == IntPtr.Zero)
return;
Marshal.FreeHGlobal(DataPtr);
DataPtr = IntPtr.Zero;
Size = 0;
@@ -72,7 +63,7 @@ namespace FlaxEditor.Tools.Terrain
}
private EditTerrainMapAction _activeAction;
private List<SplatmapData> _cachedSplatmapData = new();
private SplatmapData[] _cachedSplatmapData = new SplatmapData[2];
/// <summary>
/// The terrain painting gizmo.
@@ -268,14 +259,9 @@ namespace FlaxEditor.Tools.Terrain
/// <returns>The allocated memory using <see cref="Marshal"/> interface.</returns>
public IntPtr GetSplatmapTempBuffer(int size, int splatmapIndex)
{
if (_cachedSplatmapData.Count <= splatmapIndex)
{
_cachedSplatmapData.Add(new SplatmapData(size));
return _cachedSplatmapData[splatmapIndex].DataPtr;
}
_cachedSplatmapData[splatmapIndex].EnsureCapacity(size);
return _cachedSplatmapData[splatmapIndex].DataPtr;
ref var splatmapData = ref _cachedSplatmapData[splatmapIndex];
splatmapData.EnsureCapacity(size);
return splatmapData.DataPtr;
}
/// <summary>
@@ -309,9 +295,7 @@ namespace FlaxEditor.Tools.Terrain
// Free temporary memory buffer
foreach (var splatmapData in _cachedSplatmapData)
{
splatmapData.Free();
}
}
/// <summary>