mff/homedecor_modpack
1
0
Fork 0
forked from mtcontrib/homedecor_modpack
Code Issues Pull Requests Releases Wiki Activity

Some fixes to signslib.

Browse Source 
- Optimize texture generation by using `table.insert' and
  `table.concat' instead of concatenating strings.
- Related to first point, use `string.format' to construct
  individual textures.
- Fixed text entity not wrapping.
- Fixed small typo: `SIGN_WITH' -> `SIGN_WIDTH' :-)
This commit is contained in:
kaeza 2013-10-17 23:16:06 -02:00
parent 7f850a8e1e
commit e6e8cf04e8
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
signs_lib.lua
View File

@ -308,7 +308,7 @@ minetest.register_entity(":signs:text", {
}) })
-- CONSTANTS -- CONSTANTS
local SIGN_WITH = 110 local SIGN_WIDTH = 110
local SIGN_PADDING = 8 local SIGN_PADDING = 8
local LINE_LENGTH = 16 local LINE_LENGTH = 16
@ -328,21 +328,25 @@ homedecor.create_lines = function(text)
end end
homedecor.generate_texture = function(lines) homedecor.generate_texture = function(lines)
local texture = "[combine:"..SIGN_WITH.."x"..SIGN_WITH local texture = { ("[combine:%dx%d"):format(SIGN_WIDTH, SIGN_WIDTH) }
local ypos = 12 local ypos = 12
for i = 1, #lines do for i = 1, #lines do
texture = texture..homedecor.generate_line(lines[i], ypos) local linetex, yp = homedecor.generate_line(lines[i], ypos)
ypos = ypos + LINE_HEIGHT table.insert(texture, linetex)
ypos = yp + LINE_HEIGHT
end end
return texture return table.concat(texture, "")
end end
local math_max = math.max
homedecor.generate_line = function(s, ypos) homedecor.generate_line = function(s, ypos)
local i = 1 local i = 1
local parsed = {} local parsed = {}
local width = 0 local width = 0
local maxw = 0
local chars = 0 local chars = 0
while chars < max_chars and i <= #s do while i <= #s do
local file = nil local file = nil
if charmap[s:sub(i, i)] ~= nil then if charmap[s:sub(i, i)] ~= nil then
file = charmap[s:sub(i, i)] file = charmap[s:sub(i, i)]
@ -356,19 +360,31 @@ homedecor.generate_line = function(s, ypos)
end end
if file ~= nil then if file ~= nil then
width = width + CHAR_WIDTH width = width + CHAR_WIDTH
maxw = math_max(width, maxw)
chars = chars + 1
if chars > max_chars then
width = 0
end
table.insert(parsed, file) table.insert(parsed, file)
chars = chars + 1
end end
end end
width = width - 1 maxw = maxw - 1
local texture = "" local texture = { }
local xpos = math.floor((SIGN_WITH - 2 * SIGN_PADDING - width) / 2 + SIGN_PADDING) local start_xpos = math.floor((SIGN_WIDTH - 2 * SIGN_PADDING - maxw) / 2 + SIGN_PADDING)
local xpos = start_xpos
local linepos = 0
for i = 1, #parsed do for i = 1, #parsed do
texture = texture..":"..xpos..","..ypos.."="..parsed[i]..".png" table.insert(texture, (":%d,%d=%s.png"):format(xpos, ypos, parsed[i]))
xpos = xpos + CHAR_WIDTH + 1 xpos = xpos + CHAR_WIDTH + 1
linepos = linepos + 1
if linepos > max_chars then
xpos = start_xpos
linepos = 0
ypos = ypos + LINE_HEIGHT
end
end end
return texture return table.concat(texture, ""), ypos
end end
local function copy ( t ) local function copy ( t )