summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md4
-rw-r--r--functions.lua126
-rw-r--r--init.lua4
3 files changed, 60 insertions, 74 deletions
diff --git a/README.md b/README.md
index f76b9bd..6a9d928 100644
--- a/README.md
+++ b/README.md
@@ -163,9 +163,9 @@ Flip the current WorldEdit region along the x/y/z/? axis.
//flip z
//flip ?
-### //rotate
+### //rotate x/y/z/? <angle>
-Rotate the current WorldEdit region around the axis <axis> by angle <angle> (90 degree increment).
+Rotate the current WorldEdit region along the x/y/z/? axis by angle <angle> (90 degree increment).
//rotate x 90
//rotate y 180
diff --git a/functions.lua b/functions.lua
index ed20591..fbdfb54 100644
--- a/functions.lua
+++ b/functions.lua
@@ -50,7 +50,7 @@ worldedit.replace = function(pos1, pos2, searchnode, replacenode)
if minetest.registered_nodes[searchnode] == nil then
searchnode = "default:" .. searchnode
end
- if minetest.registered_nodes[replacenode] == nil then
+ if minetest.registered_nodes[replacenode] == nil then
replacenode = "default:" .. replacenode
end
@@ -270,14 +270,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)
- local meta1 = env:get_meta(pos):to_table()
- local value = pos[axis]
- pos[axis] = value + amount
- env:add_node(pos, node)
- local meta2 = env:get_meta(pos)
- meta2:from_table(meta1)
- pos[axis] = value
+ local node = env:get_node(pos) --obtain current node
+ local meta = env:get_meta(pos):to_table() --get meta of current node
+ local value = pos[axis] --store current position
+ pos[axis] = value + amount --move along axis
+ env:add_node(pos, node) --copy node to new position
+ env:get_meta(pos):from_table(meta) --set metadata of new node
+ pos[axis] = value --restore old position
pos.z = pos.z + 1
end
pos.y = pos.y + 1
@@ -291,14 +290,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)
- 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
+ local node = minetest.env:get_node(pos) --obtain current node
+ local meta = env:get_meta(pos):to_table() --get meta of current node
+ local value = pos[axis] --store current position
+ pos[axis] = value + amount --move along axis
+ minetest.env:add_node(pos, node) --copy node to new position
+ env:get_meta(pos):from_table(meta) --set metadata of new node
+ pos[axis] = value --restore old position
pos.z = pos.z - 1
end
pos.y = pos.y - 1
@@ -309,7 +307,7 @@ worldedit.copy = function(pos1, pos2, axis, amount)
return worldedit.volume(pos1, pos2)
end
---moves positions `pos1` and `pos2` and the region defined by them along the `axis` axis ("x" or "y" or "z") by `amount` nodes, returning the number of nodes moved
+--moves 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 moved
worldedit.move = function(pos1, pos2, axis, amount)
local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
local env = minetest.env
@@ -321,15 +319,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)
- local meta1 = env:get_meta(pos):to_table()
+ local node = env:get_node(pos) --obtain current node
+ local meta = env:get_meta(pos):to_table() --get metadata of current node
env:remove_node(pos)
- local value = pos[axis]
- pos[axis] = value + amount
- env:add_node(pos, node)
- local meta2 = env:get_meta(pos)
- meta2:from_table(meta1)
- pos[axis] = value
+ local value = pos[axis] --store current position
+ pos[axis] = value + amount --move along axis
+ env:add_node(pos, node) --move node to new position
+ env:get_meta(pos):from_table(meta) --set metadata of new node
+ pos[axis] = value --restore old position
pos.z = pos.z + 1
end
pos.y = pos.y + 1
@@ -343,15 +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 = env:get_node(pos)
- local meta1 = env:get_meta(pos):to_table()
+ local node = env:get_node(pos) --obtain current node
+ local meta = env:get_meta(pos):to_table() --get metadata of current node
env:remove_node(pos)
- local value = pos[axis]
- pos[axis] = value + amount
- env:add_node(pos, node)
- local meta2 = env:get_meta(pos)
- meta2:from_table(meta1)
- pos[axis] = value
+ local value = pos[axis] --store current position
+ pos[axis] = value + amount --move along axis
+ env:add_node(pos, node) --move node to new position
+ env:get_meta(pos):from_table(meta) --set metadata of new node
+ pos[axis] = value --restore old position
pos.z = pos.z - 1
end
pos.y = pos.y - 1
@@ -366,12 +362,12 @@ end
worldedit.stack = function(pos1, pos2, axis, count)
local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
local length = pos2[axis] - pos1[axis] + 1
- local amount = 0
- local copy = worldedit.copy
if count < 0 then
count = -count
length = -length
end
+ local amount = 0
+ local copy = worldedit.copy
for i = 1, count do
amount = amount + length
copy(pos1, pos2, axis, amount)
@@ -393,18 +389,16 @@ worldedit.transpose = function(pos1, pos2, axis1, axis2)
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 meta1 = env:get_meta(pos):to_table()
local value1, value2 = pos[axis1], pos[axis2]
- pos[axis1], pos[axis2] = pos1[axis1] + extent2, pos1[axis2] + extent1
+ pos[axis1], pos[axis2] = value1 + extent2, value2 + extent1
local node2 = env:get_node(pos)
- local meta2a = env:get_meta(pos):to_table()
+ local meta2 = 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:get_meta(pos):from_table(meta1)
+ pos[axis1], pos[axis2] = value1, value2
env:add_node(pos, node2)
- local meta2b = env:get_meta(pos)
- meta2b:from_table(meta2a)
+ env:get_meta(pos):from_table(meta2)
end
pos.z = pos.z + 1
end
@@ -429,18 +423,16 @@ worldedit.flip = function(pos1, pos2, axis)
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 meta1 = 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()
+ local meta2 = env:get_meta(pos):to_table()
env:add_node(pos, node1)
- local meta1b = env:get_meta(pos)
- meta1b:from_table(meta1a)
+ env:get_meta(pos):from_table(meta1)
pos[axis] = value
env:add_node(pos, node2)
- local meta2b = env:get_meta(pos)
- meta2b:from_table(meta2a)
+ env:get_meta(pos):from_table(meta2)
pos.z = pos.z + 1
end
pos.y = pos.y + 1
@@ -450,35 +442,29 @@ worldedit.flip = function(pos1, pos2, axis)
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
+--rotates a region defined by the positions `pos1` and `pos2` by `angle` degrees clockwise around axis `axis` (90 degree increment), 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'}
+ local axis1, axis2
+ if axis == "x" then
+ axis1, axis2 = "z", "y"
+ elseif axis == "y" then
+ axis1, axis2 = "x", "z"
+ else --axis == "z"
+ axis1, axis2 = "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])
+ worldedit.transpose(pos1, pos2, axis1, axis2)
+ worldedit.flip(pos1, pos2, axis2)
elseif angle == 180 then
- worldedit.flip(pos1, pos2, axes[1])
- worldedit.flip(pos1, pos2, axes[2])
+ worldedit.flip(pos1, pos2, axis1)
+ worldedit.flip(pos1, pos2, axis2)
elseif angle == 270 then
- worldedit.transpose(pos1, pos2, axes[1], axes[2])
- worldedit.flip(pos1, pos2, axes[1])
- else
- return 0
+ worldedit.transpose(pos1, pos2, axis1, axis2)
+ worldedit.flip(pos1, pos2, axis1)
end
return worldedit.volume(pos1, pos2)
end
diff --git a/init.lua b/init.lua
index 1948bcf..32bf8e2 100644
--- a/init.lua
+++ b/init.lua
@@ -324,8 +324,8 @@ minetest.register_chatcommand("/move", {
local count = worldedit.move(pos1, pos2, axis, tonumber(amount))
- worldedit.pos1[name][axis] = worldedit.pos1[name][axis] + amount
- worldedit.pos2[name][axis] = worldedit.pos2[name][axis] + amount
+ pos1[axis] = pos1[axis] + amount
+ pos2[axis] = pos2[axis] + amount
worldedit.mark_pos1(name)
worldedit.mark_pos2(name)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 05:18:16 +0000