mff
/
Minetest-WorldEdit
forked from mtcontrib/Minetest-WorldEdit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rotate now works with x/y/z/? instead of just y: "//rotate x 90"

This commit is contained in:
Kyle 2012-08-28 15:57:45 -07:00
parent 91c24d3a60
commit 6eb08edd30
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -165,11 +165,12 @@ Flip the current WorldEdit region along the x/y/z/? axis.
### //rotate ### //rotate
Rotate the current WorldEdit region around the y axis by angle <angle> (90 degree increment). Rotate the current WorldEdit region around the axis <axis> by angle <angle> (90 degree increment).
//rotate 90 //rotate x 90
//rotate 180 //rotate y 180
//rotate 270 //rotate z 270
//rotate ? -90
### //dig ### //dig

23
functions.lua
View File

@ -395,10 +395,17 @@ worldedit.flip = function(pos1, pos2, axis)
return worldedit.volume(pos1, pos2) return worldedit.volume(pos1, pos2)
end end
--rotates a region defined by the positions `pos1` and `pos2` by `angle` degrees clockwise around the y 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 (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, angle) worldedit.rotate = function(pos1, pos2, axis, angle)
local pos1, pos2 = worldedit.sort_pos(pos1, pos2) 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 angle = angle % 360
local pos = {x=pos1.x, y=0, z=0} local pos = {x=pos1.x, y=0, z=0}
@ -407,14 +414,14 @@ worldedit.rotate = function(pos1, pos2, angle)
local env = minetest.env local env = minetest.env
if angle == 90 then if angle == 90 then
worldedit.transpose(pos1, pos2, "x", "z") worldedit.transpose(pos1, pos2, axes[1], axes[2])
worldedit.flip(pos1, pos2, "z") worldedit.flip(pos1, pos2, axes[2])
elseif angle == 180 then elseif angle == 180 then
worldedit.flip(pos1, pos2, "x") worldedit.flip(pos1, pos2, axes[1])
worldedit.flip(pos1, pos2, "z") worldedit.flip(pos1, pos2, axes[2])
elseif angle == 270 then elseif angle == 270 then
worldedit.transpose(pos1, pos2, "x", "z") worldedit.transpose(pos1, pos2, axes[1], axes[2])
worldedit.flip(pos1, pos2, "x") worldedit.flip(pos1, pos2, axes[1])
else else
return 0 return 0
end end

13
init.lua
View File

@ -404,8 +404,8 @@ minetest.register_chatcommand("/flip", {
}) })
minetest.register_chatcommand("/rotate", { minetest.register_chatcommand("/rotate", {
params = "<angle>", params = "<axis> <angle>",
description = "Rotate the current WorldEdit region around the y axis by angle <angle> (90 degree increment)", description = "Rotate the current WorldEdit region around the axis <axis> by angle <angle> (90 degree increment)",
privs = {worldedit=true}, privs = {worldedit=true},
func = function(name, param) func = function(name, param)
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name] local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
@ -414,17 +414,20 @@ minetest.register_chatcommand("/rotate", {
return return
end end
angle = tonumber(param) local found, _, axis, angle = param:find("^([xyz%?])%s+([+-]?%d+)$")
if angle == nil then if found == nil then
minetest.chat_send_player(name, "Invalid usage: " .. param) minetest.chat_send_player(name, "Invalid usage: " .. param)
return return
end end
if axis == "?" then
axis = worldedit.player_axis(name)
end
if angle % 90 ~= 0 then if angle % 90 ~= 0 then
minetest.chat_send_player(name, "Invalid usage: angle must be multiple of 90") minetest.chat_send_player(name, "Invalid usage: angle must be multiple of 90")
return return
end end
local count = worldedit.rotate(pos1, pos2, angle) local count = worldedit.rotate(pos1, pos2, axis, angle)
minetest.chat_send_player(name, count .. " nodes rotated") minetest.chat_send_player(name, count .. " nodes rotated")
end, end,
}) })