From d7f328c65bff2d7107c9bdbe3370d4bea6492811 Mon Sep 17 00:00:00 2001 From: VorTechnix <45538536+VorTechnix@users.noreply.github.com> Date: Mon, 17 May 2021 18:47:34 -0700 Subject: [PATCH 1/2] Revert "Update torus.lua" This reverts commit 35eeb918d0a7f3805b8bd58f2ccdeb19ecfe66d4. --- worldeditadditions/lib/torus.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worldeditadditions/lib/torus.lua b/worldeditadditions/lib/torus.lua index 6648750..6b27f46 100644 --- a/worldeditadditions/lib/torus.lua +++ b/worldeditadditions/lib/torus.lua @@ -1,4 +1,4 @@ ---- Overlap command. Places a specified node on top of +--- Overlap command. Places a specified node on top of -- @module worldeditadditions.overlay --- Generates a torus shape at the given position with the given parameters. @@ -56,7 +56,7 @@ function worldeditadditions.torus(position, major_radius, minor_radius, target_n -- Where: -- (x, y, z) is the point -- a is the major radius (centre to centre of circle) - -- b is the minor radius (radius of circle) + -- b is the minor radius (radius of circle local comp_a = (x_sq+y_sq+z_sq - (major_radius_sq+minor_radius_sq)) local test_value = comp_a*comp_a - 4*major_radius*minor_radius*(minor_radius_sq-z_sq) From 7defe829c3b013ed004b81d91f5ab89813f40497 Mon Sep 17 00:00:00 2001 From: VorTechnix <45538536+VorTechnix@users.noreply.github.com> Date: Mon, 17 May 2021 18:49:07 -0700 Subject: [PATCH 2/2] Revert "Merge branch 'main' of https://github.com/sbrl/Minetest-WorldEditAdditions into main" This reverts commit d9069b3cfa9cc45229d510b0080856df7b62a0dc, reversing changes made to 35eeb918d0a7f3805b8bd58f2ccdeb19ecfe66d4. --- CHANGELOG.md | 12 ++-- Chat-Command-Reference.md | 18 +----- worldeditadditions/lib/torus.lua | 25 +------- .../commands/bonemeal.lua | 2 +- .../commands/replacemix.lua | 14 ++--- .../commands/torus.lua | 62 +++++++------------ 6 files changed, 37 insertions(+), 96 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09b4d8d..ea0d243 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,10 @@ Note to self: See the bottom of this file for the release template text. - Add `//spush`, `//spop`, and `//sstack` - `//overlay`: Don't place nodes above water - `//multi`: Improve resilience by handling some edge cases - - Add `//srect` (_select rectangle_), `//scol` (_select column_), `//scube` (_select cube_) - thanks, @VorTechnix! - - Add `//scloud` (_select point cloud_), `//scentre` (_select centre node(s)_), `//srel` (_select relative_) - thanks, @VorTechnix! - - Significantly refactored backend utility functions (more to come in future updates) - - `//bonemeal`: Try bonemealing everything that isn't an air block (#49) - - Add new universal chance parsing - - Any `` can now either be a 1-in-N number (e.g. `4`, `10`), or a percentage chance (e.g. `50%`, `10%`). - - Caveat: Percentages are converted to a 1-in-N chance, but additionally that number is rounded down in some places - - `//torus`, `//hollowtorus`: Add optional new axes argument +- Add `//srect` (_select rectangle_), `//scol` (_select column_), `//scube` (_select cube_) - thanks, @VorTechnix! +- Add `//scloud` (_select point cloud_), `//scentre` (_select centre node(s)_), `//srel` (_select relative_) - thanks, @VorTechnix! +- Significantly refactored backend utility functions (more to come in future updates) +- `//bonemeal`: Try bonemealing everything that isn't an air block (#49) ## v1.11: The big data update (25th January 2021) diff --git a/Chat-Command-Reference.md b/Chat-Command-Reference.md index 5dfe97f..705e8d2 100644 --- a/Chat-Command-Reference.md +++ b/Chat-Command-Reference.md @@ -37,7 +37,6 @@ Note also that columns without any air nodes in them at all are also skipped, so //overlay grass_with_dirt 10 dirt //overlay grass_with_dirt 10 dirt 2 sand 1 //overlay sandstone dirt 2 sand 5 -//overlay dirt 90% stone 10% ``` ## `//layers [ []] [ []] ...` @@ -124,15 +123,12 @@ Creates a hollow ellipsoid at position 1 with the radius `(rx, ry, rz)`. Works t //hollowellipsoid 21 11 41 stone ``` -## `//torus []` +## `//torus ` Creates a solid torus at position 1 with the specified major and minor radii. The major radius is the distance from the centre of the torus to the centre of the circle bit, and the minor radius is the radius of the circle bit. -The optional axes sets the axes upon which the torus will lay flat. Possible values: `xy` (the default), `xz`, `yz`. - ``` //torus 15 5 stone //torus 5 3 meselamp -//hollowtorus 10 6 sandstone xz ``` ## `//hollowtorus ` @@ -141,7 +137,6 @@ Creates a hollow torus at position 1 with the radius major and minor radii. Work ``` //hollowtorus 10 5 glass //hollowtorus 21 11 stone -//hollowtorus 18 6 dirt xz ``` ## `//line [ []]` @@ -217,15 +212,12 @@ Also optionally takes a chance number. This is the chance that an eligible node For example, a chance number of 2 would mean a 50% chance that any given eligible node will get bonemealed. A chance number of 16 would be a 6.25% chance, and a chance number of 25 would be 2%. -Since WorldEditAdditions v1.12, a percentage chance is also supported. This is denoted by suffixing a number with a percent sign (e.g. `//bonemeal 1 25%`). - ``` //bonemeal //bonemeal 3 25 //bonemeal 4 //bonemeal 1 10 //bonemeal 2 15 -//bonemeal 2 10% ``` ## `//walls ` @@ -358,14 +350,6 @@ If we wanted to put all of the above features together into a single command, th The above replaces 1 in 3 `dirt` nodes with a mix of `sandstone`, `dry_dirt`, and `cobble` nodes in the ratio 10:1:2. Awesome! -Since WorldEditAdditions v1.12, you can also use percentages: - -``` -//replacemix dirt 33% sandstone 75% dry_dirt 10% cobble 15% -``` - -Note though that the percentages are internally converted to a 1-in-N chance and rounded down. - Here are all the above examples together: ``` diff --git a/worldeditadditions/lib/torus.lua b/worldeditadditions/lib/torus.lua index 6b27f46..df4734f 100644 --- a/worldeditadditions/lib/torus.lua +++ b/worldeditadditions/lib/torus.lua @@ -1,16 +1,7 @@ --- Overlap command. Places a specified node on top of -- @module worldeditadditions.overlay ---- Generates a torus shape at the given position with the given parameters. --- @param position Vector The position at which to generate the torus. --- @param major_radius number The major radius of the torus - i.e. the distance from the middle to the ring. --- @param minor_radius number The minor radius of the torus - i.e. the radius fo the ring itself. --- @param target_node string The name of the target node to generate the torus with. --- @param axes=xz string|nil The axes upon which the torus should lay flat. --- @param hollow=false boolean Whether the generated torus should be hollow or not. -function worldeditadditions.torus(position, major_radius, minor_radius, target_node, axes, hollow) - if type(axes) ~= "string" then axes = "xz" end - +function worldeditadditions.torus(position, major_radius, minor_radius, target_node, hollow) -- position = { x, y, z } local total_radius = major_radius + minor_radius local inner_minor_radius = minor_radius - 2 @@ -20,7 +11,6 @@ function worldeditadditions.torus(position, major_radius, minor_radius, target_n -- Fetch the nodes in the specified area -- OPTIMIZE: We should be able to calculate a more efficient box-area here - -- This is complicated by the multiple possible axes though local manip, area = worldedit.manip_helpers.init_radius(position, total_radius) local data = manip:get_data() @@ -43,15 +33,6 @@ function worldeditadditions.torus(position, major_radius, minor_radius, target_n for x = -total_radius, total_radius do local x_sq = x*x - local sq = vector.new(x_sq, y_sq, z_sq) - - -- Default: xy - if axes == "xz" then - sq.x, sq.y, sq.z = sq.x, sq.z, sq.y - elseif axes == "yz" then - sq.x, sq.y, sq.z = sq.y, sq.z, sq.x - end - -- (x^2+y^2+z^2-(a^2+b^2))^2-4 a b (b^2-z^2) -- Where: -- (x, y, z) is the point @@ -66,8 +47,8 @@ function worldeditadditions.torus(position, major_radius, minor_radius, target_n if not place_ok then -- It must be hollow! Do some additional calculations. - local inner_comp_a = (sq.x+sq.y+sq.z - (major_radius_sq+inner_minor_radius_sq)) - local inner_test_value = inner_comp_a*inner_comp_a - 4*major_radius*inner_minor_radius*(inner_minor_radius_sq-sq.z) + local inner_comp_a = (x_sq+y_sq+z_sq - (major_radius_sq+inner_minor_radius_sq)) + local inner_test_value = inner_comp_a*inner_comp_a - 4*major_radius*inner_minor_radius*(inner_minor_radius_sq-z_sq) -- It's only ok to place it if it's outside our inner torus place_ok = inner_test_value >= 0 diff --git a/worldeditadditions_commands/commands/bonemeal.lua b/worldeditadditions_commands/commands/bonemeal.lua index 088780f..4223115 100644 --- a/worldeditadditions_commands/commands/bonemeal.lua +++ b/worldeditadditions_commands/commands/bonemeal.lua @@ -27,7 +27,7 @@ worldedit.register_command("bonemeal", { end end if #parts >= 2 then - chance = worldeditadditions.parse.chance(parts[2]) + chance = tonumber(parts[2]) if not chance then return false, "Invalid chance value (must be a positive integer)" end diff --git a/worldeditadditions_commands/commands/replacemix.lua b/worldeditadditions_commands/commands/replacemix.lua index 5eaa61a..965cd2c 100644 --- a/worldeditadditions_commands/commands/replacemix.lua +++ b/worldeditadditions_commands/commands/replacemix.lua @@ -1,4 +1,4 @@ -local wea = worldeditadditions +local we_c = worldeditadditions_commands -- ██████ ███████ ██████ ██ █████ ██████ ███████ ███ ███ ██ ██ ██ -- ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ████ ████ ██ ██ ██ @@ -15,7 +15,7 @@ worldedit.register_command("replacemix", { return false, "Error: No arguments specified" end - local parts = wea.split(params_text, "%s+", false) + local parts = worldeditadditions.split(params_text, "%s+", false) local target_node = nil local target_node_chance = 1 @@ -30,16 +30,16 @@ worldedit.register_command("replacemix", { return false, "Error: Invalid target_node name" end mode = "target_chance" - elseif mode == "target_chance" and wea.parse.chance(part) then - target_node_chance = wea.parse.chance(part) + elseif mode == "target_chance" and tonumber(part) then + target_node_chance = tonumber(part) mode = "replace_node" - elseif (mode == "target_chance" and not wea.parse.chance(part, "weight")) or mode == "replace_node" then + elseif (mode == "target_chance" and not tonumber(part)) or mode == "replace_node" then mode = "replace_node" - if wea.parse.chance(part, "weight") then + if tonumber(part) then if not last_node_name then return false, "Error: No previous node name was found (this is a probably a bug)." end - replace_nodes[last_node_name] = math.floor(wea.parse.chance(part, "weight")) + replace_nodes[last_node_name] = math.floor(tonumber(part)) else if last_node_name and not replace_nodes[last_node_name] then replace_nodes[last_node_name] = 1 diff --git a/worldeditadditions_commands/commands/torus.lua b/worldeditadditions_commands/commands/torus.lua index e9bf88c..0d6d4a7 100644 --- a/worldeditadditions_commands/commands/torus.lua +++ b/worldeditadditions_commands/commands/torus.lua @@ -4,53 +4,33 @@ -- ██ ██ ██ ██ ██ ██ ██ ██ -- ██ ██████ ██ ██ ██████ ███████ local function parse_params_torus(params_text) - local parts = worldeditadditions.split(params_text, "%s+", false) + local found, _, major_radius, minor_radius, replace_node = params_text:find("([0-9]+)%s+([0-9]+)%s+([a-z:_\\-]+)") - if #parts < 1 then - return false, "Error: No replace_node specified." - end - if #parts < 2 then - return false, "Error: No major radius specified (expected integer greater than 0)." - end - if #parts < 3 then - return false, "Error: No minor radius specified (expected integer greater than 0)." + if found == nil then + return nil, nil end - local major_radius = tonumber(parts[1]) - local minor_radius = tonumber(parts[2]) - local replace_node = worldedit.normalize_nodename(parts[3]) - local axes - if #parts > 3 then axes = parts[4] end - if not axes then axes = "xy" end + major_radius = tonumber(major_radius) + minor_radius = tonumber(minor_radius) + + replace_node = worldedit.normalize_nodename(replace_node) - if major_radius < 1 then - return false, "Error: The major radius must be greater than 0." - end - if minor_radius < 1 then - return false, "Error: The minor radius must be greater than 0." - end if not replace_node then - return false, "Error: Invalid node name." + return false, "Error: Invalid replace_node." end - if axes:find("[^xyz]") then - return false, "Error: The axes may only contain the letters x, y, and z." + if not major_radius or major_radius < 1 then + return false, "Error: Invalid major radius (expected integer greater than 0)" end - if #axes ~= 2 then - return false, "Error: Exactly 2 axes must be specified. For example, 'xy' is valid, but 'xyy' is not (both of course without quotes)." + if not minor_radius or minor_radius < 1 then + return false, "Error: Invalid minor radius (expected integer greater than 0)" end - - -- Sort the axis names (this is important to ensure we can identify the direction properly) - if axes == "yx" then axes = "xy" end - if axes == "zx" then axes = "xz" end - if axes == "zy" then axes = "yz" end - - return true, replace_node, major_radius, minor_radius, axes + return true, replace_node, major_radius, minor_radius end worldedit.register_command("torus", { - params = " []", - description = "Creates a 3D torus with a major radius of and a minor radius of at pos1, filled with , on axes (i.e. 2 axis names: xz, zy, etc).", + params = " ", + description = "Creates a 3D torus with a major radius of and a minor radius of at pos1, filled with .", privs = { worldedit = true }, require_pos = 1, parse = function(params_text) @@ -60,9 +40,9 @@ worldedit.register_command("torus", { nodes_needed = function(name, target_node, major_radius, minor_radius) return math.ceil(2 * math.pi*math.pi * major_radius * minor_radius*minor_radius) end, - func = function(name, target_node, major_radius, minor_radius, axes) + func = function(name, target_node, major_radius, minor_radius) local start_time = worldeditadditions.get_ms_time() - local replaced = worldeditadditions.torus(worldedit.pos1[name], major_radius, minor_radius, target_node, axes, false) + local replaced = worldeditadditions.torus(worldedit.pos1[name], major_radius, minor_radius, target_node, false) local time_taken = worldeditadditions.get_ms_time() - start_time minetest.log("action", name .. " used //torus at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. ", replacing " .. replaced .. " nodes in " .. time_taken .. "s") @@ -72,20 +52,20 @@ worldedit.register_command("torus", { -- TODO: This duplicates a lot of code. Perhaps we can trim it down a bit? worldedit.register_command("hollowtorus", { - params = " []", - description = "Creates a 3D hollow torus with a major radius of and a minor radius of at pos1, made out of , on axes (i.e. 2 axis names: xz, zy, etc).", + params = " ", + description = "Creates a 3D hollow torus with a major radius of and a minor radius of at pos1, made out of .", privs = { worldedit = true }, require_pos = 1, parse = function(params_text) local values = {parse_params_torus(params_text)} return unpack(values) end, - nodes_needed = function(name, target_node, major_radius, minor_radius, axes) + nodes_needed = function(name, target_node, major_radius, minor_radius) return math.ceil(2 * math.pi*math.pi * major_radius * minor_radius*minor_radius) end, func = function(name, target_node, major_radius, minor_radius) local start_time = worldeditadditions.get_ms_time() - local replaced = worldeditadditions.torus(worldedit.pos1[name], major_radius, minor_radius, target_node, axes, true) + local replaced = worldeditadditions.torus(worldedit.pos1[name], major_radius, minor_radius, target_node, true) local time_taken = worldeditadditions.get_ms_time() - start_time minetest.log("action", name .. " used //hollowtorus at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. ", replacing " .. replaced .. " nodes in " .. time_taken .. "s")