Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restore buggy texture overlay modifier (#14852)

Browse Source 
Required because of backwards compatibility.
This commit is contained in:
DS 2024-07-22 16:35:36 +02:00 committed by GitHub
parent 682b789dd5
commit 768fd4adee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/lua_api.md
View File

@ -456,6 +456,10 @@ i.e. without gamma-correction.
Textures can be overlaid by putting a `^` between them. Textures can be overlaid by putting a `^` between them.
Warning: If the lower and upper pixels are both semi-transparent, this operation
does *not* do alpha blending, and it is *not* associative. Otherwise it does
alpha blending in srgb color space.
Example: Example:
default_dirt.png^default_grass_side.png default_dirt.png^default_grass_side.png

11
src/client/imagesource.cpp
View File

@ -420,12 +420,11 @@ void blit_pixel(video::SColor src_col, video::SColor &dst_col)
return; return;
} }
// A semi-transparent pixel is on top of a // A semi-transparent pixel is on top of a
// semi-transparent pixel -> general alpha compositing // semi-transparent pixel -> weird overlaying
u16 a_new_255 = src_a * 255 + (255 - src_a) * dst_a; dst.r = (dst.r * (255 - src_a) + src.r * src_a) / 255;
dst.r = (dst.r * (255 - src_a) * dst_a + src.r * src_a * 255) / a_new_255; dst.g = (dst.g * (255 - src_a) + src.g * src_a) / 255;
dst.g = (dst.g * (255 - src_a) * dst_a + src.g * src_a * 255) / a_new_255; dst.b = (dst.b * (255 - src_a) + src.b * src_a) / 255;
dst.b = (dst.b * (255 - src_a) * dst_a + src.b * src_a * 255) / a_new_255; dst_a = dst_a + (255 - dst_a) * src_a * src_a / (255 * 255);
dst_a = (a_new_255 + 127) / 255;
dst_col.set(dst_a, dst.r, dst.g, dst.b); dst_col.set(dst_a, dst.r, dst.g, dst.b);
} }