Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove overlay when velocity first indicates travel, and restore it (with

Browse source 
reset) when returning to reset.
This commit is contained in:
howard-stearns 2016-05-13 14:32:54 -07:00
parent 85272a87ba
commit 1f664671f9
2 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,6 +67,32 @@ void OverlayConductor::update(float dt) {
}
void OverlayConductor::updateMode() {
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
float speed = glm::length(myAvatar->getVelocity());
bool nowDriving = _driving;
const float MIN_DRIVING = 0.2;
const float MAX_NOT_DRIVING = 0.01;
if (speed > MIN_DRIVING) {
nowDriving = true;
}
else if (speed < MAX_NOT_DRIVING) {
nowDriving = false;
}
if (nowDriving != _driving) {
if (nowDriving) {
_wantsOverlays = Menu::getInstance()->isOptionChecked(MenuOption::Overlays);
}
else { // reset when coming out of driving
_mode = FLAT; // Seems appropriate to let things reset, below, after the following.
// All reset of, e.g., room-scale location as though by apostrophe key, without all the other adjustments.
qApp->getActiveDisplayPlugin()->resetSensors();
}
if (_wantsOverlays) {
qDebug() << "flipping" << !nowDriving;
setEnabled(!nowDriving, false);
}
_driving = nowDriving;
}
Mode newMode;
if (qApp->isHMDMode()) {
@ -84,10 +110,9 @@ void OverlayConductor::updateMode() {
qApp->getApplicationCompositor().setModelTransform(identity);
break;
}
case STANDING: {
case STANDING: { // STANDING mode is not currently used.
// enter the STANDING state
// place the overlay at the current hmd position in world space
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
auto camMat = cancelOutRollAndPitch(myAvatar->getSensorToWorldMatrix() * qApp->getHMDSensorPose());
Transform t;
t.setTranslation(extractTranslation(camMat));
@ -103,15 +128,18 @@ void OverlayConductor::updateMode() {
}
_mode = newMode;
}
void OverlayConductor::setEnabled(bool enabled) {
void OverlayConductor::setEnabled(bool enabled, bool toggleQmlEvents) {
if (enabled == _enabled) {
return;
}
Menu::getInstance()->setIsOptionChecked(MenuOption::Overlays, enabled);
if (toggleQmlEvents) { // Could recurse on us with the wrong toggleQmlEvents flag, and not need in the !toggleQmlEvent case anyway.
Menu::getInstance()->setIsOptionChecked(MenuOption::Overlays, enabled);
}
_enabled = enabled; // set the new value
@ -124,8 +152,10 @@ void OverlayConductor::setEnabled(bool enabled) {
qApp->getOverlays().enable();
// enable QML events
auto offscreenUi = DependencyManager::get<OffscreenUi>();
offscreenUi->getRootItem()->setEnabled(true);
if (toggleQmlEvents) {
auto offscreenUi = DependencyManager::get<OffscreenUi>();
offscreenUi->getRootItem()->setEnabled(true);
}
if (_mode == STANDING) {
// place the overlay at the current hmd position in world space
@ -144,8 +174,10 @@ void OverlayConductor::setEnabled(bool enabled) {
qApp->getOverlays().disable();
// disable QML events
auto offscreenUi = DependencyManager::get<OffscreenUi>();
offscreenUi->getRootItem()->setEnabled(false);
if (toggleQmlEvents) { // I'd really rather always do this, but it looses drive state. bugzid:501
auto offscreenUi = DependencyManager::get<OffscreenUi>();
offscreenUi->getRootItem()->setEnabled(false);
}
}
}

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

@ -17,7 +17,7 @@ public:
~OverlayConductor();
void update(float dt);
void setEnabled(bool enable);
void setEnabled(bool enable, bool toggleQmlEvents = true);
bool getEnabled() const;
private:
@ -31,6 +31,8 @@ private:
Mode _mode { FLAT };
bool _enabled { false };
bool _driving { false };
bool _wantsOverlays { true };
};
#endif