Skip to content

fix(api): route ME_SetRemapIndex and ME_GetRemapIndex through Remap feature #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CanerKaraca23 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(api): route ME_SetRemapIndex and ME_GetRemapIndex through Remap feature #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ModelExtrasAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,11 @@ void ME_SetDirtLevel(CVehicle *pVeh, float dirtLevel) {

// Remap API
int ME_GetRemapIndex(CVehicle *pVeh) {
return pVeh ? pVeh->GetRemapIndex() : -1;
return pVeh ? Remap::GetRemapIndex(pVeh) : -1;
}

void ME_SetRemapIndex(CVehicle *pVeh, int remapIndex) {
if (pVeh) pVeh->SetRemap(remapIndex);
if (pVeh) Remap::SetRemapIndex(pVeh, remapIndex);
}

// Spoilers & Convertible Roof API
Expand Down
75 changes: 62 additions & 13 deletions src/features/remap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ void Remap::Init()
ReloadConfig();
}

void Remap::LoadRemaps(CVehicle* vehicle)
void Remap::EnsureRemapsLoaded(int modelIndex)
{
CBaseModelInfo *pModelInfo = CModelInfo::GetModelInfo(vehicle->m_nModelIndex);
if (modelIndex < 0 || modelIndex >= 20000) return;
auto itModel = xRemaps.find(modelIndex);
if (itModel != xRemaps.end() && itModel->second.bRemapsLoaded) return;

CBaseModelInfo *pModelInfo = CModelInfo::GetModelInfo(modelIndex);
if (!pModelInfo) return;

CTxdStore::PushCurrentTxd();
Expand All @@ -45,8 +49,8 @@ void Remap::LoadRemaps(CVehicle* vehicle)
return;
}

int model = vehicle->m_nModelIndex;
RemapData &data = xRemaps[model];
RemapData &data = xRemaps[modelIndex];
data.bRemapsLoaded = true;

// Collect all textures in the TXD by lowercase name
std::unordered_map<std::string, RwTexture*> allTextures;
Expand Down Expand Up @@ -89,6 +93,57 @@ void Remap::LoadRemaps(CVehicle* vehicle)
CTxdStore::PopCurrentTxd();
}

void Remap::LoadRemaps(CVehicle* vehicle)
{
if (!vehicle) return;
EnsureRemapsLoaded(vehicle->m_nModelIndex);
}

bool Remap::HasRemaps(int modelIndex)
{
if (modelIndex < 0 || modelIndex >= 20000) return false;
EnsureRemapsLoaded(modelIndex);
auto it = xRemaps.find(modelIndex);
return it != xRemaps.end() && !it->second.pTextures.empty();
}

int Remap::GetRemapCount(int modelIndex)
{
if (modelIndex < 0 || modelIndex >= 20000) return 0;
EnsureRemapsLoaded(modelIndex);
auto it = xRemaps.find(modelIndex);
if (it == xRemaps.end() || it->second.pTextures.empty()) return 0;
return static_cast<int>(it->second.pTextures.begin()->second.size());
}

int Remap::GetRemapIndex(CVehicle *pVeh)
{
if (!pVeh) return -1;
if (HasRemaps(pVeh->m_nModelIndex))
{
int count = GetRemapCount(pVeh->m_nModelIndex);
if (count <= 0) return -1;
RemapVehData &vehData = m_VehData.Get(pVeh);
if (vehData.randomId == -1)
{
vehData.randomId = RandomNumberInRange(0, count - 1);
}
return ((vehData.randomId % count) + count) % count;
}
return pVeh->GetRemapIndex();
}

void Remap::SetRemapIndex(CVehicle *pVeh, int remapIndex)
{
if (!pVeh) return;
if (HasRemaps(pVeh->m_nModelIndex))
{
RemapVehData &vehData = m_VehData.Get(pVeh);
vehData.randomId = remapIndex;
}
pVeh->SetRemap(remapIndex);
}

void Remap::ProcessTextures(CVehicle *pVeh, RpMaterial *pMat)
{
if (!m_bEnabled || !pVeh || !pMat || !pMat->texture || !pMat->texture->name)
Expand All @@ -97,15 +152,9 @@ void Remap::ProcessTextures(CVehicle *pVeh, RpMaterial *pMat)
}

int model = pVeh->m_nModelIndex;
auto itModel = xRemaps.find(model);
if (itModel == xRemaps.end() || !itModel->second.bRemapsLoaded)
{
RemapData &newData = xRemaps[model];
LoadRemaps(pVeh);
newData.bRemapsLoaded = true;
itModel = xRemaps.find(model);
}
EnsureRemapsLoaded(model);

auto itModel = xRemaps.find(model);
if (itModel == xRemaps.end() || itModel->second.pTextures.empty())
{
return;
Expand Down Expand Up @@ -138,7 +187,7 @@ void Remap::ProcessTextures(CVehicle *pVeh, RpMaterial *pMat)
vehData.randomId = RandomNumberInRange(0, sz - 1);
}

int chosen = vehData.randomId % sz;
int chosen = ((vehData.randomId % sz) + sz) % sz;
if (pMat->texture != it->second[chosen])
{
ModelInfoMgr::RegisterRestore(&pMat->texture, pMat->texture);
Expand Down
5 changes: 5 additions & 0 deletions src/features/remap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,9 @@ class Remap : public CVehFeature<RemapVehData>
public:
Remap() : CVehFeature<RemapVehData>("TextureRemapper", "FEATURES", eFeatureMatrix::TextureRemapper) {}
static void ProcessTextures(CVehicle *pVeh, RpMaterial *pMat);
static void EnsureRemapsLoaded(int modelIndex);
static bool HasRemaps(int modelIndex);
static int GetRemapCount(int modelIndex);
static int GetRemapIndex(CVehicle *pVeh);
static void SetRemapIndex(CVehicle *pVeh, int remapIndex);
};
4 changes: 3 additions & 1 deletion xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ set_defaultmode("release")

local PLUGIN_SDK_DIR = os.getenv("PLUGIN_SDK_DIR")
if not PLUGIN_SDK_DIR or not os.isdir(PLUGIN_SDK_DIR) then
if os.isdir("D:/Dev/plugin-sdk") then
if os.isdir("plugin-sdk") then
PLUGIN_SDK_DIR = "plugin-sdk"
elseif os.isdir("D:/Dev/plugin-sdk") then
PLUGIN_SDK_DIR = "D:/Dev/plugin-sdk"
end
end
Expand Down