SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial work on virtual move shortcut

Browse Source
This commit is contained in:
Robin Appelman
2018-03-14 16:48:10 +01:00
parent 6da9e724c0
commit f9cf2880cd
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/MoveCenterTabController.cpp
+41 -1
View File
@@ -192,12 +192,52 @@ void MoveCenterTabController::reset() {
emit rotationChanged(m_rotation);
}
void MoveCenterTabController::eventLoopTick(vr::ETrackingUniverseOrigin universe) {
void MoveCenterTabController::eventLoopTick(vr::ETrackingUniverseOrigin universe, vr::TrackedDevicePose_t* devicePoses) {
if (settingsUpdateCounter >= 50) {
setTrackingUniverse((int)universe);
settingsUpdateCounter = 0;
} else {
settingsUpdateCounter++;
auto rightId = vr::VRSystem()->GetTrackedDeviceIndexForControllerRole(vr::TrackedControllerRole_RightHand);
if (rightId == vr::k_unTrackedDeviceIndexInvalid) {
return;
}
vr::TrackedDevicePose_t* rightPose = devicePoses + rightId;
vr::VRControllerState_t state;
if (vr::VRSystem()->GetControllerState(rightId, &state, sizeof(vr::VRControllerState_t))) {
if (state.ulButtonPressed & vr::ButtonMaskFromId(vr::k_EButton_ApplicationMenu)) {
float newControllerX = rightPose->mDeviceToAbsoluteTracking.m[0][3];
float newControllerY = rightPose->mDeviceToAbsoluteTracking.m[1][3];
float newControllerZ = rightPose->mDeviceToAbsoluteTracking.m[2][3];
if (m_moveActive) {
float diffX = newControllerX - m_lastControllerX;
float diffY = newControllerY - m_lastControllerY;
float diffZ = newControllerZ - m_lastControllerZ;
vr::VRChaperoneSetup()->RevertWorkingCopy();
parent->AddOffsetToUniverseCenter((vr::TrackingUniverseOrigin)m_trackingUniverse, 0, diffX, m_adjustChaperone, false);
parent->AddOffsetToUniverseCenter((vr::TrackingUniverseOrigin)m_trackingUniverse, 1, diffY, m_adjustChaperone, false);
parent->AddOffsetToUniverseCenter((vr::TrackingUniverseOrigin)m_trackingUniverse, 2, diffZ, m_adjustChaperone, false);
vr::VRChaperoneSetup()->CommitWorkingCopy(vr::EChaperoneConfigFile_Live);
m_offsetX += diffX;
m_offsetY += diffY;
m_offsetZ += diffZ;
}
m_moveActive = true;
m_lastControllerX = newControllerX;
m_lastControllerY = newControllerY;
m_lastControllerZ = newControllerZ;
}
else {
if (m_moveActive) {
emit offsetXChanged(m_offsetX);
emit offsetYChanged(m_offsetY);
emit offsetZChanged(m_offsetZ);
}
m_moveActive = false;
return;
}
}
}
}
src/tabcontrollers/MoveCenterTabController.h
+5 -1
View File
@@ -31,6 +31,10 @@ private:
float m_offsetZ = 0.0f;
int m_rotation = 0;
bool m_adjustChaperone = true;
bool m_moveActive = false;
float m_lastControllerX = 0.0f;
float m_lastControllerY = 0.0f;
float m_lastControllerZ = 0.0f;
unsigned settingsUpdateCounter = 0;
@@ -38,7 +42,7 @@ public:
void initStage1();
void initStage2(OverlayController* parent, QQuickWindow* widget);
void eventLoopTick(vr::ETrackingUniverseOrigin universe);
void eventLoopTick(vr::ETrackingUniverseOrigin universe, vr::TrackedDevicePose_t* devicePoses);
float offsetX() const;
float offsetY() const;