Mirrorlandia_minetest/modlib
1
0
Fork 0
mirror of https://github.com/appgurueu/modlib.git synced 2024-11-25 16:53:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix texmod:write emitting unnecessary parens

Browse Source
This commit is contained in:
Lars Mueller 2023-05-24 22:37:55 +02:00
parent 95159c48e8
commit 0b521bbb61
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
minetest/texmod/write.lua
View File

@ -13,9 +13,6 @@ function pw:combine(w)
end end
end end
-- Consider [inventorycube{a{b{c inside [combine: no need to escape &'s (but :'s need to be escaped)
-- Consider [combine inside inventorycube: need to escape &'s
function pw:inventorycube(w) function pw:inventorycube(w)
assert(not w.inventorycube, "[inventorycube may not be nested") assert(not w.inventorycube, "[inventorycube may not be nested")
local function write_side(side) local function write_side(side)
@ -118,6 +115,9 @@ function pw:lowpart(w)
w.colon(); w.int(self.percent); w.colon(); w.esctex(self.over) w.colon(); w.int(self.percent); w.colon(); w.esctex(self.over)
end end
-- Set of "non-modifiers" which do not modify a base image
local non_modifiers = {file = true, png = true, combine = true, inventorycube = true}
return function(self, write_str) return function(self, write_str)
-- We could use a metatable here, but it wouldn't really be worth it; -- We could use a metatable here, but it wouldn't really be worth it;
-- it would save us instantiating a handful of closures at the cost of constant `__index` events -- it would save us instantiating a handful of closures at the cost of constant `__index` events
@ -153,10 +153,12 @@ return function(self, write_str)
w.hat() w.hat()
end end
if tex.type == "overlay" then if tex.type == "overlay" then
if tex.over.type ~= "file" then -- TODO also exclude [png, [combine and [inventorycube (generators) if non_modifiers[tex.over.type] then
w.str"("; w.tex(tex.over); w.str")"
else
w.tex(tex.over) w.tex(tex.over)
else
-- Make sure the modifier is first applied to its base image
-- and only after this overlaid on top of `tex.base`
w.str"("; w.tex(tex.over); w.str")"
end end
else else
w.str"[" w.str"["