mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-17 14:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop feature size radius computation in mantle engine

Browse Source
This commit is contained in:
cyberpwn
2021-09-12 08:18:46 -04:00
parent 8bf12ff32c
commit 8b55f20684
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/IrisEngineMantle.java
+1 -23
View File
@@ -30,7 +30,6 @@ import com.volmit.iris.engine.mantle.components.MantleJigsawComponent;
import com.volmit.iris.engine.mantle.components.MantleObjectComponent; import com.volmit.iris.engine.mantle.components.MantleObjectComponent;
import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisDepositGenerator; import com.volmit.iris.engine.object.IrisDepositGenerator;
import com.volmit.iris.engine.object.IrisFeaturePotential;
import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.engine.object.IrisObject;
import com.volmit.iris.engine.object.IrisObjectPlacement; import com.volmit.iris.engine.object.IrisObjectPlacement;
@@ -85,14 +84,6 @@ public class IrisEngineMantle implements EngineMantle {
return r; return r;
} }
private KList<IrisFeaturePotential> getAllFeatures() {
KList<IrisFeaturePotential> r = new KList<>();
r.addAll(getEngine().getDimension().getFeatures());
getAllRegions().forEach((i) -> r.addAll(i.getFeatures()));
getAllBiomes().forEach((i) -> r.addAll(i.getFeatures()));
return r;
}
private KList<IrisBiome> getAllBiomes() { private KList<IrisBiome> getAllBiomes() {
KList<IrisBiome> r = new KList<>(); KList<IrisBiome> r = new KList<>();
@@ -115,16 +106,6 @@ public class IrisEngineMantle implements EngineMantle {
} }
} }
private int computeFeatureRange() {
int m = 0;
for (IrisFeaturePotential i : getAllFeatures()) {
m = Math.max(m, i.getZone().getRealSize());
}
return m;
}
private int computeParallaxSize() { private int computeParallaxSize() {
Iris.verbose("Calculating the Parallax Size in Parallel"); Iris.verbose("Calculating the Parallax Size in Parallel");
AtomicInteger xg = new AtomicInteger(0); AtomicInteger xg = new AtomicInteger(0);
@@ -296,17 +277,14 @@ public class IrisEngineMantle implements EngineMantle {
x = Math.max(z, x); x = Math.max(z, x);
int u = x; int u = x;
int v = computeFeatureRange();
int c = Math.max(computeCarvingRange(), computeBodyRange()); int c = Math.max(computeCarvingRange(), computeBodyRange());
x = Math.max(jig, x); x = Math.max(jig, x);
x = Math.max(x, v);
x = Math.max(x, c); x = Math.max(x, c);
x = (Math.max(x, 16) + 16) >> 4; x = (Math.max(x, 16) + 16) >> 4;
x = x % 2 == 0 ? x + 1 : x; x = x % 2 == 0 ? x + 1 : x;
Iris.info("Parallax Size: " + x + " Chunks"); Iris.info("Mantle Size: " + x + " Chunks");
Iris.info(" Object Mantle Size: " + u + " (" + ((Math.max(u, 16) + 16) >> 4) + ")"); Iris.info(" Object Mantle Size: " + u + " (" + ((Math.max(u, 16) + 16) >> 4) + ")");
Iris.info(" Jigsaw Mantle Size: " + jig + " (" + ((Math.max(jig, 16) + 16) >> 4) + ")"); Iris.info(" Jigsaw Mantle Size: " + jig + " (" + ((Math.max(jig, 16) + 16) >> 4) + ")");
Iris.info(" Feature Mantle Size: " + v + " (" + ((Math.max(v, 16) + 16) >> 4) + ")");
Iris.info(" Carving Mantle Size: " + c + " (" + ((Math.max(c, 16) + 16) >> 4) + ")"); Iris.info(" Carving Mantle Size: " + c + " (" + ((Math.max(c, 16) + 16) >> 4) + ")");
return x; return x;