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

Fixes based on PR feedback

Browse source 
* The "Clear Overlay When Driving" avatar preference is obeyed.
* sensor reset will also center the ui.
This commit is contained in:
Anthony J. Thibault 2016-06-13 11:19:47 -07:00
parent ccf85c1f7c
commit ab4bef7d55
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -4209,6 +4209,7 @@ void Application::resetSensors(bool andReload) {
DependencyManager::get<DdeFaceTracker>()->reset(); DependencyManager::get<DdeFaceTracker>()->reset();
DependencyManager::get<EyeTracker>()->reset(); DependencyManager::get<EyeTracker>()->reset();
getActiveDisplayPlugin()->resetSensors(); getActiveDisplayPlugin()->resetSensors();
_overlayConductor.centerUI();
getMyAvatar()->reset(andReload); getMyAvatar()->reset(andReload);
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection); QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);
} }

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

@ -139,7 +139,7 @@ void OverlayConductor::update(float dt) {
switch (getState()) { switch (getState()) {
case Enabled: case Enabled:
if (qApp->isHMDMode() && headOutsideOverlay()) { if (myAvatar->getClearOverlayWhenDriving() && qApp->isHMDMode() && headOutsideOverlay()) {
setState(DisabledByHead); setState(DisabledByHead);
setEnabled(false); setEnabled(false);
} }
@ -147,7 +147,7 @@ void OverlayConductor::update(float dt) {
setState(DisabledByToggle); setState(DisabledByToggle);
setEnabled(false); setEnabled(false);
} }
if (drivingChanged && isDriving) { if (myAvatar->getClearOverlayWhenDriving() && drivingChanged && isDriving) {
setState(DisabledByDrive); setState(DisabledByDrive);
setEnabled(false); setEnabled(false);
} }
@ -192,7 +192,7 @@ void OverlayConductor::setEnabled(bool enabled) {
// if the new state is visible/enabled... // if the new state is visible/enabled...
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar(); MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
if (_enabled && myAvatar->getClearOverlayWhenDriving() && qApp->isHMDMode()) { if (_enabled && qApp->isHMDMode()) {
centerUI(); centerUI();
} }
} }

3
interface/src/ui/OverlayConductor.h
View file

@ -20,13 +20,14 @@ public:
void setEnabled(bool enable); void setEnabled(bool enable);
bool getEnabled() const; bool getEnabled() const;
void centerUI();
private: private:
bool headOutsideOverlay() const; bool headOutsideOverlay() const;
bool updateAvatarHasDriveInput(); bool updateAvatarHasDriveInput();
bool updateAvatarIsAtRest(); bool updateAvatarIsAtRest();
bool userWishesToHide() const; bool userWishesToHide() const;
bool userWishesToShow() const; bool userWishesToShow() const;
void centerUI();
enum State { enum State {
Enabled = 0, Enabled = 0,