From ed726c9d77ae8e218cc51e99add5e79fbcabb1a9 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 14 May 2018 13:51:13 -0700 Subject: [PATCH] OpenVR: Remove reference to HMD Standing Mode menu item This menu item has not existed for over a year. I was sometimes seeing a crash on startup when the display plugin attempted to reference this menu item. --- interface/src/Menu.h | 1 - plugins/openvr/src/OpenVrDisplayPlugin.cpp | 3 --- 2 files changed, 4 deletions(-) diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 20375a71b2..be3dd705f7 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -193,7 +193,6 @@ namespace MenuOption { const QString ShowOtherLookAtVectors = "Show Other Eye Vectors"; const QString EnableLookAtSnapping = "Enable LookAt Snapping"; const QString ShowRealtimeEntityStats = "Show Realtime Entity Stats"; - const QString StandingHMDSensorMode = "Standing HMD Sensor Mode"; const QString SimulateEyeTracking = "Simulate"; const QString SMIEyeTracking = "SMI Eye Tracking"; const QString SparseTextureManagement = "Enable Sparse Texture Management"; diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp index 714cb91b3f..5a7417cb49 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp +++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp @@ -36,7 +36,6 @@ Q_DECLARE_LOGGING_CATEGORY(displayplugins) -const char* StandingHMDSensorMode { "Standing HMD Sensor Mode" }; // this probably shouldn't be hardcoded here const char* OpenVrThreadedSubmit { "OpenVR Threaded Submit" }; // this probably shouldn't be hardcoded here PoseData _nextRenderPoseData; @@ -451,7 +450,6 @@ bool OpenVrDisplayPlugin::internalActivate() { qDebug() << "OpenVR Threaded submit enabled: " << _threadedSubmit; _openVrDisplayActive = true; - _container->setIsOptionChecked(StandingHMDSensorMode, true); _system->GetRecommendedRenderTargetSize(&_renderTargetSize.x, &_renderTargetSize.y); // Recommended render target size is per-eye, so double the X size for // left + right eyes @@ -507,7 +505,6 @@ void OpenVrDisplayPlugin::internalDeactivate() { Parent::internalDeactivate(); _openVrDisplayActive = false; - _container->setIsOptionChecked(StandingHMDSensorMode, false); if (_system) { // TODO: Invalidate poses. It's fine if someone else sets these shared values, but we're about to stop updating them, and // we don't want ViveControllerManager to consider old values to be valid.