Skip to content

fix(lights): sync taillight and pointlight flashing with vehicle alarm state #385

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(lights): sync taillight and pointlight flashing with vehicle alarm state #385

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
8 changes: 7 additions & 1 deletion src/features/lights/components/headlight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,13 @@ void HeadlightComponent::Render(CVehicle* pControlVeh, CVehicle* pTowedVeh, VehL

void HeadlightComponent::ProcessPointLights(CVehicle* pVeh, VehLightData& data) {
if (!CanVehicleHaveHeadlights(pVeh)) return;
bool isHeadlightsOn = (pVeh->bLightsOn || CarUtil::IsLightsForcedOn(pVeh) || (Util::IsNightTime() && !Util::IsEngineOff(pVeh))) && !CarUtil::IsLightsForcedOff(pVeh);
bool isAlarmActive = pVeh->m_nAlarmState != 0 && pVeh->m_nAlarmState != 0xFFFF;
bool isAlarmLightOn = isAlarmActive && ((pVeh->m_nAlarmState & 0x100) != 0);

bool isHeadlightsOn = (CarUtil::AreLightsOn(pVeh) || isAlarmLightOn);
if (isAlarmActive && !isAlarmLightOn) {
isHeadlightsOn = false;
}

if (isHeadlightsOn && AreHeadlightsOpen(pVeh, data)) {
float rangeMul = data.bLongLightsOn ? LightsConfig::Get().fHighBeamPointLightMul : 1.0f;
Expand Down
10 changes: 9 additions & 1 deletion src/features/lights/components/stt_light.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@ void STTLightComponent::Render(CVehicle* pControlVeh, CVehicle* pTowedVeh, VehLi

bool brakeOn = LightManager::IsBraking(pControlVeh);
bool indicatorOn = data.bUsingGlobalIndicators && data.nIndicatorState != eIndicatorState::Off;
bool tailOn = (Util::IsNightTime() || pControlVeh->bLightsOn || CarUtil::IsLightsForcedOn(pControlVeh) || indicatorOn) && !CarUtil::IsLightsForcedOff(pControlVeh);
bool isAlarmActive = pControlVeh->m_nAlarmState != 0 && pControlVeh->m_nAlarmState != 0xFFFF;
bool isAlarmLightOn = isAlarmActive && ((pControlVeh->m_nAlarmState & 0x100) != 0);

bool tailLightFlag = (CarUtil::AreLightsOn(pControlVeh) || isAlarmLightOn);
if (isAlarmActive && !isAlarmLightOn) {
tailLightFlag = false;
}

bool tailOn = tailLightFlag || indicatorOn;

if (brakeOn || tailOn) {
if (isLeftRearOk) {
Expand Down
19 changes: 17 additions & 2 deletions src/features/lights/components/tail_light.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,16 @@ void TailLightComponent::Render(CVehicle* pControlVeh, CVehicle* pTowedVeh, VehL
bool isRightRearOk = damage.isRearRightOk;

bool indicatorOn = data.bUsingGlobalIndicators && data.nIndicatorState != eIndicatorState::Off;
bool tailLightFlag = (Util::IsNightTime() || pControlVeh->bLightsOn || CarUtil::IsLightsForcedOn(pControlVeh)) && !CarUtil::IsLightsForcedOff(pControlVeh);
bool isAlarmActive = pControlVeh->m_nAlarmState != 0 && pControlVeh->m_nAlarmState != 0xFFFF;
bool isAlarmLightOn = isAlarmActive && ((pControlVeh->m_nAlarmState & 0x100) != 0);

bool tailLightFlag = (CarUtil::AreLightsOn(pControlVeh) || isAlarmLightOn);
if (isAlarmActive && !isAlarmLightOn) {
tailLightFlag = false;
}

pControlVeh->m_renderLights.m_bLeftRear = isLeftRearOk && tailLightFlag;
pControlVeh->m_renderLights.m_bRightRear = isRightRearOk && tailLightFlag;
bool sttInstalled = LightManager::IsMaterialAvailable(pTowedVeh, {eMaterialType::STTLightLeft, eMaterialType::STTLightRight});

if ((tailLightFlag || indicatorOn) && !sttInstalled) {
Expand Down Expand Up @@ -102,7 +111,13 @@ void TailLightComponent::Render(CVehicle* pControlVeh, CVehicle* pTowedVeh, VehL
}

void TailLightComponent::ProcessPointLights(CVehicle* pVeh, VehLightData& data) {
bool isHeadlightsOn = (pVeh->bLightsOn || CarUtil::IsLightsForcedOn(pVeh) || (Util::IsNightTime() && !Util::IsEngineOff(pVeh))) && !CarUtil::IsLightsForcedOff(pVeh);
bool isAlarmActive = pVeh->m_nAlarmState != 0 && pVeh->m_nAlarmState != 0xFFFF;
bool isAlarmLightOn = isAlarmActive && ((pVeh->m_nAlarmState & 0x100) != 0);

bool isHeadlightsOn = (CarUtil::AreLightsOn(pVeh) || isAlarmLightOn);
if (isAlarmActive && !isAlarmLightOn) {
isHeadlightsOn = false;
}
bool isBraking = LightManager::IsBraking(pVeh);
bool isBike = CModelInfo::IsBikeModel(pVeh->m_nModelIndex);
bool hasDedicatedBrakeDummy = LightManager::IsDummyAvailable(data, {eMaterialType::BrakeLightLeft, eMaterialType::BrakeLightRight, eMaterialType::STTLightLeft, eMaterialType::STTLightRight, eMaterialType::NABrakeLightLeft, eMaterialType::NABrakeLightRight});
Expand Down
Loading