Optimize map generation (#62)

* 分离出访问更快的chunk storage

* 分离出访问更快的 chunk storage

Author: sunnycase

…r.Interfaces/World/ChunkColumnStorage.cs ….Core/World/ChunkColumnCompactStorage.cssrc/MineCase.Server.Interfaces/World/ChunkColumnStorage.cs renamed to src/MineCase.Core/World/ChunkColumnCompactStorage.cs src/MineCase.Server.Interfaces/World/ChunkColumnStorage.cs renamed to src/MineCase.Core/World/ChunkColumnCompactStorage.cs

@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace MineCase.Server.World
+namespace MineCase.World
 {
     public static class ChunkConstants
     {
@@ -14,7 +14,7 @@ public static class ChunkConstants
         public const int BlocksInSection = BlockEdgeWidthInSection * BlockEdgeWidthInSection * BlockEdgeWidthInSection;
     }
 
-    public sealed class ChunkColumnStorage
+    public sealed class ChunkColumnCompactStorage
     {
         public uint SectionBitMask
         {
@@ -32,7 +32,7 @@ public uint SectionBitMask
             }
         }
 
-        public ChunkSectionStorage[] Sections { get; } = new ChunkSectionStorage[ChunkConstants.SectionsPerChunk];
+        public ChunkSectionCompactStorage[] Sections { get; } = new ChunkSectionCompactStorage[ChunkConstants.SectionsPerChunk];
 
         public byte[] Biomes { get; } = new byte[256];
 
@@ -43,14 +43,14 @@ public uint SectionBitMask
         }
     }
 
-    public sealed class ChunkSectionStorage
+    public sealed class ChunkSectionCompactStorage
     {
         private const byte _bitsId = 9;
         private const byte _bitsMeta = 4;
         private const byte _bitsPerBlock = _bitsId + _bitsMeta;
         private const uint _idMask = (1u << _bitsId) - 1;
         private const uint _metaMask = (1u << _bitsMeta) - 1;
-        private const ulong _blockMask = (1u << _bitsPerBlock) - 1;
+        public const ulong BlockMask = (1u << _bitsPerBlock) - 1;
 
         public byte BitsPerBlock => _bitsPerBlock;
 
@@ -60,7 +60,7 @@ public sealed class ChunkSectionStorage
 
         public NibbleArray SkyLight { get; }
 
-        public ChunkSectionStorage(bool hasSkylight)
+        public ChunkSectionCompactStorage(bool hasSkylight)
         {
             if (hasSkylight)
                 SkyLight = new NibbleArray();
@@ -88,7 +88,7 @@ public sealed class DataArray
                     var stgValue = ((ulong)value.Id << _bitsMeta) | (value.MetaValue & _metaMask);
                     var offset = GetOffset(x, y, z);
                     var tmpValue = Storage[offset.indexOffset];
-                    var mask = _blockMask << offset.bitOffset;
+                    var mask = BlockMask << offset.bitOffset;
                     var toWrite = Math.Min(_bitsPerBlock, 64 - offset.bitOffset);
                     Storage[offset.indexOffset] = (tmpValue & ~mask) | (stgValue << offset.bitOffset);
                     var rest = _bitsPerBlock - toWrite;
@@ -139,7 +139,7 @@ private static int GetBlockSerialIndex(int x, int y, int z)
             return ((y * ChunkConstants.BlockEdgeWidthInSection) + z) * ChunkConstants.BlockEdgeWidthInSection + x;
         }
 
-        internal static uint ToUInt32(ref BlockState blockState)
+        public static uint ToUInt32(ref BlockState blockState)
         {
             return ((blockState.Id & _idMask) << _bitsMeta) | (blockState.MetaValue & _metaMask);
         }

src/MineCase.Server.Grains/Network/Play/ClientPlayPacketGenerator.cs

@@ -5,13 +5,13 @@
 using System.Numerics;
 using System.Text;
 using System.Threading.Tasks;
-
 using MineCase.Protocol.Play;
 using MineCase.Serialization;
 using MineCase.Server.Game;
 using MineCase.Server.Game.Entities;
 using MineCase.Server.Game.Entities.EntityMetadata;
 using MineCase.Server.World;
+using MineCase.World;
 using Orleans.Concurrency;
 
 namespace MineCase.Server.Network.Play
@@ -247,7 +247,7 @@ public Task CollectItem(uint collectedEntityId, uint entityId, uint itemCount)
             });
         }
 
-        public Task ChunkData(Dimension dimension, int chunkX, int chunkZ, ChunkColumnStorage chunkColumn)
+        public Task ChunkData(Dimension dimension, int chunkX, int chunkZ, ChunkColumnCompactStorage chunkColumn)
         {
             return Sink.SendPacket(new ChunkData
             {

src/MineCase.Server.Grains/World/ChunkColumnGrain.cs

@@ -10,6 +10,7 @@
 using MineCase.Server.Network.Play;
 using MineCase.Server.Settings;
 using MineCase.Server.World.Generation;
+using MineCase.World;
 using Orleans;
 using Orleans.Concurrency;
 
@@ -23,7 +24,7 @@ internal class ChunkColumnGrain : Grain, IChunkColumn
         private int _chunkZ;
 
         private bool _generated = false;
-        private ChunkColumnStorage _state;
+        private ChunkColumnCompactStorage _state;
         private Dictionary<BlockChunkPos, IBlockEntity> _blockEntities;
 
         public async Task<BlockState> GetBlockState(int x, int y, int z)
@@ -32,7 +33,7 @@ public async Task<BlockState> GetBlockState(int x, int y, int z)
             return _state[x, y, z];
         }
 
-        public async Task<ChunkColumnStorage> GetState()
+        public async Task<ChunkColumnCompactStorage> GetState()
         {
             await EnsureChunkGenerated();
             return _state;

src/MineCase.Server.Grains/World/Generation/ChunkGeneratorFlatGrain.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using MineCase.World;
 using Newtonsoft.Json;
 using Orleans;
 using Orleans.Concurrency;
@@ -12,18 +13,18 @@ namespace MineCase.Server.World.Generation
     [StatelessWorker]
     internal class ChunkGeneratorFlatGrain : Grain, IChunkGeneratorFlat
     {
-        public Task<ChunkColumnStorage> Generate(IWorld world, int x, int z, GeneratorSettings settings)
+        public Task<ChunkColumnCompactStorage> Generate(IWorld world, int x, int z, GeneratorSettings settings)
         {
-            var chunkColumn = new ChunkColumnStorage();
+            var chunkColumn = new ChunkColumnCompactStorage();
             for (int i = 0; i < chunkColumn.Sections.Length; ++i)
-                chunkColumn.Sections[i] = new ChunkSectionStorage(true);
+                chunkColumn.Sections[i] = new ChunkSectionCompactStorage(true);
 
             GenerateChunk(world, chunkColumn, x, z, settings);
             PopulateChunk(world, chunkColumn, x, z, settings);
             return Task.FromResult(chunkColumn);
         }
 
-        private void GenerateChunk(IWorld world, ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
+        private void GenerateChunk(IWorld world, ChunkColumnCompactStorage chunk, int x, int z, GeneratorSettings settings)
         {
             // 按照flat模式每层的设置给chunk赋值
             for (int y = 0; y < settings.FlatBlockId.Length; ++y)
@@ -46,7 +47,7 @@ private void GenerateChunk(IWorld world, ChunkColumnStorage chunk, int x, int z,
             // todo biomes
         }
 
-        private void PopulateChunk(IWorld world, ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
+        private void PopulateChunk(IWorld world, ChunkColumnCompactStorage chunk, int x, int z, GeneratorSettings settings)
         {
             // TODO generator tree, grass, structures\
         }

src/MineCase.Server.Grains/World/Generation/ChunkGeneratorOverworldGrain.cs

@@ -10,6 +10,7 @@
 using MineCase.Server.World.Biomes;
 using MineCase.Server.World.Layer;
 using MineCase.Server.World.Mine;
+using MineCase.World;
 using Newtonsoft.Json;
 using Orleans;
 using Orleans.Concurrency;
@@ -33,6 +34,7 @@ internal class ChunkGeneratorOverWorldGrain : Grain, IChunkGeneratorOverworld
         private OctavedNoise<PerlinNoise> _minNoise;
         private OctavedNoise<PerlinNoise> _surfaceNoise;
 
+        private int _seed;
         private Random _random;
 
         private float[,] _biomeWeights;
@@ -50,8 +52,8 @@ public override Task OnActivateAsync()
             _maxLimitMap = new float[5, 33, 5];
             _surfaceMap = new float[16, 1, 16];
 
-            int seed = (int)this.GetPrimaryKeyLong();
-            _random = new Random(seed);
+            _seed = (int)this.GetPrimaryKeyLong();
+            _random = new Random(_seed);
             _depthNoise = new OctavedNoise<PerlinNoise>(new PerlinNoise(_random.Next()), 8, 0.5F);
             _mainNoise = new OctavedNoise<PerlinNoise>(new PerlinNoise(_random.Next()), 8, 0.5F);
             _maxNoise = new OctavedNoise<PerlinNoise>(new PerlinNoise(_random.Next()), 8, 0.5F);
@@ -70,23 +72,27 @@ public override Task OnActivateAsync()
 
             _biomesForGeneration = new Biome[16, 16];
 
-            _genlayer = GenLayer.InitAllLayer(seed);
+            _genlayer = GenLayer.InitAllLayer(_seed);
 
             return Task.CompletedTask;
         }
 
-        public async Task<ChunkColumnStorage> Generate(IWorld world, int x, int z, GeneratorSettings settings)
+        public async Task<ChunkColumnCompactStorage> Generate(IWorld world, int x, int z, GeneratorSettings settings)
         {
             var chunkColumn = new ChunkColumnStorage();
             for (int i = 0; i < chunkColumn.Sections.Length; ++i)
                 chunkColumn.Sections[i] = new ChunkSectionStorage(true);
 
-            await GenerateChunk(world, chunkColumn, x, z, settings);
-            await PopulateChunk(world, chunkColumn, x, z, settings);
-            return chunkColumn;
+            var info = new MapGenerationInfo
+            {
+                Seed = await world.GetSeed()
+            };
+            GenerateChunk(info, chunkColumn, x, z, settings);
+            PopulateChunk(world, chunkColumn, x, z, settings);
+            return chunkColumn.Compact();
         }
 
-        public async Task GenerateChunk(IWorld world, ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
+        private void GenerateChunk(MapGenerationInfo info, ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
         {
             // 生物群系生成
             // 获取生物群系
@@ -101,7 +107,7 @@ public async Task GenerateChunk(IWorld world, ChunkColumnStorage chunk, int x, i
             }
 
             // 基本地形生成
-            await GenerateBasicTerrain(chunk, x, z, settings);
+            GenerateBasicTerrain(chunk, x, z, settings);
 
             // 获取生物群系
             biomeIds = _genlayer.GetInts(x * 16, z * 16, 16, 16);
@@ -124,33 +130,33 @@ public async Task GenerateChunk(IWorld world, ChunkColumnStorage chunk, int x, i
             }
 
             // 添加生物群系特有方块
-            await ReplaceBiomeBlocks(settings, x, z, chunk, _biomesForGeneration);
+            ReplaceBiomeBlocks(settings, x, z, chunk, _biomesForGeneration);
 
             // Todo genrate structure
             // 生成洞穴
             if (settings.UseCaves)
             {
-                CavesGenerator generator = new CavesGenerator(world);
-                await generator.Generate(world, x, z, chunk);
+                CavesGenerator generator = new CavesGenerator(info);
+                generator.Generate(info, x, z, chunk);
             }
 
             // 计算skylight
-            await GenerateSkylightMap(chunk);
+            GenerateSkylightMap(chunk);
         }
 
-        public async Task PopulateChunk(IWorld world, ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
+        public void PopulateChunk(IWorld world, ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
         {
             int blockX = x * 16;
             int blockZ = z * 16;
             Biome chunkBiome = Biome.GetBiome(chunk.Biomes[7 * 16 + 7], settings);
 
-            await chunkBiome.Decorate(world, GrainFactory, chunk, _random, new BlockWorldPos { X = blockX, Y = 0, Z = blockZ });
+            chunkBiome.Decorate(world, GrainFactory, chunk, _random, new BlockWorldPos { X = blockX, Y = 0, Z = blockZ });
         }
 
-        private async Task GenerateBasicTerrain(ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
+        private void GenerateBasicTerrain(ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
         {
             // 产生高度图
-            await GenerateDensityMap(_densityMap, x * 4, 0, z * 4, settings);
+            GenerateDensityMap(_densityMap, x * 4, 0, z * 4, settings);
 
             // 进行线性插值
             for (int xHigh = 0; xHigh < 4; ++xHigh)
@@ -213,7 +219,7 @@ private async Task GenerateBasicTerrain(ChunkColumnStorage chunk, int x, int z,
             }
         }
 
-        private Task GenerateDensityMap(float[,,] densityMap, int xOffset, int yOffset, int zOffset, GeneratorSettings settings)
+        private void GenerateDensityMap(float[,,] densityMap, int xOffset, int yOffset, int zOffset, GeneratorSettings settings)
         {
             _depthNoise.Noise(
                 _depthMap,
@@ -361,10 +367,9 @@ private Task GenerateDensityMap(float[,,] densityMap, int xOffset, int yOffset,
             }
 
             densityMap = _densityMap;
-            return Task.CompletedTask;
         }
 
-        private Task ReplaceBiomeBlocks(GeneratorSettings settings, int x, int z, ChunkColumnStorage chunk, Biome[,] biomesIn)
+        private void ReplaceBiomeBlocks(GeneratorSettings settings, int x, int z, ChunkColumnStorage chunk, Biome[,] biomesIn)
         {
             _surfaceNoise.Noise(
                 _surfaceMap,
@@ -379,30 +384,34 @@ private Task ReplaceBiomeBlocks(GeneratorSettings settings, int x, int z, ChunkC
                     biome.GenerateBiomeTerrain(settings.SeaLevel, _random, chunk, x, z, x1, z1, (_surfaceMap[x1, 0, z1] - 0.5) * 2);
                 }
             }
-
-            return Task.CompletedTask;
         }
 
-        private Task GenerateSkylightMap(ChunkColumnStorage chunk)
+        private void GenerateSkylightMap(ChunkColumnStorage chunk)
         {
-            for (int y = 0; y < 256; ++y)
+            for (int i = 0; i < ChunkConstants.SectionsPerChunk; ++i)
             {
-                var section = chunk.Sections[y / 16];
-                for (int i = 0; i < section.SkyLight.Storage.Length; i++)
-                    section.SkyLight.Storage[i] = 0xFF;
+                var skyLight = chunk.Sections[i].SkyLight;
+                for (int y = 0; y < ChunkConstants.BlockEdgeWidthInSection; y++)
+                {
+                    for (int z = 0; z < ChunkConstants.BlockEdgeWidthInSection; z++)
+                    {
+                        for (int x = 0; x < ChunkConstants.BlockEdgeWidthInSection; x++)
+                        {
+                            skyLight[x, y, z] = 0xF;
+                        }
+                    }
+                }
             }
-
-            return Task.CompletedTask;
         }
 
-        private Task<int> GetDensityMapIndex(int x, int y, int z)
+        private int GetDensityMapIndex(int x, int y, int z)
         {
-            return Task.FromResult((x * 5 + z) * 33 + y);
+            return (x * 5 + z) * 33 + y;
         }
 
-        private Task<double> GetDensityMapValue(double[] densityMap, int x, int y, int z)
+        private double GetDensityMapValue(double[] densityMap, int x, int y, int z)
         {
-            return Task.FromResult(densityMap[(x * 5 + z) * 33 + y]);
+            return densityMap[(x * 5 + z) * 33 + y];
         }
     }
 }

src/MineCase.Server.Interfaces/World/Biomes/Biome.cs

@@ -6,6 +6,7 @@
 using MineCase.Server.World.Generation;
 using MineCase.Server.World.Mine;
 using MineCase.Server.World.Plants;
+using MineCase.World;
 using Orleans;
 
 namespace MineCase.Server.World.Biomes
@@ -252,7 +253,7 @@ public void GenerateOre(MinableGenerator generator, IWorld world, IGrainFactory
         }
 
         // 后期添加一些方块，Biome基类主要生成矿物
-        public virtual Task Decorate(IWorld world, IGrainFactory grainFactory, ChunkColumnStorage chunk, Random rand, BlockWorldPos pos)
+        public virtual void Decorate(IWorld world, IGrainFactory grainFactory, ChunkColumnStorage chunk, Random rand, BlockWorldPos pos)
         {
             GenerateOre(_dirtGen, world, grainFactory, chunk, rand, pos, _genSettings.DirtCount, _genSettings.DirtMaxHeight, _genSettings.DirtMinHeight);
             GenerateOre(_gravelOreGen, world, grainFactory, chunk, rand, pos, _genSettings.GravelCount, _genSettings.GravelMaxHeight, _genSettings.GravelMinHeight);
@@ -266,7 +267,6 @@ public virtual Task Decorate(IWorld world, IGrainFactory grainFactory, ChunkColu
             GenerateOre(_redstoneGen, world, grainFactory, chunk, rand, pos, _genSettings.RedstoneCount, _genSettings.RedstoneMaxHeight, _genSettings.RedstoneMinHeight);
             GenerateOre(_diamondGen, world, grainFactory, chunk, rand, pos, _genSettings.DiamondCount, _genSettings.DiamondMaxHeight, _genSettings.DiamondMinHeight);
             GenerateOre(_lapisGen, world, grainFactory, chunk, rand, pos, _genSettings.LapisCount, _genSettings.LapisCenterHeight + _genSettings.LapisSpread, _genSettings.LapisCenterHeight - _genSettings.LapisSpread);
-            return Task.CompletedTask;
         }
 
         // 产生生物群系特有的方块