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

Resolve the comments of @ZappoMan.

Browse source
This commit is contained in:
volansystech 2017-05-29 18:21:59 +05:30
parent 212627bd5d
commit e90b1b5a67
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -246,6 +246,7 @@ Setting::Handle<int> maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTRE
static const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com"; static const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com";
static const int INTERVAL_TO_CHECK_HMD_MOUNTED_STATUS = 500; // milliseconds static const int INTERVAL_TO_CHECK_HMD_MOUNTED_STATUS = 500; // milliseconds
static const QString OCULUS_RIFT_DISPLAY_PLUGIN_NAME = "Oculus Rift"; static const QString OCULUS_RIFT_DISPLAY_PLUGIN_NAME = "Oculus Rift";
static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop";
const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions { const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions {
{ SVO_EXTENSION, &Application::importSVOFromURL }, { SVO_EXTENSION, &Application::importSVOFromURL },
@ -1348,8 +1349,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
!_hmdPlugin->isStandBySessionActive()) { !_hmdPlugin->isStandBySessionActive()) {
startHMDStandBySession(); startHMDStandBySession();
} }
// Poll periodically to check whether the user has worn HMD or not. And switch Display mode accordingly. // Poll periodically to check whether the user has worn HMD or not. Switch Display mode accordingly.
// If the user wear HMD then switch to VR mode. If the user removes HMD then switch to Desktop mode. // If the user wears HMD then switch to VR mode. If the user removes HMD then switch to Desktop mode.
QTimer *switchDisplayModeTimer = new QTimer(this); QTimer *switchDisplayModeTimer = new QTimer(this);
connect(switchDisplayModeTimer, SIGNAL(timeout()), this, SLOT(switchDisplayMode())); connect(switchDisplayModeTimer, SIGNAL(timeout()), this, SLOT(switchDisplayMode()));
switchDisplayModeTimer->start(INTERVAL_TO_CHECK_HMD_MOUNTED_STATUS); switchDisplayModeTimer->start(INTERVAL_TO_CHECK_HMD_MOUNTED_STATUS);
@ -6773,7 +6774,7 @@ void Application::switchDisplayMode() {
// Switch to respective mode as soon as currenthmdMountedStatus changes // Switch to respective mode as soon as currenthmdMountedStatus changes
if (currentHMDMountedStatus == false && _hmdMountedStatus == true) { if (currentHMDMountedStatus == false && _hmdMountedStatus == true) {
qCDebug(interfaceapp) << "Switching from HMD to desktop mode"; qCDebug(interfaceapp) << "Switching from HMD to desktop mode";
setActiveDisplayPlugin("Desktop"); setActiveDisplayPlugin(DESKTOP_DISPLAY_PLUGIN_NAME);
startHMDStandBySession(); startHMDStandBySession();
} }
if (currentHMDMountedStatus == true && _hmdMountedStatus == false) { if (currentHMDMountedStatus == true && _hmdMountedStatus == false) {