Merge pull request #88 from JericoFX/dev

A set of changes Dui + Cleaning
This commit is contained in:
MrNewb authored and GitHub committed 2025-05-11 19:43:40 -04:00
commit 2f68a092d5
7 files changed
+681 -260

No files matched your search

+226 -189
View File
@@ -1,112 +1,158 @@
-- Cutscene Manager for FiveM
-- Handles cutscene loading, playback, and character management
---@class Cutscene
Cutscenes = Cutscenes or {}
Cutscene = Cutscene or {}
Cutscene.done = true
local names = {
{male = 'MP_1'},
{male = 'MP_2'},
{male = 'MP_3'},
{male = 'MP_4'},
{male = 'MP_Male_Character', female = 'MP_Female_Character'},
{male = 'MP_Male_Character_1', female = 'MP_Female_Character_1'},
{male = 'MP_Male_Character_2', female = 'MP_Female_Character_2'},
{male = 'MP_Male_Character_3', female = 'MP_Female_Character_3'},
{male = 'MP_Male_Character_4', female = 'MP_Female_Character_4'},
{male = 'MP_Plane_Passenger_1'},
{male = 'MP_Plane_Passenger_2'},
{male = 'MP_Plane_Passenger_3'},
{male = 'MP_Plane_Passenger_4'},
{male = 'MP_Plane_Passenger_5'},
{male = 'MP_Plane_Passenger_6'},
{male = 'MP_Plane_Passenger_7'},
{male = 'MP_Plane_Passenger_8'},
{male = 'MP_Plane_Passenger_9'},
-- Constants
local LOAD_TIMEOUT <const> = 10000
local FADE_DURATION <const> = 1000
local CUTSCENE_WAIT <const> = 1000
-- Character model definitions
local characterTags <const> = {
{ male = 'MP_1' },
{ male = 'MP_2' },
{ male = 'MP_3' },
{ male = 'MP_4' },
{ male = 'MP_Male_Character', female = 'MP_Female_Character' },
{ male = 'MP_Male_Character_1', female = 'MP_Female_Character_1' },
{ male = 'MP_Male_Character_2', female = 'MP_Female_Character_2' },
{ male = 'MP_Male_Character_3', female = 'MP_Female_Character_3' },
{ male = 'MP_Male_Character_4', female = 'MP_Female_Character_4' },
{ male = 'MP_Plane_Passenger_1' },
{ male = 'MP_Plane_Passenger_2' },
{ male = 'MP_Plane_Passenger_3' },
{ male = 'MP_Plane_Passenger_4' },
{ male = 'MP_Plane_Passenger_5' },
{ male = 'MP_Plane_Passenger_6' },
{ male = 'MP_Plane_Passenger_7' },
{ male = 'MP_Plane_Passenger_8' },
{ male = 'MP_Plane_Passenger_9' },
}
function Cutscene.GetTags(cutscene)
if not Cutscene.Load(cutscene) then return end
StartCutscene(0)
Wait(1000)
local tags = {}
for k, tag in pairs(names) do
if DoesCutsceneEntityExist(tag.male, 0) or DoesCutsceneEntityExist(tag.female, 0) then
table.insert(tags, tag)
end
-- Component definitions for character customization
local componentsToSave <const> = {
-- Components
{ name = "head", id = 0, type = "drawable" },
{ name = "beard", id = 1, type = "drawable" },
{ name = "hair", id = 2, type = "drawable" },
{ name = "arms", id = 3, type = "drawable" },
{ name = "pants", id = 4, type = "drawable" },
{ name = "parachute", id = 5, type = "drawable" },
{ name = "feet", id = 6, type = "drawable" },
{ name = "accessories", id = 7, type = "drawable" },
{ name = "undershirt", id = 8, type = "drawable" },
{ name = "vest", id = 9, type = "drawable" },
{ name = "decals", id = 10, type = "drawable" },
{ name = "jacket", id = 11, type = "drawable" },
-- Props
{ name = "hat", id = 0, type = "prop" },
{ name = "glasses", id = 1, type = "prop" },
{ name = "ears", id = 2, type = "prop" },
{ name = "watch", id = 3, type = "prop" },
{ name = "bracelet", id = 4, type = "prop" },
{ name = "misc", id = 5, type = "prop" },
{ name = "left_wrist", id = 6, type = "prop" },
{ name = "right_wrist", id = 7, type = "prop" },
{ name = "prop8", id = 8, type = "prop" },
{ name = "prop9", id = 9, type = "prop" },
}
-- Utility Functions
function table.shallow_copy(t)
local t2 = {}
for k, v in pairs(t) do
t2[k] = v
end
StopCutsceneImmediately()
Wait(2000)
return tags
return t2
end
function Cutscene.Load(cutscene)
assert(cutscene, "Cutscene.Load called without a cutscene name.")
if IsPedMale(PlayerPedId()) then
RequestCutsceneWithPlaybackList(cutscene, 31, 8)
else
RequestCutsceneWithPlaybackList(cutscene, 103, 8)
end
local timeout = GetGameTimer() + 10000
while not (HasCutsceneLoaded()) and GetGameTimer() < timeout do
local function WaitForModelLoad(modelHash)
local timeout = GetGameTimer() + LOAD_TIMEOUT
while not HasModelLoaded(modelHash) and GetGameTimer() < timeout do
Wait(0)
end
return HasModelLoaded(modelHash)
end
local function CreatePedFromModel(modelName, coords)
local model = GetHashKey(modelName)
RequestModel(model)
if not WaitForModelLoad(model) then
print("Failed to load model: " .. modelName)
return nil
end
local ped = CreatePed(0, model, coords.x, coords.y, coords.z, 0.0, true, false)
if not DoesEntityExist(ped) then
print("Failed to create ped from model: " .. modelName)
return nil
end
return ped
end
-- Cutscene Core Functions
local function LoadCutscene(cutscene)
assert(cutscene, "Cutscene.Load called without a cutscene name.")
local playbackList = IsPedMale(PlayerPedId()) and 31 or 103
RequestCutsceneWithPlaybackList(cutscene, playbackList, 8)
local timeout = GetGameTimer() + LOAD_TIMEOUT
while not HasCutsceneLoaded() and GetGameTimer() < timeout do
Wait(0)
end
if not HasCutsceneLoaded() then
print("Cutscene failed to load: ", cutscene)
return false
end
return true
end
function Cutscene.SavePedOutfit(ped)
local outfitData = {}
local componentsToSave = {
-- Components
{ name = "head", id = 0, type = "drawable" },
{ name = "beard", id = 1, type = "drawable" },
{ name = "hair", id = 2, type = "drawable" },
{ name = "arms", id = 3, type = "drawable" },
{ name = "pants", id = 4, type = "drawable" },
{ name = "parachute", id = 5, type = "drawable" },
{ name = "feet", id = 6, type = "drawable" },
{ name = "accessories", id = 7, type = "drawable" },
{ name = "undershirt", id = 8, type = "drawable" },
{ name = "vest", id = 9, type = "drawable" },
{ name = "decals", id = 10, type = "drawable" },
{ name = "jacket", id = 11, type = "drawable" },
local function GetCutsceneTags(cutscene)
if not LoadCutscene(cutscene) then return end
-- Props
{ name = "hat", id = 0, type = "prop" },
{ name = "glasses", id = 1, type = "prop" },
{ name = "ears", id = 2, type = "prop" },
{ name = "watch", id = 3, type = "prop" },
{ name = "bracelet", id = 4, type = "prop" },
{ name = "misc", id = 5, type = "prop" },
{ name = "left_wrist", id = 6, type = "prop" },
{ name = "right_wrist", id = 7, type = "prop" },
{ name = "prop8", id = 8, type = "prop" },
{ name = "prop9", id = 9, type = "prop" },
}
StartCutscene(0)
Wait(CUTSCENE_WAIT)
local tags = {}
for _, tag in pairs(characterTags) do
if DoesCutsceneEntityExist(tag.male, 0) or DoesCutsceneEntityExist(tag.female, 0) then
table.insert(tags, tag)
end
end
StopCutsceneImmediately()
Wait(CUTSCENE_WAIT * 2)
return tags
end
-- Character Outfit Management
local function SavePedOutfit(ped)
local outfitData = {}
for _, component in ipairs(componentsToSave) do
if component.type == "drawable" then
local drawable = GetPedDrawableVariation(ped, component.id)
local texture = GetPedTextureVariation(ped, component.id)
local palette = GetPedPaletteVariation(ped, component.id)
outfitData[component.name] = {
id = component.id,
type = component.type,
drawable = drawable,
texture = texture,
palette = palette,
drawable = GetPedDrawableVariation(ped, component.id),
texture = GetPedTextureVariation(ped, component.id),
palette = GetPedPaletteVariation(ped, component.id),
}
elseif component.type == "prop" then
local propIndex = GetPedPropIndex(ped, component.id)
local propTexture = GetPedPropTextureIndex(ped, component.id)
outfitData[component.name] = {
id = component.id,
type = component.type,
propIndex = propIndex,
propTexture = propTexture,
propIndex = GetPedPropIndex(ped, component.id),
propTexture = GetPedPropTextureIndex(ped, component.id),
}
end
end
@@ -114,7 +160,7 @@ function Cutscene.SavePedOutfit(ped)
return outfitData
end
function Cutscene.ApplyPedOutfit(ped, outfitData)
local function ApplyPedOutfit(ped, outfitData)
if not outfitData or type(outfitData) ~= "table" then
print("ApplyPedOutfit: Invalid outfitData provided.")
return
@@ -122,29 +168,40 @@ function Cutscene.ApplyPedOutfit(ped, outfitData)
for componentName, data in pairs(outfitData) do
if data.type == "drawable" then
-- Ensure all values are present before applying
local drawable = data.drawable or 0
local texture = data.texture or 0
local palette = data.palette or 0
SetPedComponentVariation(ped, data.id, drawable, texture, palette)
SetPedComponentVariation(ped, data.id, data.drawable or 0, data.texture or 0, data.palette or 0)
elseif data.type == "prop" then
-- Clear prop if it's marked as not present (-1 index)
if data.propIndex == -1 or data.propIndex == nil then
ClearPedProp(ped, data.id)
else
local propTexture = data.propTexture or 0
SetPedPropIndex(ped, data.id, data.propIndex, propTexture, true)
SetPedPropIndex(ped, data.id, data.propIndex, data.propTexture or 0, true)
end
end
end
end
-- Public Interface
function Cutscene.GetTags(cutscene)
return GetCutsceneTags(cutscene)
end
function Cutscene.Load(cutscene)
return LoadCutscene(cutscene)
end
function Cutscene.SavePedOutfit(ped)
return SavePedOutfit(ped)
end
function Cutscene.ApplyPedOutfit(ped, outfitData)
return ApplyPedOutfit(ped, outfitData)
end
function Cutscene.Create(cutscene, coords, srcs)
local lastCoords = coords or GetEntityCoords(PlayerPedId())
DoScreenFadeOut(0)
local tagsFromCutscene = Cutscene.GetTags(cutscene)
if not Cutscene.Load(cutscene) then
local tagsFromCutscene = GetCutsceneTags(cutscene)
if not LoadCutscene(cutscene) then
print("Cutscene.Create: Failed to load cutscene", cutscene)
DoScreenFadeIn(0)
return false
@@ -152,100 +209,85 @@ function Cutscene.Create(cutscene, coords, srcs)
srcs = srcs or {}
local clothes = {}
local localped = PlayerPedId()
local playersToProcess = {}
table.insert(playersToProcess, { ped = localped, identifier = "localplayer", coords = lastCoords})
for i, src_raw in ipairs(srcs) do
if type(src_raw) == 'number' then
if src_raw and not DoesEntityExist(src_raw) then
local playerPed = GetPlayerPed(GetPlayerFromServerId(src_raw)) -- Assuming GetPlayerPed takes server ID
-- Process players and create necessary peds
local playersToProcess = { { ped = localped, identifier = "localplayer", coords = lastCoords } }
for _, src_raw in ipairs(srcs) do
if type(src_raw) == 'number' then
if src_raw and not DoesEntityExist(src_raw) then
local playerPed = GetPlayerPed(GetPlayerFromServerId(src_raw))
if DoesEntityExist(playerPed) then
local ped = ClonePed(playerPed, false, false, true)
table.insert(playersToProcess, { ped = ped, identifier = "player" })
else
print("Cutscene.Create: Ped for src " .. src_raw .. " does not exist.")
end
else
table.insert(playersToProcess, { ped = src_raw, identifier = "user"}) --developer passed a ped
else
table.insert(playersToProcess, { ped = src_raw, identifier = "user" })
end
elseif type(src_raw) == 'string' then
-- impliment creating a ped by model name
local model = GetHashKey(src_raw)
RequestModel(model)
local timeout = GetGameTimer() + 10000
while not HasModelLoaded(model) and GetGameTimer() < timeout do
Wait(0)
end
if not HasModelLoaded(model) then
print("Cutscene.Create: Failed to load model " .. src_raw)
return false
end
local pos = GetEntityCoords(localped)
local ped = CreatePed(0, model, pos.x, pos.y, pos.z, 0.0, true, false)
if ped and DoesEntityExist(ped) then
local ped = CreatePedFromModel(src_raw, GetEntityCoords(localped))
if ped then
table.insert(playersToProcess, { ped = ped, identifier = 'script' })
else
print("Cutscene.Create: Failed to create ped for src " .. src_raw)
end
elseif type(src_raw) == 'boolean' and src_raw then
print("Cutscene.Create: src_raw is a boolean, creating random ped currently not implimented.")
-- local pos = GetEntityCoords(localped)
-- local ped = CreateRandomPed(pos.x, pos.y, pos.z)
-- if ped and DoesEntityExist(ped)then
-- table.insert(playersToProcess, { ped = ped, identifier = 'script' })
-- else
-- print("Cutscene.Create: Failed to create random ped for src " )
-- end
end
end
local availableTags = {} -- Create a mutable copy of tags
for _, tagName in ipairs(tagsFromCutscene or {}) do
table.insert(availableTags, tagName)
end
-- Process available tags and assign to players
local availableTags = table.shallow_copy(tagsFromCutscene or {})
local usedTags = {}
local cleanupTags = {}
for _, playerData in ipairs(playersToProcess) do
local currentPed = playerData.ped
local isPedMale = IsPedMale(currentPed)
local tagTable = availableTags[1]
if not currentPed or not DoesEntityExist(currentPed) then goto continue end
local tagTable = table.remove(availableTags, 1)
if not tagTable then
print("Cutscene.Create: No available tags for player", playerData.identifier)
break
end
local tag = not isPedMale and tagTable.female or tagTable.male
local unusedTag = nil
if isPedMale and tagTable.female then
unusedTag = isPedMale and tagTable.female or tagTable.male
end
local isPedMale = IsPedMale(currentPed)
local tag = isPedMale and tagTable.male or tagTable.female
local unusedTag = isPedMale and tagTable.female or tagTable.male
SetCutsceneEntityStreamingFlags(tag, 0, 1)
RegisterEntityForCutscene(currentPed, tag, 0, GetEntityModel(currentPed), 64)
SetCutscenePedComponentVariationFromPed(tag, currentPed, 0)
clothes[tag] = { clothing = Cutscene.SavePedOutfit(currentPed), ped = currentPed }
table.insert(usedTags, tag) -- Track used tags
table.insert(cleanupTags, unusedTag) -- Track tags to be cleaned up later
table.remove(availableTags, 1) -- Remove used tag
SetCutscenePedComponentVariationFromPed(tag, currentPed, 0)
clothes[tag] = {
clothing = SavePedOutfit(currentPed),
ped = currentPed
}
table.insert(usedTags, tag)
if unusedTag then table.insert(cleanupTags, unusedTag) end
::continue::
end
-- Clean up unused tags
for _, tag in ipairs(cleanupTags) do
local ped = RegisterEntityForCutscene(0, tag, 3, 0, 64)
NetworkSetEntityInvisibleToNetwork(ped, true)
if ped then
SetEntityVisible(ped, false, false)
end
end
-- Handle remaining unused tags
for _, tag in ipairs(availableTags) do
local ped1 = RegisterEntityForCutscene(0, tag.male, 3, 0, 64)
NetworkSetEntityInvisibleToNetwork(ped1, true)
local ped2 = RegisterEntityForCutscene(0, tag.female, 3, 0, 64)
NetworkSetEntityInvisibleToNetwork(ped2, true)
for _, tagType in pairs({ tag.male, tag.female }) do
if tagType then
local ped = RegisterEntityForCutscene(0, tagType, 3, 0, 64)
if ped then
SetEntityVisible(ped, false, false)
end
end
end
end
local data = {
return {
cutscene = cutscene,
coords = coords,
tags = usedTags,
@@ -253,44 +295,47 @@ function Cutscene.Create(cutscene, coords, srcs)
peds = playersToProcess,
clothes = clothes,
}
Cutscene.done = false
return data
end
function Cutscene.Start(cutsceneData)
DoScreenFadeIn(1000)
Cutscene.done = false
if not cutsceneData then
print("Cutscene.Start: Cutscene data is nil.")
return
end
DoScreenFadeIn(FADE_DURATION)
Cutscene.done = false
local clothes = cutsceneData.clothes
local coords = cutsceneData.coords
if coords then
-- Start cutscene
if coords then
if type(coords) == 'boolean' then
coords = GetEntityCoords(PlayerPedId())
end
StartCutsceneAtCoords(coords.x, coords.y, coords.z, 0 )
StartCutsceneAtCoords(coords.x, coords.y, coords.z, 0)
else
StartCutscene(0)
end
Wait(100)
-- Apply clothing to cutscene characters
for k, datam in pairs(clothes) do
local ped = datam.ped
if DoesEntityExist(ped) then
SetCutscenePedComponentVariationFromPed(k, ped, 0)
Cutscene.ApplyPedOutfit(ped, datam.clothing)
else
print("Cutscene.Create: Ped " .. k .. " does not exist.")
ApplyPedOutfit(ped, datam.clothing)
end
end
local lastCoords = nil
-- Scene loading thread
CreateThread(function()
while not Cutscene.done do
local lastCoords
while not Cutscene.done do
local coords = GetWorldCoordFromScreenCoord(0.5, 0.5)
if not lastCoords or (lastCoords and #(lastCoords - coords) > 100) then
if not lastCoords or #(lastCoords - coords) > 100 then
NewLoadSceneStartSphere(coords.x, coords.y, coords.z, 2000, 0)
lastCoords = coords
end
@@ -298,6 +343,7 @@ function Cutscene.Start(cutsceneData)
end
end)
-- Control blocking thread
CreateThread(function()
while not Cutscene.done do
DisableAllControlActions(0)
@@ -306,43 +352,34 @@ function Cutscene.Start(cutsceneData)
end
end)
while not HasCutsceneFinished() and not Cutscene.done do
-- Main cutscene loop
while not HasCutsceneFinished() and not Cutscene.done do
Wait(0)
if IsDisabledControlJustPressed(0, 200) then
DoScreenFadeOut(1000)
Wait(1000)
DoScreenFadeOut(FADE_DURATION)
Wait(FADE_DURATION)
StopCutsceneImmediately()
Wait(500)
Wait(500)
Cutscene.done = true
break
end
end
DoScreenFadeIn(1000)
-- clean up any peds marked as 'script'
-- Cleanup
DoScreenFadeIn(FADE_DURATION)
for _, playerData in ipairs(cutsceneData.peds) do
local ped = playerData.ped
if ped and DoesEntityExist(ped) and playerData.identifier == 'script' then
if not ped or not DoesEntityExist(ped) then goto continue end
if playerData.identifier == 'script' then
DeleteEntity(ped)
elseif playerData.identifier == 'localplayer' then
SetEntityCoords(ped, playerData.coords.x, playerData.coords.y, playerData.coords.z, false, false, false,
false)
end
if ped and DoesEntityExist(ped) and playerData.identifier == 'localplayer' then
SetEntityCoords(ped, playerData.coords.x, playerData.coords.y, playerData.coords.z)
end
::continue::
end
Cutscene.done = true
end
-- RegisterCommand('cutscene', function(source, args, rawCommand)
-- if not Cutscene.done then return end
-- local cutscene = args[1]
-- if not cutscene then return print("Usage: /cutscene <cutscene_name>") end
-- local cutsceneData = Cutscene.Create(cutscene, nil, {1, 1, 1 })
-- Cutscene.Start(cutsceneData)
-- end, false)
return Cutscene
return Cutscene
+329
View File
@@ -0,0 +1,329 @@
-- DUI (Direct User Interface) Manager for FiveM
-- Basic table-based implementation with full mouse support
---@class DUI
DUI = {}
-- Constants
local DEFAULT_WIDTH <const> = 1280
local DEFAULT_HEIGHT <const> = 720
-- Store active DUI instances
local activeInstances = {}
local instanceCounter = 0
-- Mouse tracking state
local mouseState = {
tracking = false,
activeId = nil,
lastX = 0,
lastY = 0,
isPressed = false,
currentButton = nil
}
-- Mouse button constants
local MOUSE_BUTTONS <const> = {
LEFT = "left",
MIDDLE = "middle",
RIGHT = "right"
}
---@class DUIInstance
---@field id number Unique identifier for this DUI instance
---@field url string URL loaded in the DUI
---@field width number Width of the DUI
---@field height number Height of the DUI
---@field handle number DUI browser handle
---@field txd string Texture dictionary name
---@field txn string Texture name
---@field active boolean Whether the DUI is active
---@field trackMouse boolean Whether mouse tracking is enabled for this instance
---@field mouseScale table<string, number> Scale factors for mouse coordinates
-- Create a new DUI instance
---@param url string URL to load
---@param width? number Width of the DUI (default: 1280)
---@param height? number Height of the DUI (default: 720)
---@return number|nil id The DUI instance ID if successful, nil if failed
function DUI.Create(url, width, height)
if not url or type(url) ~= "string" then
return print("DUI.Create: URL is required and must be a string")
end
width = width or DEFAULT_WIDTH
height = height or DEFAULT_HEIGHT
instanceCounter = instanceCounter + 1
local id = instanceCounter
local handle = CreateDui(url, width, height)
if not handle then
return print("DUI.Create: Failed to create DUI instance")
end
local instance = {
id = id,
url = url,
width = width,
height = height,
handle = handle,
txd = "dui_" .. id,
txn = "texture_" .. id,
active = true,
trackMouse = false,
mouseScale = {
x = 1.0,
y = 1.0
}
}
-- Create runtime texture
local duiHandle = GetDuiHandle(handle)
CreateRuntimeTextureFromDuiHandle(CreateRuntimeTxd(instance.txd), instance.txn, duiHandle)
activeInstances[id] = instance
return id
end
-- Destroy a DUI instance
---@param id number DUI instance ID
---@return boolean success Whether the operation was successful
function DUI.Destroy(id)
local instance = activeInstances[id]
if not instance then return false end
if instance.handle then
DestroyDui(instance.handle)
end
activeInstances[id] = nil
return true
end
-- Set URL for a DUI instance
---@param id number DUI instance ID
---@param url string New URL to load
---@return boolean success Whether the operation was successful
function DUI.SetURL(id, url)
local instance = activeInstances[id]
if not instance then return false end
SetDuiUrl(instance.handle, url)
instance.url = url
return true
end
-- Send a message to the DUI
---@param id number DUI instance ID
---@param message table Message to send (will be JSON encoded)
---@return boolean success Whether the operation was successful
function DUI.SendMessage(id, message)
local instance = activeInstances[id]
if not instance then return false end
SendDuiMessage(instance.handle, json.encode(message))
return true
end
-- Mouse interaction functions
-- Move mouse cursor on DUI
---@param id number DUI instance ID
---@param x number X coordinate
---@param y number Y coordinate
---@return boolean success Whether the operation was successful
function DUI.MoveMouse(id, x, y)
local instance = activeInstances[id]
if not instance then return false end
SendDuiMouseMove(instance.handle, x, y)
return true
end
-- Simulate mouse button press
---@param id number DUI instance ID
---@param button "left"|"middle"|"right" Mouse button to simulate
---@return boolean success Whether the operation was successful
function DUI.MouseDown(id, button)
local instance = activeInstances[id]
if not instance then return false end
if not MOUSE_BUTTONS[button:upper()] then
return print("DUI.MouseDown: Invalid button. Must be 'left', 'middle', or 'right'")
end
-- Update mouse state
if instance.trackMouse then
mouseState.isPressed = true
mouseState.currentButton = button
end
SendDuiMouseDown(instance.handle, button)
return true
end
-- Simulate mouse button release
---@param id number DUI instance ID
---@param button "left"|"middle"|"right" Mouse button to simulate
---@return boolean success Whether the operation was successful
function DUI.MouseUp(id, button)
local instance = activeInstances[id]
if not instance then return false end
if not MOUSE_BUTTONS[button:upper()] then
return print("DUI.MouseUp: Invalid button. Must be 'left', 'middle', or 'right'")
end
-- Update mouse state
if instance.trackMouse then
mouseState.isPressed = false
mouseState.currentButton = nil
end
SendDuiMouseUp(instance.handle, button)
return true
end
-- Simulate mouse wheel movement
---@param id number DUI instance ID
---@param deltaY number Vertical scroll amount
---@param deltaX number Horizontal scroll amount
---@return boolean success Whether the operation was successful
function DUI.MouseWheel(id, deltaY, deltaX)
local instance = activeInstances[id]
if not instance then return false end
SendDuiMouseWheel(instance.handle, deltaY, deltaX)
return true
end
-- Click helper function (combines MoveMouse, MouseDown, and MouseUp)
---@param id number DUI instance ID
---@param x number X coordinate
---@param y number Y coordinate
---@param button? "left"|"middle"|"right" Mouse button to click (default: "left")
---@return boolean success Whether the operation was successful
function DUI.Click(id, x, y, button)
button = button or "left"
if not DUI.MoveMouse(id, x, y) then return false end
if not DUI.MouseDown(id, button) then return false end
-- Small delay to simulate real click
Citizen.Wait(50)
return DUI.MouseUp(id, button)
end
-- Enable or disable mouse tracking for a DUI instance
---@param id number DUI instance ID
---@param enabled boolean Whether to enable mouse tracking
---@param scaleX? number Scale factor for X coordinates (default: 1.0)
---@param scaleY? number Scale factor for Y coordinates (default: 1.0)
---@return boolean success Whether the operation was successful
function DUI.TrackMouse(id, enabled, scaleX, scaleY)
local instance = activeInstances[id]
if not instance then return false end
instance.trackMouse = enabled
instance.mouseScale.x = scaleX or 1.0
instance.mouseScale.y = scaleY or 1.0
if enabled then
mouseState.tracking = true
mouseState.activeId = id
elseif mouseState.activeId == id then
mouseState.tracking = false
mouseState.activeId = nil
end
return true
end
-- Update mouse coordinates from screen position
---@param screenX number Screen X coordinate
---@param screenY number Screen Y coordinate
---@return boolean updated Whether coordinates were updated
local function UpdateMousePosition(screenX, screenY)
if not mouseState.tracking or not mouseState.activeId then return false end
local instance = activeInstances[mouseState.activeId]
if not instance or not instance.trackMouse then return false end
-- Scale coordinates based on DUI dimensions and scale factors
local scaledX = screenX * instance.mouseScale.x
local scaledY = screenY * instance.mouseScale.y
-- Only update if position changed
if scaledX ~= mouseState.lastX or scaledY ~= mouseState.lastY then
mouseState.lastX = scaledX
mouseState.lastY = scaledY
DUI.MoveMouse(mouseState.activeId, scaledX, scaledY)
return true
end
return false
end
-- Mouse tracking thread
Citizen.CreateThread(function()
while true do
if mouseState.tracking and mouseState.activeId then
local instance = activeInstances[mouseState.activeId]
if instance and instance.trackMouse then
-- Get current cursor position
local screenX, screenY = GetNuiCursorPosition()
UpdateMousePosition(screenX, screenY)
-- Handle held mouse buttons
if mouseState.isPressed and mouseState.currentButton then
-- Keep the button pressed state
SendDuiMouseDown(instance.handle, mouseState.currentButton)
end
end
end
Citizen.Wait(0)
end
end)
-- Utility functions
-- Get textures for a DUI instance
---@param id number DUI instance ID
---@return string|nil txd, string|nil txn Texture dictionary and name, or nil if instance not found
function DUI.GetTextures(id)
local instance = activeInstances[id]
if not instance then return nil, nil end
return instance.txd, instance.txn
end
-- Check if a DUI instance exists
---@param id number DUI instance ID
---@return boolean exists Whether the instance exists and is active
function DUI.Exists(id)
local instance = activeInstances[id]
return instance ~= nil and instance.active
end
-- Get all active DUI instances
---@return table<number, DUIInstance> instances Table of active DUI instances
function DUI.GetActiveInstances()
return activeInstances
end
-- Cleanup all DUI instances
function DUI.CleanupAll()
for id in pairs(activeInstances) do
DUI.Destroy(id)
end
end
-- Automatic cleanup on resource stop
AddEventHandler('onResourceStop', function(resourceName)
if GetCurrentResourceName() ~= resourceName then return end
DUI.CleanupAll()
end)
return DUI
+86 -35
View File
@@ -1,40 +1,84 @@
Scaleform = {}
---@class Scaleform
local Scaleform = {}
function SetupScaleform(scaleform, Buttons)
local scaleform = RequestScaleformMovie(scaleform)
local timeout = 5000
-- Constants
local SCALEFORM_TIMEOUT = 5000
local BACKGROUND_COLOR_VALUE = 80
local CONTROL_TYPE = 2
local RENDER_WAIT_TIME = 2
-- Local utility functions
local function setupButton(scaleform, button)
PushScaleformMovieFunction(scaleform, button.type)
if button.int then
PushScaleformMovieFunctionParameterInt(button.int)
end
-- Handle key index setup
if button.keyIndex then
if type(button.keyIndex) == "table" then
for _, keyCode in pairs(button.keyIndex) do
N_0xe83a3e3557a56640(GetControlInstructionalButton(CONTROL_TYPE, keyCode, true))
end
else
ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(CONTROL_TYPE, button.keyIndex[1],
true))
end
end
-- Handle button name setup
if button.name then
BeginTextCommandScaleformString("STRING")
AddTextComponentScaleform(button.name)
EndTextCommandScaleformString()
end
-- Handle background color
if button.type == 'SET_BACKGROUND_COLOUR' then
for _ = 1, 4 do
PushScaleformMovieFunctionParameterInt(BACKGROUND_COLOR_VALUE)
end
end
PopScaleformMovieFunctionVoid()
end
---Creates and sets up a scaleform movie
---@param scaleformName string The name of the scaleform to load
---@param buttons table Array of button configurations
---@return number scaleform The loaded scaleform handle
local function setupScaleform(scaleformName, buttons)
local scaleform = RequestScaleformMovie(scaleformName)
local timeout = SCALEFORM_TIMEOUT
-- Wait for scaleform to load
while not HasScaleformMovieLoaded(scaleform) and timeout > 0 do
timeout = timeout - 1
Wait(0)
end
assert(timeout > 0, 'Scaleform failed to load')
if timeout <= 0 then
error('Scaleform failed to load: ' .. scaleformName)
end
DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 0, 0)
for i = 1,#Buttons do
PushScaleformMovieFunction(scaleform, Buttons[i].type)
if Buttons[i].int then PushScaleformMovieFunctionParameterInt(Buttons[i].int) end
if Buttons[i].keyIndex then
if type(Buttons[i].keyIndex) == "table" then
for _, v in pairs(Buttons[i].keyIndex) do N_0xe83a3e3557a56640(GetControlInstructionalButton(2, v, true)) end
else
ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(2, Buttons[i].keyIndex[1], true))
end
end
if Buttons[i].name then
BeginTextCommandScaleformString("STRING")
AddTextComponentScaleform(Buttons[i].name)
EndTextCommandScaleformString()
end
if Buttons[i].type == 'SET_BACKGROUND_COLOUR' then
for u = 1,4 do PushScaleformMovieFunctionParameterInt(80) end
end
PopScaleformMovieFunctionVoid()
-- Setup each button
for _, button in ipairs(buttons) do
setupButton(scaleform, button)
end
return scaleform
end
---Sets up instructional buttons with default configuration
---@param buttons table Optional custom button configuration
---@return number scaleform The configured instructional buttons scaleform
function Scaleform.SetupInstructionalButtons(buttons)
buttons = buttons or {
-- Default button configuration commented out
-- Uncomment and modify as needed
-- {type = "CLEAR_ALL"},
-- {type = "SET_CLEAR_SPACE", int = 200},
-- {type = "SET_DATA_SLOT", name = config?.place_object?.name or 'Place Object:', keyIndex = config?.place_object?.key or {223}, int = 5},
@@ -46,34 +90,41 @@ function Scaleform.SetupInstructionalButtons(buttons)
-- {type = "DRAW_INSTRUCTIONAL_BUTTONS"},
-- {type = "SET_BACKGROUND_COLOUR"},
}
local scaleform = SetupScaleform("instructional_buttons", buttons)
return scaleform
return setupScaleform("instructional_buttons", buttons)
end
-- Active scaleform tracking
local activeScaleform = nil
local runningScaleform = nil
---Runs a scaleform with optional update callback
---@param scaleform number The scaleform handle to run
---@param onUpdate function Optional callback for updates during runtime
function Scaleform.Run(scaleform, onUpdate)
if runningScaleform then return end
runningScaleform = scaleform
if activeScaleform then return end
activeScaleform = scaleform
CreateThread(function()
while runningScaleform do
while activeScaleform do
DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
if onUpdate then
shouldQuit = onUpdate()
if shouldQuit then
local shouldStop = onUpdate()
if shouldStop then
Scaleform.Stop()
break
end
end
Wait(2)
Wait(RENDER_WAIT_TIME)
end
end)
end
---Stops the currently running scaleform
function Scaleform.Stop()
runningScaleform = nil
activeScaleform = nil
end
exports("Scaleform", Scaleform)
return Scaleform
return Scaleform
+1
View File
@@ -495,6 +495,7 @@ print("Result:", result)
]]
AddEventHandler('onResourceStop', function(resource)
if resource ~= GetCurrentResourceName() then return end
for _, blip in pairs(blipIDs) do
+20 -19
View File
@@ -103,14 +103,14 @@ Framework.GetPlayerInventory = function(src)
local playerItems = xPlayer.getInventory()
local repackedTable = {}
for _, v in pairs(playerItems) do
if v.count > 0 then
table.insert(repackedTable, {
name = v.name,
count = v.count,
--metadata = v.metadata,
--slot = v.slot,
})
end
if v.count > 0 then
table.insert(repackedTable, {
name = v.name,
count = v.count,
--metadata = v.metadata,
--slot = v.slot,
})
end
end
return repackedTable
end
@@ -133,9 +133,9 @@ Framework.GetPlayerMetadata = function(src, metadata)
end
-- defualt esx Available tables are
-- identifier, accounts, group, inventory, job, job_grade, loadout,
-- metadata, position, firstname, lastname, dateofbirth, sex, height,
-- skin, status, is_dead, id, disabled, last_property, created_at, last_seen,
-- identifier, accounts, group, inventory, job, job_grade, loadout,
-- metadata, position, firstname, lastname, dateofbirth, sex, height,
-- skin, status, is_dead, id, disabled, last_property, created_at, last_seen,
-- phone_number, pincode
Framework.GetStatus = function(src, column)
local xPlayer = ESX.GetPlayerFromId(src)
@@ -250,7 +250,10 @@ end
Framework.SetPlayerJob = function(src, name, grade)
local xPlayer = ESX.GetPlayerFromId(src)
if not xPlayer then return end
if not ESX.DoesJobExist(name, grade) then lib.print.error("Job Does Not Exsist In Framework :NAME "..name.." Grade:"..grade) return end
if not ESX.DoesJobExist(name, grade) then
lib.print.error("Job Does Not Exsist In Framework :NAME " .. name .. " Grade:" .. grade)
return
end
return xPlayer.setJob(name, grade, true)
end
@@ -301,14 +304,14 @@ end
Framework.GetOwnedVehicles = function(src)
local citizenId = Framework.GetPlayerIdentifier(src)
local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM owned_vehicles WHERE owner = '" .. citizenId .. "'")
local vehicles = {}
for i=1, #result do
local vehicles = {}
for i = 1, #result do
local vehicle = result[i].vehicle
local plate = result[i].plate
local model = json.decode(vehicle).model
table.insert(vehicles, {vehicle = model, plate = plate})
table.insert(vehicles, { vehicle = model, plate = plate })
end
return vehicles
return vehicles
end
-- Framework.RegisterUsableItem(item, cb)
@@ -339,7 +342,7 @@ AddEventHandler("playerDropped", function()
end)
lib.callback.register('community_bridge:Callback:GetFrameworkJobs', function(source)
return Framework.GetFrameworkJobs() or {}
return Framework.GetFrameworkJobs() or {}
end)
Framework.Commands = {}
@@ -351,5 +354,3 @@ Framework.Commands.Add = function(name, help, arguments, argsrequired, callback,
arguments = arguments
})
end
return Framework
+10 -9
View File
@@ -238,7 +238,7 @@ Framework.AddHunger = function(src, value)
player.Functions.SetMetaData('hunger', Math.Clamp(newHunger, 0, 100))
TriggerClientEvent('hud:client:UpdateNeeds', src, newHunger, playerData.metadata.thirst)
--TriggerClientEvent('hud:client:UpdateStress', src, newStress)
return newHunger
end
@@ -277,7 +277,7 @@ end
Framework.RevivePlayer = function(src)
src = tonumber(src)
if not src then return false end
TriggerClientEvent('hospital:client:Revive', src)
TriggerClientEvent('hospital:client:Revive', src)
return true
end
@@ -413,7 +413,8 @@ end
Framework.AddItem = function(src, item, amount, slot, metadata)
local player = QBCore.Functions.GetPlayer(src)
if not player then return end
TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = amount, slot = slot, metadata = metadata})
TriggerClientEvent("community_bridge:client:inventory:updateInventory", src,
{ action = "add", item = item, count = amount, slot = slot, metadata = metadata })
return player.Functions.AddItem(item, amount, slot, metadata)
end
@@ -422,7 +423,8 @@ end
Framework.RemoveItem = function(src, item, amount, slot, metadata)
local player = QBCore.Functions.GetPlayer(src)
if not player then return end
TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata})
TriggerClientEvent("community_bridge:client:inventory:updateInventory", src,
{ action = "remove", item = item, count = amount, slot = slot, metadata = metadata })
return player.Functions.RemoveItem(item, amount, slot or nil)
end
@@ -452,12 +454,13 @@ end
---@return table
Framework.GetOwnedVehicles = function(src)
local citizenId = Framework.GetPlayerIdentifier(src)
local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. citizenId .. "'")
local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" ..
citizenId .. "'")
local vehicles = {}
for i=1, #result do
for i = 1, #result do
local vehicle = result[i].vehicle
local plate = result[i].plate
table.insert(vehicles, {vehicle = vehicle, plate = plate})
table.insert(vehicles, { vehicle = vehicle, plate = plate })
end
return vehicles
end
@@ -493,5 +496,3 @@ Framework.Commands = {}
Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...)
QBCore.Commands.Add(name, help, arguments, argsrequired, callback, permission, ...)
end
return Framework
+9 -8
View File
@@ -237,7 +237,7 @@ end
Framework.RevivePlayer = function(src)
src = tonumber(src)
if not src then return false end
TriggerClientEvent('hospital:client:Revive', src)
TriggerClientEvent('hospital:client:Revive', src)
return true
end
@@ -375,7 +375,8 @@ end
Framework.AddItem = function(src, item, amount, slot, metadata)
local player = QBox:GetPlayer(src)
if not player then return end
TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = amount, slot = slot, metadata = metadata})
TriggerClientEvent("community_bridge:client:inventory:updateInventory", src,
{ action = "add", item = item, count = amount, slot = slot, metadata = metadata })
return player.Functions.AddItem(item, amount, slot, metadata)
end
@@ -389,7 +390,8 @@ end
Framework.RemoveItem = function(src, item, amount, slot, metadata)
local player = QBox:GetPlayer(src)
if not player then return end
TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata})
TriggerClientEvent("community_bridge:client:inventory:updateInventory", src,
{ action = "remove", item = item, count = amount, slot = slot, metadata = metadata })
return player.Functions.RemoveItem(item, amount, slot)
end
@@ -411,12 +413,13 @@ end
---@return table
Framework.GetOwnedVehicles = function(src)
local citizenId = Framework.GetPlayerIdentifier(src)
local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. citizenId .. "'")
local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" ..
citizenId .. "'")
local vehicles = {}
for i=1, #result do
for i = 1, #result do
local vehicle = result[i].vehicle
local plate = result[i].plate
table.insert(vehicles, {vehicle = vehicle, plate = plate})
table.insert(vehicles, { vehicle = vehicle, plate = plate })
end
return vehicles
end
@@ -449,5 +452,3 @@ AddEventHandler("playerDropped", function()
local src = source
TriggerEvent("community_bridge:Server:OnPlayerUnload", src)
end)
return Framework