From 22a913bee2882aa14733c22c99080db4bc405f1a Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 15 Jul 2019 21:10:42 -0700
Subject: [PATCH] fix bug that caused comfort-mode to be active at all times in
HMD
---
.../src/display-plugins/hmd/HmdDisplayPlugin.cpp | 15 +++------------
plugins/oculus/src/OculusDisplayPlugin.cpp | 4 ++--
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 9cbf189b38..24c16c1493 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -485,22 +485,13 @@ float HmdDisplayPlugin::stutterRate() const {
}
float adjustVisionSqueezeRatioForDevice(float visionSqueezeRatio, float visionSqueezeDeviceLow, float visionSqueezeDeviceHigh) {
- const float SETTINGS_STEP = 0.2f; // adjusting the slider in preferences changes the ratio by this much
-
- if (visionSqueezeRatio == 0.0f) {
+ if (visionSqueezeRatio <= 0.0f) {
return 0.0f;
}
float deviceRange = visionSqueezeDeviceHigh - visionSqueezeDeviceLow;
-
- if (visionSqueezeRatio <= SETTINGS_STEP) {
- // lowest "enabled" setting -- without this special case the user doesn't see anything on the lowest setting
- float scaleFactor = (visionSqueezeRatio == SETTINGS_STEP) ? 0.24f : 0.18f; // these magic values were picked through experimentation
- return deviceRange * scaleFactor + visionSqueezeDeviceLow;
- } else {
- const float SQUEEZE_ADJUSTMENT = 0.75f; // magic number picked through experimentation
- return deviceRange * (SQUEEZE_ADJUSTMENT * visionSqueezeRatio) + visionSqueezeDeviceLow;
- }
+ const float SQUEEZE_ADJUSTMENT = 0.75f; // magic number picked through experimentation
+ return deviceRange * (SQUEEZE_ADJUSTMENT * visionSqueezeRatio) + visionSqueezeDeviceLow;
}
void HmdDisplayPlugin::updateVisionSqueezeParameters(float visionSqueezeX, float visionSqueezeY,
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index b2fc6881f4..a2dc7be325 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -55,9 +55,9 @@ void OculusDisplayPlugin::init() {
// Different HMDs end up showing the squeezed-vision egg as different sizes. These values
// attempt to make them appear the same.
- _visionSqueezeDeviceLowX = 0.8f;
+ _visionSqueezeDeviceLowX = 0.7f;
_visionSqueezeDeviceHighX = 0.98f;
- _visionSqueezeDeviceLowY = 0.8f;
+ _visionSqueezeDeviceLowY = 0.7f;
_visionSqueezeDeviceHighY = 0.9f;
emit deviceConnected(getName());