Skip to content

fix(lights): filter out non-light materials with accidental light colors #268

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

Closed
CanerKaraca23 wants to merge 1 commit into from
+81 −1
Closed

fix(lights): filter out non-light materials with accidental light colors #268

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
40 changes: 39 additions & 1 deletion src/features/lights.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,44 @@ inline float GetZAngleForPoint(CVector2D const &point)
return angle;
}

static bool IsLightTexture(RpMaterial *pMat)
{
if (!pMat || !pMat->texture) {
return true;
}
if (!pMat->texture->name || pMat->texture->name[0] == '\0') {
return true;
}
if (pMat->texture == CVehicleModelInfo::ms_pLightsTexture || pMat->texture == CVehicleModelInfo::ms_pLightsOnTexture) {
return true;
}

char lowerName[64];
size_t len = strnlen(pMat->texture->name, sizeof(lowerName) - 1);
for (size_t i = 0; i < len; ++i) {
lowerName[i] = static_cast<char>(std::tolower(pMat->texture->name[i]));
}
lowerName[len] = '\0';
std::string_view name(lowerName, len);

return name.find("light") != std::string_view::npos ||
name.find("lamp") != std::string_view::npos ||
name.find("siren") != std::string_view::npos ||
name.find("strobe") != std::string_view::npos ||
name.find("indicator") != std::string_view::npos ||
name.find("turn") != std::string_view::npos ||
name.find("rev") != std::string_view::npos ||
name.find("fog") != std::string_view::npos ||
name.find("led") != std::string_view::npos ||
name.find("lens") != std::string_view::npos ||
name.find("glass") != std::string_view::npos ||
name.find("glow") != std::string_view::npos ||
name.find("emis") != std::string_view::npos ||
name.find("flare") != std::string_view::npos ||
name.find("corona") != std::string_view::npos ||
name.find("bulb") != std::string_view::npos;
}

void Lights::Init()
{
if (gConfig.ReadBoolean("FEATURES", "StandardLightsv2", false)) {
Expand Down Expand Up @@ -116,7 +154,7 @@ void Lights::Init()

ModelInfoMgr::RegisterMaterial([](CVehicle *pVeh, RpMaterial *pMat)
{
if (!m_bEnabled) {
if (!m_bEnabled || !pMat || !IsLightTexture(pMat)) {
return eMaterialType::UnknownMaterial;
}
// Headlights
Expand Down
42 changes: 42 additions & 0 deletions src/features/lights/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,49 @@ DummyConfig LightManager::CreateBaseConfig(CVehicle* pVeh, RwFrame* pFrame) {
return c;
}

static bool IsLightTexture(RpMaterial *pMat)
{
if (!pMat || !pMat->texture) {
return true;
}
if (!pMat->texture->name || pMat->texture->name[0] == '\0') {
return true;
}
if (pMat->texture == CVehicleModelInfo::ms_pLightsTexture || pMat->texture == CVehicleModelInfo::ms_pLightsOnTexture) {
return true;
}

char lowerName[64];
size_t len = strnlen(pMat->texture->name, sizeof(lowerName) - 1);
for (size_t i = 0; i < len; ++i) {
lowerName[i] = static_cast<char>(std::tolower(pMat->texture->name[i]));
}
lowerName[len] = '\0';
std::string_view name(lowerName, len);

return name.find("light") != std::string_view::npos ||
name.find("lamp") != std::string_view::npos ||
name.find("siren") != std::string_view::npos ||
name.find("strobe") != std::string_view::npos ||
name.find("indicator") != std::string_view::npos ||
name.find("turn") != std::string_view::npos ||
name.find("rev") != std::string_view::npos ||
name.find("fog") != std::string_view::npos ||
name.find("led") != std::string_view::npos ||
name.find("lens") != std::string_view::npos ||
name.find("glass") != std::string_view::npos ||
name.find("glow") != std::string_view::npos ||
name.find("emis") != std::string_view::npos ||
name.find("flare") != std::string_view::npos ||
name.find("corona") != std::string_view::npos ||
name.find("bulb") != std::string_view::npos;
}

eMaterialType LightManager::GetMatType(RpMaterial* pMat) {
if (!pMat || !IsLightTexture(pMat)) {
return eMaterialType::UnknownMaterial;
}

CRGBA matCol = *reinterpret_cast<CRGBA*>(RpMaterialGetColor(pMat));
matCol.a = 255;

Expand Down