From dc6ca3fd20d5e59e8a621b17cc42465b70253060 Mon Sep 17 00:00:00 2001 From: Fernando-A-Rocha Date: Thu, 1 Aug 2024 15:25:12 +0100 Subject: [PATCH] bw compatibility --- newmodels_reborn/models/vehicle/490/-1.txt | 4 ++-- newmodels_reborn/scripts/core/client_logic.lua | 8 ++++---- newmodels_reborn/scripts/core/server_logic.lua | 4 ++-- .../scripts/optional/compatibility/server_funcs.lua | 9 +++++++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/newmodels_reborn/models/vehicle/490/-1.txt b/newmodels_reborn/models/vehicle/490/-1.txt index fe0589c..3c57bb2 100644 --- a/newmodels_reborn/models/vehicle/490/-1.txt +++ b/newmodels_reborn/models/vehicle/490/-1.txt @@ -1,3 +1,3 @@ disableAutoFree -disableTextureFiltering -enableAlphaTransparency \ No newline at end of file +disableTXDTextureFiltering +enableDFFAlphaTransparency \ No newline at end of file diff --git a/newmodels_reborn/scripts/core/client_logic.lua b/newmodels_reborn/scripts/core/client_logic.lua index 79a5306..50c854a 100644 --- a/newmodels_reborn/scripts/core/client_logic.lua +++ b/newmodels_reborn/scripts/core/client_logic.lua @@ -61,14 +61,14 @@ local function loadCustomModel(customModel, elementToApply) local colPath, txdPath, dffPath = customInfo.col, customInfo.txd, customInfo.dff - local disableTextureFiltering = customInfo.settings.disableTextureFiltering + local disableTXDTextureFiltering = customInfo.settings.disableTXDTextureFiltering local col, txd, dff if colPath then col = reusableModelElements[colPath] or engineLoadCOL(colPath) end if txdPath then - txd = reusableModelElements[txdPath] or engineLoadTXD(txdPath, disableTextureFiltering and false or nil) + txd = reusableModelElements[txdPath] or engineLoadTXD(txdPath, disableTXDTextureFiltering and false or nil) end if dffPath then dff = reusableModelElements[dffPath] or engineLoadDFF(dffPath) @@ -85,11 +85,11 @@ local function loadCustomModel(customModel, elementToApply) return end - local enableAlphaTransparency = customInfo.settings.enableAlphaTransparency + local enableDFFAlphaTransparency = customInfo.settings.enableDFFAlphaTransparency if (col and not engineReplaceCOL(col, allocatedModel)) or (txd and not engineImportTXD(txd, allocatedModel)) - or (dff and not engineReplaceModel(dff, allocatedModel, enableAlphaTransparency or nil)) then + or (dff and not engineReplaceModel(dff, allocatedModel, enableDFFAlphaTransparency or nil)) then if col and isElement(col) then destroyElement(col) end if txd and isElement(txd) then destroyElement(txd) end if dff and isElement(dff) then destroyElement(dff) end diff --git a/newmodels_reborn/scripts/core/server_logic.lua b/newmodels_reborn/scripts/core/server_logic.lua index 3fd4275..99527b7 100644 --- a/newmodels_reborn/scripts/core/server_logic.lua +++ b/newmodels_reborn/scripts/core/server_logic.lua @@ -1,7 +1,7 @@ local CUSTOM_MODEL_SETTINGS = { ["disableAutoFree"] = true, - ["disableTextureFiltering"] = true, - ["enableAlphaTransparency"] = true, + ["disableTXDTextureFiltering"] = true, + ["enableDFFAlphaTransparency"] = true, } local function loadModels() diff --git a/newmodels_reborn/scripts/optional/compatibility/server_funcs.lua b/newmodels_reborn/scripts/optional/compatibility/server_funcs.lua index 36b820b..d9fedc4 100644 --- a/newmodels_reborn/scripts/optional/compatibility/server_funcs.lua +++ b/newmodels_reborn/scripts/optional/compatibility/server_funcs.lua @@ -26,6 +26,14 @@ local function sendModListAllPlayers() local id = mod.id local baseModel = mod.base_id local paths = mod.paths + local disableAutoFree = mod.disableAutoFree + local filteringEnabled = mod.filteringEnabled + local alphaTransparency = mod.alphaTransparency + local customSettings = { + disableAutoFree = disableAutoFree, + disableTXDTextureFiltering = filteringEnabled == false, + enableDFFAlphaTransparency = alphaTransparency == true, + } customModels[id] = { type = elementType, baseModel = baseModel, @@ -33,6 +41,7 @@ local function sendModListAllPlayers() txd = paths.txd or nil, dff = paths.dff or nil, name = mod.name, + settings = customSettings, srcResourceName = mod.srcResourceName, } table.remove(modList[elementType],i)