Dual-based cylinder

[worldedit.git] / worldedit_commands / cuboid.lua

diff --git a/worldedit_commands/cuboid.lua b/worldedit_commands/cuboid.lua
index 47126595adf507c0967eb1f7416fd907d546645b..88f026087074c3673c3c6f9b4e5380b8d9b4f8c9 100644 (file)
--- a/worldedit_commands/cuboid.lua
+++ b/worldedit_commands/cuboid.lua
@@ -1,12 +1,9 @@
-dofile(minetest.get_modpath("worldedit_commands") .. "/cuboidapi.lua")
-
-
 minetest.register_chatcommand("/outset", {
-       params = "<amount> [h|v]",
+       params = "[h|v] <amount>",
        description = "outset the selection",
        privs = {worldedit=true},
        func = function(name, param)
-               local find, _, amount, dir = param:find("^(%d+)[%s+]?([hv]?)$")
+               local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
                
                if find == nil then
                        return false, "invalid usage: " .. param
@@ -20,7 +17,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 +34,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)
@@ -42,11 +45,11 @@ minetest.register_chatcommand("/outset", {
 
 
 minetest.register_chatcommand("/inset", {
-       params = "<amount> [h|v]",
+       params = "[h|v] <amount>",
        description = "inset the selection",
        privs = {worldedit=true},
        func = function(name, param)
-               local find, _, amount, dir = param:find("^(%d+)[%s+]?([hv]?)$")
+               local find, _, dir, amount = param:find("(%a*)%s*([+-]?%d+)")
                
                if find == nil then
                        return false, "invalid usage: " .. param
@@ -60,7 +63,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 +80,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)
@@ -102,31 +111,34 @@ minetest.register_chatcommand("/shift", {
                end
                
                local axis, dir
-               if direction ~= "?" then
-                       axis, dir = worldedit.translate_direction(name, direction)
-               else
+               if direction == "x" or direction == "y" or direction == "z" then
+                       axis, dir = direction, 1
+               elseif direction == "?" then
                        axis, dir = worldedit.player_axis(name)
+               else
+                       axis, dir = worldedit.translate_direction(name, direction)
                end
                
                if axis == nil or dir == nil then
-                       return false, "Invalid"
+                       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"
+               return true, "Region shifted by " .. amount .. " nodes"
       end,
   }
 )
 
 
 minetest.register_chatcommand("/expand", {
-       params = "<amount> [reverse-amount] [up|down|left|right|front|back]",
+       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, _, amount, arg2, arg3 = param:find("(%d+)%s*(%w*)%s*(%l*)")
+       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)
@@ -139,38 +151,48 @@ minetest.register_chatcommand("/expand", {
                return
        end
        
-       local tmp = tonumber(arg2)
-       local axis, dir
-       local reverse_amount = 0
+       local absolute = direction:find("[xyz?]")
+       local dir, axis
        
-       axis,dir = worldedit.player_axis(name)
+       if rev_amount == "" then
+               rev_amount = 0
+       end
        
-       if arg2 ~= "" then
-               if tmp == nil then
-                       axis, dir = worldedit.translate_direction(name, arg2)
+       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
-                       reverse_amount = tmp
+                       axis = direction
+                       dir = 1
                end
        end
        
-       if arg3 ~= "" then
-               axis, dir = worldedit.translate_direction(name, arg3)
+       if sign == "-" then
+               dir = -dir
        end
        
        worldedit.cuboid_linear_expand(name, axis, dir, amount)
-       worldedit.cuboid_linear_expand(name, axis, -dir, reverse_amount)
+       worldedit.cuboid_linear_expand(name, axis, -dir, rev_amount)
        worldedit.marker_update(name)
+       return true, "Region expanded by " .. (amount + rev_amount) .. " nodes"
       end,
   }
 )
 
 
 minetest.register_chatcommand("/contract", {
-       params = "<amount> [reverse-amount] [up|down|left|right|front|back]",
+       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, _, amount, arg2, arg3 = param:find("(%d+)%s*(%w*)%s*(%l*)")
+       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)
@@ -183,27 +205,36 @@ minetest.register_chatcommand("/contract", {
                return
        end
        
-       local tmp = tonumber(arg2)
-       local axis, dir
-       local reverse_amount = 0
+       local absolute = direction:find("[xyz?]")
+       local dir, axis
        
-       axis,dir = worldedit.player_axis(name)
+       if rev_amount == "" then
+               rev_amount = 0
+       end
        
-       if arg2 ~= "" then
-               if tmp == nil then
-                       axis, dir = worldedit.translate_direction(name, arg2)
+       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
-                       reverse_amount = tmp
+                       axis = direction
+                       dir = 1
                end
        end
        
-       if arg3 ~= "" then
-               axis, dir = worldedit.translate_direction(name, arg3)
+       if sign == "-" then
+               dir = -dir
        end
        
        worldedit.cuboid_linear_expand(name, axis, dir, -amount)
-       worldedit.cuboid_linear_expand(name, axis, -dir, -reverse_amount)
+       worldedit.cuboid_linear_expand(name, axis, -dir, -rev_amount)
        worldedit.marker_update(name)
+       return true, "Region contracted by " .. (amount + rev_amount) .. " nodes"
       end,
   }
-)
\ No newline at end of file
+)