reduce table lookups and string concat

This commit is contained in:
Tim 2015-01-31 16:48:03 +01:00
parent e60f86a588
commit 70f38104a0
1 changed files with 15 additions and 18 deletions

View File

@ -1,6 +1,7 @@
-- This file supplies the various kinds of pneumatic tubes -- This file supplies the various kinds of pneumatic tubes
pipeworks.tubenodes = {} local tubenodes = {}
pipeworks.tubenodes = tubenodes
minetest.register_alias("pipeworks:tube", "pipeworks:tube_000000") minetest.register_alias("pipeworks:tube", "pipeworks:tube_000000")
@ -10,13 +11,9 @@ local REGISTER_COMPATIBILITY = true
local vti = {4, 3, 2, 1, 6, 5} local vti = {4, 3, 2, 1, 6, 5}
local default_textures = { local default_noctrs = { "pipeworks_tube_noctr.png" }
noctrs = { "pipeworks_tube_noctr.png" }, local default_plain = { "pipeworks_tube_plain.png" }
plain = { "pipeworks_tube_plain.png" }, local default_ends = { "pipeworks_tube_end.png" }
ends = { "pipeworks_tube_end.png" },
short = "pipeworks_tube_short.png",
inv = "pipeworks_tube_inv.png",
}
local texture_mt = { local texture_mt = {
__index = function(table, key) __index = function(table, key)
@ -29,14 +26,14 @@ local texture_mt = {
} }
local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, ends, short, inv, special, connects, style) local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, ends, short, inv, special, connects, style)
noctrs = noctrs or default_textures.noctrs noctrs = noctrs or default_noctrs
setmetatable(noctrs, texture_mt) setmetatable(noctrs, texture_mt)
plain = plain or default_textures.plain plain = plain or default_plain
setmetatable(plain, texture_mt) setmetatable(plain, texture_mt)
ends = ends or default_textures.ends ends = ends or default_ends
setmetatable(ends, texture_mt) setmetatable(ends, texture_mt)
short = short or default_textures.short short = short or "pipeworks_tube_short.png"
inv = inv or default_textures.inv inv = inv or "pipeworks_tube_inv.png"
local outboxes = {} local outboxes = {}
local outsel = {} local outsel = {}
@ -59,7 +56,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
end end
local tgroups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory = 1} local tgroups = {snappy = 3, tube = 1, tubedevice = 1, not_in_creative_inventory = 1}
local tubedesc = desc.." "..dump(connects).."... You hacker, you." local tubedesc = string.format("%s %s... You hacker, you.", desc, dump(connects))
local iimg = plain[1] local iimg = plain[1]
local wscale = {x = 1, y = 1, z = 1} local wscale = {x = 1, y = 1, z = 1}
@ -77,8 +74,8 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
wscale = {x = 1, y = 1, z = 0.01} wscale = {x = 1, y = 1, z = 0.01}
end end
local rname = name.."_"..tname local rname = string.format("%s_%s", name, tname)
table.insert(pipeworks.tubenodes, rname) table.insert(tubenodes, rname)
local nodedef = { local nodedef = {
description = tubedesc, description = tubedesc,
@ -103,7 +100,7 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e
stack_max = 99, stack_max = 99,
basename = name, basename = name,
style = style, style = style,
drop = name.."_"..dropname, drop = string.format("%s_%s", name, dropname),
tubelike = 1, tubelike = 1,
tube = { tube = {
connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}, connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1},
@ -209,7 +206,7 @@ local register_all_tubes = function(name, desc, plain, noctrs, ends, short, inv,
tube = {connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}}, tube = {connect_sides = {front = 1, back = 1, left = 1, right = 1, top = 1, bottom = 1}},
drop = name.."_1", drop = name.."_1",
}) })
table.insert(pipeworks.tubenodes, cname) table.insert(tubenodes, cname)
for xm = 0, 1 do for xm = 0, 1 do
for xp = 0, 1 do for xp = 0, 1 do
for ym = 0, 1 do for ym = 0, 1 do