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

use temp chaperone config during move

Browse Source
This commit is contained in:
Robin Appelman
2018-04-02 02:16:25 +02:00
parent ceeb62235c
commit 9fb22b7d0b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/MoveCenterTabController.cpp
+2 -5
View File
@@ -109,7 +109,6 @@ void MoveCenterTabController::setAdjustChaperone(bool value, bool notify) {
if (m_adjustChaperone != value) { if (m_adjustChaperone != value) {
m_adjustChaperone = value; m_adjustChaperone = value;
if (m_trackingUniverse == vr::TrackingUniverseStanding) { if (m_trackingUniverse == vr::TrackingUniverseStanding) {
vr::VRChaperoneSetup()->RevertWorkingCopy();
auto angle = m_rotation * 2 * M_PI / 360.0; auto angle = m_rotation * 2 * M_PI / 360.0;
float offsetdir = m_adjustChaperone ? -1.0 : 1.0; float offsetdir = m_adjustChaperone ? -1.0 : 1.0;
float offset[3] = { float offset[3] = {
@@ -269,7 +268,6 @@ void MoveCenterTabController::eventLoopTick(vr::ETrackingUniverseOrigin universe
settingsUpdateCounter = 0; settingsUpdateCounter = 0;
} else { } else {
settingsUpdateCounter++; settingsUpdateCounter++;
auto oldMoveHand = m_activeMoveController; auto oldMoveHand = m_activeMoveController;
auto newMoveHand = getMoveShortcutHand(); auto newMoveHand = getMoveShortcutHand();
auto handId = vr::VRSystem()->GetTrackedDeviceIndexForControllerRole(newMoveHand); auto handId = vr::VRSystem()->GetTrackedDeviceIndexForControllerRole(newMoveHand);
@@ -278,10 +276,9 @@ void MoveCenterTabController::eventLoopTick(vr::ETrackingUniverseOrigin universe
emit offsetXChanged(m_offsetX); emit offsetXChanged(m_offsetX);
emit offsetYChanged(m_offsetY); emit offsetYChanged(m_offsetY);
emit offsetZChanged(m_offsetZ); emit offsetZChanged(m_offsetZ);
vr::VRChaperoneSetup()->CommitWorkingCopy(vr::EChaperoneConfigFile_Live);
} }
return; return;
} else if (newMoveHand != vr::TrackedControllerRole_Invalid && oldMoveHand == vr::TrackedControllerRole_Invalid) {
vr::VRChaperoneSetup()->RevertWorkingCopy();
} }
vr::TrackedDevicePose_t* pose = devicePoses + handId; vr::TrackedDevicePose_t* pose = devicePoses + handId;
vr::VRControllerState_t state; vr::VRControllerState_t state;
@@ -316,7 +313,7 @@ void MoveCenterTabController::eventLoopTick(vr::ETrackingUniverseOrigin universe
rotateCoordinates(diff, angle); rotateCoordinates(diff, angle);
parent->AddOffsetToUniverseCenter((vr::TrackingUniverseOrigin)m_trackingUniverse, diff, m_adjustChaperone, false); parent->AddOffsetToUniverseCenter((vr::TrackingUniverseOrigin)m_trackingUniverse, diff, m_adjustChaperone, false);
vr::VRChaperoneSetup()->CommitWorkingCopy(vr::EChaperoneConfigFile_Live); vr::VRChaperoneSetup()->CommitWorkingCopy(vr::EChaperoneConfigFile_Temp);
} }
m_lastControllerPosition[0] = absoluteControllerPosition[0]; m_lastControllerPosition[0] = absoluteControllerPosition[0];
m_lastControllerPosition[1] = absoluteControllerPosition[1]; m_lastControllerPosition[1] = absoluteControllerPosition[1];