BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix worldaligned textures

Browse Source 
As reported in #12197, b0b9732359d43325c8bd820abeb8417353365a0c
introduces a regression in worldalign textures.

The specific change that seems to be responsible for this issue is the
change in order between the computation of the cuboid texture
coordinates and the box edge correction.

Fix #12197 by moving the box edge correction back to before the cuboid
texture coordinates, as it used to be.
This commit is contained in:
Giuseppe Bilotta 2022-04-24 12:26:06 +02:00 committed by sfan5
parent 23f981c458
commit b55d7cd45a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/content_mapblock.cpp
View File

@ -373,6 +373,10 @@ void MapblockMeshGenerator::drawAutoLightedCuboid(aabb3f box, const f32 *txc,
f32 dx2 = box.MaxEdge.X; f32 dx2 = box.MaxEdge.X;
f32 dy2 = box.MaxEdge.Y; f32 dy2 = box.MaxEdge.Y;
f32 dz2 = box.MaxEdge.Z; f32 dz2 = box.MaxEdge.Z;
box.MinEdge += origin;
box.MaxEdge += origin;
if (scale) { if (scale) {
if (!txc) { // generate texture coords before scaling if (!txc) { // generate texture coords before scaling
generateCuboidTextureCoords(box, texture_coord_buf); generateCuboidTextureCoords(box, texture_coord_buf);
@ -385,8 +389,7 @@ void MapblockMeshGenerator::drawAutoLightedCuboid(aabb3f box, const f32 *txc,
generateCuboidTextureCoords(box, texture_coord_buf); generateCuboidTextureCoords(box, texture_coord_buf);
txc = texture_coord_buf; txc = texture_coord_buf;
} }
box.MinEdge += origin;
box.MaxEdge += origin;
if (!tiles) { if (!tiles) {
tiles = &tile; tiles = &tile;
tile_count = 1; tile_count = 1;