Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-19 15:09:18 +00:00
Code Issues Releases Activity

minor noise optimizations

Browse Source
This commit is contained in:
Julian Krings
2025-09-04 16:13:41 +02:00
parent 003be1f88b
commit a75738dd7a
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/com/volmit/iris/engine/IrisComplex.java
View File

@@ -25,8 +25,6 @@ import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.*;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.collection.KSet;
import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.context.IrisContext;
import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.data.DataProvider;
import com.volmit.iris.util.interpolation.IrisInterpolation.NoiseKey; import com.volmit.iris.util.interpolation.IrisInterpolation.NoiseKey;
@@ -43,7 +41,7 @@ import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import java.io.File; import java.io.File;
import java.util.UUID; import java.util.*;
@Data @Data
@EqualsAndHashCode(exclude = "data") @EqualsAndHashCode(exclude = "data")
@@ -53,7 +51,7 @@ public class IrisComplex implements DataProvider {
private RNG rng; private RNG rng;
private double fluidHeight; private double fluidHeight;
private IrisData data; private IrisData data;
private KMap<IrisInterpolator, KSet<IrisGenerator>> generators; private Map<IrisInterpolator, Set<IrisGenerator>> generators;
private ProceduralStream<IrisRegion> regionStream; private ProceduralStream<IrisRegion> regionStream;
private ProceduralStream<Double> regionStyleStream; private ProceduralStream<Double> regionStyleStream;
private ProceduralStream<Double> regionIdentityStream; private ProceduralStream<Double> regionIdentityStream;
@@ -98,10 +96,10 @@ public class IrisComplex implements DataProvider {
this.data = engine.getData(); this.data = engine.getData();
double height = engine.getMaxHeight(); double height = engine.getMaxHeight();
fluidHeight = engine.getDimension().getFluidHeight(); fluidHeight = engine.getDimension().getFluidHeight();
generators = new KMap<>(); generators = new HashMap<>();
focusBiome = engine.getFocus(); focusBiome = engine.getFocus();
focusRegion = engine.getFocusRegion(); focusRegion = engine.getFocusRegion();
KMap<InferredType, ProceduralStream<IrisBiome>> inferredStreams = new KMap<>(); Map<InferredType, ProceduralStream<IrisBiome>> inferredStreams = new HashMap<>();
if (focusBiome != null) { if (focusBiome != null) {
focusBiome.setInferredType(InferredType.LAND); focusBiome.setInferredType(InferredType.LAND);
@@ -302,12 +300,12 @@ public class IrisComplex implements DataProvider {
return biome; return biome;
} }
private double interpolateGenerators(Engine engine, IrisInterpolator interpolator, KSet<IrisGenerator> generators, double x, double z, long seed) { private double interpolateGenerators(Engine engine, IrisInterpolator interpolator, Set<IrisGenerator> generators, double x, double z, long seed) {
if (generators.isEmpty()) { if (generators.isEmpty()) {
return 0; return 0;
} }
KMap<NoiseKey, IrisBiome> cache = new KMap<>(); HashMap<NoiseKey, IrisBiome> cache = new HashMap<>(64);
double hi = interpolator.interpolate(x, z, (xx, zz) -> { double hi = interpolator.interpolate(x, z, (xx, zz) -> {
try { try {
IrisBiome bx = baseBiomeStream.get(xx, zz); IrisBiome bx = baseBiomeStream.get(xx, zz);
@@ -379,7 +377,7 @@ public class IrisComplex implements DataProvider {
} }
private void registerGenerator(IrisGenerator cachedGenerator) { private void registerGenerator(IrisGenerator cachedGenerator) {
generators.computeIfAbsent(cachedGenerator.getInterpolator(), (k) -> new KSet<>()).add(cachedGenerator); generators.computeIfAbsent(cachedGenerator.getInterpolator(), (k) -> new HashSet<>()).add(cachedGenerator);
} }
private IrisBiome implode(IrisBiome b, Double x, Double z) { private IrisBiome implode(IrisBiome b, Double x, Double z) {