Skip to content
Permalink
Browse files

Merge remote-tracking branch 'tmp/cuboidmanip'

  • Loading branch information
sfan5 committed Jul 4, 2016
2 parents b23e929 + e18525d commit f72abdb766d7808c4c731ec224c90f1f1fb395c6
Showing with 535 additions and 1 deletion.
  1. +35 −0 ChatCommands.md
  2. +1 −0 worldedit_commands/.gitignore
  3. +239 −0 worldedit_commands/cuboid.lua
  4. +258 −0 worldedit_commands/cuboidapi.lua
  5. +2 −1 worldedit_commands/init.lua
@@ -386,3 +386,38 @@ This mode can be left with `//mtschemprob finish`. `//mtschemprob get` will disp
Clears all objects within the WorldEdit region.

//clearobjects

### `//shift x/y/z/?/up/down/left/right/front/back [+|-]<amount>`

Shifts the selection area by `[+|-]<amount>` without touching its contents. The shifting axis can be absolute (`x/y/z`) or
relative (`up/down/left/right/front/back`).

//shift left 5

### `//expand [+|-]x/y/z/?/up/down/left/right/front/back <amount> [reverse-amount]`

Expands the selection by `<amount>` in the selected absolute or relative axis. If specified, the selection can be expanded in the
opposite direction over the same axis by `[reverse-amount]`.

//expand right 7 5

### `//contract [+|-]x/y/z/?/up/down/left/right/front/back <amount> [reverse-amount]`

Contracts the selection by `<amount>` in the selected absolute or relative axis. If specified, the selection can be contracted in the
opposite direction over the same axis by `[reverse-amount]`.

//expand right 7 5

### `//outset [hv] <amount>`

Expands the selection in all directions by `<amount>`. If specified, the selection can be expanded horizontally in the x and z axes `[h]`
or vertically in the y axis `[v]`.

//outset v 5

### `//inset [hv] <amount>`

Contracts the selection in all directions by `<amount>`. If specified, the selection can be contracted horizontally in the x and z axes `[h]`
or vertically in the y axis `[v]`.

//outset v 5
@@ -0,0 +1 @@
*~
@@ -0,0 +1,239 @@
dofile(minetest.get_modpath("worldedit_commands") .. "/cuboidapi.lua")


minetest.register_chatcommand("/outset", {
params = "[h|v] <amount>",
description = "outset the selection",
privs = {worldedit=true},
func = function(name, param)
local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")

if find == nil then
return false, "invalid usage: " .. param
end

local pos1 = worldedit.pos1[name]
local pos2 = worldedit.pos2[name]

if pos1 == nil or pos2 == nil then
return false,
"Undefined region. Region must be defined beforehand."
end

local hv_test = dir:find("[^hv]+")

if hv_test ~= nil then
return false, "Invalid direction."
end

if dir == "" or dir == "hv" or dir == "vh" then
assert(worldedit.cuboid_volumetric_expand(name, amount))
elseif dir == "h" then
assert(worldedit.cuboid_linear_expand(name, 'x', 1, amount))
assert(worldedit.cuboid_linear_expand(name, 'x', -1, amount))
assert(worldedit.cuboid_linear_expand(name, 'z', 1, amount))
assert(worldedit.cuboid_linear_expand(name, 'z', -1, amount))
elseif dir == "v" then
assert(worldedit.cuboid_linear_expand(name, 'y', 1, amount))
assert(worldedit.cuboid_linear_expand(name, 'y', -1, amount))
else
return false, "Invalid number of arguments"
end

worldedit.marker_update(name)
return true, "Region outset by " .. amount .. " blocks"
end,
}
)


minetest.register_chatcommand("/inset", {
params = "[h|v] <amount>",
description = "inset the selection",
privs = {worldedit=true},
func = function(name, param)
local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")

if find == nil then
return false, "invalid usage: " .. param
end

local pos1 = worldedit.pos1[name]
local pos2 = worldedit.pos2[name]

if pos1 == nil or pos2 == nil then
return false,
"Undefined region. Region must be defined beforehand."
end

local hv_test = dir:find("[^hv]+")

if hv_test ~= nil then
return false, "Invalid direction."
end

if dir == "" or dir == "vh" or dir == "hv" then
assert(worldedit.cuboid_volumetric_expand(name, -amount))
elseif dir == "h" then
assert(worldedit.cuboid_linear_expand(name, 'x', 1, -amount))
assert(worldedit.cuboid_linear_expand(name, 'x', -1, -amount))
assert(worldedit.cuboid_linear_expand(name, 'z', 1, -amount))
assert(worldedit.cuboid_linear_expand(name, 'z', -1, -amount))
elseif dir == "v" then
assert(worldedit.cuboid_linear_expand(name, 'y', 1, -amount))
assert(worldedit.cuboid_linear_expand(name, 'y', -1, -amount))
else
return false, "Invalid number of arguments"
end

worldedit.marker_update(name)
return true, "Region inset by " .. amount .. " blocks"
end,
}
)


minetest.register_chatcommand("/shift", {
params = "[x|y|z|?|up|down|left|right|front|back] [+|-]<amount>",
description = "Moves the selection region. Does not move contents.",
privs = {worldedit=true},
func = function(name, param)
local pos1 = worldedit.pos1[name]
local pos2 = worldedit.pos2[name]
local find, _, direction, amount = param:find("([%?%l]+)%s*([+-]?%d+)")

if find == nil then
worldedit.player_notify(name, "invalid usage: " .. param)
return
end

if pos1 == nil or pos2 == nil then
worldedit.player_notify(name,
"Undefined region. Region must be defined beforehand.")
return
end

local axis, dir
if direction ~= "?" then
axis, dir = worldedit.translate_direction(name, direction)
else
axis, dir = worldedit.player_axis(name)
end

if axis == nil or dir == nil then
return false, "Invalid if looking straight up or down"
end

assert(worldedit.cuboid_shift(name, axis, amount * dir))
worldedit.marker_update(name)

return true, "region shifted by " .. amount .. " nodes"
end,
}
)


minetest.register_chatcommand("/expand", {
params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
description = "expand the selection in one or two directions at once",
privs = {worldedit=true},
func = function(name, param)
local find, _, sign, direction, amount,
rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")

if find == nil then
worldedit.player_notify(name, "invalid use: " .. param)
return
end

if worldedit.pos1[name] == nil or worldedit.pos2[name] == nil then
worldedit.player_notify(name,
"Undefined region. Region must be defined beforehand.")
return
end

local absolute = direction:find("[xyz?]")
local dir, axis

if rev_amount == "" then
rev_amount = 0
end

if absolute == nil then
axis, dir = worldedit.translate_direction(name, direction)

if axis == nil or dir == nil then
return false, "Invalid if looking straight up or down"
end
else
if direction == "?" then
axis, dir = worldedit.player_axis(name)
else
axis = direction
dir = 1
end
end

if sign == "-" then
dir = -dir
end

worldedit.cuboid_linear_expand(name, axis, dir, amount)
worldedit.cuboid_linear_expand(name, axis, -dir, rev_amount)
worldedit.marker_update(name)
end,
}
)


minetest.register_chatcommand("/contract", {
params = "[+|-]<x|y|z|?|up|down|left|right|front|back> <amount> [reverse-amount]",
description = "contract the selection in one or two directions at once",
privs = {worldedit=true},
func = function(name, param)
local find, _, sign, direction, amount,
rev_amount = param:find("([+-]?)([%?%l]+)%s*(%d+)%s*(%d*)")

if find == nil then
worldedit.player_notify(name, "invalid use: " .. param)
return
end

if worldedit.pos1[name] == nil or worldedit.pos2[name] == nil then
worldedit.player_notify(name,
"Undefined region. Region must be defined beforehand.")
return
end

local absolute = direction:find("[xyz?]")
local dir, axis

if rev_amount == "" then
rev_amount = 0
end

if absolute == nil then
axis, dir = worldedit.translate_direction(name, direction)

if axis == nil or dir == nil then
return false, "Invalid if looking straight up or down"
end
else
if direction == "?" then
axis, dir = worldedit.player_axis(name)
else
axis = direction
dir = 1
end
end

if sign == "-" then
dir = -dir
end

worldedit.cuboid_linear_expand(name, axis, dir, -amount)
worldedit.cuboid_linear_expand(name, axis, -dir, -rev_amount)
worldedit.marker_update(name)
end,
}
)

0 comments on commit f72abdb

Please sign in to comment.