Overworld gen (#42)

* Correct the terrain

* Ready to fix a bug

* Fix storage bug

* Fix storage's bug

Author: jstzwj

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

@@ -94,7 +94,7 @@ public async Task GenerateChunk(ChunkColumnStorage chunk, int x, int z, Generato
             await GenerateBasicTerrain(chunk, x, z, settings);
 
             // Todo add biomes blocks
-            ReplaceBiomeBlocks(settings, x, z, chunk, _biomesForGeneration);
+            await ReplaceBiomeBlocks(settings, x, z, chunk, _biomesForGeneration);
 
             // Todo genrate structure
             await GenerateSkylightMap(chunk);
@@ -254,7 +254,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) * 128 / 8000.0F;
+                    float random = (_depthMap[x1, 0, z1] - 0.5F) * 160000 / 8000.0F;
                     if (random < 0.0F)
                     {
                         random = -random * 0.3F;
@@ -306,9 +306,9 @@ private Task GenerateDensityMap(float[,,] densityMap, int xOffset, int yOffset,
                         }
 
                         // 并不保证lowerLimit < upperLimit，不过没有影响
-                        float lowerLimit = (_minLimitMap[x1, y, z1] - 0.5F) * 128 / settings.LowerLimitScale; // lowerLimitScale=512
-                        float upperLimit = (_maxLimitMap[x1, y, z1] - 0.5F) * 128 / settings.UpperLimitScale; // upperLimitScale=512
-                        float t = ((_mainNoiseMap[x1, y, z1] - 0.5F) * 128 / 10.0F + 1.0F) / 2.0F;
+                        float lowerLimit = (_minLimitMap[x1, y, z1] - 0.5F) * 160000 / settings.LowerLimitScale; // lowerLimitScale=512
+                        float upperLimit = (_maxLimitMap[x1, y, z1] - 0.5F) * 160000 / settings.UpperLimitScale; // upperLimitScale=512
+                        float t = ((_mainNoiseMap[x1, y, z1] - 0.5F) * 160000 / 10.0F + 1.0F) / 2.0F;
 
                         // 这个函数t < 0则取lowerLimit，t > 1则取upperLimit，否则以t为参数在上下限间线性插值
                         float result = MathHelper.DenormalizeClamp(lowerLimit, upperLimit, t) - offset;
@@ -330,7 +330,7 @@ private Task GenerateDensityMap(float[,,] densityMap, int xOffset, int yOffset,
             return Task.CompletedTask;
         }
 
-        public void ReplaceBiomeBlocks(GeneratorSettings settings, int x, int z, ChunkColumnStorage chunk, Biome[,] biomesIn)
+        private Task ReplaceBiomeBlocks(GeneratorSettings settings, int x, int z, ChunkColumnStorage chunk, Biome[,] biomesIn)
         {
             _surfaceNoise.Noise(
                 _surfaceMap,
@@ -342,9 +342,11 @@ public void ReplaceBiomeBlocks(GeneratorSettings settings, int x, int z, ChunkCo
                 for (int z1 = 0; z1 < 16; ++z1)
                 {
                     Biome biome = biomesIn[x1, z1];
-                    biome.GenerateBiomeTerrain(settings.SeaLevel, _random, chunk, x * 16 + x1, z * 16 + z1, _surfaceMap[x1, 0, z1]);
+                    biome.GenerateBiomeTerrain(settings.SeaLevel, _random, chunk, x, z, x1, z1, _surfaceMap[x1, 0, z1]);
                 }
             }
+
+            return Task.CompletedTask;
         }
 
         private Task GenerateSkylightMap(ChunkColumnStorage chunk)

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

@@ -78,26 +78,24 @@ public static Biome GetBiome(int id)
             switch (biomeId)
             {
                 case BiomeId.Ocean:
-                    // return new BiomeOcean();
+                // return new BiomeOcean();
                 case BiomeId.Plains:
-                    // return new BiomePlains();
+                // return new BiomePlains();
                 case BiomeId.Desert:
-                    // return new BiomeDesert();
+                // return new BiomeDesert();
                 case BiomeId.ExtremeHills:
-                    // return new BiomeExtremeHills();
+                // return new BiomeExtremeHills();
                 default:
                     return null;
             }
         }
 
-        public void GenerateBiomeTerrain(int seaLevel, Random rand, ChunkColumnStorage chunk, int x, int z, double noiseVal)
+        public void GenerateBiomeTerrain(int seaLevel, Random rand, ChunkColumnStorage chunk, int chunk_x, int chunk_z, int x_in_chunk, int z_in_chunk, double noiseVal)
         {
             BlockState topBlockstate = _topBlock;
             BlockState fillerBlockstate = _fillerBlock;
             int surfaceFlag = -1;
             int surfaceDepth = (int)(noiseVal / 3.0D + 3.0D + rand.NextDouble() * 0.25D);
-            int x_in_chunk = x & 0xF;
-            int z_in_chunk = z & 0xF;
 
             for (int y = 255; y >= 0; --y)
             {

src/MineCase.Server.Interfaces/World/ChunkColumnStorage.cs

@@ -48,6 +48,7 @@ public sealed class ChunkSectionStorage
         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;
 
@@ -78,8 +79,8 @@ public sealed class DataArray
                     var value = Storage[offset.indexOffset] >> offset.bitOffset;
                     var rest = _bitsPerBlock - toRead;
                     if (rest > 0)
-                        value = (value << rest) | (Storage[offset.bitOffset + 1] & ((1u << rest) - 1));
-                    return new BlockState { Id = (uint)(value >> _bitsMeta), MetaValue = (uint)(value & _metaMask) };
+                        value |= (Storage[offset.indexOffset + 1] & ((1u << rest) - 1)) << toRead;
+                    return new BlockState { Id = (uint)((value >> _bitsMeta) & _idMask), MetaValue = (uint)(value & _metaMask) };
                 }
 
                 set

src/MineCase.Server.Interfaces/World/Generation/GeneratorSettings.cs

@@ -30,9 +30,9 @@ public class GeneratorSettings
 
         public float DepthNoiseScaleZ { get; set; } = 200.0F;
 
-        public float CoordinateScale { get; set; } = 684.412F; // mc = 684.412F;
+        public float CoordinateScale { get; set; } = 0.05F; // mc = 684.412F;
 
-        public float HeightScale { get; set; } = 684.412F; // mc = 684.412F;
+        public float HeightScale { get; set; } = 0.05F; // mc = 684.412F;
 
         public float MainNoiseScaleX { get; set; } = 80.0F;