add 'model-name' block property

src/content/ContentLoader.cpp

@@ -219,14 +219,15 @@ void ContentLoader::loadBlock(
     }
 
     // block model
-    std::string modelName;
-    root.at("model").get(modelName);
-    if (auto model = BlockModel_from(modelName)) {
+    std::string modelTypeName;
+    root.at("model").get(modelTypeName);
+    root.at("model-name").get(def.modelName);
+    if (auto model = BlockModel_from(modelTypeName)) {
         if (*model == BlockModel::custom) {
             if (root.has("model-primitives")) {
                 def.customModelRaw = root["model-primitives"];
-            } else {
-                throw std::runtime_error(name + ": no 'model-primitives' found");
+            } else if (def.modelName.empty()) {
+                throw std::runtime_error(name + ": no 'model-primitives' or 'model-name' found");
             }
             for (uint i = 0; i < 6; i++) {
                 std::string& texture = def.textureFaces[i];
@@ -236,8 +237,8 @@ void ContentLoader::loadBlock(
             }
         }
         def.model = *model;
-    } else if (!modelName.empty()) {
-        logger.error() << "unknown model " << modelName;
+    } else if (!modelTypeName.empty()) {
+        logger.error() << "unknown model " << modelTypeName;
         def.model = BlockModel::none;
     }
 

src/engine.cpp

@@ -288,14 +288,17 @@ void Engine::loadAssets() {
     if (content) {
         for (auto& [name, def] : content->blocks.getDefs()) {
             if (def->model == BlockModel::custom) {
-                assets->store(
-                    std::make_unique<model::Model>(
-                        ModelsGenerator::loadCustomBlockModel(
-                            def->customModelRaw, *assets, !def->shadeless
-                        )
-                    ),
-                    name + ".model"
-                );
+                if (def->modelName.empty()) {
+                    assets->store(
+                        std::make_unique<model::Model>(
+                            ModelsGenerator::loadCustomBlockModel(
+                                def->customModelRaw, *assets, !def->shadeless
+                            )
+                        ),
+                        name + ".model"
+                    );
+                    def->modelName = def->name + ".model";
+                }
             }
         }
         for (auto& [name, def] : content->items.getDefs()) {

src/frontend/ContentGfxCache.cpp

@@ -30,7 +30,7 @@ ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets)
         }
         if (def->model == BlockModel::custom) {
             models[def->rt.id] =
-                assets->require<model::Model>(def->name + ".model");
+                assets->require<model::Model>(def->modelName);
         }
     }
 }

src/graphics/render/ModelsGenerator.cpp

@@ -113,7 +113,7 @@ model::Model ModelsGenerator::generate(
                 "blocks:" + blockDef.textureFaces.at(0), assets
             );
         } else if (blockDef.model == BlockModel::custom) {
-            model = assets.require<model::Model>(blockDef.name+".model");
+            model = assets.require<model::Model>(blockDef.modelName);
             for (auto& mesh : model.meshes) {
                 mesh.scale(glm::vec3(0.3f));
             }

src/voxels/Block.hpp

@@ -135,6 +135,8 @@ public:
     /// @brief Custom model raw data
     dv::value customModelRaw = nullptr;
 
+    std::string modelName = "";
+
     /// @brief Does the block passing lights into itself
     bool lightPassing = false;