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

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

Browse Source 
# Conflicts:
#	README.md
This commit is contained in:
Wojtek Figat
2023-02-16 09:54:22 +01:00
parent c4b7f50609 ac368863aa
commit 30fa911832
47 changed files with 381 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/Tools/Terrain/CreateTerrainDialog.cs
View File

@@ -26,7 +26,9 @@ namespace FlaxEditor.Tools.Terrain
_31 = 31,
_63 = 63,
_127 = 127,
_254 = 254,
_255 = 255,
_511 = 511,
}
private class Options
@@ -34,7 +36,7 @@ namespace FlaxEditor.Tools.Terrain
[EditorOrder(100), EditorDisplay("Layout", "Number Of Patches"), DefaultValue(typeof(Int2), "1,1"), Limit(0, 512), Tooltip("Amount of terrain patches in each direction (X and Z). Each terrain patch contains a grid of 16 chunks. Patches can be later added or removed from terrain using a terrain editor tool.")]
public Int2 NumberOfPatches = new Int2(1, 1);
[EditorOrder(110), EditorDisplay("Layout"), DefaultValue(ChunkSizes._127), Tooltip("The size of the chunk (amount of quads per edge for the highest LOD). Must be power of two minus one (eg. 63).")]
[EditorOrder(110), EditorDisplay("Layout"), DefaultValue(ChunkSizes._127), Tooltip("The size of the chunk (amount of quads per edge for the highest LOD).")]
public ChunkSizes ChunkSize = ChunkSizes._127;
[EditorOrder(120), EditorDisplay("Layout", "LOD Count"), DefaultValue(6), Limit(1, FlaxEngine.Terrain.MaxLODs), Tooltip("The maximum Level Of Details count. The actual amount of LODs may be lower due to provided chunk size (each LOD has 4 times less quads).")]