From 8dc97142827ec1e9fb1f72af5a3711239cbfa58b Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Thu, 27 Jul 2017 09:08:34 -0700
Subject: [PATCH] Pass armCircumference and shoulderWidth to qml.
---
.../resources/qml/hifi/tablet/OpenVrConfiguration.qml | 3 +++
plugins/openvr/src/ViveControllerManager.cpp | 7 +++++++
2 files changed, 10 insertions(+)
diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index 36424e22b4..e3aff97557 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -878,6 +878,9 @@ Rectangle {
var viveController = settings["handController"];
var desktopMode = settings["desktopMode"];
+ armCircumference.value = settings.armCircumference;
+ shoulderWidth.value = settings.shoulderWidth;
+
if (HmdHead) {
headBox.checked = true;
headPuckBox.checked = false;
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 61a0b33255..5aaf92ed0b 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -375,6 +375,7 @@ void ViveControllerManager::InputDevice::calibrateFromUI(const controller::Input
}
static const float CM_TO_M = 0.01f;
+static const float M_TO_CM = 100.0f;
void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJsonObject configurationSettings) {
Locker locker(_lock);
@@ -411,6 +412,10 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
_armCircumference = shoulderObj["armCircumference"].toDouble() * CM_TO_M;
_shoulderWidth = shoulderObj["shoulderWidth"].toDouble() * CM_TO_M;
}
+ } else if (iter.key() == "armCircumference") {
+ _armCircumference = (float)iter.value().toDouble() * CM_TO_M;
+ } else if (iter.key() == "shoulderWidth") {
+ _shoulderWidth = (float)iter.value().toDouble() * CM_TO_M;
}
iter++;
}
@@ -429,6 +434,8 @@ QJsonObject ViveControllerManager::InputDevice::configurationSettings() {
configurationSettings["HMDHead"] = (_headConfig == HeadConfig::HMD);
configurationSettings["handController"] = (_handConfig == HandConfig::HandController);
configurationSettings["puckCount"] = (int)_validTrackedObjects.size();
+ configurationSettings["armCircumference"] = (double)_armCircumference * M_TO_CM;
+ configurationSettings["shoulderWidth"] = (double)_shoulderWidth * M_TO_CM;
return configurationSettings;
}