Cache 2D noise results to increase performance, update to latest Gaea

This commit is contained in:
dfsek
2020-10-31 15:46:09 -07:00
parent 89bc05fde8
commit be70ffa1b4
21 changed files with 51 additions and 26 deletions

View File

@@ -1,5 +1,6 @@
package com.dfsek.terra.math;
import com.dfsek.terra.config.base.ConfigUtil;
import org.polydev.gaea.math.FastNoiseLite;
import parsii.eval.Expression;
import parsii.eval.Function;
@@ -8,6 +9,7 @@ import java.util.List;
public class NoiseFunction2 implements Function {
private FastNoiseLite gen;
private final Cache cache = new Cache();
@Override
public int getNumberOfArguments() {
@@ -16,7 +18,7 @@ public class NoiseFunction2 implements Function {
@Override
public double eval(List<Expression> list) {
return gen.getNoise((float) list.get(0).evaluate(), (float) list.get(1).evaluate());
return cache.get(list.get(0).evaluate(), list.get(1).evaluate());
}
public void setNoise(FastNoiseLite gen) {
@@ -27,4 +29,24 @@ public class NoiseFunction2 implements Function {
public boolean isNaturalFunction() {
return true;
}
private final class Cache {
private final double[] cacheX = new double[ConfigUtil.cacheSize];
private final double[] cacheZ = new double[ConfigUtil.cacheSize];
private final double[] cacheValues = new double[ConfigUtil.cacheSize];
public double get(double x, double z) {
for(int i = 0; i < cacheX.length; i++) {
if(cacheX[i] == x && cacheZ[i] == z) return cacheValues[i];
}
cacheX[0] = x;
cacheZ[0] = z;
cacheValues[0] = gen.getNoise(x, z);
for(int i = 0; i < cacheX.length-1; i++) {
cacheX[i+1] = cacheX[i];
cacheZ[i+1] = cacheZ[i];
cacheValues[i+1] = cacheValues[i];
}
return cacheValues[0];
}
}
}

View File

@@ -16,7 +16,7 @@ public class NoiseFunction3 implements Function {
@Override
public double eval(List<Expression> list) {
return gen.getNoise((float) list.get(0).evaluate(), (float) list.get(1).evaluate(), (float) list.get(2).evaluate());
return gen.getNoise(list.get(0).evaluate(), list.get(1).evaluate(), list.get(2).evaluate());
}
public void setNoise(FastNoiseLite gen) {