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

refactor(streamingRequest): internal method for request functions

Browse Source 
- TS package type inference for request functions.
- Type fix for Lua's waitFor callback.
- Lua request functions cannot return nil.
This commit is contained in:
Linden
2024-03-31 16:15:44 +11:00
parent e3ece4f337
commit 0f0c7a6591
10 changed files with 50 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
imports/requestStreamedTextureDict/client.lua
View File

@@ -1,7 +1,7 @@
---Load a texture dictionary. When called from a thread, it will yield until it has loaded.
---@param textureDict string
---@param timeout number? Approximate milliseconds to wait for the dictionary to load. Default is 1000.
---@return string? textureDict
---@return string textureDict
function lib.requestStreamedTextureDict(textureDict, timeout)
if HasStreamedTextureDictLoaded(textureDict) then return textureDict end
@@ -9,13 +9,7 @@ function lib.requestStreamedTextureDict(textureDict, timeout)
error(("expected textureDict to have type 'string' (received %s)"):format(type(textureDict)))
end
RequestStreamedTextureDict(textureDict, false)
if not coroutine.isyieldable() then return textureDict end
return lib.waitFor(function()
if HasStreamedTextureDictLoaded(textureDict) then return textureDict end
end, ("failed to load textureDict '%s'"):format(textureDict), timeout)
return lib.streamingRequest(RequestStreamedTextureDict, HasStreamedTextureDictLoaded, 'textureDict', textureDict, timeout)
end
return lib.requestStreamedTextureDict