voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 04:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'dev' into pathfinding

Browse source
This commit is contained in:
MihailRis 2025-08-24 17:32:13 +03:00
commit 98e9f5a2a9
9 changed files with 73 additions and 24 deletions
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 "content/Content.hpp"
#include "debug/Logger.hpp"
#include "core_defs.hpp"
static debug::Logger logger("models-generator");
@ -67,11 +68,18 @@ void ModelsGenerator::prepareModel(
} else {
auto srcModel = assets.get<model::Model>(blockModel.name);
if (srcModel) {
bool defaultAssigned = variant.textureFaces[0] != TEXTURE_NOTFOUND;
auto model = std::make_unique<model::Model>(*srcModel);
for (auto& mesh : model->meshes) {
if (mesh.texture.length() && mesh.texture[0] == '$') {
int index = std::stoll(mesh.texture.substr(1));
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;