summaryrefslogtreecommitdiff
path: root/worldedit
diff options
context:
space:
mode:
Diffstat (limited to 'worldedit')
-rw-r--r--worldedit/cuboid.lua258
-rw-r--r--worldedit/init.lua2
-rw-r--r--worldedit/manipulations.lua34
-rw-r--r--worldedit/primitives.lua4
-rw-r--r--worldedit/serialization.lua6
-rw-r--r--worldedit/textures/worldedit_wand.pngbin0 -> 442 bytes
-rw-r--r--worldedit/wand.lua51
7 files changed, 349 insertions, 6 deletions
diff --git a/worldedit/cuboid.lua b/worldedit/cuboid.lua
new file mode 100644
index 0000000..ce20761
--- /dev/null
+++ b/worldedit/cuboid.lua
@@ -0,0 +1,258 @@
+-- Expands or contracts the cuboid in all axes by amount (positive or negative)
+worldedit.cuboid_volumetric_expand = function(name, amount)
+ local pos1 = worldedit.pos1[name]
+ local pos2 = worldedit.pos2[name]
+
+ if pos1 == nil or pos2 == nil then
+ return false, "Undefined cuboid"
+ end
+
+ local delta1 = vector.new()
+ local delta2 = vector.new()
+ local delta_dir1
+ local delta_dir2
+
+ delta1 = vector.add(delta1, amount)
+ delta2 = vector.add(delta2, amount)
+ delta_dir1, delta_dir2 = worldedit.get_expansion_directions(pos1, pos2)
+ delta1 = vector.multiply(delta1, delta_dir1)
+ delta2 = vector.multiply(delta2, delta_dir2)
+ worldedit.pos1[name] = vector.add(pos1, delta1)
+ worldedit.pos2[name] = vector.add(pos2, delta2)
+
+ return true
+end
+
+
+-- Expands or contracts the cuboid in a single axis by amount (positive or negative)
+worldedit.cuboid_linear_expand = function(name, axis, direction, amount)
+ local pos1 = worldedit.pos1[name]
+ local pos2 = worldedit.pos2[name]
+
+ if pos1 == nil or pos2 == nil then
+ return false, "undefined cuboid"
+ end
+
+ if direction ~= 1 and direction ~= -1 then
+ return false, "invalid marker"
+ end
+
+ local marker = worldedit.marker_get_closest_to_axis(name, axis, direction)
+ local deltavect = vector.new()
+
+ if axis == 'x' then
+ deltavect.x = amount * direction
+ elseif axis == 'y' then
+ deltavect.y = amount * direction
+ elseif axis == 'z' then
+ deltavect.z = amount * direction
+ else
+ return false, "invalid axis"
+ end
+
+ worldedit.marker_move(name, marker, deltavect)
+ return true
+end
+
+
+-- Shifts the cuboid by '+-amount' in axis 'axis'
+worldedit.cuboid_shift = function(name, axis, amount)
+ local pos1 = worldedit.pos1[name]
+ local pos2 = worldedit.pos2[name]
+
+ if pos1 == nil or pos2 == nil then
+ return false, "undefined cuboid"
+ end
+
+ if axis == 'x' then
+ worldedit.pos1[name].x = pos1.x + amount
+ worldedit.pos2[name].x = pos2.x + amount
+ elseif axis == 'y' then
+ worldedit.pos1[name].y = pos1.y + amount
+ worldedit.pos2[name].y = pos2.y + amount
+ elseif axis == 'z' then
+ worldedit.pos1[name].z = pos1.z + amount
+ worldedit.pos2[name].z = pos2.z + amount
+ else
+ return false, "invalid axis"
+ end
+
+ return true
+end
+
+
+-- Moves the location of a single marker by adding deltavector
+worldedit.marker_move = function(name, marker, deltavector)
+ if marker ~= 1 and marker ~= 2 then
+ return false
+ end
+
+ if marker == 1 then
+ local pos = worldedit.pos1[name]
+ worldedit.pos1[name] = vector.add(deltavector, pos)
+ else
+ local pos = worldedit.pos2[name]
+ worldedit.pos2[name] = vector.add(deltavector, pos)
+ end
+
+ return true
+end
+
+-- Updates the location ingame of the markers
+worldedit.marker_update = function(name, marker)
+ if marker == nil then
+ worldedit.mark_pos1(name)
+ worldedit.mark_pos2(name)
+ elseif marker == 1 then
+ worldedit.mark_pos1(name)
+ elseif marker == 2 then
+ worldedit.mark_pos2(name)
+ else
+ minetest.debug(
+ "worldedit: Invalid execution of function update_markers")
+ end
+end
+
+
+-- Returns two vectors with the directions for volumetric expansion
+worldedit.get_expansion_directions = function(mark1, mark2)
+ if mark1 == nil or mark2 == nil then
+ return
+ end
+ local dir1 = vector.new()
+ local dir2 = vector.new()
+
+ if mark1.x < mark2.x then
+ dir1.x = -1
+ dir2.x = 1
+ else
+ dir1.x = 1
+ dir2.x = -1
+ end
+ if mark1.y < mark2.y then
+ dir1.y = -1
+ dir2.y = 1
+ else
+ dir1.y = 1
+ dir2.y = -1
+ end
+ if mark1.z < mark2.z then
+ dir1.z = -1
+ dir2.z = 1
+ else
+ dir1.z = 1
+ dir2.z = -1
+ end
+ return dir1, dir2
+end
+
+
+-- Return the marker that is closest to the player
+worldedit.marker_get_closest_to_player = function(name)
+ local playerpos = minetest.get_player_by_name(name):getpos()
+ local dist1 = vector.distance(playerpos, worldedit.pos1[name])
+ local dist2 = vector.distance(playerpos, worldedit.pos2[name])
+
+ if dist1 < dist2 then
+ return 1
+ else
+ return 2
+ end
+end
+
+
+-- Returns the closest marker to the specified axis and direction
+worldedit.marker_get_closest_to_axis = function(name, axis, direction)
+ local pos1 = vector.new()
+ local pos2 = vector.new()
+
+ if direction ~= 1 and direction ~= -1 then
+ return nil
+ end
+
+ if axis == 'x' then
+ pos1.x = worldedit.pos1[name].x * direction
+ pos2.x = worldedit.pos2[name].x * direction
+ if pos1.x > pos2.x then
+ return 1
+ else
+ return 2
+ end
+ elseif axis == 'y' then
+ pos1.y = worldedit.pos1[name].y * direction
+ pos2.y = worldedit.pos2[name].y * direction
+ if pos1.y > pos2.y then
+ return 1
+ else
+ return 2
+ end
+ elseif axis == 'z' then
+ pos1.z = worldedit.pos1[name].z * direction
+ pos2.z = worldedit.pos2[name].z * direction
+ if pos1.z > pos2.z then
+ return 1
+ else
+ return 2
+ end
+ else
+ return nil
+ end
+end
+
+
+-- Translates up, down, left, right, front, back to their corresponding axes and
+-- directions according to faced direction
+worldedit.translate_direction = function(name, direction)
+ local axis, dir = worldedit.player_axis(name)
+ local resaxis, resdir
+
+ if direction == "up" then
+ return 'y', 1
+ end
+
+ if direction == "down" then
+ return 'y', -1
+ end
+
+ if direction == "front" then
+ if axis == "y" then
+ resaxis = nil
+ resdir = nil
+ else
+ resaxis = axis
+ resdir = dir
+ end
+ end
+
+ if direction == "back" then
+ if axis == "y" then
+ resaxis = nil
+ resdir = nil
+ else
+ resaxis = axis
+ resdir = -dir
+ end
+ end
+
+ if direction == "left" then
+ if axis == 'x' then
+ resaxis = 'z'
+ resdir = dir
+ elseif axis == 'z' then
+ resaxis = 'x'
+ resdir = -dir
+ end
+ end
+
+ if direction == "right" then
+ if axis == 'x' then
+ resaxis = 'z'
+ resdir = -dir
+ elseif axis == 'z' then
+ resaxis = 'x'
+ resdir = dir
+ end
+ end
+
+ return resaxis, resdir
+end \ No newline at end of file
diff --git a/worldedit/init.lua b/worldedit/init.lua
index e193454..343a1e4 100644
--- a/worldedit/init.lua
+++ b/worldedit/init.lua
@@ -36,6 +36,8 @@ load_module(path .. "/visualization.lua")
load_module(path .. "/serialization.lua")
load_module(path .. "/code.lua")
load_module(path .. "/compatibility.lua")
+load_module(path .. "/wand.lua")
+load_module(path .. "/cuboid.lua")
if minetest.setting_getbool("log_mods") then
diff --git a/worldedit/manipulations.lua b/worldedit/manipulations.lua
index 365d7b3..cf95517 100644
--- a/worldedit/manipulations.lua
+++ b/worldedit/manipulations.lua
@@ -90,7 +90,7 @@ function worldedit.stack2(pos1, pos2, direction, amount, finished)
translated.x = translated.x + direction.x
translated.y = translated.y + direction.y
translated.z = translated.z + direction.z
- worldedit.copy2(pos1, pos2, translated, volume)
+ worldedit.copy2(pos1, pos2, translated)
minetest.after(0, next_one)
else
if finished then
@@ -164,6 +164,38 @@ function worldedit.copy(pos1, pos2, axis, amount)
return worldedit.volume(pos1, pos2)
end
+--- Copies a region by offset vector `off`.
+-- @param pos1
+-- @param pos2
+-- @param off
+-- @return The number of nodes copied.
+function worldedit.copy2(pos1, pos2, off)
+ local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
+
+ worldedit.keep_loaded(pos1, pos2)
+
+ local get_node, get_meta, set_node = minetest.get_node,
+ minetest.get_meta, minetest.set_node
+ local pos = {}
+ pos.x = pos2.x
+ while pos.x >= pos1.x do
+ pos.y = pos2.y
+ while pos.y >= pos1.y do
+ pos.z = pos2.z
+ while pos.z >= pos1.z do
+ local node = get_node(pos) -- Obtain current node
+ local meta = get_meta(pos):to_table() -- Get meta of current node
+ local newpos = vector.add(pos, off) -- Calculate new position
+ set_node(newpos, node) -- Copy node to new position
+ get_meta(newpos):from_table(meta) -- Set metadata of new node
+ pos.z = pos.z - 1
+ end
+ pos.y = pos.y - 1
+ end
+ pos.x = pos.x - 1
+ end
+ return worldedit.volume(pos1, pos2)
+end
--- Moves a region along `axis` by `amount` nodes.
-- @return The number of nodes moved.
diff --git a/worldedit/primitives.lua b/worldedit/primitives.lua
index edb7db6..fe22fff 100644
--- a/worldedit/primitives.lua
+++ b/worldedit/primitives.lua
@@ -158,7 +158,7 @@ function worldedit.pyramid(pos, axis, height, node_name, hollow)
-- Set up voxel manipulator
local manip, area = mh.init_axis_radius(pos, axis,
height >= 0 and height or -height)
- local data = mh.get_empty_data()
+ local data = mh.get_empty_data(area)
-- Handle inverted pyramids
local start_axis, end_axis, step
@@ -178,7 +178,7 @@ function worldedit.pyramid(pos, axis, height, node_name, hollow)
y = pos.y - area.MinEdge.y,
z = pos.z - area.MinEdge.z,
}
- local size = height * step
+ local size = math.abs(height * step)
local count = 0
-- For each level of the pyramid
for index1 = 0, height, step do
diff --git a/worldedit/serialization.lua b/worldedit/serialization.lua
index 00d984d..a0848e2 100644
--- a/worldedit/serialization.lua
+++ b/worldedit/serialization.lua
@@ -144,9 +144,9 @@ local function load_schematic(value)
"([^%s]+)%s+(%d+)%s+(%d+)[^\r\n]*[\r\n]*") do
param1, param2 = tonumber(param1), tonumber(param2)
table.insert(nodes, {
- x = originx + tonumber(x),
- y = originy + tonumber(y),
- z = originz + tonumber(z),
+ x = tonumber(x),
+ y = tonumber(y),
+ z = tonumber(z),
name = name,
param1 = param1 ~= 0 and param1 or nil,
param2 = param2 ~= 0 and param2 or nil,
diff --git a/worldedit/textures/worldedit_wand.png b/worldedit/textures/worldedit_wand.png
new file mode 100644
index 0000000..13eb121
--- /dev/null
+++ b/worldedit/textures/worldedit_wand.png
Binary files differ
diff --git a/worldedit/wand.lua b/worldedit/wand.lua
new file mode 100644
index 0000000..415e7ca
--- /dev/null
+++ b/worldedit/wand.lua
@@ -0,0 +1,51 @@
+minetest.register_tool("worldedit:wand", {
+ description = "WorldEdit wand tool. Left-click to set the 1st position, Right-click to set the 2nd position.",
+ groups = {},
+ inventory_image = "worldedit_wand.png",
+ wield_image = "",
+ wield_scale = {x=1,y=1,z=1},
+ stack_max = 1, -- there is no need to have more than one
+ liquids_pointable = true, -- ground with only water on can be selected as well
+ -- the tool_capabilities are completely irrelevant here - no need to dig
+ tool_capabilities = {
+ full_punch_interval = 1.0,
+ max_drop_level=0,
+ groupcaps={
+ fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
+ snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1},
+ choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0}
+ }
+ },
+ node_placement_prediction = nil,
+
+ on_use = function(itemstack, placer, pointed_thing)
+ if placer ~= nil and pointed_thing ~= nil then
+ local name = placer:get_player_name()
+ local pos = minetest.get_pointed_thing_position( pointed_thing, false ) -- not above
+
+ if not pos then
+ return itemstack
+ end
+
+ worldedit.pos1[name] = pos
+ worldedit.mark_pos1(name)
+
+ end
+ return itemstack -- nothing consumed, nothing changed
+ end,
+
+ on_place = function(itemstack, placer, pointed_thing) -- Left Click
+ if placer ~= nil and pointed_thing ~= nil then
+ local name = placer:get_player_name()
+ local pos = minetest.get_pointed_thing_position( pointed_thing, false ) -- not above
+
+ if not pos then
+ return itemstack
+ end
+
+ worldedit.pos2[name] = pos
+ worldedit.mark_pos2(name)
+ end
+ return itemstack -- nothing consumed, nothing changed
+ end,
+})
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 03:28:41 +0000