mirrors/Terra
1
0 Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-25 21:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

equation -> expression

Browse Source
This commit is contained in:
dfsek committed 2022-01-20 14:02:43 -07:00
1 parent 17d903ff32
commit c051040b12
1 file changed
+2 -4
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java
+2 -4
View File
@@ -11,8 +11,6 @@ import com.dfsek.paralithic.eval.tokenizer.ParseException;
import com.dfsek.paralithic.functions.Function; import com.dfsek.paralithic.functions.Function;
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.tectonic.api.exception.LoadException;
import com.dfsek.tectonic.api.exception.ValidationException;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -37,7 +35,7 @@ public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFuncti
@Default @Default
private @Meta Map<String, @Meta Double> vars = new HashMap<>(); private @Meta Map<String, @Meta Double> vars = new HashMap<>();
@Value("expression") @Value("expression")
private @Meta String equation; private @Meta String expression;
@Value("samplers") @Value("samplers")
@Default @Default
private @Meta LinkedHashMap<String, @Meta DimensionApplicableNoiseSampler> samplers = new LinkedHashMap<>(); private @Meta LinkedHashMap<String, @Meta DimensionApplicableNoiseSampler> samplers = new LinkedHashMap<>();
@@ -54,7 +52,7 @@ public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFuncti
public NoiseSampler get() { public NoiseSampler get() {
try { try {
Map<String, Function> noiseFunctionMap = generateFunctions(); Map<String, Function> noiseFunctionMap = generateFunctions();
return new ExpressionFunction(noiseFunctionMap, equation, vars); return new ExpressionFunction(noiseFunctionMap, expression, vars);
} catch(ParseException e) { } catch(ParseException e) {
throw new RuntimeException("Failed to parse expression.", e); throw new RuntimeException("Failed to parse expression.", e);
} }