Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-07-04 15:05:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring

Browse Source
This commit is contained in:
Lars Mueller 2024-06-02 18:31:32 +02:00
parent 34bd7dcde1
commit 1588eab2f7
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/client/wieldmesh.cpp
View File

@ -347,15 +347,11 @@ void WieldMeshSceneNode::setCube(const ContentFeatures &f,
// Customize materials // Customize materials
for (u32 i = 0; i < cubemesh->getMeshBufferCount(); ++i) { for (u32 i = 0; i < cubemesh->getMeshBufferCount(); ++i) {
const TileSpec *tile = &(f.tiles[i]); // It suffices to look at the first layer;
// a special overlay layer needs to be consistent with it -
// otherwise we would be overwriting the material options of the fist layer
scene::IMeshBuffer *buf = cubemesh->getMeshBuffer(i); scene::IMeshBuffer *buf = cubemesh->getMeshBuffer(i);
for (int layernum = 0; layernum < MAX_TILE_LAYERS; layernum++) { f.tiles[i].layers[0].applyMaterialOptions(buf->getMaterial());
const TileLayer *layer = &tile->layers[layernum];
if (layer->texture_id == 0)
continue;
video::SMaterial &material = buf->getMaterial();
layer->applyMaterialOptions(material);
}
} }
changeToMesh(copy); changeToMesh(copy);
@ -779,9 +775,8 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
video::SMaterial &material = buf->getMaterial(); video::SMaterial &material = buf->getMaterial();
// Note: This overwrites material types / type params // Note: This overwrites material types / type params
// of plantlike extrusion meshes for alpha blending consistency. // of plantlike extrusion meshes for alpha blending consistency.
const auto material_type = def.type == ITEM_NODE // It suffices to look at the first layer; overlays need to be consistent.
? f.getMaterialType() : TILE_MATERIAL_ALPHA; f.tiles[i].layers[0].applyMaterialOptions(material);
MaterialType_to_irr(material_type, material);
material.ZWriteEnable = video::EZW_ON; material.ZWriteEnable = video::EZW_ON;
material.forEachTexture([] (auto &tex) { material.forEachTexture([] (auto &tex) {
tex.MinFilter = video::ETMINF_NEAREST_MIPMAP_NEAREST; tex.MinFilter = video::ETMINF_NEAREST_MIPMAP_NEAREST;