Merge branch 'main' into headless-mode

2024-12-21 09:03:30 +03:00
parent dc93cac1b9 9594e025c3
commit ba0610d857
22 changed files with 191 additions and 63 deletions
@@ -239,10 +239,18 @@ void ContentLoader::loadBlock(
        }
        def.model = *model;
    } else if (!modelTypeName.empty()) {
-        logger.error() << "unknown model " << modelTypeName;
+        logger.error() << "unknown model: " << modelTypeName;
        def.model = BlockModel::none;
    }

+    std::string cullingModeName = to_string(def.culling);
+    root.at("culling").get(cullingModeName);
+    if (auto mode = CullingMode_from(cullingModeName)) {
+        def.culling = *mode;
+    } else {
+        logger.error() << "unknown culling mode: " << cullingModeName;
+    }
+
    root.at("material").get(def.material);

    // rotation profile