Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 08:16:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify code.

Browse source
This commit is contained in:
howard-stearns 2016-05-20 16:50:17 -07:00
parent 6568c0563d
commit 9a428947e4
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/ui/OverlayConductor.cpp
View file

@ -73,7 +73,6 @@ void OverlayConductor::updateMode() {
const float MAX_NOT_DRIVING = 0.01f; const float MAX_NOT_DRIVING = 0.01f;
const quint64 REQUIRED_USECS_IN_NEW_MODE_BEFORE_INVISIBLE = 200 * 1000; const quint64 REQUIRED_USECS_IN_NEW_MODE_BEFORE_INVISIBLE = 200 * 1000;
const quint64 REQUIRED_USECS_IN_NEW_MODE_BEFORE_VISIBLE = 1000 * 1000; const quint64 REQUIRED_USECS_IN_NEW_MODE_BEFORE_VISIBLE = 1000 * 1000;
int fixmeDiff;
bool nowDriving = _driving; // Assume current _driving mode unless... bool nowDriving = _driving; // Assume current _driving mode unless...
if (speed > MIN_DRIVING) { // ... we're definitely moving... if (speed > MIN_DRIVING) { // ... we're definitely moving...
nowDriving = true; nowDriving = true;
@ -85,14 +84,8 @@ void OverlayConductor::updateMode() {
_timeInPotentialMode = 0; _timeInPotentialMode = 0;
} else if (_timeInPotentialMode == 0) { // We've just changed with no timer, so start timing now. } else if (_timeInPotentialMode == 0) { // We've just changed with no timer, so start timing now.
_timeInPotentialMode = usecTimestampNow(); _timeInPotentialMode = usecTimestampNow();
nowDriving = _driving; } else if ((usecTimestampNow() - _timeInPotentialMode) > (nowDriving ? REQUIRED_USECS_IN_NEW_MODE_BEFORE_INVISIBLE : REQUIRED_USECS_IN_NEW_MODE_BEFORE_VISIBLE)) {
} else if ((fixmeDiff = (usecTimestampNow() - _timeInPotentialMode)) < (nowDriving ? REQUIRED_USECS_IN_NEW_MODE_BEFORE_INVISIBLE : REQUIRED_USECS_IN_NEW_MODE_BEFORE_VISIBLE)) { _timeInPotentialMode = 0; // a real transition
nowDriving = _driving; // Haven't accumulated enough time in new mode, but keep timing.
} else { // a real transition
_timeInPotentialMode = 0;
}
// If we're really in a transition
if (nowDriving != _driving) {
if (nowDriving) { if (nowDriving) {
_wantsOverlays = Menu::getInstance()->isOptionChecked(MenuOption::Overlays); _wantsOverlays = Menu::getInstance()->isOptionChecked(MenuOption::Overlays);
} else { // reset when coming out of driving } else { // reset when coming out of driving
@ -105,7 +98,7 @@ void OverlayConductor::updateMode() {
setEnabled(!nowDriving, false); setEnabled(!nowDriving, false);
} }
_driving = nowDriving; _driving = nowDriving;
} } // Else haven't accumulated enough time in new mode, but keep timing.
Mode newMode; Mode newMode;
if (qApp->isHMDMode()) { if (qApp->isHMDMode()) {