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

Revert "Slope condition"

Browse Source 
This reverts commit d4c0e07b1d.
This commit is contained in:
Sjoerd van de Goor
2023-02-08 01:35:18 +01:00
parent c1cf8e88ee
commit 66d07dcaca
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/object/IrisObject.java
-7
View File
@@ -497,13 +497,6 @@ public class IrisObject extends IrisRegistrant {
public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, BiConsumer<BlockPosition, BlockData> listener, CarveResult c, IrisData rdata) { public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, BiConsumer<BlockPosition, BlockData> listener, CarveResult c, IrisData rdata) {
IObjectPlacer placer = (config.getHeightmap() != null) ? new HeightmapObjectPlacer(oplacer.getEngine() == null ? IrisContext.get().getEngine() : oplacer.getEngine(), rng, x, yv, z, config, oplacer) : oplacer; IObjectPlacer placer = (config.getHeightmap() != null) ? new HeightmapObjectPlacer(oplacer.getEngine() == null ? IrisContext.get().getEngine() : oplacer.getEngine(), rng, x, yv, z, config, oplacer) : oplacer;
// Slope calculation
if (!config.getSlopeCondition().isDefault() &&
!config.getSlopeCondition().isValid(rdata.getEngine().getComplex().getSlopeStream().get(x, z)))
{
return -1;
}
// Rotation calculation // Rotation calculation
double slopeRotationY = 0; double slopeRotationY = 0;
ProceduralStream<Double> heightStream = rdata.getEngine().getComplex().getHeightStream(); ProceduralStream<Double> heightStream = rdata.getEngine().getComplex().getHeightStream();
src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
-2
View File
@@ -62,8 +62,6 @@ public class IrisObjectPlacement {
private double snow = 0; private double snow = 0;
@Desc("Whether or not this object can be targeted by a dolphin.") @Desc("Whether or not this object can be targeted by a dolphin.")
private boolean isDolphinTarget = false; private boolean isDolphinTarget = false;
@Desc("The slope at which this object can be placed. Range from 0 to 10 by default. Calculated from the corners of the object.")
private IrisSlopeClip slopeCondition = new IrisSlopeClip();
@Desc("Set to true to add the rotation of the direction of the slope of the terrain (wherever the slope is going down) to the y-axis rotation of the object. See also rotateTowardsSlopePrecise.") @Desc("Set to true to add the rotation of the direction of the slope of the terrain (wherever the slope is going down) to the y-axis rotation of the object. See also rotateTowardsSlopePrecise.")
private boolean rotateTowardsSlope = false; private boolean rotateTowardsSlope = false;
@Desc("By default the 'rotateTowardsSlope' function simply calculates which direction" + @Desc("By default the 'rotateTowardsSlope' function simply calculates which direction" +