Set up double request seated recenter
This commit is contained in:
@@ -1253,7 +1253,15 @@ void MoveCenterTabController::incomingSeatedReset()
|
|||||||
{
|
{
|
||||||
if ( m_enableSeatedMotion )
|
if ( m_enableSeatedMotion )
|
||||||
{
|
{
|
||||||
updateSeatedResetData();
|
if ( !m_selfRequestedSeatedRecenter )
|
||||||
|
{
|
||||||
|
m_selfRequestedSeatedRecenter = true;
|
||||||
|
vr::VRSystem()->ResetSeatedZeroPose();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
updateSeatedResetData();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if ( parent->enableDebug() && parent->debugState() == 1 )
|
else if ( parent->enableDebug() && parent->debugState() == 1 )
|
||||||
{
|
{
|
||||||
@@ -1466,6 +1474,10 @@ void MoveCenterTabController::zeroOffsets()
|
|||||||
|
|
||||||
void MoveCenterTabController::sendSeatedRecenter()
|
void MoveCenterTabController::sendSeatedRecenter()
|
||||||
{
|
{
|
||||||
|
if ( parent->enableDebug() && parent->debugState() == 7 )
|
||||||
|
{
|
||||||
|
m_selfRequestedSeatedRecenter = true;
|
||||||
|
}
|
||||||
vr::VRSystem()->ResetSeatedZeroPose();
|
vr::VRSystem()->ResetSeatedZeroPose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1516,6 +1528,8 @@ void MoveCenterTabController::updateSeatedResetData()
|
|||||||
{
|
{
|
||||||
vr::VRChaperoneSetup()->ReloadFromDisk( vr::EChaperoneConfigFile_Live );
|
vr::VRChaperoneSetup()->ReloadFromDisk( vr::EChaperoneConfigFile_Live );
|
||||||
}
|
}
|
||||||
|
// done with this recenter, so set self request back to false for next time.
|
||||||
|
m_selfRequestedSeatedRecenter = false;
|
||||||
// set pending update here, will be processed on next instance of motion or
|
// set pending update here, will be processed on next instance of motion or
|
||||||
// running the reset() function.
|
// running the reset() function.
|
||||||
m_pendingSeatedRecenter = true;
|
m_pendingSeatedRecenter = true;
|
||||||
|
|||||||
@@ -176,6 +176,7 @@ private:
|
|||||||
bool m_pendingZeroOffsets = true;
|
bool m_pendingZeroOffsets = true;
|
||||||
bool m_pendingSeatedRecenter = false;
|
bool m_pendingSeatedRecenter = false;
|
||||||
bool m_pendingSeatedReloadFromDisk = false;
|
bool m_pendingSeatedReloadFromDisk = false;
|
||||||
|
bool m_selfRequestedSeatedRecenter = false;
|
||||||
bool m_dashWasOpenPreviousFrame = false;
|
bool m_dashWasOpenPreviousFrame = false;
|
||||||
bool m_roomSetupModeDetected = false;
|
bool m_roomSetupModeDetected = false;
|
||||||
bool m_seatedModeDetected = false;
|
bool m_seatedModeDetected = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user