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

Simplify compound stitching

Browse Source
This commit is contained in:
Daniel Mills 2021-01-04 13:03:33 -05:00
parent 7937d8d041
commit 9c4ccc51c7
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,6 @@ import org.bukkit.event.world.WorldSaveEvent;
import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.BlockPopulator;
import java.io.File; import java.io.File;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
public class IrisEngineCompound implements EngineCompound { public class IrisEngineCompound implements EngineCompound {
@Getter @Getter
@ -227,30 +225,33 @@ public class IrisEngineCompound implements EngineCompound {
for(i = 0; i < engines.length; i++) for(i = 0; i < engines.length; i++)
{ {
AtomicInteger index = new AtomicInteger(i);
Engine engine = engines[i]; Engine engine = engines[i];
int doffset = offset; int doffset = offset;
int height = engine.getTarget().getHeight(); int height = engine.getTarget().getHeight();
AtomicReference<Hunk<BlockData>> cblock = new AtomicReference<>(Hunk.newArrayHunk(16, height, 16)); Hunk<BlockData> cblock = Hunk.newArrayHunk(16, height, 16);
AtomicReference<Hunk<BlockData>> cpblock = new AtomicReference<>(structures ? Hunk.newArrayHunk(16, height, 16) : null); Hunk<BlockData> cpblock = structures ? Hunk.newArrayHunk(16, height, 16) : null;
AtomicReference<Hunk<Biome>> cbiome = new AtomicReference<>(Hunk.newArrayHunk(16, height, 16)); Hunk<Biome> cbiome = Hunk.newArrayHunk(16, height, 16);
cblock.set(engine.getTarget().isInverted() ? cblock.get().invertY() : cblock.get());
if(engine.getTarget().isInverted())
{
cblock = cblock.invertY();
cbiome = cbiome.invertY();
if(structures) if(structures)
{ {
cpblock.set(engine.getTarget().isInverted() ? cpblock.get().invertY() : cpblock.get()); cpblock = cpblock.invertY();
}
} }
cbiome.set(engine.getTarget().isInverted() ? cbiome.get().invertY() : cbiome.get()); engine.generate(x, z, cblock, cpblock, cbiome);
engine.generate(x, z, cblock.get(), cpblock.get(), cbiome.get()); blocks.insert(0, doffset, 0, cblock);
blocks.insert(0, doffset, 0, cblock.get());
if(structures) if(structures)
{ {
postblocks.insert(0, doffset, 0, cpblock.get()); postblocks.insert(0, doffset, 0, cpblock);
} }
biomes.insert(0, doffset, 0, cbiome.get()); biomes.insert(0, doffset, 0, cbiome);
offset += height; offset += height;
} }
} }