Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-30 04:29:05 +00:00
Code Issues Releases Activity

Alright

Browse Source
This commit is contained in:
Daniel Mills
2020-08-16 21:14:40 -04:00
parent c07b4e9f98
commit 0c5855a82d
5 changed files with 189 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java
View File

@@ -144,11 +144,15 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
for(int kv = Math.max(height, fluidHeight); kv < Math.min(Math.max(height, fluidHeight) + 16, 255); kv++)
{
Biome skyBiome = biome.getSkyBiome(masterRandom, rz, kv, rx);
sliver.set(kv, biome.getDerivative());
sliver.set(k, skyBiome);
sliver.set(kv, skyBiome);
}
}
if(k <= Math.max(height, fluidHeight))
{
sliver.set(k, biome.getGroundBiome(masterRandom, rz, k, rx));
}
// Set Sea Material (water/lava)
if(underwater)
{

176
src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java
View File

@@ -5,11 +5,11 @@ import org.bukkit.block.data.BlockData;
import com.volmit.iris.gen.DimensionChunkGenerator;
import com.volmit.iris.gen.atomics.AtomicSliver;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.noise.FastNoise;
import com.volmit.iris.noise.FastNoise.CellularDistanceFunction;
import com.volmit.iris.noise.FastNoise.CellularReturnType;
import com.volmit.iris.noise.FastNoise.NoiseType;
import com.volmit.iris.object.IrisCaveLayer;
import com.volmit.iris.util.B;
import com.volmit.iris.util.CaveResult;
import com.volmit.iris.util.GenLayer;
@@ -21,16 +21,12 @@ public class GenLayerCave extends GenLayer
public static final BlockData CAVE_AIR = B.getBlockData("CAVE_AIR");
public static final BlockData AIR = B.getBlockData("AIR");
private static final KList<CaveResult> EMPTY = new KList<>();
private CNG gincline;
private CNG shuffle;
private FastNoise gg;
public GenLayerCave(DimensionChunkGenerator iris, RNG rng)
{
//@builder
super(iris, rng);
shuffle = CNG.signature(rng.nextParallelRNG(1348566));
gincline = new CNG(rng.nextParallelRNG(26512), 1D, 3).scale(0.00452);
gg = new FastNoise(324895 * rng.nextParallelRNG(49678).imax());
//@done
}
@@ -42,116 +38,124 @@ public class GenLayerCave extends GenLayer
return EMPTY;
}
int surface = data.getHighestBlock();
KList<CaveResult> result = new KList<>();
shuffle.scale(0.01);
double shuffleDistance = 72;
gg.SetNoiseType(NoiseType.Cellular);
gg.SetCellularReturnType(CellularReturnType.Distance2Sub);
gg.SetCellularDistanceFunction(CellularDistanceFunction.Natural);
for(int i = 0; i < 3; i++)
for(int i = 0; i < iris.getDimension().getCaveLayers().size(); i++)
{
double wx = wxx + (shuffle.noise(wxx, wzz) * shuffleDistance);
double wz = wzz + (shuffle.noise(wzz, wxx) * shuffleDistance);
double incline = 157;
double baseWidth = (14 * iris.getDimension().getCaveScale());
double distanceCheck = 0.0132 * baseWidth;
double distanceTake = 0.0022 * baseWidth;
double drop = (-i * 17) + 44 + iris.getDimension().getCaveShift();
double caveHeightNoise = incline * gincline.noise((wx + (10000 * i)), (wz - (10000 * i)));
caveHeightNoise += shuffle.fitDouble(-1, 1, wxx - caveHeightNoise, wzz + caveHeightNoise) * 3;
IrisCaveLayer layer = iris.getDimension().getCaveLayers().get(i);
generateCave(result, wxx, wzz, x, z, data, layer, i);
}
int ceiling = -256;
int floor = 512;
return result;
}
for(double tunnelHeight = 1; tunnelHeight <= baseWidth; tunnelHeight++)
public void generateCave(KList<CaveResult> result, double wxx, double wzz, int x, int z, AtomicSliver data, IrisCaveLayer layer, int seed)
{
double scale = layer.getCaveZoom();
int surface = data.getHighestBlock();
double wx = wxx + layer.getHorizontalSlope().get(rng, wxx, wzz);
double wz = wzz + layer.getHorizontalSlope().get(rng, -wzz, -wxx);
double baseWidth = (14 * scale);
double distanceCheck = 0.0132 * baseWidth;
double distanceTake = 0.0022 * baseWidth;
double caveHeightNoise = layer.getVerticalSlope().get(rng, wxx, wzz);
int ceiling = -256;
int floor = 512;
for(double tunnelHeight = 1; tunnelHeight <= baseWidth; tunnelHeight++)
{
double distance = (gg.GetCellular((float) ((wx + (10000 * seed)) / layer.getCaveZoom()), (float) ((wz - (10000 * seed)) / layer.getCaveZoom())) + 1D) / 2D;
if(distance < distanceCheck - (tunnelHeight * distanceTake))
{
double distance = (gg.GetCellular((float) wx + (10000 * i), (float) wz - (10000 * i)) + 1D) / 2D;
if(distance < distanceCheck - (tunnelHeight * distanceTake))
int caveHeight = (int) Math.round(caveHeightNoise);
int pu = (int) (caveHeight + tunnelHeight);
int pd = (int) (caveHeight - tunnelHeight);
if(pd > surface + 1)
{
int caveHeight = (int) Math.round(caveHeightNoise - drop);
int pu = (int) (caveHeight + tunnelHeight);
int pd = (int) (caveHeight - tunnelHeight);
continue;
}
if(pd > surface + 1)
if(!layer.isCanBreakSurface() && pu > surface - 3)
{
continue;
}
if((pu > 255 && pd > 255) || (pu < 0 && pd < 0))
{
continue;
}
if(data == null)
{
ceiling = pu > ceiling ? pu : ceiling;
floor = pu < floor ? pu : floor;
ceiling = pd > ceiling ? pd : ceiling;
floor = pd < floor ? pd : floor;
if(tunnelHeight == 1)
{
continue;
ceiling = caveHeight > ceiling ? caveHeight : ceiling;
floor = caveHeight < floor ? caveHeight : floor;
}
}
if((pu > 255 && pd > 255) || (pu < 0 && pd < 0))
{
continue;
}
if(data == null)
else
{
if(dig(x, pu, z, data))
{
ceiling = pu > ceiling ? pu : ceiling;
floor = pu < floor ? pu : floor;
if(pu > surface - 2)
{
if(dig(x, pu + 1, z, data))
{
ceiling = pu + 1 > ceiling ? pu + 1 : ceiling;
floor = pu + 1 < floor ? pu + 1 : floor;
if(dig(x, pu + 2, z, data))
{
ceiling = pu + 2 > ceiling ? pu + 2 : ceiling;
floor = pu + 2 < floor ? pu + 2 : floor;
if(dig(x, pu + 3, z, data))
{
ceiling = pu + 3 > ceiling ? pu + 3 : ceiling;
floor = pu + 3 < floor ? pu + 3 : floor;
}
}
}
}
}
if(dig(x, pd, z, data))
{
ceiling = pd > ceiling ? pd : ceiling;
floor = pd < floor ? pd : floor;
}
if(tunnelHeight == 1)
if(tunnelHeight == 1)
{
if(dig(x, (int) (caveHeight), z, data))
{
ceiling = caveHeight > ceiling ? caveHeight : ceiling;
floor = caveHeight < floor ? caveHeight : floor;
}
}
else
{
if(dig(x, pu, z, data))
{
ceiling = pu > ceiling ? pu : ceiling;
floor = pu < floor ? pu : floor;
if(pu > surface - 2)
{
if(dig(x, pu + 1, z, data))
{
ceiling = pu + 1 > ceiling ? pu + 1 : ceiling;
floor = pu + 1 < floor ? pu + 1 : floor;
if(dig(x, pu + 2, z, data))
{
ceiling = pu + 2 > ceiling ? pu + 2 : ceiling;
floor = pu + 2 < floor ? pu + 2 : floor;
if(dig(x, pu + 3, z, data))
{
ceiling = pu + 3 > ceiling ? pu + 3 : ceiling;
floor = pu + 3 < floor ? pu + 3 : floor;
}
}
}
}
}
if(dig(x, pd, z, data))
{
ceiling = pd > ceiling ? pd : ceiling;
floor = pd < floor ? pd : floor;
}
if(tunnelHeight == 1)
{
if(dig(x, (int) (caveHeight), z, data))
{
ceiling = caveHeight > ceiling ? caveHeight : ceiling;
floor = caveHeight < floor ? caveHeight : floor;
}
}
}
}
}
if(floor >= 0 && ceiling <= 255)
{
result.add(new CaveResult(floor, ceiling));
}
}
return result;
if(floor >= 0 && ceiling <= 255)
{
result.add(new CaveResult(floor, ceiling));
}
}
public boolean dig(int x, int y, int z, AtomicSliver data)