Skip to content

⚡ Optimize material color provider lookup #236

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

⚡ Optimize material color provider lookup #236

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
24 changes: 11 additions & 13 deletions src/features/sirens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,22 +607,20 @@ void Sirens::Init()

ModelInfoMgr::RegisterMaterialColProvider([](CVehicle *pVeh, RpMaterial *pMat, eMaterialType type)
{
if (type == eMaterialType::SirenLight) {
int matIdx = GetSirenIndex(pVeh, pMat);

if (matIdx != - 1) {
int curState = vehicleData[pVeh]->GetCurrentState();
auto& state = modelData[pVeh->m_nModelIndex]->States[curState];
if (state->Materials.contains(matIdx)) {
if (modelData[pVeh->m_nModelIndex]->isImVehFtSiren) {
return MatStateColor{state->Materials[matIdx]->Color, state->Materials[matIdx]->Color};
} else {
return MatStateColor{state->Materials[matIdx]->Color, DEFAULT_MAT_COL};
}
int matIdx = GetSirenIndex(pVeh, pMat);

if (matIdx != - 1) {
int curState = vehicleData[pVeh]->GetCurrentState();
auto& state = modelData[pVeh->m_nModelIndex]->States[curState];
if (state->Materials.contains(matIdx)) {
if (modelData[pVeh->m_nModelIndex]->isImVehFtSiren) {
return MatStateColor{state->Materials[matIdx]->Color, state->Materials[matIdx]->Color};
} else {
return MatStateColor{state->Materials[matIdx]->Color, DEFAULT_MAT_COL};
}
}
}
return MatStateColor{DEFAULT_MAT_COL, DEFAULT_MAT_COL}; });
return MatStateColor{DEFAULT_MAT_COL, DEFAULT_MAT_COL}; }, eMaterialType::SirenLight);

ModelInfoMgr::RegisterDummy([](CVehicle *vehicle, RwFrame *frame, const std::string_view name2)
{
Expand Down
26 changes: 19 additions & 7 deletions src/utils/modelinfomgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ void ModelInfoMgr::RegisterMaterial(MaterialCallback_t mat)
materials.push_back(mat);
}

void ModelInfoMgr::RegisterMaterialColProvider(MaterialColProviderCallback_t mat)
void ModelInfoMgr::RegisterMaterialColProvider(MaterialColProviderCallback_t mat, eMaterialType type)
{
matColProviders.push_back(mat);
matColProviders[type].push_back(mat);
}

void ModelInfoMgr::SetupRender(CVehicle *ptr)
Expand Down Expand Up @@ -179,16 +179,28 @@ struct tRestoreEntry

MatStateColor ModelInfoMgr::FetchMaterialCol(CVehicle *pVeh, RpMaterial *pMat, eMaterialType type)
{
MatStateColor col = {DEFAULT_MAT_COL, DEFAULT_MAT_COL};
for (auto &e : matColProviders)
auto CheckProviders = [&](const std::vector<MaterialColProviderCallback_t> &providers) -> MatStateColor
{
col = e(pVeh, pMat, type);
for (auto &e : providers)
{
MatStateColor col = e(pVeh, pMat, type);
if (col.on != DEFAULT_MAT_COL || col.off != DEFAULT_MAT_COL)
{
return col;
}
}
return {DEFAULT_MAT_COL, DEFAULT_MAT_COL};
};

if (type >= 0 && type < eMaterialType::TotalMaterial)
{
MatStateColor col = CheckProviders(matColProviders[type]);
if (col.on != DEFAULT_MAT_COL || col.off != DEFAULT_MAT_COL)
{
break;
return col;
}
}
return col;
return CheckProviders(matColProviders[eMaterialType::TotalMaterial]);
}

eMaterialType ModelInfoMgr::FetchMaterialType(CVehicle *pVeh, RpMaterial *pMat)
Expand Down
4 changes: 2 additions & 2 deletions src/utils/modelinfomgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class ModelInfoMgr
private:
static inline std::vector<DummyCallback_t> dummy;
static inline std::vector<MaterialCallback_t> materials;
static inline std::vector<MaterialColProviderCallback_t> matColProviders;
static inline std::vector<MaterialColProviderCallback_t> matColProviders[eMaterialType::TotalMaterial + 1];
static inline std::vector<RenderCallback_t> renders;

static inline VehicleExtendedData<VehModelData> m_VehData;
Expand All @@ -102,7 +102,7 @@ class ModelInfoMgr
static void Init();
static void RegisterDummy(DummyCallback_t function);
static void RegisterMaterial(MaterialCallback_t material);
static void RegisterMaterialColProvider(MaterialColProviderCallback_t material);
static void RegisterMaterialColProvider(MaterialColProviderCallback_t material, eMaterialType type = eMaterialType::TotalMaterial);
static void RegisterRender(RenderCallback_t render);
static void Reload(CVehicle *pVeh);
};
Loading