Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-01-04 15:41:30 +00:00
Code Issues Releases Activity

Fixes

Browse Source
This commit is contained in:
Daniel Mills
2020-08-15 23:07:39 -04:00
parent da79b4e2ea
commit 86be84b015
10 changed files with 1162 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
src/main/java/com/volmit/iris/noise/CNG.java
View File

@@ -8,19 +8,20 @@ import com.volmit.iris.util.KList;
import com.volmit.iris.util.NoiseInjector;
import com.volmit.iris.util.RNG;
public class CNG {
public class CNG
{
public static long hits = 0;
public static long creates = 0;
public static final NoiseInjector ADD = (s, v) -> new double[] { s + v, 1 };
public static final NoiseInjector SRC_SUBTRACT = (s, v) -> new double[] { s - v < 0 ? 0 : s - v, -1 };
public static final NoiseInjector DST_SUBTRACT = (s, v) -> new double[] { v - s < 0 ? 0 : s - v, -1 };
public static final NoiseInjector MULTIPLY = (s, v) -> new double[] { s * v, 0 };
public static final NoiseInjector MAX = (s, v) -> new double[] { Math.max(s, v), 0 };
public static final NoiseInjector MIN = (s, v) -> new double[] { Math.min(s, v), 0 };
public static final NoiseInjector SRC_MOD = (s, v) -> new double[] { s % v, 0 };
public static final NoiseInjector SRC_POW = (s, v) -> new double[] { Math.pow(s, v), 0 };
public static final NoiseInjector DST_MOD = (s, v) -> new double[] { v % s, 0 };
public static final NoiseInjector DST_POW = (s, v) -> new double[] { Math.pow(v, s), 0 };
public static final NoiseInjector ADD = (s, v) -> new double[] {s + v, 1};
public static final NoiseInjector SRC_SUBTRACT = (s, v) -> new double[] {s - v < 0 ? 0 : s - v, -1};
public static final NoiseInjector DST_SUBTRACT = (s, v) -> new double[] {v - s < 0 ? 0 : s - v, -1};
public static final NoiseInjector MULTIPLY = (s, v) -> new double[] {s * v, 0};
public static final NoiseInjector MAX = (s, v) -> new double[] {Math.max(s, v), 0};
public static final NoiseInjector MIN = (s, v) -> new double[] {Math.min(s, v), 0};
public static final NoiseInjector SRC_MOD = (s, v) -> new double[] {s % v, 0};
public static final NoiseInjector SRC_POW = (s, v) -> new double[] {Math.pow(s, v), 0};
public static final NoiseInjector DST_MOD = (s, v) -> new double[] {v % s, 0};
public static final NoiseInjector DST_POW = (s, v) -> new double[] {Math.pow(v, s), 0};
private double scale;
private double bakedScale;
private double fscale;
@@ -36,31 +37,38 @@ public class CNG {
private double down;
private double power;
public NoiseGenerator getGen() {
public NoiseGenerator getGen()
{
return generator;
}
public static CNG signature(RNG rng) {
public static CNG signature(RNG rng)
{
return signature(rng, NoiseType.SIMPLEX);
}
public static CNG signatureHalf(RNG rng) {
public static CNG signatureHalf(RNG rng)
{
return signatureHalf(rng, NoiseType.SIMPLEX);
}
public static CNG signatureThick(RNG rng) {
public static CNG signatureThick(RNG rng)
{
return signatureThick(rng, NoiseType.SIMPLEX);
}
public static CNG signatureDouble(RNG rng) {
public static CNG signatureDouble(RNG rng)
{
return signatureDouble(rng, NoiseType.SIMPLEX);
}
public static CNG signatureDouble(RNG rng, NoiseType t) {
public static CNG signatureDouble(RNG rng, NoiseType t)
{
return signatureThick(rng, t).fractureWith(signature(rng.nextParallelRNG(4956)), 93);
}
public static CNG signature(RNG rng, NoiseType t) {
public static CNG signature(RNG rng, NoiseType t)
{
// @builder
return new CNG(rng.nextParallelRNG(17), t, 1D, 1)
.fractureWith(
@@ -72,7 +80,8 @@ public class CNG {
// @done
}
public static CNG signatureThick(RNG rng, NoiseType t) {
public static CNG signatureThick(RNG rng, NoiseType t)
{
// @builder
return new CNG(rng.nextParallelRNG(133), t, 1D, 1)
.fractureWith(
@@ -84,7 +93,8 @@ public class CNG {
// @done
}
public static CNG signatureHalf(RNG rng, NoiseType t) {
public static CNG signatureHalf(RNG rng, NoiseType t)
{
// @builder
return new CNG(rng.nextParallelRNG(127), t, 1D, 1)
.fractureWith(
@@ -96,19 +106,23 @@ public class CNG {
// @done
}
public CNG(RNG random) {
public CNG(RNG random)
{
this(random, 1);
}
public CNG(RNG random, int octaves) {
public CNG(RNG random, int octaves)
{
this(random, 1D, octaves);
}
public CNG(RNG random, double opacity, int octaves) {
public CNG(RNG random, double opacity, int octaves)
{
this(random, NoiseType.SIMPLEX, opacity, octaves);
}
public CNG(RNG random, NoiseType t, double opacity, int octaves) {
public CNG(RNG random, NoiseType t, double opacity, int octaves)
{
creates++;
this.oct = octaves;
this.rng = random;
@@ -124,19 +138,23 @@ public class CNG {
this.opacity = opacity;
this.injector = ADD;
if (generator instanceof OctaveNoise) {
if(generator instanceof OctaveNoise)
{
((OctaveNoise) generator).setOctaves(octaves);
}
}
public CNG bake() {
public CNG bake()
{
bakedScale *= scale;
scale = 1;
return this;
}
public CNG child(CNG c) {
if (children == null) {
public CNG child(CNG c)
{
if(children == null)
{
children = new KList<>();
}
@@ -145,114 +163,141 @@ public class CNG {
}
@Deprecated
public RNG nextRNG() {
public RNG nextRNG()
{
return getRNG().nextRNG();
}
public RNG getRNG() {
public RNG getRNG()
{
return rng;
}
public CNG fractureWith(CNG c, double scale) {
public CNG fractureWith(CNG c, double scale)
{
fracture = c;
fscale = scale;
return this;
}
public CNG scale(double c) {
public CNG scale(double c)
{
scale = c;
return this;
}
public CNG patch(double c) {
public CNG patch(double c)
{
patch = c;
return this;
}
public CNG up(double c) {
public CNG up(double c)
{
up = c;
return this;
}
public CNG down(double c) {
public CNG down(double c)
{
down = c;
return this;
}
public CNG injectWith(NoiseInjector i) {
public CNG injectWith(NoiseInjector i)
{
injector = i;
return this;
}
public <T extends IRare> T fitRarity(KList<T> b, double... dim) {
if (b.size() == 0) {
public <T extends IRare> T fitRarity(KList<T> b, double... dim)
{
if(b.size() == 0)
{
return null;
}
if (b.size() == 1) {
if(b.size() == 1)
{
return b.get(0);
}
KList<T> rarityMapped = new KList<>();
boolean o = false;
int max = 1;
for (T i : b) {
if (i.getRarity() > max) {
for(T i : b)
{
if(i.getRarity() > max)
{
max = i.getRarity();
}
}
max++;
for (T i : b) {
for (int j = 0; j < max - i.getRarity(); j++) {
if (o = !o) {
for(T i : b)
{
for(int j = 0; j < max - i.getRarity(); j++)
{
if(o = !o)
{
rarityMapped.add(i);
}
else {
else
{
rarityMapped.add(0, i);
}
}
}
if (rarityMapped.size() == 1) {
if(rarityMapped.size() == 1)
{
return rarityMapped.get(0);
}
if (rarityMapped.isEmpty()) {
if(rarityMapped.isEmpty())
{
throw new RuntimeException("BAD RARITY MAP! RELATED TO: " + b.toString(", or possibly "));
}
return fit(rarityMapped, dim);
}
public <T> T fit(T[] v, double... dim) {
if (v.length == 0) {
public <T> T fit(T[] v, double... dim)
{
if(v.length == 0)
{
return null;
}
if (v.length == 1) {
if(v.length == 1)
{
return v[0];
}
return v[fit(0, v.length - 1, dim)];
}
public <T> T fit(List<T> v, double... dim) {
if (v.size() == 0) {
public <T> T fit(List<T> v, double... dim)
{
if(v.size() == 0)
{
return null;
}
if (v.size() == 1) {
if(v.size() == 1)
{
return v.get(0);
}
return v.get(fit(0, v.size() - 1, dim));
}
public int fit(int min, int max, double... dim) {
if (min == max) {
public int fit(int min, int max, double... dim)
{
if(min == max)
{
return min;
}
@@ -261,8 +306,10 @@ public class CNG {
return (int) Math.round(IrisInterpolation.lerp(min, max, noise));
}
public int fit(double min, double max, double... dim) {
if (min == max) {
public int fit(double min, double max, double... dim)
{
if(min == max)
{
return (int) Math.round(min);
}
@@ -271,8 +318,10 @@ public class CNG {
return (int) Math.round(IrisInterpolation.lerp(min, max, noise));
}
public double fitDouble(double min, double max, double... dim) {
if (min == max) {
public double fitDouble(double min, double max, double... dim)
{
if(min == max)
{
return min;
}
@@ -281,21 +330,24 @@ public class CNG {
return IrisInterpolation.lerp(min, max, noise);
}
public double noise(double... dim) {
public double noise(double... dim)
{
double scale = this.bakedScale * this.scale;
double f = fracture != null ? (fracture.noise(dim) - 0.5) * fscale : 0D;
double f = (fracture != null ? (fracture.noise(dim) - 0.5) * fscale : 0D);
double x = dim.length > 0 ? dim[0] + f : 0D;
double y = dim.length > 1 ? dim[1] - f : 0D;
double z = dim.length > 2 ? dim[2] + f : 0D;
double z = dim.length > 1 ? dim[1] - f : 0D;
double y = dim.length > 2 ? dim[2] + f : 0D;
double n = generator.noise(x * scale, y * scale, z * scale) * opacity;
n = power != 1D ? Math.pow(n, power) : n;
double m = 1;
hits += oct;
if (children == null) {
if(children == null)
{
return (n - down + up) * patch;
}
for (CNG i : children) {
for(CNG i : children)
{
double[] r = injector.combine(n, i.noise(dim));
n = r[0];
m += r[1];
@@ -304,17 +356,20 @@ public class CNG {
return ((n / m) - down + up) * patch;
}
public CNG pow(double power) {
public CNG pow(double power)
{
this.power = power;
return this;
}
public CNG oct(int octaves) {
public CNG oct(int octaves)
{
oct = octaves;
return this;
}
public double getScale() {
public double getScale()
{
return scale;
}
}