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

feat: process external custom block models for variable textures

Browse Source
This commit is contained in:
MihailRis
2025-05-02 15:12:01 +03:00
parent 43c76c92ff
commit 9a0f6b23b0
4 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/render/ModelsGenerator.cpp
+27 -11
View File
@@ -50,16 +50,28 @@ static inline UVRegion get_region_for(
void ModelsGenerator::prepare(Content& content, Assets& assets) {
for (auto& [name, def] : content.blocks.getDefs()) {
if (def->model.type == BlockModelType::CUSTOM && def->model.name.empty()) {
assets.store(
std::make_unique<model::Model>(
loadCustomBlockModel(
def->model.customRaw, assets, !def->shadeless
)
),
name + ".model"
);
def->model.name = def->name + ".model";
if (def->model.type == BlockModelType::CUSTOM) {
if (def->model.name.empty()) {
assets.store(
std::make_unique<model::Model>(
loadCustomBlockModel(
def->model.customRaw, assets, !def->shadeless
)
),
name + ".model"
);
def->model.name = def->name + ".model";
} else {
auto model = assets.get<model::Model>(def->model.name);
if (model) {
for (auto& mesh : model->meshes) {
if (mesh.texture.length() && mesh.texture[0] == '$') {
int index = std::stoll(mesh.texture.substr(1));
mesh.texture = "blocks:" + def->textureFaces[index];
}
}
}
}
}
}
for (auto& [name, def] : content.items.getDefs()) {
@@ -91,8 +103,12 @@ model::Model ModelsGenerator::fromCustom(
get_region_for(modelTextures[i * 6 + 1], assets),
get_region_for(modelTextures[i * 6 + 0], assets)
};
bool enabled[6] {1,1,1,1,1,1};
mesh.addBox(
modelBoxes[i].center(), modelBoxes[i].size() * 0.5f, boxtexfaces
modelBoxes[i].center(),
modelBoxes[i].size() * 0.5f,
boxtexfaces,
enabled
);
}
for (size_t i = 0; i < points.size() / 4; i++) {