mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 02:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

More complex streams

Browse Source
This commit is contained in:
Daniel Mills 2020-10-26 22:33:15 -04:00
parent 59eda04949
commit 4d352b231c
1 changed files with 73 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/com/volmit/iris/gen/v2/IrisComplex.java
View File

@ -9,12 +9,15 @@ import com.volmit.iris.gen.v2.scaffold.layer.ProceduralStream;
import com.volmit.iris.gen.v2.scaffold.stream.Interpolated; import com.volmit.iris.gen.v2.scaffold.stream.Interpolated;
import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.manager.IrisDataManager;
import com.volmit.iris.noise.CNG; import com.volmit.iris.noise.CNG;
import com.volmit.iris.object.DecorationPart;
import com.volmit.iris.object.InferredType; import com.volmit.iris.object.InferredType;
import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.object.IrisDecorator;
import com.volmit.iris.object.IrisBiomePaletteLayer; import com.volmit.iris.object.IrisBiomePaletteLayer;
import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisDimension;
import com.volmit.iris.object.IrisGenerator; import com.volmit.iris.object.IrisGenerator;
import com.volmit.iris.object.IrisRegion; import com.volmit.iris.object.IrisRegion;
import com.volmit.iris.util.FastBlockData;
import com.volmit.iris.util.KList; import com.volmit.iris.util.KList;
import com.volmit.iris.util.M; import com.volmit.iris.util.M;
import com.volmit.iris.util.RNG; import com.volmit.iris.util.RNG;
@ -25,6 +28,7 @@ import lombok.Data;
public class IrisComplex implements DataProvider public class IrisComplex implements DataProvider
{ {
private RNG rng; private RNG rng;
private double fluidHeight;
private IrisDataManager data; private IrisDataManager data;
private KList<IrisGenerator> generators; private KList<IrisGenerator> generators;
private static final BlockData AIR = Material.AIR.createBlockData(); private static final BlockData AIR = Material.AIR.createBlockData();
@ -41,6 +45,12 @@ public class IrisComplex implements DataProvider
private ProceduralStream<Double> maxHeightStream; private ProceduralStream<Double> maxHeightStream;
private ProceduralStream<Double> overlayStream; private ProceduralStream<Double> overlayStream;
private ProceduralStream<Double> heightFluidStream; private ProceduralStream<Double> heightFluidStream;
private ProceduralStream<RNG> rngStream;
private ProceduralStream<RNG> chunkRngStream;
private ProceduralStream<IrisDecorator> terrainSurfaceDecoration;
private ProceduralStream<IrisDecorator> terrainCeilingDecoration;
private ProceduralStream<IrisDecorator> seaSurfaceDecoration;
private ProceduralStream<IrisDecorator> shoreSurfaceDecoration;
private ProceduralStream<BlockData> terrainStream; private ProceduralStream<BlockData> terrainStream;
private ProceduralStream<BlockData> rockStream; private ProceduralStream<BlockData> rockStream;
private ProceduralStream<BlockData> fluidStream; private ProceduralStream<BlockData> fluidStream;
@ -79,7 +89,7 @@ public class IrisComplex implements DataProvider
{ {
this.rng = new RNG(seed); this.rng = new RNG(seed);
this.data = data; this.data = data;
double fluidHeight = dimension.getFluidHeight(); fluidHeight = dimension.getFluidHeight();
generators = new KList<>(); generators = new KList<>();
RNG rng = new RNG(seed); RNG rng = new RNG(seed);
//@builder //@builder
@ -89,6 +99,9 @@ public class IrisComplex implements DataProvider
.forEach((c) -> registerGenerator(c.getCachedGenerator(this))))); .forEach((c) -> registerGenerator(c.getCachedGenerator(this)))));
overlayStream = ProceduralStream.ofDouble((x, z) -> 0D); overlayStream = ProceduralStream.ofDouble((x, z) -> 0D);
dimension.getOverlayNoise().forEach((i) -> overlayStream.add((x, z) -> i.get(rng, x, z))); dimension.getOverlayNoise().forEach((i) -> overlayStream.add((x, z) -> i.get(rng, x, z)));
rngStream = ProceduralStream.of((x, z) -> new RNG(((x.longValue()) << 32) | (z.longValue() & 0xffffffffL)).nextParallelRNG(seed), Interpolated.RNG)
.cache2D(64);
chunkRngStream = rngStream.blockToChunkCoords();
rockStream = dimension.getRockPalette().getLayerGenerator(rng.nextRNG(), data).stream() rockStream = dimension.getRockPalette().getLayerGenerator(rng.nextRNG(), data).stream()
.select(dimension.getRockPalette().getBlockData(data)) .select(dimension.getRockPalette().getBlockData(data))
.convert((v) -> v.getBlockData()); .convert((v) -> v.getBlockData());
@ -150,7 +163,20 @@ public class IrisComplex implements DataProvider
trueBiomeDerivativeStream = trueBiomeStream.convert((b) -> b.getDerivative()); trueBiomeDerivativeStream = trueBiomeStream.convert((b) -> b.getDerivative());
heightFluidStream = heightStream.max(fluidHeight); heightFluidStream = heightStream.max(fluidHeight);
maxHeightStream = ProceduralStream.ofDouble((x, z) -> 255D); maxHeightStream = ProceduralStream.ofDouble((x, z) -> 255D);
terrainStream = ProceduralStream.of((x, y, z) -> { terrainSurfaceDecoration = trueBiomeStream
.convertAware2D((b, xx,zz) -> decorateFor(b, xx, zz, DecorationPart.NONE));
terrainCeilingDecoration = trueBiomeStream
.convertAware2D((b, xx,zz) -> decorateFor(b, xx, zz, DecorationPart.CEILING));
shoreSurfaceDecoration = trueBiomeStream
.convertAware2D((b, xx,zz) -> decorateFor(b, xx, zz, DecorationPart.SHORE_LINE));
seaSurfaceDecoration = trueBiomeStream
.convertAware2D((b, xx,zz) -> decorateFor(b, xx, zz, DecorationPart.SEA_SURFACE));
terrainStream = ProceduralStream.of(this::fillTerrain, Interpolated.BLOCK_DATA);
//@done
}
private BlockData fillTerrain(Double x, Double y, Double z)
{
double height = heightStream.get(x, z); double height = heightStream.get(x, z);
IrisBiome biome = trueBiomeStream.get(x, z); IrisBiome biome = trueBiomeStream.get(x, z);
int depth = (int) (Math.round(height) - y); int depth = (int) (Math.round(height) - y);
@ -179,21 +205,29 @@ public class IrisComplex implements DataProvider
} }
return rockStream.get(x, y, z); return rockStream.get(x, y, z);
}, new Interpolated<BlockData>()
{
@Override
public double toDouble(BlockData t)
{
return 0;
} }
@Override private IrisDecorator decorateFor(IrisBiome b, double x, double z, DecorationPart part)
public BlockData fromDouble(double d)
{ {
return null; RNG rngc = chunkRngStream.get(x, z);
for(IrisDecorator i : b.getDecorators())
{
if(!i.getPartOf().equals(part))
{
continue;
} }
});
//@done FastBlockData block = i.getBlockData(b, rngc, x, z, data);
if(block != null)
{
Iris.info("DECO AT " + x + " " + z);
return i;
}
}
return null;
} }
private IrisBiome implode(IrisBiome b, Double x, Double z) private IrisBiome implode(IrisBiome b, Double x, Double z)