Skip to content

feat(api): support arrays for offset/coords #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FjamZoo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(api): support arrays for offset/coords #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions client/api.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,12 @@ local function addOptions(target, options, resource, bonesTarget, offsetsTarget)
local offset = option[offsetKey]
local offsetType = type(offset)

if offsetType == 'table' and offset.x and offset.y and offset.z then
offset = vec3(offset.x, offset.y, offset.z)
if offsetType == 'table' then
if table.type(offset) == 'array' and #offset == 3 then
offset = vec3(offset[1], offset[2], offset[3])
elseif offset.x and offset.y and offset.z then
offset = vec3(offset.x, offset.y, offset.z)
end
end

if offsetType ~= 'table' and offsetType ~= 'vector3' then
Expand Down Expand Up @@ -184,8 +188,12 @@ function interact.addCoords(coords, options)
typeError('coords', 'vector3 or vector3[]', coordsType)
end

if coordsType == "table" and coords.x and coords.y and coords.z then
coords = { vector3(coords.x, coords.y, coords.z) }
if coordsType == "table" then
if table.type(coords) == 'array' and type(coords[1]) ~= 'vector3' and #coords == 3 then
coords = { vector3(coords[1], coords[2], coords[3]) }
elseif coords.x and coords.y and coords.z then
coords = { vector3(coords.x, coords.y, coords.z) }
end
end

if coordsType ~= "table" then
Expand Down