X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=functions.lua;h=b2f644387814d9305bc21d5ccdf285198c6fdaec;hb=a25a2a1fb0c198ca427a4da6ba53fd51b344ee54;hp=b752b06de9f6127dffb781bc1ec877b71683bc7b;hpb=6a6f37460de55ad23cd1f4121a7a3d3b0e91901d;p=worldedit.git

diff --git a/functions.lua b/functions.lua
index b752b06..b2f6443 100644
--- a/functions.lua
+++ b/functions.lua
@@ -72,6 +72,189 @@ worldedit.replace = function(pos1, pos2, searchnode, replacenode)
 	return count
 end
 
+--adds a hollow cylinder at `pos` along the `axis` axis ("x" or "y" or "z") with length `length` and radius `radius`, returning the number of nodes added
+worldedit.hollow_cylinder = function(pos, axis, length, radius, nodename)
+	local other1, other2
+	if axis == "x" then
+		other1, other2 = "y", "z"
+	elseif axis == "y" then
+		other1, other2 = "x", "z"
+	else --axis == "z"
+		other1, other2 = "x", "y"
+	end
+
+	local env = minetest.env
+	local currentpos = {x=pos.x, y=pos.y, z=pos.z}
+	local node = {name=nodename}
+	local count = 0
+	for i = 1, length do
+		local offset1, offset2 = 0, radius
+		local delta = -radius
+		while offset1 <= offset2 do
+			--add node at each octant
+			local first1, first2 = pos[other1] + offset1, pos[other1] - offset1
+			local second1, second2 = pos[other2] + offset2, pos[other2] - offset2
+			currentpos[other1], currentpos[other2] = first1, second1
+			env:add_node(currentpos, node) --octant 1
+			currentpos[other1] = first2
+			env:add_node(currentpos, node) --octant 4
+			currentpos[other2] = second2
+			env:add_node(currentpos, node) --octant 5
+			currentpos[other1] = first1
+			env:add_node(currentpos, node) --octant 8
+			local first1, first2 = pos[other1] + offset2, pos[other1] - offset2
+			local second1, second2 = pos[other2] + offset1, pos[other2] - offset1
+			currentpos[other1], currentpos[other2] = first1, second1
+			env:add_node(currentpos, node) --octant 2
+			currentpos[other1] = first2
+			env:add_node(currentpos, node) --octant 3
+			currentpos[other2] = second2
+			env:add_node(currentpos, node) --octant 6
+			currentpos[other1] = first1
+			env:add_node(currentpos, node) --octant 7
+
+			count = count + 8 --wip: broken
+
+			--move to next location
+			delta = delta + (offset1 * 2) + 1
+			if delta >= 0 then
+				offset2 = offset2 - 1
+				delta = delta - (offset2 * 2)
+			end
+			offset1 = offset1 + 1
+		end
+		currentpos[axis] = currentpos[axis] + 1
+	end
+	return count
+end
+
+--adds a cylinder at `pos` along the `axis` axis ("x" or "y" or "z") with length `length` and radius `radius`, returning the number of nodes added
+worldedit.cylinder = function(pos, axis, length, radius, nodename)
+	local other1, other2
+	if axis == "x" then
+		other1, other2 = "y", "z"
+	elseif axis == "y" then
+		other1, other2 = "x", "z"
+	else --axis == "z"
+		other1, other2 = "x", "y"
+	end
+
+	local env = minetest.env
+	local currentpos = {x=pos.x, y=pos.y, z=pos.z}
+	local node = {name=nodename}
+	local count = 0
+	for i = 1, length do
+		local offset1, offset2 = 0, radius
+		local delta = -radius
+		while offset1 <= offset2 do
+			--connect each pair of octants
+			currentpos[other1] = pos[other1] - offset1
+			local second1, second2 = pos[other2] + offset2, pos[other2] - offset2
+			for i = 0, offset1 * 2 do
+				currentpos[other2] = second1
+				env:add_node(currentpos, node) --octant 1 to 4
+				currentpos[other2] = second2
+				env:add_node(currentpos, node) --octant 5 to 8
+				currentpos[other1] = currentpos[other1] + 1
+			end
+			currentpos[other1] = pos[other1] - offset2
+			local second1, second2 = pos[other2] + offset1, pos[other2] - offset1
+			for i = 0, offset2 * 2 do
+				currentpos[other2] = second1
+				env:add_node(currentpos, node) --octant 2 to 3
+				currentpos[other2] = second2
+				env:add_node(currentpos, node) --octant 6 to 7
+				currentpos[other1] = currentpos[other1] + 1
+			end
+
+			count = count + (offset1 * 4) + (offset2 * 4) + 4 --wip: broken
+
+			--move to next location
+			delta = delta + (offset1 * 2) + 1
+			offset1 = offset1 + 1
+			if delta >= 0 then
+				offset2 = offset2 - 1
+				delta = delta - (offset2 * 2)
+			end
+		end
+		currentpos[axis] = currentpos[axis] + 1
+	end
+	return count
+end
+
+--adds a spiral at `pos` with size `size`, returning the number of nodes changed
+worldedit.spiral = function(pos, size, nodename)
+	local shift_x, shift_y
+	sa = spiralt(size)
+	shift_y = #sa -- "Height" of the Array
+	local fe = sa[1]
+	shift_x = #fe -- "Width" of the Array
+	fe = nil
+
+	local count = 0
+	local node = {name=nodename}
+	for x, v in ipairs(sa) do
+		for y, z in ipairs(v) do
+			minetest.env:add_node({x=pos.x - shift_x + x,y=pos.y - shift_y + y,z=pos.z + z}, node)
+			count = count + 1
+		end
+	end
+	return count
+end
+
+--wip: 
+sign = function(s)
+	if s > 0 then
+		return 1
+	end
+	if s < 0 then
+		return -1
+	end
+	return 0
+end
+
+--wip: needs to be faster
+function spiral_index(y, x) -- returns the value at (x, y) in a spiral that starts at 1 and goes outwards
+	if y == -x and y >= x then
+		return (2 * y + 1) ^ 2
+	end
+	local l = math.max(math.abs(y), math.abs(x))
+	local value
+	if math.abs(y) == l then
+		value = x
+		if y < 0 then
+			value = -value
+		end
+	else
+		value = y
+		if x < 0 then
+			value = -value
+		end
+	end
+	t1 = l * 2
+	if x + y < 0 then
+		t1 = -t1
+	end
+	t2 = y ^ 2 - x ^ 2
+	if t2 < 0 then
+		t2 = -t2
+	end
+	return ((2 * l - 1) ^ 2) + (l * 4) + t1 + (t2 * (l - value))
+end
+
+--wip: needs to be faster
+function spiralt(side)
+	local spiral = {}
+	local start, stop = math.floor((-side+1)/2), math.floor((side-1)/2)
+	for i = 1, side do
+		spiral[i] = {}
+		for j = 1, side do
+			spiral[i][j] = side ^ 2 - spiral_index(stop - i + 1,start + j - 1) --moves the coordinates so (0,0) is at the center of the spiral
+		end
+	end
+	return spiral
+end
+
 --copies the region defined by positions `pos1` and `pos2` along the `axis` axis ("x" or "y" or "z") by `amount` nodes, returning the number of nodes copied
 worldedit.copy = function(pos1, pos2, axis, amount)
 	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
@@ -84,10 +267,13 @@ worldedit.copy = function(pos1, pos2, axis, amount)
 			while pos.y <= pos2.y do
 				pos.z = pos1.z
 				while pos.z <= pos2.z do
-					local node = env:get_node(pos, node)
+					local node = env:get_node(pos)
+					local meta1 = env:get_meta(pos):to_table()
 					local value = pos[axis]
-					pos[axis] = value - amount
+					pos[axis] = value + amount
 					env:add_node(pos, node)
+					local meta2 = env:get_meta(pos)
+					meta2:from_table(meta1)
 					pos[axis] = value
 					pos.z = pos.z + 1
 				end
@@ -102,10 +288,13 @@ worldedit.copy = function(pos1, pos2, axis, amount)
 			while pos.y >= pos1.y do
 				pos.z = pos2.z
 				while pos.z >= pos1.z do
-					local node = minetest.env:get_node(pos, node)
+					local node = minetest.env:get_node(pos)
+					local meta1 = env:get_meta(pos):to_table()
 					local value = pos[axis]
 					pos[axis] = value + amount
 					minetest.env:add_node(pos, node)
+					local meta2 = env:get_meta(pos)
+					meta2:from_table(meta1)
 					pos[axis] = value
 					pos.z = pos.z - 1
 				end
@@ -129,11 +318,14 @@ worldedit.move = function(pos1, pos2, axis, amount)
 			while pos.y <= pos2.y do
 				pos.z = pos1.z
 				while pos.z <= pos2.z do
-					local node = env:get_node(pos, node)
+					local node = env:get_node(pos)
+					local meta1 = env:get_meta(pos):to_table()
 					env:remove_node(pos)
 					local value = pos[axis]
-					pos[axis] = value - amount
+					pos[axis] = value + amount
 					env:add_node(pos, node)
+					local meta2 = env:get_meta(pos)
+					meta2:from_table(meta1)
 					pos[axis] = value
 					pos.z = pos.z + 1
 				end
@@ -148,11 +340,14 @@ worldedit.move = function(pos1, pos2, axis, amount)
 			while pos.y >= pos1.y do
 				pos.z = pos2.z
 				while pos.z >= pos1.z do
-					local node = minetest.env:get_node(pos, node)
+					local node = env:get_node(pos)
+					local meta1 = env:get_meta(pos):to_table()
 					env:remove_node(pos)
 					local value = pos[axis]
 					pos[axis] = value + amount
-					minetest.env:add_node(pos, node)
+					env:add_node(pos, node)
+					local meta2 = env:get_meta(pos)
+					meta2:from_table(meta1)
 					pos[axis] = value
 					pos.z = pos.z - 1
 				end
@@ -181,6 +376,110 @@ worldedit.stack = function(pos1, pos2, axis, count)
 	return worldedit.volume(pos1, pos2)
 end
 
+--transposes a region defined by the positions `pos1` and `pos2` between the `axis1` and `axis2` axes, returning the number of nodes transposed
+worldedit.transpose = function(pos1, pos2, axis1, axis2)
+	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
+
+	local pos = {x=pos1.x, y=0, z=0}
+	local env = minetest.env
+	while pos.x <= pos2.x do
+		pos.y = pos1.y
+		while pos.y <= pos2.y do
+			pos.z = pos1.z
+			while pos.z <= pos2.z do
+				local extent1, extent2 = pos[axis1] - pos1[axis1], pos[axis2] - pos1[axis2]
+				if extent1 < extent2 then
+					local node1 = env:get_node(pos)
+					local meta1a = env:get_meta(pos):to_table()
+					local value1, value2 = pos[axis1], pos[axis2]
+					pos[axis1], pos[axis2] = pos1[axis1] + extent2, pos1[axis2] + extent1
+					local node2 = env:get_node(pos)
+					local meta2a = env:get_meta(pos):to_table()
+					env:add_node(pos, node1)
+					local meta1b = env:get_meta(pos)
+					meta1b:from_table(meta1a)
+					pos[axis1], pos[axis2] = pos1[axis1] + extent1, pos1[axis2] + extent2
+					env:add_node(pos, node2)
+					local meta2b = env:get_meta(pos)
+					meta2b:from_table(meta2a)
+				end
+				pos.z = pos.z + 1
+			end
+			pos.y = pos.y + 1
+		end
+		pos.x = pos.x + 1
+	end
+	return worldedit.volume(pos1, pos2)
+end
+
+--flips a region defined by the positions `pos1` and `pos2` along the `axis` axis ("x" or "y" or "z"), returning the number of nodes flipped
+worldedit.flip = function(pos1, pos2, axis)
+	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
+
+	local pos = {x=pos1.x, y=0, z=0}
+	local start = pos1[axis] + pos2[axis]
+	pos2[axis] = pos1[axis] + math.floor((pos2[axis] - pos1[axis]) / 2)
+	local env = minetest.env
+	while pos.x <= pos2.x do
+		pos.y = pos1.y
+		while pos.y <= pos2.y do
+			pos.z = pos1.z
+			while pos.z <= pos2.z do
+				local node1 = env:get_node(pos)
+				local meta1a = env:get_meta(pos):to_table()
+				local value = pos[axis]
+				pos[axis] = start - value
+				local node2 = env:get_node(pos)
+				local meta2a = env:get_meta(pos):to_table()
+				env:add_node(pos, node1)
+				local meta1b = env:get_meta(pos)
+				meta1b:from_table(meta1a)
+				pos[axis] = value
+				env:add_node(pos, node2)
+				local meta2b = env:get_meta(pos)
+				meta2b:from_table(meta2a)
+				pos.z = pos.z + 1
+			end
+			pos.y = pos.y + 1
+		end
+		pos.x = pos.x + 1
+	end
+	return worldedit.volume(pos1, pos2)
+end
+
+--rotates a region defined by the positions `pos1` and `pos2` by `angle` degrees clockwise (if you are looking in the negative direction) around the `axis` (supporting 90 degree increments only), returning the number of nodes rotated
+worldedit.rotate = function(pos1, pos2, axis, angle)
+	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
+
+	if axis == 'x' then
+		axes = {'z', 'y'}
+	elseif axis == 'y' then
+		axes = {'x', 'z'}
+	else--if axis == 'z' then
+		axes = {'y', 'x'}
+	end
+	angle = angle % 360
+
+	local pos = {x=pos1.x, y=0, z=0}
+	local newpos = {x=0, y=0, z=0}
+	local offsetx, offsetz
+	local env = minetest.env
+
+	if angle == 90 then
+		worldedit.transpose(pos1, pos2, axes[1], axes[2])
+		worldedit.flip(pos1, pos2, axes[2])
+	elseif angle == 180 then
+		worldedit.flip(pos1, pos2, axes[1])
+		worldedit.flip(pos1, pos2, axes[2])
+	elseif angle == 270 then
+		worldedit.transpose(pos1, pos2, axes[1], axes[2])
+		worldedit.flip(pos1, pos2, axes[1])
+	else
+		return 0
+	end
+	return worldedit.volume(pos1, pos2)
+end
+
 --digs a region defined by positions `pos1` and `pos2`, returning the number of nodes dug
 worldedit.dig = function(pos1, pos2)
 	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
@@ -246,4 +545,35 @@ worldedit.deserialize = function(originpos, value)
 		count = count + 1
 	end
 	return count
-end
\ No newline at end of file
+end
+
+--loads the nodes represented by string `value` at position `originpos`, returning the number of nodes deserialized
+--based on [table.save/table.load](http://lua-users.org/wiki/SaveTableToFile) by ChillCode, available under the MIT license (GPL compatible)
+worldedit.deserialize_old = function(originpos, value)
+	--obtain the node table
+	local count = 0
+	local get_tables = loadstring(value)
+	if get_tables == nil then --error loading value
+		return count
+	end
+	local tables = get_tables()
+
+	--transform the node table into an array of nodes
+	for i = 1, #tables do
+		for j, v in pairs(tables[i]) do
+			if type(v) == "table" then
+				tables[i][j] = tables[v[1]]
+			end
+		end
+	end
+
+	--load the node array
+	local env = minetest.env
+	for i, v in ipairs(tables[1]) do
+		local pos = v[1]
+		pos.x, pos.y, pos.z = originpos.x + pos.x, originpos.y + pos.y, originpos.z + pos.z
+		env:add_node(pos, v[2])
+		count = count + 1
+	end
+	return count
+end