eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 23:19:19 +02:00
Code Issues 123 Wiki Activity

Wiper logic cleanup

Browse Source
This commit is contained in:
Hirek
2025-03-06 23:26:09 +01:00
parent b5172e940b
commit 664896275f
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DynObj.cpp
View File

@@ -4163,19 +4163,11 @@ bool TDynamicObject::Update(double dt, double dt1)
if (dWiperPos[i] < 1.0 && !wiperDirection[i] && wiperParkTimer[i] > currentWiperParams.interval) if (dWiperPos[i] < 1.0 && !wiperDirection[i] && wiperParkTimer[i] > currentWiperParams.interval)
// go out // go out
{ {
if (!sWiperToPark.is_playing())
{
wiper_playSoundFromStart[i] = true;
}
dWiperPos[i] = std::min(1.0, dWiperPos[i] + (1.f / currentWiperParams.WiperSpeed) * dt1); dWiperPos[i] = std::min(1.0, dWiperPos[i] + (1.f / currentWiperParams.WiperSpeed) * dt1);
} }
if (dWiperPos[i] > 0.0 && wiperDirection[i] && wiperOutTimer[i] > currentWiperParams.outBackDelay) if (dWiperPos[i] > 0.0 && wiperDirection[i] && wiperOutTimer[i] > currentWiperParams.outBackDelay)
// return back // return back
{ {
if (!sWiperToPark.is_playing())
{
wiper_playSoundToStart[i] = true;
}
dWiperPos[i] = std::max(0.0, dWiperPos[i] - (1.f / currentWiperParams.WiperSpeed) * dt1); dWiperPos[i] = std::max(0.0, dWiperPos[i] - (1.f / currentWiperParams.WiperSpeed) * dt1);
} }
if (dWiperPos[i] == 1.0) // we reached end if (dWiperPos[i] == 1.0) // we reached end
@@ -4193,27 +4185,6 @@ bool TDynamicObject::Update(double dt, double dt1)
} }
} }
// sound
if (wiper_playSoundFromStart[i] && dWiperPos[i] == 1.0)
{
sWiperFromPark.play(sound_flags::exclusive);
wiper_playSoundFromStart[i] = false;
}
else
{
sWiperToPark.stop();
}
if (wiper_playSoundToStart[i] && dWiperPos[i] == 0.0)
{
sWiperToPark.play(sound_flags::exclusive);
wiper_playSoundToStart[i] = false;
}
else
{
sWiperToPark.stop();
}
} }
} }