Skip to content
Permalink
Browse files

Modify outset and inset to accept both hv and vh combinations. Update…

… documentation accordingly.
  • Loading branch information
danierukun committed Jul 4, 2016
1 parent 78890dd commit e18525d8c983eb78c8f7f2fa2425cede21fc8289
Showing with 20 additions and 8 deletions.
  1. +2 −2 ChatCommands.md
  2. +18 −6 worldedit_commands/cuboid.lua
@@ -408,14 +408,14 @@ opposite direction over the same axis by `[reverse-amount]`.

//expand right 7 5

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

if find == nil then
return false, "invalid usage: " .. param
@@ -20,7 +20,13 @@ minetest.register_chatcommand("/outset", {
"Undefined region. Region must be defined beforehand."
end

if dir == "" then
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))
@@ -31,7 +37,7 @@ minetest.register_chatcommand("/outset", {
assert(worldedit.cuboid_linear_expand(name, 'y', 1, amount))
assert(worldedit.cuboid_linear_expand(name, 'y', -1, amount))
else
return false, "Unknown error"
return false, "Invalid number of arguments"
end

worldedit.marker_update(name)
@@ -46,7 +52,7 @@ minetest.register_chatcommand("/inset", {
description = "inset the selection",
privs = {worldedit=true},
func = function(name, param)
local find, _, dir, amount = param:find("([hv]?)%s*([+-]?%d+)")
local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")

if find == nil then
return false, "invalid usage: " .. param
@@ -60,7 +66,13 @@ minetest.register_chatcommand("/inset", {
"Undefined region. Region must be defined beforehand."
end

if dir == "" then
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))
@@ -71,7 +83,7 @@ minetest.register_chatcommand("/inset", {
assert(worldedit.cuboid_linear_expand(name, 'y', 1, -amount))
assert(worldedit.cuboid_linear_expand(name, 'y', -1, -amount))
else
return false, "Unknown error"
return false, "Invalid number of arguments"
end

worldedit.marker_update(name)

0 comments on commit e18525d

Please sign in to comment.