PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

extract one texture from custom model if not assigned

Browse Source
This commit is contained in:
MihailRis 2025-08-20 23:52:41 +03:00
parent 6cae75e02f
commit a9d40c312c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/render/ModelsGenerator.cpp
View File

@ -6,6 +6,7 @@
#include "voxels/Block.hpp" #include "voxels/Block.hpp"
#include "content/Content.hpp" #include "content/Content.hpp"
#include "debug/Logger.hpp" #include "debug/Logger.hpp"
#include "core_defs.hpp"
static debug::Logger logger("models-generator"); static debug::Logger logger("models-generator");
@ -67,11 +68,18 @@ void ModelsGenerator::prepareModel(
} else { } else {
auto srcModel = assets.get<model::Model>(blockModel.name); auto srcModel = assets.get<model::Model>(blockModel.name);
if (srcModel) { if (srcModel) {
bool defaultAssigned = variant.textureFaces[0] != TEXTURE_NOTFOUND;
auto model = std::make_unique<model::Model>(*srcModel); auto model = std::make_unique<model::Model>(*srcModel);
for (auto& mesh : model->meshes) { for (auto& mesh : model->meshes) {
if (mesh.texture.length() && mesh.texture[0] == '$') { if (mesh.texture.length() && mesh.texture[0] == '$') {
int index = std::stoll(mesh.texture.substr(1)); int index = std::stoll(mesh.texture.substr(1));
mesh.texture = "blocks:" + variant.textureFaces[index]; mesh.texture = "blocks:" + variant.textureFaces[index];
} else if (!defaultAssigned && !mesh.texture.empty()) {
size_t sepPos = mesh.texture.find(':');
if (sepPos == std::string::npos)
continue;
variant.textureFaces[0] = mesh.texture.substr(sepPos + 1);
defaultAssigned = true;
} }
} }
blockModel.name = modelName; blockModel.name = modelName;