mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-07 16:26:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

VANILLA STRUCTURES

Browse Source
This commit is contained in:
Daniel Mills
2020-11-22 07:27:24 -05:00
parent dd083f73f7
commit 6ea0bb30e0
23 changed files with 2256 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/generator/IrisComplex.java
View File

@@ -138,7 +138,7 @@ public class IrisComplex implements DataProvider
.convertCached((s) -> data.getBiomeLoader().load(s)
.setInferredType(InferredType.SHORE))
).convertAware2D(ProceduralStream::get).cache2D(cacheSize);
bridgeStream = engine.getDimension().getContinentalStyle().create(rng.nextRNG()).stream()
bridgeStream = engine.getDimension().getContinentalStyle().create(rng.nextRNG()).bake().scale(1D / engine.getDimension().getContinentZoom()).bake().stream()
.convert((v) -> v >= engine.getDimension().getLandChance() ? InferredType.SEA : InferredType.LAND);
baseBiomeStream = bridgeStream.convertAware2D((t, x, z) -> t.equals(InferredType.SEA)
? seaBiomeStream.get(x, z) : landBiomeStream.get(x, z))

8
src/main/java/com/volmit/iris/generator/IrisEngine.java
View File

@@ -95,12 +95,14 @@ public class IrisEngine extends BlockPopulator implements Engine
}
@Override
public void generate(int x, int z, Hunk<BlockData> vblocks, Hunk<Biome> vbiomes) {
public void generate(int x, int z, Hunk<BlockData> vblocks, Hunk<BlockData> postblocks, Hunk<Biome> vbiomes) {
try
{
PrecisionStopwatch p = PrecisionStopwatch.start();
Hunk<Biome> biomes = vbiomes;
Hunk<BlockData> blocks = vblocks.synchronize().listen((xx,y,zz,t) -> catchBlockUpdates(x+xx,y+getMinHeight(),z+zz, t));
Hunk<BlockData> pblocks = postblocks.synchronize().listen((xx,y,zz,t) -> catchBlockUpdates(x+xx,y+getMinHeight(),z+zz, t));
Hunk<BlockData> fringe = Hunk.fringe(blocks, pblocks);
MultiBurst.burst.burst(
() -> getFramework().getEngineParallax().generateParallaxArea(x, z),
@@ -114,10 +116,10 @@ public class IrisEngine extends BlockPopulator implements Engine
MultiBurst.burst.burst(
() -> getFramework().getDepositModifier().modify(x, z, blocks),
() -> getFramework().getPostModifier().modify(x, z, blocks),
() -> getFramework().getDecorantActuator().actuate(x, z, blocks)
() -> getFramework().getDecorantActuator().actuate(x, z, fringe)
);
getFramework().getEngineParallax().insertParallax(x, z, blocks);
getFramework().getEngineParallax().insertParallax(x, z, fringe);
getFramework().recycle();
getMetrics().getTotal().put(p.getMilliseconds());
}

27
src/main/java/com/volmit/iris/generator/IrisEngineCompound.java
View File

@@ -32,6 +32,8 @@ public class IrisEngineCompound implements EngineCompound {
private final AtomicRollingSequence wallClock;
private Engine defaultEngine;
@Getter
private final EngineData engineMetadata;
@@ -69,6 +71,7 @@ public class IrisEngineCompound implements EngineCompound {
{
burster = null;
engines = new Engine[]{new IrisEngine(new EngineTarget(world, rootDimension, data, 256, maximumThreads), this, 0)};
defaultEngine = engines[0];
}
else
@@ -97,6 +100,16 @@ public class IrisEngineCompound implements EngineCompound {
engines[i] = new IrisEngine(new EngineTarget(world, dimension, data.copy(), (int)Math.floor(256D * (index.getWeight() / totalWeight)), index.isInverted(), threadDist), this, i);
engines[i].setMinHeight(buf);
buf += engines[i].getHeight();
if(index.isPrimary())
{
defaultEngine = engines[i];
}
}
if(defaultEngine == null)
{
defaultEngine = engines[0];
}
}
@@ -194,12 +207,12 @@ public class IrisEngineCompound implements EngineCompound {
}
@Override
public void generate(int x, int z, Hunk<BlockData> blocks, Hunk<Biome> biomes)
public void generate(int x, int z, Hunk<BlockData> blocks, Hunk<BlockData> postblocks, Hunk<Biome> biomes)
{
PrecisionStopwatch p = PrecisionStopwatch.start();
if(engines.length == 1 && !getEngine(0).getTarget().isInverted())
{
engines[0].generate(x, z, blocks, biomes);
engines[0].generate(x, z, blocks, postblocks, biomes);
}
else
@@ -216,15 +229,18 @@ public class IrisEngineCompound implements EngineCompound {
int doffset = offset;
int height = engine.getTarget().getHeight();
AtomicReference<Hunk<BlockData>> cblock = new AtomicReference<>(Hunk.newArrayHunk(16, height, 16));
AtomicReference<Hunk<BlockData>> cpblock = new AtomicReference<>(Hunk.newArrayHunk(16, height, 16));
AtomicReference<Hunk<Biome>> cbiome = new AtomicReference<>(Hunk.newArrayHunk(16, height, 16));
cblock.set(engine.getTarget().isInverted() ? cblock.get().invertY() : cblock.get());
cpblock.set(engine.getTarget().isInverted() ? cpblock.get().invertY() : cpblock.get());
cbiome.set(engine.getTarget().isInverted() ? cbiome.get().invertY() : cbiome.get());
e.queue(() -> {
engine.generate(x, z, cblock.get(), cbiome.get());
engine.generate(x, z, cblock.get(), cpblock.get(), cbiome.get());
synchronized (insert)
{
insert[index.get()] = () -> {
blocks.insert(0, doffset, 0, cblock.get());
postblocks.insert(0, doffset, 0, cpblock.get());
biomes.insert(0, doffset, 0, cbiome.get());
};
}
@@ -270,6 +286,11 @@ public class IrisEngineCompound implements EngineCompound {
return false;
}
@Override
public Engine getDefaultEngine() {
return defaultEngine;
}
@Override
public void hotload() {
for(int i = 0; i < getSize(); i++)