Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

added lookup table for tracking result and configs

Browse source
This commit is contained in:
Dante Ruiz 2017-05-13 00:40:07 +01:00
parent 052126bdd2
commit e6020e0137
2 changed files with 25 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -56,6 +56,14 @@ static const int CHEST = 3;
const char* ViveControllerManager::NAME { "OpenVR" }; const char* ViveControllerManager::NAME { "OpenVR" };
const std::map<vr::ETrackingResult, QString> TRACKING_RESULT_TO_STRING = {
{vr::TrackingResult_Uninitialized, QString("vr::TrackingResult_Uninitialized")},
{vr::TrackingResult_Calibrating_InProgress, QString("vr::TrackingResult_Calibrating_InProgess")},
{vr::TrackingResult_Calibrating_OutOfRange, QString("TrackingResult_Calibrating_OutOfRange")},
{vr::TrackingResult_Running_OK, QString("TrackingResult_Running_Ok")},
{vr::TrackingResult_Running_OutOfRange, QString("TrackingResult_Running_OutOfRange")}
};
static glm::mat4 computeOffset(glm::mat4 defaultToReferenceMat, glm::mat4 defaultJointMat, controller::Pose puckPose) { static glm::mat4 computeOffset(glm::mat4 defaultToReferenceMat, glm::mat4 defaultJointMat, controller::Pose puckPose) {
glm::mat4 poseMat = createMatFromQuatAndPos(puckPose.rotation, puckPose.translation); glm::mat4 poseMat = createMatFromQuatAndPos(puckPose.rotation, puckPose.translation);
glm::mat4 referenceJointMat = defaultToReferenceMat * defaultJointMat; glm::mat4 referenceJointMat = defaultToReferenceMat * defaultJointMat;
@ -68,22 +76,10 @@ static bool sortPucksYPosition(std::pair<uint32_t, controller::Pose> firstPuck,
static QString deviceTrackingResultToString(vr::ETrackingResult trackingResult) { static QString deviceTrackingResultToString(vr::ETrackingResult trackingResult) {
QString result; QString result;
switch (trackingResult) { auto iterator = TRACKING_RESULT_TO_STRING.find(trackingResult);
case vr::TrackingResult_Uninitialized:
result = "vr::TrackingResult_Uninitialized"; if (iterator != TRACKING_RESULT_TO_STRING.end()) {
break; return iterator->second;
case vr::TrackingResult_Calibrating_InProgress:
result = "vr::TrackingResult_Calibrating_InProgess";
break;
case vr::TrackingResult_Calibrating_OutOfRange:
result = "vr::TrackingResult_Calibrating_OutOfRange";
break;
case vr::TrackingResult_Running_OK:
result = "vr::TrackingResult_Running_OK";
break;
case vr::TrackingResult_Running_OutOfRange:
result = "vr::TrackingResult_Running_OutOfRange";
break;
} }
return result; return result;
} }
@ -166,6 +162,15 @@ void ViveControllerManager::pluginUpdate(float deltaTime, const controller::Inpu
} }
} }
ViveControllerManager::InputDevice::InputDevice(vr::IVRSystem*& system) : controller::InputDevice("Vive"), _system(system) {
createPreferences();
_configStringMap[Config::Auto] = QString("Auto");
_configStringMap[Config::Feet] = QString("Feet");
_configStringMap[Config::FeetAndHips] = QString("FeetAndHips");
_configStringMap[Config::FeetHipsAndChest] = QString("FeetHipsAndChest");
}
void ViveControllerManager::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) { void ViveControllerManager::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
_poseStateMap.clear(); _poseStateMap.clear();
_buttonPressedMap.clear(); _buttonPressedMap.clear();
@ -626,25 +631,7 @@ void ViveControllerManager::InputDevice::saveSettings() const {
} }
QString ViveControllerManager::InputDevice::configToString(Config config) { QString ViveControllerManager::InputDevice::configToString(Config config) {
QString currentConfig; return _configStringMap[config];
switch (config) {
case Config::Auto:
currentConfig = "Auto";
break;
case Config::Feet:
currentConfig = "Feet";
break;
case Config::FeetAndHips:
currentConfig = "FeetAndHips";
break;
case Config::FeetHipsAndChest:
currentConfig = "FeetHipsAndChest";
break;
}
return currentConfig;
} }
void ViveControllerManager::InputDevice::setConfigFromString(const QString& value) { void ViveControllerManager::InputDevice::setConfigFromString(const QString& value) {
@ -665,7 +652,7 @@ void ViveControllerManager::InputDevice::createPreferences() {
static const QString VIVE_PUCKS_CONFIG = "Vive Pucks Configuration"; static const QString VIVE_PUCKS_CONFIG = "Vive Pucks Configuration";
{ {
auto getter = [this]()->QString { return configToString(_preferedConfig); }; auto getter = [this]()->QString { return _configStringMap[_preferedConfig]; };
auto setter = [this](const QString& value) { setConfigFromString(value); saveSettings(); }; auto setter = [this](const QString& value) { setConfigFromString(value); saveSettings(); };
auto preference = new ComboBoxPreference(VIVE_PUCKS_CONFIG, "Configuration", getter, setter); auto preference = new ComboBoxPreference(VIVE_PUCKS_CONFIG, "Configuration", getter, setter);
QStringList list = (QStringList() << "Auto" << "Feet" << "FeetAndHips" << "FeetHipsAndChest"); QStringList list = (QStringList() << "Auto" << "Feet" << "FeetAndHips" << "FeetHipsAndChest");

3
plugins/openvr/src/ViveControllerManager.h
View file

@ -51,7 +51,7 @@ public:
private: private:
class InputDevice : public controller::InputDevice { class InputDevice : public controller::InputDevice {
public: public:
InputDevice(vr::IVRSystem*& system) : controller::InputDevice("Vive"), _system(system) { createPreferences(); } InputDevice(vr::IVRSystem*& system);
private: private:
// Device functions // Device functions
controller::Input::NamedVector getAvailableInputs() const override; controller::Input::NamedVector getAvailableInputs() const override;
@ -111,6 +111,7 @@ private:
std::vector<std::pair<uint32_t, controller::Pose>> _validTrackedObjects; std::vector<std::pair<uint32_t, controller::Pose>> _validTrackedObjects;
std::map<uint32_t, glm::mat4> _pucksOffset; std::map<uint32_t, glm::mat4> _pucksOffset;
std::map<int, uint32_t> _jointToPuckMap; std::map<int, uint32_t> _jointToPuckMap;
std::map<Config, QString> _configStringMap;
PoseData _lastSimPoseData; PoseData _lastSimPoseData;
// perform an action when the InputDevice mutex is acquired. // perform an action when the InputDevice mutex is acquired.
using Locker = std::unique_lock<std::recursive_mutex>; using Locker = std::unique_lock<std::recursive_mutex>;