Convert spaces to tabs and add unknown node checks to xpanes

This commit is contained in:
ShadowNinja 2014-07-06 21:49:47 -04:00
parent 5e0c49345a
commit ca7f6bb97a

@ -12,14 +12,20 @@ local directions = {
} }
local function update_pane(pos, name) local function update_pane(pos, name)
if minetest.get_node(pos).name:find("xpanes:"..name) == nil then if not minetest.get_node(pos).name:find("^xpanes:"..name) then
return return
end end
local sum = 0 local sum = 0
for i = 1, 4 do for i, dir in pairs(directions) do
local node = minetest.get_node({x = pos.x + directions[i].x, y = pos.y + directions[i].y, z = pos.z + directions[i].z}) local node = minetest.get_node({
local pane_num = minetest.registered_nodes[node.name].groups.pane or 0 x = pos.x + dir.x,
if (minetest.registered_nodes[node.name].walkable ~= false and minetest.registered_nodes[node.name].drawtype ~= "nodebox") or pane_num > 0 then y = pos.y + dir.y,
z = pos.z + dir.z
})
local def = minetest.registered_nodes[node.name]
local pane_num = def and def.groups.pane or 0
if pane_num > 0 or not def or (def.walkable ~= false and
def.drawtype ~= "nodebox") then
sum = sum + 2 ^ (i - 1) sum = sum + 2 ^ (i - 1)
end end
end end
@ -29,40 +35,44 @@ local function update_pane(pos,name)
minetest.set_node(pos, {name = "xpanes:"..name.."_"..sum}) minetest.set_node(pos, {name = "xpanes:"..name.."_"..sum})
end end
local function update_nearby(pos,n) local function update_nearby(pos, node)
if n == nil then n = minetest.get_node(pos) end node = node or minetest.get_node(pos)
if not n or not n.name then return end if node.name:sub(1, 7) ~= "xpanes:" then return end
local name = string.sub(n.name,8,10) local underscore_pos = node.name:find("_") or 0
if name ~= "bar" then name = "pane" end local name = node.name:sub(8, underscore_pos - 1)
for i = 1,4 do for i, dir in pairs(directions) do
update_pane({x = pos.x + directions[i].x, y = pos.y + directions[i].y, z = pos.z + directions[i].z}, name) update_pane({
x = pos.x + dir.x,
y = pos.y + dir.y,
z = pos.z + dir.z
}, name)
end end
end end
local half_blocks = { local half_boxes = {
{0, -0.5, -1/32, 0.5, 0.5, 1/32}, {0, -0.5, -1/32, 0.5, 0.5, 1/32},
{-1/32, -0.5, 0, 1/32, 0.5, 0.5}, {-1/32, -0.5, 0, 1/32, 0.5, 0.5},
{-0.5, -0.5, -1/32, 0, 0.5, 1/32}, {-0.5, -0.5, -1/32, 0, 0.5, 1/32},
{-1/32, -0.5, -0.5, 1/32, 0.5, 0} {-1/32, -0.5, -0.5, 1/32, 0.5, 0}
} }
local full_blocks = { local full_boxes = {
{-0.5, -0.5, -1/32, 0.5, 0.5, 1/32}, {-0.5, -0.5, -1/32, 0.5, 0.5, 1/32},
{-1/32, -0.5, -0.5, 1/32, 0.5, 0.5} {-1/32, -0.5, -0.5, 1/32, 0.5, 0.5}
} }
local sb_half_blocks = { local sb_half_boxes = {
{0, -0.5, -0.06, 0.5, 0.5, 0.06}, {0, -0.5, -0.06, 0.5, 0.5, 0.06},
{-0.06, -0.5, 0, 0.06, 0.5, 0.5}, {-0.06, -0.5, 0, 0.06, 0.5, 0.5},
{-0.5, -0.5, -0.06, 0, 0.5, 0.06}, {-0.5, -0.5, -0.06, 0, 0.5, 0.06},
{-0.06, -0.5, -0.5, 0.06, 0.5, 0} {-0.06, -0.5, -0.5, 0.06, 0.5, 0}
} }
local sb_full_blocks = { local sb_full_boxes = {
{-0.5, -0.5, -0.06, 0.5, 0.5, 0.06}, {-0.5, -0.5, -0.06, 0.5, 0.5, 0.06},
{-0.06, -0.5, -0.5, 0.06, 0.5, 0.5} {-0.06, -0.5, -0.5, 0.06, 0.5, 0.5}
} }
--register panes and bars
function xpanes.register_pane(name, def) function xpanes.register_pane(name, def)
for i = 1, 15 do for i = 1, 15 do
local need = {} local need = {}
@ -78,18 +88,18 @@ for i = 1, 15 do
if need[1] == true and need[3] == true then if need[1] == true and need[3] == true then
need[1] = nil need[1] = nil
need[3] = nil need[3] = nil
table.insert(take, full_blocks[1]) table.insert(take, full_boxes[1])
table.insert(take2, sb_full_blocks[1]) table.insert(take2, sb_full_boxes[1])
end end
if need[2] == true and need[4] == true then if need[2] == true and need[4] == true then
need[2] = nil need[2] = nil
need[4] = nil need[4] = nil
table.insert(take, full_blocks[2]) table.insert(take, full_boxes[2])
table.insert(take2, sb_full_blocks[2]) table.insert(take2, sb_full_boxes[2])
end end
for k in pairs(need) do for k in pairs(need) do
table.insert(take, half_blocks[k]) table.insert(take, half_boxes[k])
table.insert(take2, sb_half_blocks[k]) table.insert(take2, sb_half_boxes[k])
end end
local texture = def.textures[1] local texture = def.textures[1]
if cnt == 1 then if cnt == 1 then
@ -173,3 +183,4 @@ xpanes.register_pane("bar", {
{'default:glass', 'default:glass', 'default:glass'} {'default:glass', 'default:glass', 'default:glass'}
} }
}) })