Merge branch 'main' into item-models

2024-10-28 10:18:04 +03:00
parent cc3abf32ab 493477c27b
commit 962c1afc4a
12 changed files with 141 additions and 8 deletions
@@ -202,6 +202,16 @@ void ContentLoader::loadGenerator(
    map.at("biome-parameters").get(def.biomeParameters);
    map.at("biome-bpd").get(def.biomesBPD);
    map.at("heights-bpd").get(def.heightsBPD);
+    std::string interpName;
+    map.at("heights-interpolation").get(interpName);
+    if (auto interp = InterpolationType_from(interpName)) {
+        def.heightsInterpolation = *interp;
+    }
+    map.at("biomes-interpolation").get(interpName);
+    if (auto interp = InterpolationType_from(interpName)) {
+        def.biomesInterpolation = *interp;
+    }
+
    map.at("sea-level").get(def.seaLevel);
    map.at("wide-structs-chunks-radius").get(def.wideStructsChunksRadius);
    if (map.has("heightmap-inputs")) {