Merge branch 'master' into banner-mask-fix-3

Render preview banners with transparent patterns correctly
2021-05-29 23:18:26 +00:00 · 2021-05-27 22:49:17 +00:00 · 2021-05-17 15:21:02 +02:00
1 changed files with 4 additions and 2 deletions
--- a/mods/ITEMS/mcl_banners/init.lua
+++ b/mods/ITEMS/mcl_banners/init.lua
@ -388,12 +388,14 @@ for colorid, colortab in pairs(mcl_banners.colors) do
 		-- art and use that instead.

 		local layer = "(([combine:20x40:-2,-2=" .. pattern .. "^[resize:16x24^[colorize:" .. color .. ":" .. layer_ratio .. "))"
+		local mask = "(([combine:20x40:-2,-2=" .. pattern .. "^[resize:16x24" .. "))"

 		function escape(text)
 			 return text:gsub("%^", "\\%^"):gsub(":", "\\:") -- :gsub("%(", "\\%("):gsub("%)", "\\%)")
 		end

-		finished_banner = "[combine:32x32:0,0=" .. escape(base) .. ":8,4=" .. escape(layer)
+		local layer_masked = layer .. "^[mask:" .. escape(mask)
+		finished_banner = "[combine:32x32:0,0=" .. escape(base) .. ":8,4=" .. escape(layer_masked)
 	end

 	inv = finished_banner
Author	SHA1	Message	Date
My favourite Minetest cheat clients are Dragonfire and Waspsaliva.	a138317c2e	Merge branch 'master' into banner-mask-fix-3	2021-05-29 23:18:26 +00:00
My favourite Minetest cheat clients are Dragonfire and Waspsaliva.	ae4feb7006	Merge branch 'master' into banner-mask-fix-3	2021-05-27 22:49:17 +00:00
Nils Dagsson Moskopp	0b65c0c9ae	Render preview banners with transparent patterns correctly Without this fix, the banner pattern preview generation does not mask the banner pattern, so the alpha channel of the banner pattern is not taken into account. This lead to preview banners with color gradients showing up as a solid color banner and opaque pixel artifacts for the bottom triangle pattern.	2021-05-17 15:21:02 +02:00