Fixes & Tweaks to interp

2025-12-29 11:49:22 +00:00 · 2020-08-18 01:16:45 -04:00
parent d00bb65554
commit f4bd928140
19 changed files with 68 additions and 19 deletions
--- a/flat/_docs/interpolation-method.txt
+++ b/flat/_docs/interpolation-method.txt
@@ -1,4 +1,15 @@
 NONE
 BILINEAR
+BILINEAR_BEZIER
+BILINEAR_PARAMETRIC_2
+BILINEAR_PARAMETRIC_4
+BILINEAR_PARAMETRIC_1_5
 BICUBIC
 HERMITE
+CATMULL_ROM_SPLINE
+HERMITE_TENSE
+HERMITE_LOOSE
+HERMITE_LOOSE_HALF_POSITIVE_BIAS
+HERMITE_LOOSE_HALF_NEGATIVE_BIAS
+HERMITE_LOOSE_FULL_POSITIVE_BIAS
+HERMITE_LOOSE_FULL_NEGATIVE_BIAS
--- a/flat/biomes/f2.json
+++ b/flat/biomes/f2.json
@@ -0,0 +1,23 @@
+{
+    "name": "Flat 2",
+    "derivative": "PLAINS",
+    "layers": [
+        {
+            "maxHeight": 10,
+            "minHeight": 10,
+            "palette": [
+                "REDSTONE_BLOCK"
+            ]
+        },
+        {
+            "palette": ["DIRT"],
+            "minHeight": 2,
+            "maxHeight": 2
+        }
+    ],
+    "generators": [{
+        "min": 30,
+        "max": 50,
+        "generator": "flat"
+    }]
+}
--- a/flat/biomes/flat.json
+++ b/flat/biomes/flat.json
@@ -3,8 +3,10 @@
    "derivative": "PLAINS",
    "layers": [
        {
+            "maxHeight": 10,
+            "minHeight": 10,
            "palette": [
-                "GRASS_BLOCK"
+                "EMERALD_BLOCK"
            ]
        },
        {
@@ -14,8 +16,8 @@
        }
    ],
    "generators": [{
-        "min": 10,
-        "max": 10,
+        "min": 9,
+        "max": 15,
        "generator": "flat"
    }]
 }
--- a/flat/dimensions/flat.json
+++ b/flat/dimensions/flat.json
@@ -9,6 +9,7 @@
    "caves": false,
    "placeObjects": false,
    "coordFractureDistance": 24,
+    "landChance": 1,
    "fluidHeight": 0,
    "vanillaStructures": true
 }
--- a/flat/generators/flat.json
+++ b/flat/generators/flat.json
@@ -1,11 +1,12 @@
 {
    "seed": 1,
-    "interpolationFunction": "BILINEAR",
-    "interpolationScale": 5,
+    "interpolationFunction": "HERMITE_LOOSE",
+    "interpolationScale": 3,
    "composite": [
        {
            "style": {
-                "style": "FLAT"
+                "style": "SIMPLEX",
+                "zoom": 0.3
            },
            "seed": 10
        }
--- a/flat/regions/flat.json
+++ b/flat/regions/flat.json
@@ -1,6 +1,6 @@
 {
    "shoreBiomes": ["flat"],
-    "landBiomes": ["flat"],
+    "landBiomes": ["flat", "f2"],
    "seaBiomes": ["flat"],
    "name": "Flat"
 }
--- a/overworld/_docs/interpolation-method.txt
+++ b/overworld/_docs/interpolation-method.txt
@@ -1,4 +1,15 @@
 NONE
 BILINEAR
+BILINEAR_BEZIER
+BILINEAR_PARAMETRIC_2
+BILINEAR_PARAMETRIC_4
+BILINEAR_PARAMETRIC_1_5
 BICUBIC
 HERMITE
+CATMULL_ROM_SPLINE
+HERMITE_TENSE
+HERMITE_LOOSE
+HERMITE_LOOSE_HALF_POSITIVE_BIAS
+HERMITE_LOOSE_HALF_NEGATIVE_BIAS
+HERMITE_LOOSE_FULL_POSITIVE_BIAS
+HERMITE_LOOSE_FULL_NEGATIVE_BIAS
--- a/overworld/generators/mesa-sharp-4.json
+++ b/overworld/generators/mesa-sharp-4.json
@@ -1,5 +1,5 @@
 {
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 9,
    "seed": 2246661,
    "composite": [{
--- a/overworld/generators/mesa-sharp-5.json
+++ b/overworld/generators/mesa-sharp-5.json
@@ -1,5 +1,5 @@
 {
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 37,
    "seed": 2246661,
    "composite": [{
--- a/overworld/generators/mesa-sharp-6.json
+++ b/overworld/generators/mesa-sharp-6.json
@@ -1,5 +1,5 @@
 {
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 67,
    "seed": 3246661,
    "composite": [{
--- a/overworld/generators/mesa-sharp-7.json
+++ b/overworld/generators/mesa-sharp-7.json
@@ -1,5 +1,5 @@
 {
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 133,
    "seed": 7245661,
    "composite": [{
--- a/overworld/generators/mountain-cliffs.json
+++ b/overworld/generators/mountain-cliffs.json
@@ -13,7 +13,7 @@
        "bezier": true,
        "exponent": 1.125
    }],
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 188,
    "seed": 7246236,
    "cliffHeightMax": 35,
--- a/overworld/generators/mountain.json
+++ b/overworld/generators/mountain.json
@@ -1,5 +1,5 @@
 {
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 122,
    "seed": 9246661,
    "composite": [{
--- a/overworld/generators/plain-chaotic.json
+++ b/overworld/generators/plain-chaotic.json
@@ -1,5 +1,5 @@
 {
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 279,
    "seed": 7546112,
    "composite": [{
--- a/overworld/generators/plain-cliffs-thin.json
+++ b/overworld/generators/plain-cliffs-thin.json
@@ -13,7 +13,7 @@
        "bezier": true,
        "exponent": 1.125
    }],
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 198,
    "seed": 7886661,
    "cliffHeightMax": 45,
--- a/overworld/generators/plain-cliffs.json
+++ b/overworld/generators/plain-cliffs.json
@@ -13,7 +13,7 @@
        "bezier": true,
        "exponent": 1.125
    }],
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 198,
    "seed": 7246661,
    "cliffHeightMax": 80,
--- a/overworld/generators/plain.json
+++ b/overworld/generators/plain.json
@@ -1,5 +1,5 @@
 {
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 272,
    "seed": 7246661,
    "composite": [{
--- a/overworld/generators/sharp.json
+++ b/overworld/generators/sharp.json
@@ -1,7 +1,7 @@
 {
    "offsetX": 0,
    "offsetZ": 0,
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 20,
    "seed": 8192,
    "composite": [{
--- a/overworld/generators/sharper.json
+++ b/overworld/generators/sharper.json
@@ -1,7 +1,7 @@
 {
    "offsetX": 0,
    "offsetZ": 0,
-    "interpolationFunction": "HERMITE",
+    "interpolationFunction": "HERMITE_LOOSE",
    "interpolationScale": 9,
    "seed": 8192,
    "composite": [{