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

Revert "Drop features "

Browse Source 
This reverts commit 1f0ebd8ba155e69ab370f6858f626bc744271cb3.
This commit is contained in:
cyberpwn 2021-09-10 21:33:07 -04:00
parent 1f0ebd8ba1
commit 784fca98c8
2 changed files with 26 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,31 +190,22 @@ public class IrisComplex implements DataProvider {
slopeStream = heightStream.slope(3).cache2D(cacheSize); slopeStream = heightStream.slope(3).cache2D(cacheSize);
objectChanceStream = ProceduralStream.ofDouble((x, z) -> { objectChanceStream = ProceduralStream.ofDouble((x, z) -> {
AtomicDouble str = new AtomicDouble(1D); AtomicDouble str = new AtomicDouble(1D);
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) {
if(engine.getDimension().isNoiseModificationFromFeatures()) str.set(Math.min(str.get(), i.getObjectChanceModifier(x, z, rng, getData())));
{
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) {
str.set(Math.min(str.get(), i.getObjectChanceModifier(x, z, rng, getData())));
}
} }
return str.get(); return str.get();
}); });
trueBiomeStream = focus != null ? ProceduralStream.of((x, y) -> focus, Interpolated.of(a -> 0D, trueBiomeStream = focus != null ? ProceduralStream.of((x, y) -> focus, Interpolated.of(a -> 0D,
b -> focus)).convertAware2D((b, x, z) -> { b -> focus)).convertAware2D((b, x, z) -> {
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) {
IrisBiome bx = i.filter(x, z, b, rng);
if(engine.getDimension().isNoiseModificationFromFeatures()) if (bx != null) {
{ bx.setInferredType(b.getInferredType());
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { return bx;
IrisBiome bx = i.filter(x, z, b, rng); }
if (bx != null) {
bx.setInferredType(b.getInferredType());
return bx;
} }
}
}
return b; return b;
}) })
@ -223,39 +214,28 @@ public class IrisComplex implements DataProvider {
fixBiomeType(h, baseBiomeStream.get(x, z), fixBiomeType(h, baseBiomeStream.get(x, z),
regionStream.get(x, z), x, z, fluidHeight)) regionStream.get(x, z), x, z, fluidHeight))
.convertAware2D((b, x, z) -> { .convertAware2D((b, x, z) -> {
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) {
IrisBiome bx = i.filter(x, z, b, rng);
if(engine.getDimension().isNoiseModificationFromFeatures()) if (bx != null) {
{ bx.setInferredType(b.getInferredType());
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { return bx;
IrisBiome bx = i.filter(x, z, b, rng);
if (bx != null) {
bx.setInferredType(b.getInferredType());
return bx;
}
} }
} }
return b; return b;
}) })
.cache2D(cacheSize); .cache2D(cacheSize);
trueBiomeStream = focus != null ? ProceduralStream.of((x, y) -> focus, Interpolated.of(a -> 0D, trueBiomeStream = focus != null ? ProceduralStream.of((x, y) -> focus, Interpolated.of(a -> 0D,
b -> focus)).convertAware2D((b, x, z) -> { b -> focus)).convertAware2D((b, x, z) -> {
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) {
IrisBiome bx = i.filter(x, z, b, rng);
if (bx != null) {
if(engine.getDimension().isNoiseModificationFromFeatures()) bx.setInferredType(b.getInferredType());
{ return bx;
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { }
IrisBiome bx = i.filter(x, z, b, rng);
if (bx != null) {
bx.setInferredType(b.getInferredType());
return bx;
} }
}
}
return b; return b;
}) })
@ -264,18 +244,13 @@ public class IrisComplex implements DataProvider {
fixBiomeType(h, baseBiomeStream.get(x, z), fixBiomeType(h, baseBiomeStream.get(x, z),
regionStream.get(x, z), x, z, fluidHeight)) regionStream.get(x, z), x, z, fluidHeight))
.convertAware2D((b, x, z) -> { .convertAware2D((b, x, z) -> {
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) {
IrisBiome bx = i.filter(x, z, b, rng);
if(engine.getDimension().isNoiseModificationFromFeatures()) if (bx != null) {
{ bx.setInferredType(b.getInferredType());
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { return bx;
IrisBiome bx = i.filter(x, z, b, rng);
if (bx != null) {
bx.setInferredType(b.getInferredType());
return bx;
}
} }
} }
return b; return b;
@ -422,11 +397,8 @@ public class IrisComplex implements DataProvider {
AtomicDouble noise = new AtomicDouble(h + fluidHeight + overlayStream.get(x, z)); AtomicDouble noise = new AtomicDouble(h + fluidHeight + overlayStream.get(x, z));
if (features) { if (features) {
if(engine.getDimension().isNoiseModificationFromFeatures()) for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) {
{ noise.set(i.filter(x, z, noise.get(), rng, getData()));
for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) {
noise.set(i.filter(x, z, noise.get(), rng, getData()));
}
} }
} }

4
src/main/java/com/volmit/iris/engine/object/IrisDimension.java
View File

@ -181,10 +181,6 @@ public class IrisDimension extends IrisRegistrant {
@MaxNumber(360) @MaxNumber(360)
@Desc("You can rotate the input coordinates by an angle. This can make terrain appear more natural (less sharp corners and lines). This literally rotates the entire dimension by an angle. Hint: Try 12 degrees or something not on a 90 or 45 degree angle.") @Desc("You can rotate the input coordinates by an angle. This can make terrain appear more natural (less sharp corners and lines). This literally rotates the entire dimension by an angle. Hint: Try 12 degrees or something not on a 90 or 45 degree angle.")
private double dimensionAngleDeg = 0; private double dimensionAngleDeg = 0;
@Desc("Use noise mods from features such as vacuum")
private boolean noiseModificationFromFeatures = true;
@MinNumber(0) @MinNumber(0)
@MaxNumber(8192) @MaxNumber(8192)
@Desc("Coordinate fracturing applies noise to the input coordinates. This creates the 'iris swirls' and wavy features. The distance pushes these waves further into places they shouldnt be. This is a block value multiplier.") @Desc("Coordinate fracturing applies noise to the input coordinates. This creates the 'iris swirls' and wavy features. The distance pushes these waves further into places they shouldnt be. This is a block value multiplier.")