sbrl-github/Minetest-WorldEditAdditions
1
0
Fork 0
mirror of https://github.com/sbrl/Minetest-WorldEditAdditions.git synced 2024-09-28 16:15:57 +00:00
Code Issues Releases Wiki Activity

rename new parse functions

Browse source
This commit is contained in:
VorTechnix 2023-07-14 17:35:19 -07:00
parent 714716ff32
commit b68dd2a387
No known key found for this signature in database
GPG key ID: 091E91A69545D5BA
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
worldeditadditions_core/utils/parse/axes_parser.lua
View file

@ -135,6 +135,8 @@ function parse.vectorize(axes,value,sign)
return ret return ret
end end
--- Converts Unified Axis Keyword table into Vector3 instances. --- Converts Unified Axis Keyword table into Vector3 instances.
-- @param: tbl: Table: Keyword table to parse -- @param: tbl: Table: Keyword table to parse
-- @param: facing: Table: Output from worldeditadditions_core.player_dir(name) -- @param: facing: Table: Output from worldeditadditions_core.player_dir(name)
@ -216,7 +218,11 @@ function parse.keytable(tbl, facing, sum)
self.axis, self.sign = "", 1 self.axis, self.sign = "", 1
end end
local function processNumber(num, axes, sign) --- Processes a number and adds it to the min and max vectors.
-- @param num The number to process.
-- @param axes The axes to apply the number to.
-- @param sign The sign of the number.
local function parseNumber(num, axes, sign)
if num * sign >= 0 then if num * sign >= 0 then
max = max:add(parse.vectorize(axes, num, sign)) max = max:add(parse.vectorize(axes, num, sign))
else else
@ -233,7 +239,7 @@ function parse.keytable(tbl, facing, sum)
if expected == 1 then if expected == 1 then
if tmp.num then if tmp.num then
processNumber(tmp.num, {"x", "y", "z"}, tmp.sign) parseNumber(tmp.num, {"x", "y", "z"}, tmp.sign)
else else
local key_type, key_entry, key_sign = parse.keyword(v) local key_type, key_entry, key_sign = parse.keyword(v)
@ -253,7 +259,7 @@ function parse.keytable(tbl, facing, sum)
end end
else else
if tmp.num then if tmp.num then
processNumber(tmp.num, tmp.axes, tmp.sign) parseNumber(tmp.num, tmp.axes, tmp.sign)
expected = 1 expected = 1
else else
return false, "Error: Expected number after \""..tostring(tbl[i-1]).."\". Got \""..tostring(v).."\"." return false, "Error: Expected number after \""..tostring(tbl[i-1]).."\". Got \""..tostring(v).."\"."

4
worldeditadditions_core/utils/parse/init.lua
View file

@ -12,8 +12,8 @@ local uak_parse = dofile(wea_c.modpath.."/utils/parse/axes_parser.lua")
local axes = dofile(wea_c.modpath.."/utils/parse/axes.lua") local axes = dofile(wea_c.modpath.."/utils/parse/axes.lua")
wea_c.parse = { wea_c.parse = {
direction_keyword = uak_parse.keyword, axis_name = uak_parse.keyword,
directions = uak_parse.keytable, axes_multi = uak_parse.keytable,
-- Old parse functions (marked for deprecation). -- Old parse functions (marked for deprecation).
-- Use parse.keytable or parse.keyword instead -- Use parse.keytable or parse.keyword instead
axes = axes.parse_axes, axes = axes.parse_axes,