More biomes (#52)

* Set seed from setting file

* Add Ocean

* Add DoublePlants generator

* Add Double grass generator

* Test CactiGenerator

* Caves Generator(without test)

* Add Caves with test

* Add biome generation

* Add Layer Generator

* Fix a bug in GenlayerZoom

* Better biome parameters

* Fix cavegen bug

* Remove useless code

* Remove old blockaccessor

Author: jstzwj

src/MineCase.Server.Grains/User/UserGrain.cs

@@ -88,7 +88,7 @@ public async Task JoinGame()
             // _worldTimeSyncTimer = RegisterTimer(OnSyncWorldTime, null, TimeSpan.Zero, )
 
             // 设置出生点
-            await _player.Spawn(this.GetPrimaryKey(), new Vector3(0, 200, 0), 0.0f, 0.0f);
+            await _player.Spawn(this.GetPrimaryKey(), new Vector3(1000, 200, 1000), 0.0f, 0.0f);
         }
 
         private async Task SendTimeUpdate()

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

@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using MineCase.Server.Game.Entities;
+using MineCase.Server.Settings;
 using MineCase.Server.World.Generation;
 using Orleans;
 
@@ -109,22 +110,33 @@ public Task UpdatePlayerPosition(IPlayer player, Vector3 position)
 
         private async Task EnsureChunkGenerated()
         {
-            /*
-            var generator = GrainFactory.GetGrain<IChunkGeneratorFlat>(1);
-            GeneratorSettings settings = new GeneratorSettings
+            var serverSetting = GrainFactory.GetGrain<IServerSettings>(0);
+            string worldType = (await serverSetting.GetSettings()).LevelType;
+            if (worldType == "DEFAULT" || worldType == "default")
             {
-                FlatGeneratorInfo = new FlatGeneratorInfo
+                var generator = GrainFactory.GetGrain<IChunkGeneratorOverworld>(await _world.GetSeed());
+                GeneratorSettings settings = new GeneratorSettings
+                {
+                };
+                _state = await generator.Generate(_world, _chunkX, _chunkZ, settings);
+            }
+            else if (worldType == "FLAT" || worldType == "flat")
+            {
+                var generator = GrainFactory.GetGrain<IChunkGeneratorFlat>(await _world.GetSeed());
+                GeneratorSettings settings = new GeneratorSettings
                 {
                     FlatBlockId = new BlockState?[] { BlockStates.Stone(), BlockStates.Dirt(), BlockStates.Grass() }
-                }
-            };
-            _state = await generator.Generate(_chunkX, _chunkZ, settings);
-            */
-            var generator = GrainFactory.GetGrain<IChunkGeneratorOverworld>(1);
-            GeneratorSettings settings = new GeneratorSettings
+                };
+                _state = await generator.Generate(_world, _chunkX, _chunkZ, settings);
+            }
+            else
             {
-            };
-            _state = await generator.Generate(_world, _chunkX, _chunkZ, settings);
+                var generator = GrainFactory.GetGrain<IChunkGeneratorOverworld>(await _world.GetSeed());
+                GeneratorSettings settings = new GeneratorSettings
+                {
+                };
+                _state = await generator.Generate(_world, _chunkX, _chunkZ, settings);
+            }
         }
     }
 }

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

@@ -8,6 +8,8 @@
 using MineCase.Algorithm;
 using MineCase.Algorithm.Noise;
 using MineCase.Server.World.Biomes;
+using MineCase.Server.World.Layer;
+using MineCase.Server.World.Mine;
 using Newtonsoft.Json;
 using Orleans;
 using Orleans.Concurrency;
@@ -37,6 +39,8 @@ internal class ChunkGeneratorOverWorldGrain : Grain, IChunkGeneratorOverworld
 
         private Biome[,] _biomesForGeneration; // 10x10 or 16 x 16
 
+        private GenLayer _genlayer;
+
         public override Task OnActivateAsync()
         {
             _densityMap = new float[5, 33, 5];
@@ -64,6 +68,10 @@ public override Task OnActivateAsync()
                 }
             }
 
+            _biomesForGeneration = new Biome[16, 16];
+
+            _genlayer = GenLayer.InitAllLayer(seed);
+
             return Task.CompletedTask;
         }
 
@@ -80,15 +88,29 @@ public async Task<ChunkColumnStorage> Generate(IWorld world, int x, int z, Gener
 
         public async Task GenerateChunk(IWorld world, ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
         {
-            // GetBiomesForGeneration(_biomesForGeneration, x * 4 - 2, z * 4 - 2, 10, 10);
             // 生物群系生成
-            // 生物群系先暂时初始化成这样，以后修改
-            _biomesForGeneration = new Biome[16, 16];
+            // 获取生物群系
+            int[,] biomeIds = _genlayer.GetInts(x * 16 - 8, z * 16 - 8, 32, 32);
+
+            for (int i = 0; i < 10; ++i)
+            {
+                for (int j = 0; j < 10; ++j)
+                {
+                    _biomesForGeneration[j, i] = Biome.GetBiome(biomeIds[(int)(0.861111F * j * 4), (int)(0.861111F * i * 4)], settings);
+                }
+            }
+
+            // 基本地形生成
+            await GenerateBasicTerrain(chunk, x, z, settings);
+
+            // 获取生物群系
+            biomeIds = _genlayer.GetInts(x * 16, z * 16, 16, 16);
+
             for (int i = 0; i < 16; ++i)
             {
                 for (int j = 0; j < 16; ++j)
                 {
-                    _biomesForGeneration[i, j] = new BiomePlains(new BiomeProperties { BiomeName = "plains" }, settings);
+                    _biomesForGeneration[j, i] = Biome.GetBiome(biomeIds[j, i], settings);
                 }
             }
 
@@ -97,17 +119,20 @@ public async Task GenerateChunk(IWorld world, ChunkColumnStorage chunk, int x, i
             {
                 for (int j = 0; j < 16; ++j)
                 {
-                    chunk.Biomes[i * 16 + j] = (byte)_biomesForGeneration[i, j].GetBiomeId();
+                    chunk.Biomes[j * 16 + i] = (byte)_biomesForGeneration[j, i].GetBiomeId();
                 }
             }
 
-            // 基本地形生成
-            await GenerateBasicTerrain(chunk, x, z, settings);
-
             // 添加生物群系特有方块
             await ReplaceBiomeBlocks(settings, x, z, chunk, _biomesForGeneration);
 
             // Todo genrate structure
+            // 生成洞穴
+            if (settings.UseCaves)
+            {
+                CavesGenerator generator = new CavesGenerator(world);
+                await generator.Generate(world, x, z, chunk);
+            }
 
             // 计算skylight
             await GenerateSkylightMap(chunk);
@@ -124,48 +149,43 @@ public async Task PopulateChunk(IWorld world, ChunkColumnStorage chunk, int x, i
 
         private async Task GenerateBasicTerrain(ChunkColumnStorage chunk, int x, int z, GeneratorSettings settings)
         {
-            // this.biomesForGeneration = this.world.getBiomeProvider().getBiomesForGeneration(this.biomesForGeneration, x * 4 - 2, z * 4 - 2, 10, 10);
+            // 产生高度图
             await GenerateDensityMap(_densityMap, x * 4, 0, z * 4, settings);
 
+            // 进行线性插值
             for (int xHigh = 0; xHigh < 4; ++xHigh)
             {
-                // int xPart1 = xHigh * 5;
-                // int xPart2 = (xHigh + 1) * 5;
                 for (int zHigh = 0; zHigh < 4; ++zHigh)
                 {
-                    // int zPart11 = (xPart1 + zHigh) * 33;
-                    // int zPart12 = (xPart1 + zHigh + 1) * 33;
-                    // int zPart21 = (xPart2 + zHigh) * 33;
-                    // int zPart22 = (xPart2 + zHigh + 1) * 33;
                     for (int yHigh = 0; yHigh < 32; ++yHigh)
                     {
                         double yPart111 = _densityMap[xHigh, yHigh, zHigh];
                         double yPart121 = _densityMap[xHigh, yHigh, zHigh + 1];
                         double yPart211 = _densityMap[xHigh + 1, yHigh, zHigh];
                         double yPart221 = _densityMap[xHigh + 1, yHigh, zHigh + 1];
-                        double yDensityDif11 = (_densityMap[xHigh, yHigh + 1, zHigh] - yPart111) * 0.125;
-                        double yDensityDif12 = (_densityMap[xHigh, yHigh + 1, zHigh + 1] - yPart121) * 0.125;
-                        double yDensityDif21 = (_densityMap[xHigh + 1, yHigh + 1, zHigh] - yPart211) * 0.125;
-                        double yDensityDif22 = (_densityMap[xHigh + 1, yHigh + 1, zHigh + 1] - yPart221) * 0.125;
+                        double yDensityStep11 = (_densityMap[xHigh, yHigh + 1, zHigh] - yPart111) * 0.125;
+                        double yDensityStep12 = (_densityMap[xHigh, yHigh + 1, zHigh + 1] - yPart121) * 0.125;
+                        double yDensityStep21 = (_densityMap[xHigh + 1, yHigh + 1, zHigh] - yPart211) * 0.125;
+                        double yDensityStep22 = (_densityMap[xHigh + 1, yHigh + 1, zHigh + 1] - yPart221) * 0.125;
 
                         for (int yLow = 0; yLow < 8; ++yLow)
                         {
                             double density111 = yPart111;
                             double density121 = yPart121;
-                            double xDensityDif11 = (yPart211 - yPart111) * 0.25;
-                            double xDensityDif21 = (yPart221 - yPart121) * 0.25;
+                            double xDensityStep11 = (yPart211 - yPart111) * 0.25;
+                            double xDensityStep21 = (yPart221 - yPart121) * 0.25;
 
                             for (int xLow = 0; xLow < 4; ++xLow)
                             {
-                                double zDensityDif11 = (density121 - density111) * 0.25;
-                                double blockValue = density111 - zDensityDif11;
+                                double zDensityStep11 = (density121 - density111) * 0.25;
+                                double blockValue = density111 - zDensityStep11;
 
                                 for (int zLow = 0; zLow < 4; ++zLow)
                                 {
                                     int posX = xHigh * 4 + xLow;
                                     int posY = yHigh * 8 + yLow;
                                     int posZ = zHigh * 4 + zLow;
-                                    if ((blockValue += zDensityDif11) > 0.0)
+                                    if ((blockValue += zDensityStep11) > 0.0)
                                     {
                                         chunk[posX, posY, posZ] = BlockStates.Stone();
                                     }
@@ -179,14 +199,14 @@ private async Task GenerateBasicTerrain(ChunkColumnStorage chunk, int x, int z,
                                     }
                                 }
 
-                                density111 += xDensityDif11;
-                                density121 += xDensityDif21;
+                                density111 += xDensityStep11;
+                                density121 += xDensityStep21;
                             }
 
-                            yPart111 += yDensityDif11;
-                            yPart121 += yDensityDif12;
-                            yPart211 += yDensityDif21;
-                            yPart221 += yDensityDif22;
+                            yPart111 += yDensityStep11;
+                            yPart121 += yDensityStep12;
+                            yPart211 += yDensityStep21;
+                            yPart221 += yDensityStep22;
                         }
                     }
                 }
@@ -238,14 +258,14 @@ private Task GenerateDensityMap(float[,,] densityMap, int xOffset, int yOffset,
                     float totalWeight = 0.0F;
 
                     // 中心点生物群系
-                    Biome centerBiome = _biomesForGeneration[x1 + 2, z1 + 2];
+                    Biome centerBiome = _biomesForGeneration[z1 + 2, x1 + 2];
 
                     // 求scale和groundYOffset的加权平均值
                     for (int x2 = 0; x2 < 5; ++x2)
                     {
                         for (int z2 = 0; z2 < 5; ++z2)
                         {
-                            Biome biome = _biomesForGeneration[x1 + x2, z1 + z2];
+                            Biome biome = _biomesForGeneration[z1 + z2, x1 + x2];
                             float curGroundYOffset = settings.BiomeDepthOffSet + biome.GetBaseHeight() * settings.BiomeDepthWeight; // biomeDepthOffSet=0
                             float curScale = settings.BiomeScaleOffset + biome.GetHeightVariation() * settings.BiomeScaleWeight; // biomeScaleOffset=0
 
@@ -269,7 +289,7 @@ private Task GenerateDensityMap(float[,,] densityMap, int xOffset, int yOffset,
                     groundYOffset = (groundYOffset * 4.0F - 1.0F) / 8.0F;
 
                     // 取一个-0.36~0.125的随机数，这个随机数决定了起伏的地表
-                    float random = (_depthMap[x1, 0, z1] - 0.5F) * 160000 / 8000.0F;
+                    float random = (_depthMap[x1, 0, z1] - 0.5F) * 2 / 8000.0F;
                     if (random < 0.0F)
                     {
                         random = -random * 0.3F;
@@ -304,10 +324,9 @@ private Task GenerateDensityMap(float[,,] densityMap, int xOffset, int yOffset,
                     // groundYOffset有-0.072~0.025的变动量
                     groundYOffset1 = groundYOffset1 + random * 0.2F;
                     groundYOffset1 = groundYOffset1 * settings.BaseSize / 8.0F;
-                    float groundY = settings.BaseSize + groundYOffset1 * 4.0F;
 
-                    // 这个是大概的地面y坐标，实际上也没有保证不会出现浮空岛...
-                    // float groundY = settings.BaseSize * (1.0F + groundYOffset1 / 2.0F); // baseSize=8.5，应该代表了平均地表高度68
+                    // 这个是大概的地面y坐标
+                    float groundY = settings.BaseSize + groundYOffset1 * 4.0F; // baseSize=8.5，应该代表了平均地表高度68
 
                     // 注意这个y*8才是最终的y坐标
                     for (int y = 0; y < 33; ++y)
@@ -356,8 +375,8 @@ private Task ReplaceBiomeBlocks(GeneratorSettings settings, int x, int z, ChunkC
             {
                 for (int z1 = 0; z1 < 16; ++z1)
                 {
-                    Biome biome = biomesIn[x1, z1];
-                    biome.GenerateBiomeTerrain(settings.SeaLevel, _random, chunk, x, z, x1, z1, _surfaceMap[x1, 0, z1]);
+                    Biome biome = biomesIn[z1, x1];
+                    biome.GenerateBiomeTerrain(settings.SeaLevel, _random, chunk, x, z, x1, z1, (_surfaceMap[x1, 0, z1] - 0.5) * 2);
                 }
             }
 

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

@@ -16,7 +16,6 @@ internal class WorldGrain : Grain, IWorld
         private Dictionary<uint, IEntity> _entities;
         private uint _nextAvailEId;
         private long _worldAge;
-        private IBlockAccessor _blockAccessor;
         private GeneratorSettings _genSettings; // 生成设置
         private string _seed; // 世界种子
 
@@ -25,7 +24,6 @@ public override async Task OnActivateAsync()
             IServerSettings serverSettings = GrainFactory.GetGrain<IServerSettings>(0);
             _nextAvailEId = 0;
             _entities = new Dictionary<uint, IEntity>();
-            _blockAccessor = GrainFactory.GetGrain<IBlockAccessor>(this.GetPrimaryKeyString());
             _genSettings = new GeneratorSettings();
             await InitGeneratorSettings(_genSettings);
             _seed = (await serverSettings.GetSettings()).LevelSeed;
@@ -64,11 +62,6 @@ public Task OnGameTick(TimeSpan deltaTime)
 
         public Task<long> GetAge() => Task.FromResult(_worldAge);
 
-        public Task<IBlockAccessor> GetBlockAccessor()
-        {
-            return Task.FromResult(_blockAccessor);
-        }
-
         public Task<int> GetSeed()
         {
             int result = 0;