mirrors/Terra
1
0 Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-27 14:30:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

simply noise context api

Browse Source
This commit is contained in:
Zoë Gidiere committed 2023-10-08 19:18:45 -06:00
1 parent 9ff23a9458
commit e0328a3c89
27 files changed
+122 -156
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/Normalizer.java
+2 -2
View File
@@ -22,12 +22,12 @@ public abstract class Normalizer implements NoiseSampler {
public abstract double normalize(double in); public abstract double normalize(double in);
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return normalize(sampler.noise(seed, x, y)); return normalize(sampler.noise(seed, x, y));
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return normalize(sampler.noise(seed, x, y, z)); return normalize(sampler.noise(seed, x, y, z));
} }
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class DomainWarpedSampler implements NoiseSampler {
} }
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return function.noise(seed++, return function.noise(seed++,
x + warp.noise(seed++, x, y) * amplitude, x + warp.noise(seed++, x, y) * amplitude,
y + warp.noise(seed, x, y) * amplitude y + warp.noise(seed, x, y) * amplitude
@@ -32,7 +32,7 @@ public class DomainWarpedSampler implements NoiseSampler {
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return function.noise(seed++, return function.noise(seed++,
x + warp.noise(seed++, x, y, z) * amplitude, x + warp.noise(seed++, x, y, z) * amplitude,
y + warp.noise(seed++, x, y, z) * amplitude, y + warp.noise(seed++, x, y, z) * amplitude,
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/ImageSampler.java
+2 -2
View File
@@ -26,14 +26,14 @@ public class ImageSampler implements NoiseSampler {
} }
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return ((channel.getChannel(image.getRGB(Math.floorMod((int) Math.floor(x * frequency), image.getWidth()), return ((channel.getChannel(image.getRGB(Math.floorMod((int) Math.floor(x * frequency), image.getWidth()),
Math.floorMod((int) Math.floor(y * frequency), image.getHeight()))) / 255D) - 0.5) * Math.floorMod((int) Math.floor(y * frequency), image.getHeight()))) / 255D) - 0.5) *
2; 2;
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return noise(seed, x, y); return noise(seed, x, y);
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/KernelSampler.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class KernelSampler implements NoiseSampler {
} }
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
x *= frequency; x *= frequency;
y *= frequency; y *= frequency;
double accumulator = 0; double accumulator = 0;
@@ -45,7 +45,7 @@ public class KernelSampler implements NoiseSampler {
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
x *= frequency; x *= frequency;
y *= frequency; y *= frequency;
z *= frequency; z *= frequency;
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/LinearHeightmapSampler.java
+2 -2
View File
@@ -18,12 +18,12 @@ public class LinearHeightmapSampler implements NoiseSampler {
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return noise(seed, x, 0, y); return noise(seed, x, 0, y);
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return -y + base + sampler.noise(seed, x, y, z) * scale; return -y + base + sampler.noise(seed, x, y, z) * scale;
} }
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/TranslateSampler.java
+2 -2
View File
@@ -18,12 +18,12 @@ public class TranslateSampler implements NoiseSampler {
} }
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return sampler.noise(seed, x - dx, y - dz); return sampler.noise(seed, x - dx, y - dz);
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return sampler.noise(seed, x - dx, y - dy, z - dz); return sampler.noise(seed, x - dx, y - dy, z - dz);
} }
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/arithmetic/BinaryArithmeticSampler.java
+2 -2
View File
@@ -15,12 +15,12 @@ public abstract class BinaryArithmeticSampler implements NoiseSampler {
} }
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return operate(left.noise(seed, x, y), right.noise(seed, x, y)); return operate(left.noise(seed, x, y), right.noise(seed, x, y));
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return operate(left.noise(seed, x, y, z), right.noise(seed, x, y, z)); return operate(left.noise(seed, x, y, z), right.noise(seed, x, y, z));
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java
+2 -2
View File
@@ -221,7 +221,7 @@ public class CellularSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
int xr = (int) Math.round(x); int xr = (int) Math.round(x);
int yr = (int) Math.round(y); int yr = (int) Math.round(y);
@@ -298,7 +298,7 @@ public class CellularSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double z, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
int xr = (int) Math.round(x); int xr = (int) Math.round(x);
int yr = (int) Math.round(y); int yr = (int) Math.round(y);
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ConstantSampler.java
+2 -2
View File
@@ -21,12 +21,12 @@ public class ConstantSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius) {
return constant; return constant;
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
return constant; return constant;
} }
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/DistanceSampler.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class DistanceSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius) {
double dx = x - ox; double dx = x - ox;
double dy = y - oz; double dy = y - oz;
if (normalize && (Math.abs(dx) > radius || Math.abs(dy) > radius)) return 1; if (normalize && (Math.abs(dx) > radius || Math.abs(dy) > radius)) return 1;
@@ -35,7 +35,7 @@ public class DistanceSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
double dx = x - ox; double dx = x - ox;
double dy = y - oy; double dy = y - oy;
double dz = z - oz; double dz = z - oz;
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ExpressionFunction.java
+2 -2
View File
@@ -42,12 +42,12 @@ public class ExpressionFunction extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius) {
return expression.evaluate(new SeedContext(seed), x, 0, y); return expression.evaluate(new SeedContext(seed), x, 0, y);
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
return expression.evaluate(new SeedContext(seed), x, y, z); return expression.evaluate(new SeedContext(seed), x, y, z);
} }
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java
+2 -2
View File
@@ -105,12 +105,12 @@ public class GaborNoiseSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double z, double[] context, int contextRadius) {
return gaborNoise(seed, x, z); return gaborNoise(seed, x, z);
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
return gaborNoise(seed, x, z); return gaborNoise(seed, x, z);
} }
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java
+10 -12
View File
@@ -53,32 +53,30 @@ public abstract class NoiseFunction implements NoiseSampler {
} }
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return getNoiseRaw(seed + salt, x * frequency, y * frequency, context, contextLayer, contextRadius); return getNoiseRaw(seed + salt, x * frequency, y * frequency, context, contextRadius);
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return getNoiseRaw(seed + salt, x * frequency, y * frequency, z * frequency, context, contextLayer, contextRadius); return getNoiseRaw(seed + salt, x * frequency, y * frequency, z * frequency, context, contextRadius);
} }
public double getNoiseRaw(long seed, double x, double y) { public double getNoiseRaw(long seed, double x, double y) {
int contextRadius = getContextRadius(); int contextRadius = getContextRadius();
ArrayList<double[]> list = new ArrayList<>(); double[] context = generateContext(seed, x, y, contextRadius);
generateContext(seed, x, y, list, 0, contextRadius); return getNoiseRaw(seed, x, y, context, getContextRadius());
return getNoiseRaw(seed, x, y, list, 0, getContextRadius());
} }
public double getNoiseRaw(long seed, double x, double y, double z) { public double getNoiseRaw(long seed, double x, double y, double z) {
int contextRadius = getContextRadius(); int contextRadius = getContextRadius();
ArrayList<double[]> list = new ArrayList<>(); double[] context = generateContext(seed, x, y, z, contextRadius);
generateContext(seed, x, y, z, list, 0, contextRadius); return getNoiseRaw(seed, x, y, z, context, getContextRadius());
return getNoiseRaw(seed, x, y, z, list, 0, getContextRadius());
} }
public abstract double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius); public abstract double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius);
public abstract double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius); public abstract double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius);
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/PseudoErosionSampler.java
+12 -25
View File
@@ -234,18 +234,16 @@ public class PseudoErosionSampler extends NoiseFunction {
} }
public void generateContextRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double[] generateContextRaw(long sl, double x, double y, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
// Round sampled position to integers to derive grid coordinates // Round sampled position to integers to derive grid coordinates
int gridX = (int) Math.round(x); int gridX = (int) Math.round(x);
int gridY = (int) Math.round(y); int gridY = (int) Math.round(y);
int nextContextLayer = contextLayer + 1;
int nextContextRadius = contextRadius + getContextRadius(); int nextContextRadius = contextRadius + getContextRadius();
context.add(contextLayer, new double[0]); double[] context = this.lookup.generateContext(seed, x, y, nextContextRadius);
this.lookup.generateContext(seed, x, y, context, nextContextLayer, nextContextRadius);
int contextCircumference = (contextRadius * 2 + 1); int contextCircumference = (contextRadius * 2 + 1);
int contextSizeArraySize = contextCircumference * contextCircumference * 3; int contextSizeArraySize = contextCircumference * contextCircumference * 3;
@@ -267,7 +265,7 @@ public class PseudoErosionSampler extends NoiseFunction {
double actualCellX = cellX * inverseFrequency; double actualCellX = cellX * inverseFrequency;
double actualCellY = cellY * inverseFrequency; double actualCellY = cellY * inverseFrequency;
double lookup = this.lookup.noise(seed, actualCellX, actualCellY, context, nextContextLayer, nextContextRadius); double lookup = this.lookup.noise(seed, actualCellX, actualCellY, context, nextContextRadius);
cellData[cellDataIndex++] = cellX; cellData[cellDataIndex++] = cellX;
cellData[cellDataIndex++] = cellY; cellData[cellDataIndex++] = cellY;
@@ -275,14 +273,12 @@ public class PseudoErosionSampler extends NoiseFunction {
} }
} }
context.add(contextLayer, cellData); return cellData;
} }
public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double[] cellData, int contextRadius) {
double finalDistance = Double.MAX_VALUE; double finalDistance = Double.MAX_VALUE;
double[] cellData = context.get(contextLayer);
int xIndexSize = (contextRadius * 6) + 3; int xIndexSize = (contextRadius * 6) + 3;
int deltaRadius = (contextRadius - NEARBY_CELLS_RADIUS); int deltaRadius = (contextRadius - NEARBY_CELLS_RADIUS);
@@ -292,17 +288,14 @@ public class PseudoErosionSampler extends NoiseFunction {
// Iterate over nearby cells // Iterate over nearby cells
int cellDataIndex = xIndex; int cellDataIndex = xIndex;
//int cellDataIndex = 21;
for(int xi = -NEARBY_CELLS_RADIUS; xi <= NEARBY_CELLS_RADIUS; xi++) { for(int xi = -NEARBY_CELLS_RADIUS; xi <= NEARBY_CELLS_RADIUS; xi++) {
cellDataIndex += yIndex; cellDataIndex += yIndex;
//cellDataIndex += 3;
for(int yi = -NEARBY_CELLS_RADIUS; yi <= NEARBY_CELLS_RADIUS; yi++) { for(int yi = -NEARBY_CELLS_RADIUS; yi <= NEARBY_CELLS_RADIUS; yi++) {
// Find cell position with the lowest lookup value within moore neighborhood of neighbor // Find cell position with the lowest lookup value within moore neighborhood of neighbor
double lowestLookup = Double.MAX_VALUE; double lowestLookup = Double.MAX_VALUE;
double connectedCellX = 0; double connectedCellX = 0;
double connectedCellY = 0; double connectedCellY = 0;
//int cellDataIndexN = cellDataIndex - xIndex - 1;
int cellDataIndexN = cellDataIndex - 22; int cellDataIndexN = cellDataIndex - 22;
int yniMin = yi - MAX_CONNECTION_RADIUS; int yniMin = yi - MAX_CONNECTION_RADIUS;
int yniMax = yi + MAX_CONNECTION_RADIUS; int yniMax = yi + MAX_CONNECTION_RADIUS;
@@ -332,7 +325,6 @@ public class PseudoErosionSampler extends NoiseFunction {
cellDataIndex += 3; cellDataIndex += 3;
} }
cellDataIndex += yIndex; cellDataIndex += yIndex;
//cellDataIndex += 3;
} }
return finalDistance; return finalDistance;
@@ -372,29 +364,24 @@ public class PseudoErosionSampler extends NoiseFunction {
} }
public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double z, double[] context, int contextRadius) {
// TODO // TODO
return 0; return 0;
} }
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return getNoiseRaw(seed + salt, x * frequency, y * frequency, context, contextLayer, contextRadius); return getNoiseRaw(seed + salt, x * frequency, y * frequency, context, contextRadius);
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return getNoiseRaw(seed + salt, x * frequency, y * frequency, z * frequency, context, contextLayer, contextRadius); return getNoiseRaw(seed + salt, x * frequency, y * frequency, z * frequency, context, contextRadius);
} }
@Override @Override
public void generateContext(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double[] generateContext(long seed, double x, double y, int contextRadius) {
generateContextRaw(seed + salt, x * frequency, y * frequency, context, contextLayer, contextRadius); return generateContextRaw(seed + salt, x * frequency, y * frequency, contextRadius);
}
@Override
public void generateContext(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
//no-op
} }
@Override @Override
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/BrownianMotionSampler.java
+2 -2
View File
@@ -19,7 +19,7 @@ public class BrownianMotionSampler extends FractalNoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius) {
double sum = 0; double sum = 0;
double amp = fractalBounding; double amp = fractalBounding;
@@ -37,7 +37,7 @@ public class BrownianMotionSampler extends FractalNoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
double sum = 0; double sum = 0;
double amp = fractalBounding; double amp = fractalBounding;
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/PingPongSampler.java
+2 -2
View File
@@ -31,7 +31,7 @@ public class PingPongSampler extends FractalNoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius) {
double sum = 0; double sum = 0;
double amp = fractalBounding; double amp = fractalBounding;
@@ -49,7 +49,7 @@ public class PingPongSampler extends FractalNoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
double sum = 0; double sum = 0;
double amp = fractalBounding; double amp = fractalBounding;
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/RidgedFractalSampler.java
+2 -2
View File
@@ -20,7 +20,7 @@ public class RidgedFractalSampler extends FractalNoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius) {
double sum = 0; double sum = 0;
double amp = fractalBounding; double amp = fractalBounding;
@@ -38,7 +38,7 @@ public class RidgedFractalSampler extends FractalNoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
double sum = 0; double sum = 0;
double amp = fractalBounding; double amp = fractalBounding;
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/GaussianNoiseSampler.java
+2 -2
View File
@@ -23,7 +23,7 @@ public class GaussianNoiseSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius) {
double v1, v2, s; double v1, v2, s;
do { do {
v1 = whiteNoiseSampler.noise(seed++, x, y); v1 = whiteNoiseSampler.noise(seed++, x, y);
@@ -35,7 +35,7 @@ public class GaussianNoiseSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
double v1, v2, s; double v1, v2, s;
do { do {
v1 = whiteNoiseSampler.noise(seed++, x, y, z); v1 = whiteNoiseSampler.noise(seed++, x, y, z);
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/WhiteNoiseSampler.java
+2 -2
View File
@@ -42,12 +42,12 @@ public class WhiteNoiseSampler extends NoiseFunction {
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double[] context, int contextRadius) {
return (getNoiseUnmapped(seed, x, y) - 1.5) * 2; return (getNoiseUnmapped(seed, x, y) - 1.5) * 2;
} }
@Override @Override
public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long seed, double x, double y, double z, double[] context, int contextRadius) {
return (getNoiseUnmapped(seed, x, y, z) - 1.5) * 2; return (getNoiseUnmapped(seed, x, y, z) - 1.5) * 2;
} }
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2SSampler.java
+2 -2
View File
@@ -16,7 +16,7 @@ import java.util.List;
public class OpenSimplex2SSampler extends SimplexStyleSampler { public class OpenSimplex2SSampler extends SimplexStyleSampler {
@Override @Override
@SuppressWarnings("NumericOverflow") @SuppressWarnings("NumericOverflow")
public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
// 2D OpenSimplex2S case is a modified 2D simplex noise. // 2D OpenSimplex2S case is a modified 2D simplex noise.
@@ -124,7 +124,7 @@ public class OpenSimplex2SSampler extends SimplexStyleSampler {
@Override @Override
@SuppressWarnings("NumericOverflow") @SuppressWarnings("NumericOverflow")
public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double z, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
// 3D OpenSimplex2S case uses two offset rotated cube grids. // 3D OpenSimplex2S case uses two offset rotated cube grids.
final double R3 = (2.0 / 3.0); final double R3 = (2.0 / 3.0);
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java
+2 -2
View File
@@ -17,7 +17,7 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
private static final double SQRT3 = 1.7320508075688772935274463415059; private static final double SQRT3 = 1.7320508075688772935274463415059;
@Override @Override
public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
// 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex. // 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex.
final double G2 = (3 - SQRT3) / 6; final double G2 = (3 - SQRT3) / 6;
@@ -78,7 +78,7 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
} }
@Override @Override
public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double z, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
// 3D OpenSimplex2Sampler case uses two offset rotated cube grids. // 3D OpenSimplex2Sampler case uses two offset rotated cube grids.
final double R3 = (2.0 / 3.0); final double R3 = (2.0 / 3.0);
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PerlinSampler.java
+2 -2
View File
@@ -17,7 +17,7 @@ import java.util.List;
*/ */
public class PerlinSampler extends SimplexStyleSampler { public class PerlinSampler extends SimplexStyleSampler {
@Override @Override
public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
int x0 = (int) Math.floor(x); int x0 = (int) Math.floor(x);
int y0 = (int) Math.floor(y); int y0 = (int) Math.floor(y);
@@ -42,7 +42,7 @@ public class PerlinSampler extends SimplexStyleSampler {
} }
@Override @Override
public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double z, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
int x0 = (int) Math.floor(x); int x0 = (int) Math.floor(x);
int y0 = (int) Math.floor(y); int y0 = (int) Math.floor(y);
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexSampler.java
+2 -2
View File
@@ -61,7 +61,7 @@ public class SimplexSampler extends SimplexStyleSampler {
} }
@Override @Override
public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
double t = (x + y) * F2; double t = (x + y) * F2;
int i = (int) Math.floor(x + t); int i = (int) Math.floor(x + t);
@@ -118,7 +118,7 @@ public class SimplexSampler extends SimplexStyleSampler {
} }
@Override @Override
public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double z, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
double t = (x + y + z) * F3; double t = (x + y + z) * F3;
int i = (int) Math.floor(x + t); int i = (int) Math.floor(x + t);
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueCubicSampler.java
+2 -2
View File
@@ -14,7 +14,7 @@ import java.util.List;
public class ValueCubicSampler extends ValueStyleNoise { public class ValueCubicSampler extends ValueStyleNoise {
@Override @Override
public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
int x1 = (int) Math.floor(x); int x1 = (int) Math.floor(x);
int y1 = (int) Math.floor(y); int y1 = (int) Math.floor(y);
@@ -44,7 +44,7 @@ public class ValueCubicSampler extends ValueStyleNoise {
} }
@Override @Override
public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double z, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
int x1 = (int) Math.floor(x); int x1 = (int) Math.floor(x);
int y1 = (int) Math.floor(y); int y1 = (int) Math.floor(y);
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueSampler.java
+2 -2
View File
@@ -14,7 +14,7 @@ import java.util.List;
public class ValueSampler extends ValueStyleNoise { public class ValueSampler extends ValueStyleNoise {
@Override @Override
public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
int x0 = (int) Math.floor(x); int x0 = (int) Math.floor(x);
int y0 = (int) Math.floor(y); int y0 = (int) Math.floor(y);
@@ -34,7 +34,7 @@ public class ValueSampler extends ValueStyleNoise {
} }
@Override @Override
public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double getNoiseRaw(long sl, double x, double y, double z, double[] context, int contextRadius) {
int seed = (int) sl; int seed = (int) sl;
int x0 = (int) Math.floor(x); int x0 = (int) Math.floor(x);
int y0 = (int) Math.floor(y); int y0 = (int) Math.floor(y);
common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java
+50 -69
View File
@@ -21,29 +21,16 @@ import java.util.List;
public interface NoiseSampler { public interface NoiseSampler {
static NoiseSampler zero() { static NoiseSampler zero() {
return new NoiseSampler() { return new NoiseSampler() {
@Override @Override
public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double[] context, int contextRadius) {
return 0; return 0;
} }
@Override @Override
public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { public double noise(long seed, double x, double y, double z, double[] context, int contextRadius) {
return 0; return 0;
} }
@Override
public void generateContext(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
//no-op
}
@Override
public void generateContext(long seed, double x, double y, double z, List<double[]> context, int contextLayer,
int contextRadius) {
//no-op
}
@Override @Override
public int getContextRadius() { public int getContextRadius() {
return 0; return 0;
@@ -68,29 +55,28 @@ public interface NoiseSampler {
return noise(seed, vector2.getX(), vector2.getZ()); return noise(seed, vector2.getX(), vector2.getZ());
} }
default double noise(Vector3 vector3, long seed, List<double[]> context, int contextLayer, int contextRadius) { default double noise(Vector3 vector3, long seed, double[] context, int contextRadius) {
return noise(seed, vector3.getX(), vector3.getY(), vector3.getZ(), context, contextLayer, contextRadius); return noise(seed, vector3.getX(), vector3.getY(), vector3.getZ(), context, contextRadius);
} }
default double noise(Vector3Int vector3, long seed, List<double[]> context, int contextLayer, int contextRadius) { default double noise(Vector3Int vector3, long seed, double[] context, int contextRadius) {
return noise(seed, vector3.getX(), vector3.getY(), vector3.getZ(), context, contextLayer, contextRadius); return noise(seed, vector3.getX(), vector3.getY(), vector3.getZ(), context, contextRadius);
} }
default double noise(Vector2 vector2, long seed, List<double[]> context, int contextLayer, int contextRadius) { default double noise(Vector2 vector2, long seed, double[] context, int contextRadius) {
return noise(seed, vector2.getX(), vector2.getZ(), context, contextLayer, contextRadius); return noise(seed, vector2.getX(), vector2.getZ(), context, contextRadius);
} }
default double noise(Vector2Int vector2, long seed, List<double[]> context, int contextLayer, int contextRadius) { default double noise(Vector2Int vector2, long seed, double[] context, int contextRadius) {
return noise(seed, vector2.getX(), vector2.getZ(), context, contextLayer, contextRadius); return noise(seed, vector2.getX(), vector2.getZ(), context, contextRadius);
} }
default double noise(long seed, double x, double y) { default double noise(long seed, double x, double y) {
int contextRadius = getContextRadius(); int contextRadius = getContextRadius();
ArrayList<double[]> list = new ArrayList<>(); double[] context = generateContext(seed, x, y, contextRadius);
generateContext(seed, x, y, list, 0, contextRadius); return noise(seed, x, y, context, contextRadius);
return noise(seed, x, y, list, 0, contextRadius);
} }
default double noise(long seed, int x, int y) { default double noise(long seed, int x, int y) {
@@ -100,87 +86,82 @@ public interface NoiseSampler {
default double noise(long seed, double x, double y, double z) { default double noise(long seed, double x, double y, double z) {
int contextRadius = getContextRadius(); int contextRadius = getContextRadius();
ArrayList<double[]> list = new ArrayList<>(); double[] context = generateContext(seed, x, y, z, contextRadius);
generateContext(seed, x, y, z, list, 0, contextRadius); return noise(seed, x, y, z, context, contextRadius);
return noise(seed, x, y, z, list, 0, contextRadius);
} }
default double noise(long seed, int x, int y, int z) { default double noise(long seed, int x, int y, int z) {
return noise(seed, (double) x, y, z); return noise(seed, (double) x, y, z);
} }
double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius); double noise(long seed, double x, double y, double[] context, int contextRadius);
default double noise(long seed, int x, int y, List<double[]> context, int contextLayer, int contextRadius) { default double noise(long seed, int x, int y, double[] context, int contextRadius) {
return noise(seed, (double) x, y, context, contextLayer, contextRadius); return noise(seed, (double) x, y, context, contextRadius);
} }
double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius); double noise(long seed, double x, double y, double z, double[] context, int contextRadius);
default double noise(long seed, int x, int y, int z, List<double[]> context, int contextLayer, int contextRadius) { default double noise(long seed, int x, int y, int z, double[] context, int contextRadius) {
return noise(seed, (double) x, y, z, context, contextLayer, contextRadius); return noise(seed, (double) x, y, z, context, contextRadius);
} }
default void generateContext(long seed, Vector2 vector2, List<double[]> context, int contextLayer, int contextRadius) { default double[] generateContext(long seed, Vector2 vector2, int contextRadius) {
//no-op return new double[0];
} }
default void generateContext(long seed, Vector2 vector2, List<double[]> context) { default double[] generateContext(long seed, Vector2 vector2) {
generateContext(seed, vector2.getX(), vector2.getZ(), context); return generateContext(seed, vector2.getX(), vector2.getZ());
} }
default void generateContext(long seed, Vector2Int vector2, List<double[]> context, int contextLayer, int contextRadius) { default double[] generateContext(long seed, Vector2Int vector2, int contextRadius) {
generateContext(seed, (double) vector2.getX(), vector2.getZ(), context, contextLayer, contextRadius); return generateContext(seed, (double) vector2.getX(), vector2.getZ(), contextRadius);
} }
default void generateContext(long seed, Vector2Int vector2, List<double[]> context) { default double[] generateContext(long seed, Vector2Int vector2) {
generateContext(seed, (double) vector2.getX(), vector2.getZ(), context); return generateContext(seed, (double) vector2.getX(), vector2.getZ());
} }
default void generateContext(long seed, Vector3 vector3, List<double[]> context, int contextLayer, int contextRadius) { default double[] generateContext(long seed, Vector3 vector3, int contextRadius) {
//no-op return new double[0];
} }
default void generateContext(long seed, Vector3 vector3, List<double[]> context) { default double[] generateContext(long seed, Vector3 vector3) {
generateContext(seed, vector3.getX(), vector3.getY(), vector3.getZ(), context); return generateContext(seed, vector3.getX(), vector3.getY(), vector3.getZ());
} }
default void generateContext(long seed, Vector3Int vector3, List<double[]> context, int contextLayer, int contextRadius) { default double[] generateContext(long seed, Vector3Int vector3, int contextRadius) {
generateContext(seed, (double) vector3.getX(), vector3.getY(), vector3.getZ(), context, contextLayer, contextRadius); return generateContext(seed, (double) vector3.getX(), vector3.getY(), vector3.getZ(), contextRadius);
} }
default void generateContext(long seed, Vector3Int vector3, List<double[]> context) { default double[] generateContext(long seed, Vector3Int vector3) {
generateContext(seed, (double) vector3.getX(), vector3.getY(), vector3.getZ(), context); return generateContext(seed, (double) vector3.getX(), vector3.getY(), vector3.getZ());
} }
default void generateContext(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) { default double[] generateContext(long seed, double x, double y, int contextRadius) {
//no-op return new double[0];
} }
default void generateContext(long seed, double x, double y, List<double[]> context) { default double[] generateContext(long seed, double x, double y) {
generateContext(seed, x, y, context, 0, getContextRadius()); return generateContext(seed, x, y, getContextRadius());
} }
default void generateContext(long seed, int x, int y, List<double[]> context, int contextLayer, int contextRadius) { default double[] generateContext(long seed, int x, int y) {
generateContext(seed, (double) x, y, context, contextLayer, contextRadius); return generateContext(seed, (double) x, y);
} }
default void generateContext(long seed, int x, int y, List<double[]> context) { default double[] generateContext(long seed, double x, double y, double z, int contextRadius) {
generateContext(seed, (double) x, y, context); return new double[0];
} }
default void generateContext(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) { default double[] generateContext(long seed, double x, double y, double z) {
//no-op return generateContext(seed, x, y, z, getContextRadius());
} }
default void generateContext(long seed, double x, double y, double z, List<double[]> context) { default double[] generateContext(long seed, int x, int y, int z, int contextRadius) {
generateContext(seed, x, y, z, context, 0, getContextRadius()); return generateContext(seed, (double) x, y, z, contextRadius);
} }
default void generateContext(long seed, int x, int y, int z, List<double[]> context, int contextLayer, int contextRadius) { default double[] generateContext(long seed, int x, int y, int z) {
generateContext(seed, (double) x, y, z, context, contextLayer, contextRadius); return generateContext(seed, (double) x, y, z);
}
default void generateContext(long seed, int x, int y, int z, List<double[]> context) {
generateContext(seed, (double) x, y, z, context);
} }
default int getContextRadius() { default int getContextRadius() {
common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java
+4 -4
View File
@@ -51,25 +51,25 @@ public class ProbabilityCollection<E> implements Collection<E> {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public E get(NoiseSampler n, double x, double y, double z, long seed) { public E get(NoiseSampler n, double x, double y, double z, long seed) {
if(array.length == 0) return null; if(array.length == 0) return null;
return (E) array[(int) MathUtil.normalizeIndex(n.noise(seed, x, y, z), array.length)]; return (E) array[MathUtil.normalizeIndex(n.noise(seed, x, y, z), array.length)];
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public E get(NoiseSampler n, Vector3Int vector3Int, long seed) { public E get(NoiseSampler n, Vector3Int vector3Int, long seed) {
if(array.length == 0) return null; if(array.length == 0) return null;
return (E) array[(int) MathUtil.normalizeIndex(n.noise(seed, vector3Int.getX(), vector3Int.getY(), vector3Int.getZ()), array.length)]; return (E) array[MathUtil.normalizeIndex(n.noise(seed, vector3Int.getX(), vector3Int.getY(), vector3Int.getZ()), array.length)];
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public E get(NoiseSampler n, Vector3 vector3Int, long seed) { public E get(NoiseSampler n, Vector3 vector3Int, long seed) {
if(array.length == 0) return null; if(array.length == 0) return null;
return (E) array[(int) MathUtil.normalizeIndex(n.noise(seed, vector3Int.getX(), vector3Int.getY(), vector3Int.getZ()), array.length)]; return (E) array[MathUtil.normalizeIndex(n.noise(seed, vector3Int.getX(), vector3Int.getY(), vector3Int.getZ()), array.length)];
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public E get(NoiseSampler n, double x, double z, long seed) { public E get(NoiseSampler n, double x, double z, long seed) {
if(array.length == 0) return null; if(array.length == 0) return null;
return (E) array[(int) MathUtil.normalizeIndex(n.noise(seed, x, z), array.length)]; return (E) array[MathUtil.normalizeIndex(n.noise(seed, x, z), array.length)];
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")