X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=xwall.lua;h=a6a7a6ab05d102d9f63033c2788e8810f8bcd001;hb=a9f74339656ad0f2c3c63c0b17baa16f9ff8d8bd;hp=c9734efe4e28b75a8a00c588200ea290916354ce;hpb=b887a4bd0cf7f219313cfa52f8f2152e9674b1f4;p=xdecor.git

diff --git a/xwall.lua b/xwall.lua
index c9734ef..a6a7a6a 100644
--- a/xwall.lua
+++ b/xwall.lua
@@ -3,6 +3,7 @@
 -- Optimized by kilbith
 
 local xwall = {}
+screwdriver = screwdriver or {}
 
 xwall.get_candidate = {}
 local profiles = {
@@ -13,63 +14,42 @@ local profiles = {
 }
 
 for _, p in pairs(profiles) do
-	local p1, p2, p3 = p[1], p[2], p[3]
-	xwall.get_candidate[p1] = {p2, p3}
+	xwall.get_candidate[p[1]] = {p[2], p[3]}
 end
 
 local directions = {
-	{x = 1, y = 0, z = 0}, {x = 0, y = 0, z = 1},
-	{x = -1, y = 0, z = 0}, {x = 0, y = 0, z = -1}
+	{x=1, y=0, z=0}, {x=0, y=0, z=1},
+	{x=-1, y=0, z=0}, {x=0, y=0, z=-1}
 }
 
--- Source: Mesecons (util.lua).
--- Creates a deep copy of the table.
-local function clone_table(table) 
-	if type(table) ~= "table" then return table end -- No need to copy.
-	local newtable = {}
-
-	for idx, item in pairs(table) do
-		if type(item) == "table" then
-			newtable[idx] = clone_table(item)
-		else
-			newtable[idx] = item
-		end
-	end
-
-	return newtable
-end
-
 function xwall.update_one_node(pos, name, digged)
 	if not pos or not name or not minetest.registered_nodes[name] then return end
 	local candidates = {0, 0, 0, 0}
 	local pow2 = {1, 2, 4, 8}
 	local id = 0
 
-	for i = 1, #directions do
-		local dir = directions[i]
-		local node = minetest.get_node({x=pos.x + dir.x, y=pos.y, z=pos.z + dir.z})
+	for i, dir in pairs(directions) do
+		local node = minetest.get_node(vector.add(pos, dir))
+		local ndef = minetest.registered_nodes[node.name]
 
-		if node and node.name and minetest.registered_nodes[node.name] then
-			local ndef = minetest.registered_nodes[node.name]
+		if node and node.name and ndef then
 			if ndef.drop == name or (ndef.groups and ndef.groups.xwall) then
 				candidates[i] = node.name
 				id = id + pow2[i]
 			end
-			if ndef.walkable ~= false and ndef.drawtype ~= "nodebox" then
-				candidates[i] = 0
-				id = id + pow2[i]
-			end
 		end
 	end
 
 	if digged then return candidates end
-
 	local newnode = xwall.get_candidate[id]
+
 	if newnode and newnode[1] then
-		local newname = string.sub(name, 1, string.len(name) -3)..newnode[1]
-		if newname and minetest.registered_nodes[newname] then
+		local newname = name:sub(1, name:len()-3)..newnode[1]
+		local regnode = minetest.registered_nodes[newname]
+
+		if newname and regnode then
 			minetest.swap_node(pos, {name=newname, param2=newnode[2]})
-		elseif newnode[1] == '_c0' and not minetest.registered_nodes[newname] then
+		elseif newnode[1] == '_c0' and not regnode then
 			minetest.swap_node(pos, {name=name, param2=0})
 		end
 	end
@@ -81,125 +61,98 @@ function xwall.update(pos, name, active, has_been_digged)
 	if not pos or not name or not minetest.registered_nodes[name] then return end
 
 	local c = xwall.update_one_node(pos, name, has_been_digged)
-	for j = 1, #directions do
-		local dir2 = directions[j]
+	for j, dir2 in pairs(directions) do
 		if c[j] ~= 0 and c[j] ~= "ignore" then
-			xwall.update_one_node({x=pos.x + dir2.x, y=pos.y, z=pos.z + dir2.z}, c[j], false)
+			xwall.update_one_node(vector.add(pos, dir2), c[j], false)
 		end
 	end
 end
 
-function xwall.register(name, def, node_box_data)
-	for k, v in pairs(node_box_data) do
-		def.drawtype = "nodebox"
-		def.paramtype = "light"
-		def.paramtype2 = "facedir"
-		def.drop = name.."_ln"
-		def.node_box = {type = "fixed", fixed = node_box_data[k]}
-
-		if not def.tiles then
-			def.tiles = def.textures
-		end
-		if not def.groups then
-			def.groups = {xwall=1, cracky=3}
-		else
-			def.groups.xwall = 1
-		end
-
-		local newdef = clone_table(def)
-		if k == "ln" then
-			newdef.on_construct = function(pos)
-				return xwall.update(pos, name.."_ln", true, nil)
-			end
-		else
-			newdef.groups.not_in_creative_inventory = 1
-		end
-		newdef.after_dig_node = function(pos, oldnode, oldmetadata, digger)
-			return xwall.update(pos, name.."_ln", true, true)
-		end
-
-		minetest.register_node(name.."_"..k, newdef)
-	end
-end
-
-function xwall.construct_node_box_data(node_box_list, center_node_box_list, node_box_line)
+function xwall.construct_nodebox(nodebox_list, center_nodebox_list, nodebox_line)
 	local res = {}
 	res.c0, res.c1, res.c2, res.c3, res.c4 = {}, {}, {}, {}, {}
-	local pos0, pos1, pos2, pos3, pos4 = #res.c0, #res.c1, #res.c2, #res.c3, #res.c4
-
-	for _, v in pairs(node_box_list) do
-		pos1 = pos1 + 1
-		pos2 = pos2 + 1
-		pos3 = pos3 + 1
-		pos4 = pos4 + 1
-		res.c1[pos1] = v
-		res.c2[pos2] = v
-		res.c3[pos3] = v
-		res.c4[pos4] = v
+
+	for _, v in pairs(nodebox_list) do
+		res.c1[#res.c1+1] = v
+		res.c2[#res.c2+1] = v
+		res.c3[#res.c3+1] = v
+		res.c4[#res.c4+1] = v
 	end
 
-	for _, v in pairs(node_box_list) do
-		pos2 = pos2 + 1
-		pos3 = pos3 + 1
-		pos4 = pos4 + 1
-		res.c2[pos2] = {v[3], v[2], v[1], v[6], v[5], v[4]}
-		res.c3[pos3] = {v[3], v[2], v[1], v[6], v[5], v[4]}
-		res.c4[pos4] = {v[3], v[2], v[1], v[6], v[5], v[4]}
+	for _, v in pairs(nodebox_list) do
+		res.c2[#res.c2+1] = {v[3], v[2], v[1], v[6], v[5], v[4]}
+		res.c3[#res.c3+1] = {v[3], v[2], v[1], v[6], v[5], v[4]}
+		res.c4[#res.c4+1] = {v[3], v[2], v[1], v[6], v[5], v[4]}
 	end
 
-	for _, v in pairs(node_box_list) do
-		pos3 = pos3 + 1
-		pos4 = pos4 + 1
-		res.c3[pos3] = {v[4], v[2], v[3]-0.5, v[1], v[5], v[6]-0.5}
-		res.c4[pos4] = {v[4], v[2], v[3]-0.5, v[1], v[5], v[6]-0.5}
+	for _, v in pairs(nodebox_list) do
+		res.c3[#res.c3+1] = {v[4], v[2], v[3]-0.5, v[1], v[5], v[6]-0.5}
+		res.c4[#res.c4+1] = {v[4], v[2], v[3]-0.5, v[1], v[5], v[6]-0.5}
 	end
 
-	for _, v in pairs(node_box_list) do
-		pos4 = pos4 + 1
-		res.c4[pos4] = {v[3]-0.5, v[2], v[4], v[6]-0.5, v[5], v[1]}
+	for _, v in pairs(nodebox_list) do
+		res.c4[#res.c4+1] = {v[3]-0.5, v[2], v[4], v[6]-0.5, v[5], v[1]}
 	end
 
-	for _, v in pairs(center_node_box_list) do
-		pos0 = pos0 + 1
-		pos1 = pos1 + 1
-		pos2 = pos2 + 1
-		pos3 = pos3 + 1
-		pos4 = pos4 + 1
-		res.c0[pos0] = v
-		res.c1[pos1] = v
-		res.c2[pos2] = v
-		res.c3[pos3] = v
-		res.c4[pos4] = v
+	for _, v in pairs(center_nodebox_list) do
+		res.c0[#res.c0+1] = v
+		res.c1[#res.c1+1] = v
+		res.c2[#res.c2+1] = v
+		res.c3[#res.c3+1] = v
+		res.c4[#res.c4+1] = v
 	end	
 
 	if #res.c0 < 1 then
 		res.c0 = nil
 	end
 
-	res.ln = node_box_line
+	res.ln = nodebox_line
 	return res
 end
 
-function xwall.register_wall(name, tiles, def)
-	local node_box_data = xwall.construct_node_box_data(
-		{{ -3/16, -0.5, 0,  3/16, 5/16, 0.5 }},
-		{{ -4/16, -0.5, -4/16, 4/16, 0.5, 4/16 }},
-		{{ -3/16, -0.5, -0.5, 3/16, 5/16, 0.5 }}
+function xwall.register_wall(name, tiles)
+	local groups, def = {}, {}
+	local nodebox_data = xwall.construct_nodebox(
+		{{-.1875,-.6875,0,.1875,.3125,.5}},
+		{{-.25,-.6875,-.25,.25,.5,.25}},
+		{{-.1875,-.6875,-.5,.1875,.3125,.5}}
 	)
 
-	if def then return end
-	def = { 
-		description = string.sub(string.gsub(name, "%l", string.upper, 7), 8, -6).." Wall",
-		textures = {tiles, tiles, tiles, tiles},
-		sounds = xdecor.stone,
-		groups = {cracky=3, stone=1, pane=1},
-		collision_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.25, 0.5, 1, 0.25}
+	local function group(k)
+		groups = {xwall=1, cracky=3}
+		if k ~= "ln" then
+			groups.not_in_creative_inventory=1
+		end
+		return groups
+	end
+
+	for k, v in pairs(nodebox_data) do
+		def = { 
+			description = name:gsub("^%l", string.upper).." Wall",
+			drawtype = "nodebox",
+			paramtype = "light",
+			paramtype2 = "facedir",
+			tiles = {tiles},
+			drop = "xdecor:"..name.."_wall_ln",
+			node_box = {type = "fixed", fixed = nodebox_data[k]},
+			sounds = default.node_sound_stone_defaults(),
+			groups = group(k),
+			sunlight_propagates = true,
+			on_rotate = screwdriver.disallow,
+			collision_box = {
+				type = "fixed",
+				fixed = {-.5,-.5,-.25,.5,1,.25}
+			},
+			on_construct = function(pos)
+				return xwall.update(pos, "xdecor:"..name.."_wall_ln", true, nil)
+			end,
+			after_dig_node = function(pos, _, _, _)
+				return xwall.update(pos, "xdecor:"..name.."_wall_ln", true, true)
+			end
 		}
-	}
-	xwall.register(name, def, node_box_data)
+		minetest.register_node("xdecor:"..name.."_wall_"..k, def)
+	end
 end
 
-xwall.register_wall("xdecor:cobble_wall", "default_cobble.png")
-xwall.register_wall("xdecor:mossycobble_wall", "default_mossycobble.png")
+xwall.register_wall("cobble", "default_cobble.png")
+xwall.register_wall("mossycobble", "default_mossycobble.png")