AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-24 21:53:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Optimise CreateStrata even more

Browse Source
This commit is contained in:
UnknownShadow200 2017-02-24 19:01:33 +11:00
parent fde902fe68
commit d006264b7b
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ClassicalSharp/Generator/NotchyGenerator.cs
View File

@ -20,6 +20,7 @@ namespace ClassicalSharp.Generator {
BlockID[] blocks;
short[] heightmap;
JavaRandom rnd;
int minHeight;
public override string GeneratorName { get { return "Vanilla classic"; } }
@ -28,6 +29,7 @@ namespace ClassicalSharp.Generator {
waterLevel = Height / 2;
blocks = new BlockID[Width * Height * Length];
rnd = new JavaRandom(seed);
minHeight = Height;
CreateHeightmap();
CreateStrata();
@ -66,7 +68,10 @@ namespace ClassicalSharp.Generator {
double height = n3.Compute(x, z) > 0 ? hLow : Math.Max(hLow, hHigh);
height *= 0.5;
if (height < 0) height *= 0.8f;
hMap[index++] = (short)(height + waterLevel);
short adjHeight = (short)(height + waterLevel);
minHeight = adjHeight < minHeight ? adjHeight : minHeight;
hMap[index++] = adjHeight;
}
}
heightmap = hMap;
@ -74,29 +79,27 @@ namespace ClassicalSharp.Generator {
void CreateStrata() {
OctaveNoise n = new OctaveNoise(8, rnd);
CurrentState = "Creating strata";
int hMapIndex = 0, maxY = Height - 1;
CurrentState = "Creating strata";
int hMapIndex = 0, maxY = Height - 1, mapIndex = 0;
int minStoneY = CreateStrataFast();
for (int z = 0; z < Length; z++) {
CurrentProgress = (float)z / Length;
for (int x = 0; x < Width; x++) {
int dirtThickness = (int)(n.Compute(x, z) / 24 - 4);
int dirtHeight = heightmap[hMapIndex++];
int stoneHeight = dirtHeight + dirtThickness;
int mapIndex = z * Width + x;
blocks[mapIndex] = Block.Lava;
mapIndex += oneY;
int stoneHeight = dirtHeight + dirtThickness;
stoneHeight = Math.Min(stoneHeight, maxY);
dirtHeight = Math.Min(dirtHeight, maxY);
for (int y = 1; y <= stoneHeight; y++) {
mapIndex = minStoneY * oneY + z * Width + x;
for (int y = minStoneY; y <= stoneHeight; y++) {
blocks[mapIndex] = Block.Stone; mapIndex += oneY;
}
stoneHeight = Math.Max(stoneHeight, 0);
mapIndex = (stoneHeight + 1) * oneY + z * Width + x;
for (int y = stoneHeight + 1; y <= dirtHeight; y++) {
blocks[mapIndex] = Block.Dirt; mapIndex += oneY;
}
@ -104,6 +107,29 @@ namespace ClassicalSharp.Generator {
}
}
int CreateStrataFast() {
// Make lava layer at bottom
int mapIndex = 0;
for (int z = 0; z < Length; z++)
for (int x = 0; x < Width; x++)
{
blocks[mapIndex++] = Block.Lava;
}
// Invariant: the lowest value dirtThickness can possible be is -14
int stoneHeight = minHeight - 14;
if (stoneHeight <= 0) return 1; // no layer is fully stone
// We can quickly fill in bottom solid layers
for (int y = 1; y <= stoneHeight; y++)
for (int z = 0; z < Length; z++)
for (int x = 0; x < Width; x++)
{
blocks[mapIndex++] = Block.Stone;
}
return stoneHeight;
}
void CarveCaves() {
int cavesCount = blocks.Length / 8192;
CurrentState = "Carving caves";