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

True fracturing allowed

Browse Source
This commit is contained in:
Daniel Mills 2020-11-06 00:54:28 -05:00
parent f2e3914ad8
commit 4f6a676c32
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package com.volmit.iris.noise;
import java.util.List;
import com.oracle.webservices.internal.api.databinding.DatabindingMode;
import com.volmit.iris.Iris;
import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
import com.volmit.iris.v2.scaffold.stream.sources.CNGStream;
@ -11,7 +12,9 @@ import com.volmit.iris.util.IrisInterpolation;
import com.volmit.iris.util.KList;
import com.volmit.iris.util.NoiseInjector;
import com.volmit.iris.util.RNG;
import lombok.Data;
@Data
public class CNG
{
public static long hits = 0;
@ -29,6 +32,7 @@ public class CNG
private double scale;
private double bakedScale;
private double fscale;
private boolean trueFracturing = false;
private KList<CNG> children;
private CNG fracture;
private NoiseGenerator generator;
@ -340,14 +344,45 @@ public class CNG
return IrisInterpolation.lerp(min, max, noise);
}
public double noise(double... dim)
private double getNoise(double... dim)
{
if(isTrueFracturing())
{
if(dim.length == 2)
{
double scale = noscale ? 1 : this.bakedScale * this.scale;
double f1 = noscale ? 0 : (fracture != null ? (fracture.noise(dim[0], dim[1]) - 0.5) * fscale : 0D);
double f2 = noscale ? 0 : (fracture != null ? (fracture.noise(dim[1], dim[0]) - 0.5) * fscale : 0D);
double x = dim[0] + f1;
double y = dim[1] + -f1;
double z = 0D;
return generator.noise(x * scale, y * scale, z * scale) * opacity;
}
else if(dim.length == 3)
{
double scale = noscale ? 1 : this.bakedScale * this.scale;
double f1 = noscale ? 0 : (fracture != null ? (fracture.noise(dim[0], dim[2], dim[1]) - 0.5) * fscale : 0D);
double f2 = noscale ? 0 : (fracture != null ? (fracture.noise(dim[1], dim[0], dim[2]) - 0.5) * fscale : 0D);
double f3 = noscale ? 0 : (fracture != null ? (fracture.noise(dim[2], dim[1], dim[0]) - 0.5) * fscale : 0D);
double x = dim[0] + f1;
double y = dim[1] + f3;
double z = dim[2] + f2;
return generator.noise(x * scale, y * scale, z * scale) * opacity;
}
}
double scale = noscale ? 1 : this.bakedScale * this.scale;
double f = noscale ? 0 : (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 n = generator.noise(x * scale, y * scale, z * scale) * opacity;
return generator.noise(x * scale, y * scale, z * scale) * opacity;
}
public double noise(double... dim)
{
double n = getNoise(dim);
n = power != 1D ? (n < 0 ? -Math.pow(Math.abs(n), power) : Math.pow(n, power)) : n;
double m = 1;
hits += oct;

5
src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java
View File

@ -37,6 +37,10 @@ public class IrisGeneratorStyle
@Desc("The Output multiplier. Only used if parent is fracture.")
private double multiplier = 1;
@DontObfuscate
@Desc("If set to true, each dimension will be fractured with a different order of input coordinates. This is usually 2 or 3 times slower than normal.")
private boolean maxFractureAccuracy = false;
@DontObfuscate
@Desc("Apply a generator to the coordinate field fed into this parent generator. I.e. Distort your generator with another generator.")
private IrisGeneratorStyle fracture = null;
@ -65,6 +69,7 @@ public class IrisGeneratorStyle
return cng.aquire(() ->
{
CNG cng = style.create(rng).bake().scale(1D / zoom).pow(exponent).bake();
cng.setTrueFracturing(maxFractureAccuracy);
if(fracture != null)
{

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

@ -123,8 +123,8 @@ public class IrisNoiseGenerator
{
if(i.isEnabled())
{
x += i.getNoise(superSeed + seed + g, xv, zv);
z -= i.getNoise(superSeed + seed + g, zv, xv);
x += i.getNoise(superSeed + seed + g, xv, zv) - (opacity / 2D);
z -= i.getNoise(superSeed + seed + g, zv, xv) - (opacity / 2D);
}
g += 819;
}