forked from mtcontrib/Minetest-WorldEdit
Remove work in progress/unused components
infinity: unused and not public, superseded by minetest.raycast() limited: wip and disabled entirely anyway
This commit is contained in:
sfan5
parent
d572d769ce
commit
35ad2f031d
@ -1 +0,0 @@
|
|||||||
worldedit?
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
worldedit = rawget(_G, "worldedit") or {}
|
|
||||||
local minetest = minetest --local copy of global
|
|
||||||
|
|
||||||
local get_pointed = function(pos, nearest, distance)
|
|
||||||
if distance > 100 then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
--check for collision with node
|
|
||||||
local nodename = minetest.get_node(pos).name
|
|
||||||
if nodename ~= "air"
|
|
||||||
and nodename ~= "default:water_source"
|
|
||||||
and nodename ~= "default:water_flowing" then
|
|
||||||
if nodename ~= "ignore" then
|
|
||||||
return nearest
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local use = function(itemstack, user, pointed_thing)
|
|
||||||
if pointed_thing.type == "nothing" then --pointing at nothing
|
|
||||||
local placepos = worldedit.raytrace(user:getpos(), user:get_look_dir(), get_pointed)
|
|
||||||
if placepos then --extended reach
|
|
||||||
pointed_thing.type = "node"
|
|
||||||
pointed_thing.under = nil --wip
|
|
||||||
pointed_thing.above = nil --wip
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return minetest.item_place_node(itemstack, user, pointed_thing)
|
|
||||||
end
|
|
||||||
--
|
|
||||||
|
|
||||||
worldedit.raytrace = function(pos, dir, callback)
|
|
||||||
local base = {x=math.floor(pos.x), y=math.floor(pos.y), z=math.floor(pos.z)}
|
|
||||||
local stepx, stepy, stepz = 0, 0, 0
|
|
||||||
local componentx, componenty, componentz = 0, 0, 0
|
|
||||||
local intersectx, intersecty, intersectz = 0, 0, 0
|
|
||||||
|
|
||||||
if dir.x == 0 then
|
|
||||||
intersectx = math.huge
|
|
||||||
elseif dir.x > 0 then
|
|
||||||
stepx = 1
|
|
||||||
componentx = 1 / dir.x
|
|
||||||
intersectx = ((base.x - pos.x) + 1) * componentx
|
|
||||||
else
|
|
||||||
stepx = -1
|
|
||||||
componentx = 1 / -dir.x
|
|
||||||
intersectx = (pos.x - base.x) * componentx
|
|
||||||
end
|
|
||||||
if dir.y == 0 then
|
|
||||||
intersecty = math.huge
|
|
||||||
elseif dir.y > 0 then
|
|
||||||
stepy = 1
|
|
||||||
componenty = 1 / dir.y
|
|
||||||
intersecty = ((base.y - pos.y) + 1) * componenty
|
|
||||||
else
|
|
||||||
stepy = -1
|
|
||||||
componenty = 1 / -dir.y
|
|
||||||
intersecty = (pos.y - base.y) * componenty
|
|
||||||
end
|
|
||||||
if dir.z == 0 then
|
|
||||||
intersectz = math.huge
|
|
||||||
elseif dir.z > 0 then
|
|
||||||
stepz = 1
|
|
||||||
componentz = 1 / dir.z
|
|
||||||
intersectz = ((base.z - pos.z) + 1) * componentz
|
|
||||||
else
|
|
||||||
stepz = -1
|
|
||||||
componentz = 1 / -dir.z
|
|
||||||
intersectz = (pos.z - base.z) * componentz
|
|
||||||
end
|
|
||||||
|
|
||||||
local distance = 0
|
|
||||||
local nearest = {x=base.x, y=base.y, z=base.z}
|
|
||||||
while true do
|
|
||||||
local values = {callback(base, nearest, distance)}
|
|
||||||
if #values > 0 then
|
|
||||||
return unpack(values)
|
|
||||||
end
|
|
||||||
|
|
||||||
nearest.x, nearest.y, nearest.z = base.x, base.y, base.z
|
|
||||||
if intersectx < intersecty then
|
|
||||||
if intersectx < intersectz then
|
|
||||||
base.x = base.x + stepx
|
|
||||||
distance = intersectx
|
|
||||||
intersectx = intersectx + componentx
|
|
||||||
else
|
|
||||||
base.z = base.z + stepz
|
|
||||||
distance = intersectz
|
|
||||||
intersectz = intersectz + componentz
|
|
||||||
end
|
|
||||||
elseif intersecty < intersectz then
|
|
||||||
base.y = base.y + stepy
|
|
||||||
distance = intersecty
|
|
||||||
intersecty = intersecty + componenty
|
|
||||||
else
|
|
||||||
base.z = base.z + stepz
|
|
||||||
distance = intersectz
|
|
||||||
intersectz = intersectz + componentz
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@ -1 +0,0 @@
|
|||||||
worldedit
|
|
||||||
@ -1,120 +0,0 @@
|
|||||||
do return end
|
|
||||||
do
|
|
||||||
local MAX_VOLUME = 30 * 30 * 30
|
|
||||||
|
|
||||||
local we = worldedit
|
|
||||||
local volume = we.volume
|
|
||||||
local safewrap = function(func)
|
|
||||||
return function(pos1, pos2, ...)
|
|
||||||
if validbox(pos1, pos2) then
|
|
||||||
return func(pos1, pos2, ...)
|
|
||||||
end
|
|
||||||
return 0, pos1, pos2
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local validbox = function(pos1, pos2)
|
|
||||||
tpos1, tpos2 = we.sort_pos(pos1, pos2)
|
|
||||||
|
|
||||||
if volume(tpos1, tpos2) > MAX_VOLUME then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
--check for ownership of area if ownership mod is installed
|
|
||||||
if owner_defs then
|
|
||||||
local inside = false
|
|
||||||
for _, def in pairs(owner_defs) do
|
|
||||||
--sort positions
|
|
||||||
local tdef = {x1=def.x1, x2 = def.x2, y1=def.y1, y2=def.y2, z1=def.z1, z2=def.z2}
|
|
||||||
if tdef.x1 > tdef.x2 then
|
|
||||||
tdef.x1, tdef.x2 = tdef.x2, tdef.x1
|
|
||||||
end
|
|
||||||
if tdef.y1 > tdef.y2 then
|
|
||||||
tdef.y1, tdef.y2 = tdef.y2, tdef.y1
|
|
||||||
end
|
|
||||||
if tdef.z1 > tdef.z2 then
|
|
||||||
tdef.z1, tdef.z2 = tdef.z2, tdef.z1
|
|
||||||
end
|
|
||||||
|
|
||||||
--check ownership
|
|
||||||
if tpos1.x >= tdef.x1 and tpos1.x <= tdef.x2
|
|
||||||
and tpos2.x >= tdef.x1 and tpos2.x <= tdef.x2
|
|
||||||
and tpos1.y >= tdef.y1 and tpos1.y <= tdef.y2
|
|
||||||
and tpos2.y >= tdef.y1 and tpos2.y <= tdef.y2
|
|
||||||
and tpos1.z >= tdef.z1 and tpos1.z <= tdef.z2
|
|
||||||
and tpos2.z >= tdef.z1 and tpos2.z <= tdef.z2
|
|
||||||
and name == def.owner then --wip: name isn't available here
|
|
||||||
inside = true
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if not inside then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
worldedit = {
|
|
||||||
sort_pos = we.sort_pos,
|
|
||||||
|
|
||||||
set = safewrap(we.set),
|
|
||||||
replace = safewrap(we.replace),
|
|
||||||
replaceinverse = safewrap(we.replaceinverse),
|
|
||||||
copy = function(pos1, pos2, axis, amount)
|
|
||||||
tpos1, tpos2 = we.sort_pos(pos1, pos2)
|
|
||||||
tpos1[axis] = tpos1[axis] + amount
|
|
||||||
tpos2[axis] = tpos2[axis] + amount
|
|
||||||
if validbox(pos1, pos2) and validbox(tpos1, tpos2) then
|
|
||||||
we.copy(pos1, pos2, axis, amount)
|
|
||||||
else
|
|
||||||
return 0
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
move = function(pos1, pos2, axis, amount)
|
|
||||||
tpos1, tpos2 = we.sort_pos(pos1, pos2)
|
|
||||||
tpos1[axis] = tpos1[axis] + amount
|
|
||||||
tpos2[axis] = tpos2[axis] + amount
|
|
||||||
if validbox(pos1, pos2) and validbox(tpos1, tpos2) then
|
|
||||||
we.move(pos1, pos2, axis, amount)
|
|
||||||
else
|
|
||||||
return 0
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
stack = function(pos1, pos2, axis, count)
|
|
||||||
tpos1, tpos2 = we.sort_pos(pos1, pos2)
|
|
||||||
local length = (tpos2[axis] - tpos1[axis] + 1) * count
|
|
||||||
if count < 0 then
|
|
||||||
tpos1[axis] = tpos1[axis] + length
|
|
||||||
else
|
|
||||||
tpos2[axis] = tpos2[axis] + length
|
|
||||||
end
|
|
||||||
if validbox(tpos1, tpos2) then
|
|
||||||
we.stack(pos1, pos2, axis, amount)
|
|
||||||
else
|
|
||||||
return 0
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
--wip: add transpose, rotate safely
|
|
||||||
flip = safewrap(we.flip),
|
|
||||||
orient = safewrap(we.orient),
|
|
||||||
fixlight = safewrap(we.fixlight),
|
|
||||||
--wip: add primitives here
|
|
||||||
volume = we.volume,
|
|
||||||
hide = safewrap(we.hide),
|
|
||||||
suppress = safewrap(we.suppress),
|
|
||||||
highlight = safewrap(we.highlight),
|
|
||||||
restore = safewrap(we.restore),
|
|
||||||
serialize = safewrap(we.serialize),
|
|
||||||
allocate = we.allocate,
|
|
||||||
deserialize = function(originpos, value)
|
|
||||||
local tpos1, tpos2 = we.allocate(originpos, value)
|
|
||||||
if validbox(tpos1, tpos2) then
|
|
||||||
we.deserialize(originpos, value)
|
|
||||||
else
|
|
||||||
return 0
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
end
|
|
||||||
Loading…
Reference in New Issue
Block a user