mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-02-16 10:30:42 +00:00
Remove temp DerivativeFractl nose
This commit is contained in:
Zoe Gidiere
@@ -1,31 +0,0 @@
|
||||
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.Value;
|
||||
|
||||
import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
|
||||
import com.dfsek.terra.addons.noise.samplers.noise.simplex.DerivativeFractal;
|
||||
|
||||
|
||||
public class DerivativeFractalTemplate extends DerivativeNoiseTemplate<DerivativeFractal> {
|
||||
|
||||
@Value("octaves")
|
||||
@Default
|
||||
private int octaves = 3;
|
||||
|
||||
@Value("gain")
|
||||
@Default
|
||||
private double gain = 0.5;
|
||||
|
||||
@Value("lacunarity")
|
||||
@Default
|
||||
private double lacunarity = 2.0;
|
||||
|
||||
@Override
|
||||
public DerivativeFractal get() {
|
||||
DerivativeFractal derivativeFractal = new DerivativeFractal(octaves, gain, lacunarity);
|
||||
derivativeFractal.setFrequency(frequency);
|
||||
derivativeFractal.setSalt(salt);
|
||||
return derivativeFractal;
|
||||
}
|
||||
}
|
||||
@@ -1,122 +0,0 @@
|
||||
package com.dfsek.terra.addons.noise.samplers.noise.simplex;
|
||||
|
||||
import com.dfsek.terra.addons.noise.samplers.noise.DerivativeNoiseFunction;
|
||||
|
||||
import static com.dfsek.terra.addons.noise.samplers.noise.PseudoErosionSampler.dot;
|
||||
|
||||
|
||||
/**
|
||||
* Temporary sampler that provides derivatives to test pseudoerosion, should be replaced with
|
||||
* derivative versions of existing samplers
|
||||
*/
|
||||
public class DerivativeFractal extends DerivativeNoiseFunction {
|
||||
|
||||
private final int heightOctaves;
|
||||
private final double heightGain;
|
||||
private final double heightLacunarity;
|
||||
private static final float HASH_X = 0.3183099f;
|
||||
private static final float HASH_Y = 0.3678794f;
|
||||
|
||||
public DerivativeFractal(int octaves, double gain, double lacunarity) {
|
||||
this.heightOctaves = octaves;
|
||||
this.heightGain = gain;
|
||||
this.heightLacunarity = lacunarity;
|
||||
}
|
||||
|
||||
public static float hash(float x, float y) {
|
||||
float xx = x * HASH_X + HASH_Y;
|
||||
float yy = y * HASH_Y + HASH_X;
|
||||
|
||||
// Swapped the components here
|
||||
return 16 * (xx * yy * (xx + yy));
|
||||
}
|
||||
|
||||
public static float hashX(float n) {
|
||||
// Swapped the components here
|
||||
float nx = HASH_X * n;
|
||||
return -1.0f + 2.0f * fract(nx);
|
||||
}
|
||||
|
||||
public static float hashY(float n) {
|
||||
float ny = HASH_Y * n;
|
||||
return -1.0f + 2.0f * fract(ny);
|
||||
}
|
||||
|
||||
public static float fract(float x) {
|
||||
return (x - (float)Math.floor(x));
|
||||
}
|
||||
|
||||
private static float[] baseNoise(float px, float py) {
|
||||
float ix = (float)Math.floor(px);
|
||||
float iy = (float)Math.floor(py);
|
||||
float fx = px - ix;
|
||||
float fy = py - iy;
|
||||
|
||||
float ux = fx * fx * fx * (fx * (fx * 6.0f - 15.0f) + 10.0f);
|
||||
float uy = fy * fy * fy * (fy * (fy * 6.0f - 15.0f) + 10.0f);
|
||||
float dux = fx * fx * 30.0f * (fx * (fx - 2.0f) + 1.0f);
|
||||
float duy = fy * fy * 30.0f * (fy * (fy - 2.0f) + 1.0f);
|
||||
|
||||
float gan = hash(ix, iy);
|
||||
float gax = hashX(gan);
|
||||
float gay = hashY(gan);
|
||||
|
||||
float gbn = hash(ix + 1, iy);
|
||||
float gbx = hashX(gbn);
|
||||
float gby = hashY(gbn);
|
||||
|
||||
float gcn = hash(ix, iy + 1);
|
||||
float gcx = hashX(gcn);
|
||||
float gcy = hashY(gcn);
|
||||
|
||||
float gdn = hash(ix + 1, iy + 1);
|
||||
float gdx = hashX(gdn);
|
||||
float gdy = hashY(gdn);
|
||||
|
||||
float va = dot(gax, gay, fx, fy);
|
||||
float vb = dot(gbx, gby, fx - 1, fy);
|
||||
float vc = dot(gcx, gcy, fx, fy - 1);
|
||||
float vd = dot(gdx, gdy, fx - 1, fy - 1);
|
||||
|
||||
float u2x = gax + (gbx - gax) * ux + (gcx - gax) * uy + (gax - gbx - gcx + gdx) * ux * uy + dux * (uy * (va - vb - vc + vd) + vb - va);
|
||||
float u2y = gay + (gby - gay) * ux + (gcy - gay) * uy + (gay - gby - gcy + gdy) * ux * uy + duy * (ux * (va - vb - vc + vd) + vc - va);
|
||||
|
||||
return new float[] { va + ux * (vb - va) + uy * (vc - va) + ux * uy * (va - vb - vc + vd), u2x, u2y };
|
||||
}
|
||||
|
||||
@Override
|
||||
public double[] getNoiseDerivativeRaw(long seed, double x, double y) {
|
||||
double[] out = { 0.0f, 0.0f, 0.0f };
|
||||
float heightFreq = 1.0f;
|
||||
float heightAmp = 1f;
|
||||
float cumAmp = 0.0f;
|
||||
for (int i = 0; i < heightOctaves; i++) {
|
||||
float[] noise = baseNoise((float) (x * heightFreq), (float) (y * heightFreq));
|
||||
out[0] += noise[0] * heightAmp;
|
||||
out[1] += noise[1] * heightAmp * heightFreq;
|
||||
out[2] += noise[2] * heightAmp * heightFreq;
|
||||
cumAmp += heightAmp;
|
||||
heightAmp *= heightGain;
|
||||
heightFreq *= heightLacunarity;
|
||||
}
|
||||
out[0] /= cumAmp;
|
||||
out[1] /= cumAmp;
|
||||
out[2] /= cumAmp;
|
||||
return out;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double[] getNoiseDerivativeRaw(long seed, double x, double y, double z) {
|
||||
return getNoiseDerivativeRaw(seed, x, y);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getNoiseRaw(long seed, double x, double y) {
|
||||
return getNoiseDerivativeRaw(seed, x, y)[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getNoiseRaw(long seed, double x, double y, double z) {
|
||||
return getNoiseRaw(seed, x, y);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user