FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-18 15:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(zones): correct zone data types (#729)

Browse Source
This commit is contained in:
ANTOND.
2025-03-13 08:17:10 +01:00
committed by GitHub
parent 39ec1d3df5
commit 2a8ce3f4b0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
imports/zones/shared.lua
View File

@@ -1,7 +1,6 @@
local glm = require 'glm' local glm = require 'glm'
---@class ZoneProperties ---@class ZoneProperties
---@field coords vector3
---@field debug? boolean ---@field debug? boolean
---@field debugColour? vector4 ---@field debugColour? vector4
---@field onEnter fun(self: CZone)? ---@field onEnter fun(self: CZone)?
@@ -343,6 +342,7 @@ lib.zones = {}
---@class PolyZone : ZoneProperties ---@class PolyZone : ZoneProperties
---@field points vector3[] ---@field points vector3[]
---@field thickness? number
---@param data PolyZone ---@param data PolyZone
---@return CZone ---@return CZone
@@ -422,9 +422,9 @@ function lib.zones.poly(data)
end end
---@class BoxZone : ZoneProperties ---@class BoxZone : ZoneProperties
---@field size number | vector3 ---@field coords vector3
---@field thickness? number ---@field size? vector3
---@field rotation? vector4 ---@field rotation? number | vector3 | vector4 | matrix
---@param data BoxZone ---@param data BoxZone
---@return CZone ---@return CZone
@@ -432,7 +432,7 @@ function lib.zones.box(data)
data.id = #Zones + 1 data.id = #Zones + 1
data.coords = convertToVector(data.coords) data.coords = convertToVector(data.coords)
data.size = data.size and convertToVector(data.size) / 2 or vec3(2) data.size = data.size and convertToVector(data.size) / 2 or vec3(2)
data.thickness = data.size.z * 2 or 4 data.thickness = data.size.z * 2
data.rotation = quat(data.rotation or 0, vec3(0, 0, 1)) data.rotation = quat(data.rotation or 0, vec3(0, 0, 1))
data.__type = 'box' data.__type = 'box'
data.width = data.size.x * 2 data.width = data.size.x * 2
@@ -448,6 +448,7 @@ function lib.zones.box(data)
end end
---@class SphereZone : ZoneProperties ---@class SphereZone : ZoneProperties
---@field coords vector3
---@field radius? number ---@field radius? number
---@param data SphereZone ---@param data SphereZone