mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-13 11:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce number of erosion impulses

Browse Source 
A reduction of impulse evaluations from 5^2 to 3^2, original algorithm used exponential falloff function which required evaluating impulses from further away to avoid artifacts. I've changed it to a parabolic falloff function which is exactly 0 at the largest possible distance from a cell origin, meaning any cells further than that will not have an effect, preventing said artifacting from occurring. The parabolic function could be replaced with an exponential function (or any other similar easing function) as long as it has an x-intercept at maxCellDistSq. In addition, an option to control whether averaging impulses has been added as it has more of a visual impact with the aforementioned changes.
This commit is contained in:
Astrash
2024-04-20 15:55:59 +10:00
parent ff03b38b81
commit 823afd592b
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java
View File

@@ -53,10 +53,18 @@ public class PseudoErosionTemplate extends SamplerTemplate<PseudoErosion> {
@Default
private double slopeMaskFull = 1;
@Value("jitter")
@Default
private double jitterModifier = 1;
@Value("average-impulses")
@Default
private boolean averageErosionImpulses = true;
@Override
public PseudoErosion get() {
return new PseudoErosion(octaves, gain, lacunarity,
slopeStrength, branchStrength, strength,
erosionFrequency, heightSampler, slopeMask, slopeMaskFull, slopeMaskNone);
erosionFrequency, heightSampler, slopeMask, slopeMaskFull, slopeMaskNone, jitterModifier, averageErosionImpulses);
}
}

48
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PseudoErosion.java
View File

@@ -21,9 +21,14 @@ public class PseudoErosion implements NoiseSampler {
private final boolean slopeMask;
private final double slopeMaskFullSq;
private final double slopeMaskNoneSq;
private final double jitter;
private final double maxCellDistSq;
private final double maxCellDistSqRecip;
private final boolean averageErosionImpulses;
public PseudoErosion(int octaves, double gain, double lacunarity, double slopeStrength, double branchStrength, double erosionStrength, double erosionFrequency, DerivativeNoiseSampler sampler,
boolean slopeMask, double slopeMaskFull, double slopeMaskNone) {
boolean slopeMask, double slopeMaskFull, double slopeMaskNone, double jitterModifier,
boolean averageErosionImpulses) {
this.octaves = octaves;
this.gain = gain;
this.lacunarity = lacunarity;
@@ -37,6 +42,10 @@ public class PseudoErosion implements NoiseSampler {
// squared value, otherwise a sqrt would need to be used
this.slopeMaskFullSq = slopeMaskFull * slopeMaskFull * Math.signum(slopeMaskFull);
this.slopeMaskNoneSq = slopeMaskNone * slopeMaskNone * Math.signum((slopeMaskNone));
this.jitter = 0.43701595 * jitterModifier;
this.averageErosionImpulses = averageErosionImpulses;
this.maxCellDistSq = 1 + jitter * jitter;
this.maxCellDistSqRecip = 1 / maxCellDistSq;
}
public static float hash(float x, float y) {
@@ -62,26 +71,25 @@ public class PseudoErosion implements NoiseSampler {
return (x - (float)Math.floor(x));
}
public static float[] erosion(float x, float y, float dirX, float dirY) {
float gridX = (float) Math.floor(x);
float gridY = (float) Math.floor(y);
float localX = x - gridX;
float localY = y - gridY;
public float[] erosion(float x, float y, float dirX, float dirY) {
int gridX = Math.round(x);
int gridY = Math.round(y);
float noise = 0.0f;
float dirOutX = 0.0f;
float dirOutY = 0.0f;
float cumAmp = 0.0f;
for (int cellX = -2; cellX < 2; cellX++) {
for (int cellY = -2; cellY < 2; cellY++) {
for (int cellX = gridX - 1; cellX <= gridX + 1; cellX++) {
for (int cellY = gridY - 1; cellY <= gridY + 1; cellY++) {
// TODO - Make seed affect hashing
float cellHash = hash(gridX - (float) cellX, gridY - (float) cellY);
float cellOffsetX = hashX(cellHash) * 0.5f;
float cellOffsetY = hashY(cellHash) * 0.5f;
float cellOriginDeltaX = cellX - cellOffsetX + localX;
float cellOriginDeltaY = cellY - cellOffsetY + localY;
float cellOriginDistSq = dot(cellOriginDeltaX, cellOriginDeltaY, cellOriginDeltaX, cellOriginDeltaY);
float amp = (float)exp(-cellOriginDistSq * 2.0); // Exponentially decrease amplitude further from cell center
float cellHash = hash(cellX, cellY);
float cellOffsetX = (float) (hashX(cellHash) * jitter);
float cellOffsetY = (float) (hashY(cellHash) * jitter);
float cellOriginDeltaX = (x - cellX) + cellOffsetX;
float cellOriginDeltaY = (y - cellY) + cellOffsetY;
float cellOriginDistSq = cellOriginDeltaX * cellOriginDeltaX + cellOriginDeltaY * cellOriginDeltaY;
if (cellOriginDistSq > maxCellDistSq) continue; // Skip calculating cells too far away
float ampTmp = (float) ((cellOriginDistSq * maxCellDistSqRecip) - 1); float amp = ampTmp * ampTmp; // Decrease cell amplitude further away
cumAmp += amp;
float directionalStrength = dot(cellOriginDeltaX, cellOriginDeltaY, dirX, dirY) * TAU;
noise += (float) (MathUtil.cos(directionalStrength) * amp);
@@ -90,11 +98,11 @@ public class PseudoErosion implements NoiseSampler {
dirOutY -= sinAngle * (cellOriginDeltaY + dirY);
}
}
noise /= cumAmp;
dirOutX /= cumAmp;
dirOutY /= cumAmp;
if (averageErosionImpulses && cumAmp != 0) {
noise /= cumAmp;
dirOutX /= cumAmp;
dirOutY /= cumAmp;
}
return new float[] {noise, dirOutX, dirOutY};
}