FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-17 06:56:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(client/marker): add marker options (#520)

Browse Source 
add BobUpAndDown, FaceCamera, Rotate, Texture for markers
This commit is contained in:
GiroudMathias
2024-03-18 08:52:34 +01:00
committed by GitHub
parent 2190cd32f4
commit f4d43e533d
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
imports/marker/client.lua
View File

@@ -5,6 +5,11 @@ local defaultRotation = vector3(0, 0, 0)
local defaultDirection = vector3(0, 0, 0) local defaultDirection = vector3(0, 0, 0)
local defaultColor = { r = 255, g = 255, b = 255, a = 100 } local defaultColor = { r = 255, g = 255, b = 255, a = 100 }
local defaultSize = { width = 2, height = 1 } local defaultSize = { width = 2, height = 1 }
local defaultBobUpAndDown = false
local defaultFaceCamera = true
local defaultRotate = false
local defaultTextureDict = nil
local defaultTextureName = nil
local markerTypesMap = { local markerTypesMap = {
UpsideDownCone = 0, UpsideDownCone = 0,
@@ -107,6 +112,11 @@ local markerTypesMap = {
---@field color? { r: number, g: number, b: number, a: number } ---@field color? { r: number, g: number, b: number, a: number }
---@field rotation? { x: number, y: number, z: number } ---@field rotation? { x: number, y: number, z: number }
---@field direction? { x: number, y: number, z: number } ---@field direction? { x: number, y: number, z: number }
---@field bobUpAndDown? boolean
---@field faceCamera? boolean
---@field rotate? boolean
---@field textureDict? string
---@field textureName? string
---@param self MarkerProps ---@param self MarkerProps
local function drawMarker(self) local function drawMarker(self)
@@ -117,7 +127,7 @@ local function drawMarker(self)
self.rotation.x, self.rotation.y, self.rotation.z, self.rotation.x, self.rotation.y, self.rotation.z,
self.width, self.width, self.height, self.width, self.width, self.height,
self.color.r, self.color.g, self.color.b, self.color.a, self.color.r, self.color.g, self.color.b, self.color.a,
false, true, 2, false, nil, nil, false) self.bobUpAndDown, self.faceCamera, 2, self.rotate, self.textureDict, self.textureName, false)
end end
---@param options MarkerProps ---@param options MarkerProps
@@ -142,6 +152,11 @@ function lib.marker.new(options)
self.height = options.height or defaultSize.height self.height = options.height or defaultSize.height
self.rotation = options.rotation or defaultRotation self.rotation = options.rotation or defaultRotation
self.direction = options.direction or defaultDirection self.direction = options.direction or defaultDirection
self.bobUpAndDown = options.bobUpAndDown or defaultBobUpAndDown
self.faceCamera = options.faceCamera or defaultFaceCamera
self.rotate = options.rotate or defaultRotate
self.textureDict = options.textureDict or defaultTextureDict
self.textureName = options.textureName or defaultTextureName
self.draw = drawMarker self.draw = drawMarker
self.width += 0.0 self.width += 0.0