From f4bd9281405208a50ae32bafa2e9c3e048f260e7 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Tue, 18 Aug 2020 01:16:45 -0400 Subject: [PATCH] Fixes & Tweaks to interp --- flat/_docs/interpolation-method.txt | 11 ++++++++++ flat/biomes/f2.json | 23 +++++++++++++++++++++ flat/biomes/flat.json | 8 ++++--- flat/dimensions/flat.json | 1 + flat/generators/flat.json | 7 ++++--- flat/regions/flat.json | 2 +- overworld/_docs/interpolation-method.txt | 11 ++++++++++ overworld/generators/mesa-sharp-4.json | 2 +- overworld/generators/mesa-sharp-5.json | 2 +- overworld/generators/mesa-sharp-6.json | 2 +- overworld/generators/mesa-sharp-7.json | 2 +- overworld/generators/mountain-cliffs.json | 2 +- overworld/generators/mountain.json | 2 +- overworld/generators/plain-chaotic.json | 2 +- overworld/generators/plain-cliffs-thin.json | 2 +- overworld/generators/plain-cliffs.json | 2 +- overworld/generators/plain.json | 2 +- overworld/generators/sharp.json | 2 +- overworld/generators/sharper.json | 2 +- 19 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 flat/biomes/f2.json diff --git a/flat/_docs/interpolation-method.txt b/flat/_docs/interpolation-method.txt index d701909c..1e449779 100644 --- 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 diff --git a/flat/biomes/f2.json b/flat/biomes/f2.json new file mode 100644 index 00000000..bd24cac4 --- /dev/null +++ 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" + }] +} diff --git a/flat/biomes/flat.json b/flat/biomes/flat.json index 4701e1bd..997f01fc 100644 --- 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" }] } diff --git a/flat/dimensions/flat.json b/flat/dimensions/flat.json index 5ac7e950..e7bc888c 100644 --- 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 } diff --git a/flat/generators/flat.json b/flat/generators/flat.json index ffef598d..b3bceb2c 100644 --- 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 } diff --git a/flat/regions/flat.json b/flat/regions/flat.json index 317280c0..0bcdfefd 100644 --- 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" } diff --git a/overworld/_docs/interpolation-method.txt b/overworld/_docs/interpolation-method.txt index d701909c..1e449779 100644 --- 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 diff --git a/overworld/generators/mesa-sharp-4.json b/overworld/generators/mesa-sharp-4.json index 694d7fbc..9750a657 100644 --- 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": [{ diff --git a/overworld/generators/mesa-sharp-5.json b/overworld/generators/mesa-sharp-5.json index 106fe4cb..83eab830 100644 --- 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": [{ diff --git a/overworld/generators/mesa-sharp-6.json b/overworld/generators/mesa-sharp-6.json index 57284c84..ea5e80da 100644 --- 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": [{ diff --git a/overworld/generators/mesa-sharp-7.json b/overworld/generators/mesa-sharp-7.json index 3710d061..ed6d484f 100644 --- 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": [{ diff --git a/overworld/generators/mountain-cliffs.json b/overworld/generators/mountain-cliffs.json index b9fe1ebd..cab97ad2 100644 --- 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, diff --git a/overworld/generators/mountain.json b/overworld/generators/mountain.json index 452369f2..544fe9a8 100644 --- a/overworld/generators/mountain.json +++ b/overworld/generators/mountain.json @@ -1,5 +1,5 @@ { - "interpolationFunction": "HERMITE", + "interpolationFunction": "HERMITE_LOOSE", "interpolationScale": 122, "seed": 9246661, "composite": [{ diff --git a/overworld/generators/plain-chaotic.json b/overworld/generators/plain-chaotic.json index 1a6ae78f..dd5ff319 100644 --- 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": [{ diff --git a/overworld/generators/plain-cliffs-thin.json b/overworld/generators/plain-cliffs-thin.json index f989d953..066d901c 100644 --- 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, diff --git a/overworld/generators/plain-cliffs.json b/overworld/generators/plain-cliffs.json index eff3d0a9..98c3dfee 100644 --- 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, diff --git a/overworld/generators/plain.json b/overworld/generators/plain.json index 9eebe706..d672341f 100644 --- a/overworld/generators/plain.json +++ b/overworld/generators/plain.json @@ -1,5 +1,5 @@ { - "interpolationFunction": "HERMITE", + "interpolationFunction": "HERMITE_LOOSE", "interpolationScale": 272, "seed": 7246661, "composite": [{ diff --git a/overworld/generators/sharp.json b/overworld/generators/sharp.json index 95492579..95e082ea 100644 --- 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": [{ diff --git a/overworld/generators/sharper.json b/overworld/generators/sharper.json index 32cbc10d..70c6a916 100644 --- 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": [{