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

Remove base noise features

Browse Source
This commit is contained in:
cyberpwn
2021-09-12 08:08:18 -04:00
parent 5bc019d3d3
commit 2fd3abbb14
5 changed files with 14 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/engine/object/IrisObject.java
View File

@@ -528,7 +528,7 @@ public class IrisObject extends IrisRegistrant {
}
}
}
} else if (config.getMode().equals(ObjectPlaceMode.FAST_MAX_HEIGHT) || config.getMode().equals(ObjectPlaceMode.VACUUM) || config.getMode().equals(ObjectPlaceMode.FAST_STILT)) {
} else if (config.getMode().equals(ObjectPlaceMode.FAST_MAX_HEIGHT) || config.getMode().equals(ObjectPlaceMode.FAST_STILT)) {
BlockVector offset = new BlockVector(config.getTranslate().getX(), config.getTranslate().getY(), config.getTranslate().getZ());
BlockVector rotatedDimensions = config.getRotation().rotate(new BlockVector(getW(), getH(), getD()), spinx, spiny, spinz).clone();

23
src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
View File

@@ -63,9 +63,7 @@ public class IrisObjectPlacement {
private IrisObjectRotation rotation = new IrisObjectRotation();
@Desc("Limit the max height or min height of placement.")
private IrisObjectLimit clamp = new IrisObjectLimit();
@ArrayType(min = 1, type = IrisFeaturePotential.class)
@Desc("Place additional noise features in the object's place location")
private KList<IrisFeaturePotential> addFeatures = new KList<>();
@MinNumber(0)
@MaxNumber(1)
@Desc("The maximum layer level of a snow filter overtop of this placement. Set to 0 to disable. Max of 1.")
@@ -89,15 +87,7 @@ public class IrisObjectPlacement {
@MinNumber(-1)
@Desc("When bore is enabled, lower min-y of the cuboid it removes")
private int boreExtendMinY = 0;
@MaxNumber(64)
@MinNumber(4)
@Desc("When vacuum is enabled, define the interpolation radius")
private int vacuumInterpolationRadius = 16;
@MaxNumber(64)
@MinNumber(4)
@Desc("When vacuum is enabled, define the interpolation method")
private InterpolationMethod vacuumInterpolationMethod = InterpolationMethod.BILINEAR_STARCAST_9;
@Desc("If set to true, objects will place on the terrain height, ignoring the water surface.")
@Desc("If set to true, objects will place on the terrain height, ignoring the water surface.")
private boolean underwater = false;
@Desc("If set to true, objects will place in carvings (such as underground) or under an overhang.")
private CarvingMode carvingSupport = CarvingMode.SURFACE_ONLY;
@@ -146,7 +136,6 @@ public class IrisObjectPlacement {
p.setWarp(warp);
p.setBore(bore);
p.setMeld(meld);
p.setAddFeatures(addFeatures.copy());
p.setWaterloggable(waterloggable);
p.setOnwater(onwater);
p.setSmartBore(smartBore);
@@ -193,14 +182,6 @@ public class IrisObjectPlacement {
return g.getData().getObjectLoader().load(place.get(random.nextInt(place.size())));
}
public boolean isVacuum() {
return getMode().equals(ObjectPlaceMode.VACUUM);
}
public boolean usesFeatures() {
return isVacuum() || getAddFeatures().isNotEmpty();
}
public boolean matches(IrisTreeSize size, TreeType type) {
for (IrisTree i : getTrees()) {
if (i.matches(size, type)) {

6
src/main/java/com/volmit/iris/engine/object/ObjectPlaceMode.java
View File

@@ -52,9 +52,5 @@ public enum ObjectPlaceMode {
@Desc("Samples the height of the terrain at every x,z position of your object and pushes it down to the surface. It's pretty much like a melt function over the terrain.")
PAINT,
@Desc("Applies multiple terrain features into the parallax layer before this object places to distort the height, essentially vacuuming the terrain's heightmap closer to the bottom of this object. Uses MAX_HEIGHT to place")
VACUUM
PAINT
}