mirror of
https://github.com/Uberi/Minetest-WorldEdit.git
synced 2024-12-26 18:50:40 +01:00
bb8456b711
Non-stylistic changes: * Add LuaDoc/LDoc support. * Fix `clear_objects` area size calculation. * Fix `clear_objects` removing player objects. * Fix shadowing of marker entity name with player name. * Make visualization functions use `swap_node`. * Make hidden nodes unwalkable. * Prevent `hide` from hiding air. * Make deprecated functions log to deprecated stream when called. * Fixed `replaceinverse` not using normalized node names. * Added .gitignore. * Bump version to 1.1. Stylistic changes: * Change `x = function` to `function x`. * Change comment format. * Make missing VoxelManip error less obnoxious. * Move `sort_pos` into `common.lua`, which is a required module. * Remove local copies of `minetest`. * Remove `worldedit = worldedit or {}` from modules. * Replace replaceinverse with an inverse argument to `replace`. * Added `error()`s on on invalid axes. * Change `wip` to `TODO`. * Rename `clearobjects` to `clear_objects`. * Remove `hollow_{sphere,dome,cylinder}` and replace them with a hollow parameter to each function. * Add helpers to reduce code duplication. * Renamed `Chat Commands.md` to `ChatCommands.md`.
163 lines
4.8 KiB
Lua
163 lines
4.8 KiB
Lua
worldedit.marker1 = {}
|
|
worldedit.marker2 = {}
|
|
worldedit.marker_region = {}
|
|
|
|
--marks worldedit region position 1
|
|
worldedit.mark_pos1 = function(name)
|
|
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
|
|
|
|
if pos1 ~= nil then
|
|
--make area stay loaded
|
|
local manip = minetest.get_voxel_manip()
|
|
manip:read_from_map(pos1, pos1)
|
|
end
|
|
if worldedit.marker1[name] ~= nil then --marker already exists
|
|
worldedit.marker1[name]:remove() --remove marker
|
|
worldedit.marker1[name] = nil
|
|
end
|
|
if pos1 ~= nil then
|
|
--add marker
|
|
worldedit.marker1[name] = minetest.add_entity(pos1, "worldedit:pos1")
|
|
if worldedit.marker1[name] ~= nil then
|
|
worldedit.marker1[name]:get_luaentity().player_name = name
|
|
end
|
|
end
|
|
worldedit.mark_region(name)
|
|
end
|
|
|
|
--marks worldedit region position 2
|
|
worldedit.mark_pos2 = function(name)
|
|
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
|
|
|
|
if pos2 ~= nil then
|
|
--make area stay loaded
|
|
local manip = minetest.get_voxel_manip()
|
|
manip:read_from_map(pos2, pos2)
|
|
end
|
|
if worldedit.marker2[name] ~= nil then --marker already exists
|
|
worldedit.marker2[name]:remove() --remove marker
|
|
worldedit.marker2[name] = nil
|
|
end
|
|
if pos2 ~= nil then
|
|
--add marker
|
|
worldedit.marker2[name] = minetest.add_entity(pos2, "worldedit:pos2")
|
|
if worldedit.marker2[name] ~= nil then
|
|
worldedit.marker2[name]:get_luaentity().player_name = name
|
|
end
|
|
end
|
|
worldedit.mark_region(name)
|
|
end
|
|
|
|
worldedit.mark_region = function(name)
|
|
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
|
|
|
|
if worldedit.marker_region[name] ~= nil then --marker already exists
|
|
--wip: make the area stay loaded somehow
|
|
for _, entity in ipairs(worldedit.marker_region[name]) do
|
|
entity:remove()
|
|
end
|
|
worldedit.marker_region[name] = nil
|
|
end
|
|
if pos1 ~= nil and pos2 ~= nil then
|
|
local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
|
|
local thickness = 0.2
|
|
local sizex, sizey, sizez = (1 + pos2.x - pos1.x) / 2, (1 + pos2.y - pos1.y) / 2, (1 + pos2.z - pos1.z) / 2
|
|
|
|
--make area stay loaded
|
|
local manip = minetest.get_voxel_manip()
|
|
manip:read_from_map(pos1, pos2)
|
|
|
|
local markers = {}
|
|
|
|
--XY plane markers
|
|
for _, z in ipairs({pos1.z - 0.5, pos2.z + 0.5}) do
|
|
local marker = minetest.add_entity({x=pos1.x + sizex - 0.5, y=pos1.y + sizey - 0.5, z=z}, "worldedit:region_cube")
|
|
marker:set_properties({
|
|
visual_size={x=sizex * 2, y=sizey * 2},
|
|
collisionbox = {-sizex, -sizey, -thickness, sizex, sizey, thickness},
|
|
})
|
|
marker:get_luaentity().player_name = name
|
|
table.insert(markers, marker)
|
|
end
|
|
|
|
--YZ plane markers
|
|
for _, x in ipairs({pos1.x - 0.5, pos2.x + 0.5}) do
|
|
local marker = minetest.add_entity({x=x, y=pos1.y + sizey - 0.5, z=pos1.z + sizez - 0.5}, "worldedit:region_cube")
|
|
marker:set_properties({
|
|
visual_size={x=sizez * 2, y=sizey * 2},
|
|
collisionbox = {-thickness, -sizey, -sizez, thickness, sizey, sizez},
|
|
})
|
|
marker:setyaw(math.pi / 2)
|
|
marker:get_luaentity().player_name = name
|
|
table.insert(markers, marker)
|
|
end
|
|
|
|
worldedit.marker_region[name] = markers
|
|
end
|
|
end
|
|
|
|
minetest.register_entity(":worldedit:pos1", {
|
|
initial_properties = {
|
|
visual = "cube",
|
|
visual_size = {x=1.1, y=1.1},
|
|
textures = {"worldedit_pos1.png", "worldedit_pos1.png",
|
|
"worldedit_pos1.png", "worldedit_pos1.png",
|
|
"worldedit_pos1.png", "worldedit_pos1.png"},
|
|
collisionbox = {-0.55, -0.55, -0.55, 0.55, 0.55, 0.55},
|
|
physical = false,
|
|
},
|
|
on_step = function(self, dtime)
|
|
if worldedit.marker1[self.player_name] == nil then
|
|
self.object:remove()
|
|
end
|
|
end,
|
|
on_punch = function(self, hitter)
|
|
self.object:remove()
|
|
worldedit.marker1[self.player_name] = nil
|
|
end,
|
|
})
|
|
|
|
minetest.register_entity(":worldedit:pos2", {
|
|
initial_properties = {
|
|
visual = "cube",
|
|
visual_size = {x=1.1, y=1.1},
|
|
textures = {"worldedit_pos2.png", "worldedit_pos2.png",
|
|
"worldedit_pos2.png", "worldedit_pos2.png",
|
|
"worldedit_pos2.png", "worldedit_pos2.png"},
|
|
collisionbox = {-0.55, -0.55, -0.55, 0.55, 0.55, 0.55},
|
|
physical = false,
|
|
},
|
|
on_step = function(self, dtime)
|
|
if worldedit.marker2[self.player_name] == nil then
|
|
self.object:remove()
|
|
end
|
|
end,
|
|
on_punch = function(self, hitter)
|
|
self.object:remove()
|
|
worldedit.marker2[self.player_name] = nil
|
|
end,
|
|
})
|
|
|
|
minetest.register_entity(":worldedit:region_cube", {
|
|
initial_properties = {
|
|
visual = "upright_sprite",
|
|
visual_size = {x=1.1, y=1.1},
|
|
textures = {"worldedit_cube.png"},
|
|
visual_size = {x=10, y=10},
|
|
physical = false,
|
|
},
|
|
on_step = function(self, dtime)
|
|
if worldedit.marker_region[self.player_name] == nil then
|
|
self.object:remove()
|
|
return
|
|
end
|
|
end,
|
|
on_punch = function(self, hitter)
|
|
for _, entity in ipairs(worldedit.marker_region[self.player_name]) do
|
|
entity:remove()
|
|
end
|
|
worldedit.marker_region[self.player_name] = nil
|
|
end,
|
|
})
|
|
|