mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-05 02:51:49 +00:00
fix block models generation
This commit is contained in:
parent
87663e597b
commit
6f9bad0557
4 changed files with 24 additions and 10 deletions
|
|
@ -63,7 +63,7 @@ model::Model ModelsGenerator::generate(
|
|||
for (size_t i = 0; i < blockDef.modelBoxes.size(); i++) {
|
||||
auto& mesh =
|
||||
model.addMesh("blocks:" + blockDef.modelTextures[i * 6]);
|
||||
mesh.lighting = !def.rt.emissive;
|
||||
mesh.lighting = !blockDef.shadeless;
|
||||
const UVRegion (&boxtexfaces)[6] = {
|
||||
get_region_for(blockDef.modelTextures[i * 6], assets),
|
||||
get_region_for(blockDef.modelTextures[i * 6 + 1], assets),
|
||||
|
|
@ -86,7 +86,7 @@ model::Model ModelsGenerator::generate(
|
|||
blockDef.modelTextures[blockDef.modelBoxes.size() * 6 + i];
|
||||
|
||||
auto& mesh = model.addMesh(texture);
|
||||
mesh.lighting = !def.rt.emissive;
|
||||
mesh.lighting = !blockDef.shadeless;
|
||||
|
||||
auto reg = get_region_for(texture, assets);
|
||||
mesh.vertices.push_back(
|
||||
|
|
@ -108,8 +108,13 @@ model::Model ModelsGenerator::generate(
|
|||
{points[i * 4 + 0] - poff, glm::vec2(reg.u1, reg.v2), norm}
|
||||
);
|
||||
}
|
||||
for (auto& mesh : model.meshes) {
|
||||
mesh.scale(glm::vec3(0.3f));
|
||||
}
|
||||
return model;
|
||||
}
|
||||
for (auto& mesh : model.meshes) {
|
||||
mesh.lighting = !blockDef.shadeless;
|
||||
switch (blockDef.model) {
|
||||
case BlockModel::aabb: {
|
||||
glm::vec3 size = blockDef.hitboxes.at(0).size();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue