mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refractor PseudoErosion

Browse Source
This commit is contained in:
Zoe Gidiere 2024-09-23 16:46:48 -06:00
parent b1ad820e1c
commit 07e3d0058d
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,12 +3,12 @@ package com.dfsek.terra.addons.noise.config.templates.noise;
import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.noise.samplers.noise.simplex.PseudoErosion; import com.dfsek.terra.addons.noise.samplers.noise.PseudoErosionSampler;
import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.DerivativeNoiseSampler; import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosion> { public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosionSampler> {
@Value("octaves") @Value("octaves")
@Default @Default
@ -66,8 +66,8 @@ public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosion> {
protected @Meta double frequency = 1d; protected @Meta double frequency = 1d;
@Override @Override
public PseudoErosion get() { public PseudoErosionSampler get() {
PseudoErosion pseudoErosion = new PseudoErosion(octaves, gain, lacunarity, PseudoErosionSampler pseudoErosion = new PseudoErosionSampler(octaves, gain, lacunarity,
slopeStrength, branchStrength, strength, slopeStrength, branchStrength, strength,
erosionFrequency, heightSampler, slopeMask, slopeMaskFull, slopeMaskNone, jitterModifier, averageErosionImpulses); erosionFrequency, heightSampler, slopeMask, slopeMaskFull, slopeMaskNone, jitterModifier, averageErosionImpulses);
pseudoErosion.setFrequency(frequency); pseudoErosion.setFrequency(frequency);

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

@ -1,13 +1,11 @@
package com.dfsek.terra.addons.noise.samplers.noise.simplex; package com.dfsek.terra.addons.noise.samplers.noise;
import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
import com.dfsek.terra.api.noise.DerivativeNoiseSampler; import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.MathUtil;
public class PseudoErosion extends NoiseFunction { public class PseudoErosionSampler extends NoiseFunction {
public static final float TAU = (float) (2.0 * Math.PI); public static final float TAU = (float) (2.0 * Math.PI);
private static final float HASH_X = 0.3183099f; private static final float HASH_X = 0.3183099f;
private static final float HASH_Y = 0.3678794f; private static final float HASH_Y = 0.3678794f;
@ -27,7 +25,7 @@ public class PseudoErosion extends NoiseFunction {
private final double maxCellDistSqRecip; private final double maxCellDistSqRecip;
private final boolean averageErosionImpulses; private final boolean averageErosionImpulses;
public PseudoErosion(int octaves, double gain, double lacunarity, double slopeStrength, double branchStrength, double erosionStrength, double erosionFrequency, DerivativeNoiseSampler sampler, public PseudoErosionSampler(int octaves, double gain, double lacunarity, double slopeStrength, double branchStrength, double erosionStrength, double erosionFrequency, DerivativeNoiseSampler sampler,
boolean slopeMask, double slopeMaskFull, double slopeMaskNone, double jitterModifier, boolean slopeMask, double slopeMaskFull, double slopeMaskNone, double jitterModifier,
boolean averageErosionImpulses) { boolean averageErosionImpulses) {
this.octaves = octaves; this.octaves = octaves;

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

@ -2,7 +2,7 @@ package com.dfsek.terra.addons.noise.samplers.noise.simplex;
import com.dfsek.terra.addons.noise.samplers.noise.DerivativeNoiseFunction; import com.dfsek.terra.addons.noise.samplers.noise.DerivativeNoiseFunction;
import static com.dfsek.terra.addons.noise.samplers.noise.simplex.PseudoErosion.dot; import static com.dfsek.terra.addons.noise.samplers.noise.PseudoErosionSampler.dot;
/** /**