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

fix freq issues

Browse Source
This commit is contained in:
dfsek 2021-02-17 17:39:14 -07:00
parent 6446f9b4a7
commit 2b84967e05
7 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/ExpressionFunction.java
View File

@ -25,6 +25,7 @@ public class ExpressionFunction extends NoiseFunction {
functions.forEach(p::registerFunction); functions.forEach(p::registerFunction);
expression = p.parse(eq, scope); expression = p.parse(eq, scope);
frequency = 1;
} }
@Override @Override

1
common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/FractalNoiseFunction.java
View File

@ -14,6 +14,7 @@ public abstract class FractalNoiseFunction extends NoiseFunction {
public FractalNoiseFunction(int seed, NoiseSampler input) { public FractalNoiseFunction(int seed, NoiseSampler input) {
super(seed); super(seed);
this.input = input; this.input = input;
frequency = 1;
} }
public void setWeightedStrength(double weightedStrength) { public void setWeightedStrength(double weightedStrength) {

10
common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ExpressionFunctionTemplate.java
View File

@ -12,12 +12,14 @@ import com.dfsek.terra.api.math.parsii.BlankFunction;
import com.dfsek.terra.api.math.parsii.noise.NoiseFunction2; import com.dfsek.terra.api.math.parsii.noise.NoiseFunction2;
import com.dfsek.terra.api.math.parsii.noise.NoiseFunction3; import com.dfsek.terra.api.math.parsii.noise.NoiseFunction3;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@SuppressWarnings({"unused", "FieldMayBeFinal"})
public class ExpressionFunctionTemplate extends NoiseTemplate<ExpressionFunction> implements ValidatedConfigTemplate { @SuppressWarnings({"FieldMayBeFinal", "unused"})
public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFunction> implements ValidatedConfigTemplate {
@Value("variables") @Value("variables")
@Default @Default
private Map<String, Double> vars = new HashMap<>(); private Map<String, Double> vars = new HashMap<>();
@ -28,10 +30,6 @@ public class ExpressionFunctionTemplate extends NoiseTemplate<ExpressionFunction
@Value("functions") @Value("functions")
private Map<String, NoiseSeeded> functions; private Map<String, NoiseSeeded> functions;
public ExpressionFunctionTemplate() {
frequency = 1;
}
@Override @Override
public NoiseSampler apply(Long seed) { public NoiseSampler apply(Long seed) {
try { try {

1
common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java
View File

@ -7,7 +7,6 @@ public class BrownianMotionTemplate extends FractalTemplate<BrownianMotionSample
@Override @Override
public NoiseSampler apply(Long seed) { public NoiseSampler apply(Long seed) {
BrownianMotionSampler sampler = new BrownianMotionSampler((int) (long) seed, function.apply(seed)); BrownianMotionSampler sampler = new BrownianMotionSampler((int) (long) seed, function.apply(seed));
sampler.setFrequency(frequency);
sampler.setGain(fractalGain); sampler.setGain(fractalGain);
sampler.setLacunarity(fractalLacunarity); sampler.setLacunarity(fractalLacunarity);
sampler.setOctaves(octaves); sampler.setOctaves(octaves);

8
common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java
View File

@ -4,9 +4,9 @@ import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.math.noise.samplers.noise.fractal.FractalNoiseFunction; import com.dfsek.terra.api.math.noise.samplers.noise.fractal.FractalNoiseFunction;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.config.loaders.config.sampler.templates.noise.NoiseTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
public abstract class FractalTemplate<T extends FractalNoiseFunction> extends NoiseTemplate<T> { public abstract class FractalTemplate<T extends FractalNoiseFunction> extends SamplerTemplate<T> {
@Value("octaves") @Value("octaves")
@Default @Default
protected int octaves = 3; protected int octaves = 3;
@ -25,8 +25,4 @@ public abstract class FractalTemplate<T extends FractalNoiseFunction> extends No
@Value("function") @Value("function")
protected NoiseSeeded function; protected NoiseSeeded function;
public FractalTemplate() {
frequency = 1; // Fractal default freq = 1.
}
} }

1
common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java
View File

@ -13,7 +13,6 @@ public class PingPongTemplate extends FractalTemplate<PingPongSampler> {
@Override @Override
public NoiseSampler apply(Long seed) { public NoiseSampler apply(Long seed) {
PingPongSampler sampler = new PingPongSampler((int) (long) seed, function.apply(seed)); PingPongSampler sampler = new PingPongSampler((int) (long) seed, function.apply(seed));
sampler.setFrequency(frequency);
sampler.setGain(fractalGain); sampler.setGain(fractalGain);
sampler.setLacunarity(fractalLacunarity); sampler.setLacunarity(fractalLacunarity);
sampler.setOctaves(octaves); sampler.setOctaves(octaves);

1
common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java
View File

@ -7,7 +7,6 @@ public class RidgedFractalTemplate extends FractalTemplate<RidgedFractalSampler>
@Override @Override
public NoiseSampler apply(Long seed) { public NoiseSampler apply(Long seed) {
RidgedFractalSampler sampler = new RidgedFractalSampler((int) (long) seed, function.apply(seed)); RidgedFractalSampler sampler = new RidgedFractalSampler((int) (long) seed, function.apply(seed));
sampler.setFrequency(frequency);
sampler.setGain(fractalGain); sampler.setGain(fractalGain);
sampler.setLacunarity(fractalLacunarity); sampler.setLacunarity(fractalLacunarity);
sampler.setOctaves(octaves); sampler.setOctaves(octaves);