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

Cleanup

Browse Source
This commit is contained in:
cyberpwn
2021-09-12 08:26:09 -04:00
parent 04be430b8c
commit 8858e1bce8
16 changed files with 80 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/volmit/iris/engine/object/IrisGenerator.java
View File

@@ -18,7 +18,6 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.core.loader.IrisRegistrant;
import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.ArrayType;
@@ -218,18 +217,14 @@ public class IrisGenerator extends IrisRegistrant {
double h = multiplicitive ? 1 : 0;
double tp = 0;
if(composite.size() == 1)
{
if (composite.size() == 1) {
if (multiplicitive) {
h *= composite.get(0).getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
} else {
tp += composite.get(0).getOpacity();
h += composite.get(0).getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
}
}
else
{
} else {
for (IrisNoiseGenerator i : composite) {
if (multiplicitive) {
h *= i.getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());

10
src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java
View File

@@ -22,7 +22,6 @@ import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.engine.object.annotations.Snippet;
import com.volmit.iris.util.function.NoiseProvider;
import com.volmit.iris.util.interpolation.InterpolationMethod;
import com.volmit.iris.util.interpolation.IrisInterpolation;
@@ -52,16 +51,13 @@ public class IrisInterpolator {
private double horizontalScale = 7;
@Override
public int hashCode()
{
public int hashCode() {
return Objects.hash(horizontalScale, function);
}
@Override
public boolean equals(Object o)
{
if(o instanceof IrisInterpolator i)
{
public boolean equals(Object o) {
if (o instanceof IrisInterpolator i) {
return i.getFunction().equals(function) && i.getHorizontalScale() == horizontalScale;
}

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

@@ -33,7 +33,6 @@ import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.data.B;
import com.volmit.iris.util.data.DataProvider;
import com.volmit.iris.util.data.WeightedRandom;
import com.volmit.iris.util.interpolation.InterpolationMethod;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.noise.CNG;
import lombok.AllArgsConstructor;
@@ -87,7 +86,7 @@ public class IrisObjectPlacement {
@MinNumber(-1)
@Desc("When bore is enabled, lower min-y of the cuboid it removes")
private int boreExtendMinY = 0;
@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;