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

Fix possible startup issue on WMR (#160)

Browse Source 
* Add more checks for zero quads count for WMR

* Delay initial zeroOffsets() to init stage2

* Re-add OpenVR 1.3.22 libraries
This commit is contained in:
Kung-vr
2019-04-17 12:56:27 -05:00
committed by ykeara
parent 154bbe2642
commit fcbc11e659
5 changed files with 46 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlaycontroller.cpp
+1 -1
View File
@@ -420,7 +420,6 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
m_steamVRTabController.initStage2( this, m_pWindow.get() );
m_chaperoneTabController.initStage2( this, m_pWindow.get() );
m_moveCenterTabController.initStage2( this, m_pWindow.get() );
m_fixFloorTabController.initStage2( this, m_pWindow.get() );
m_audioTabController.initStage2( this, m_pWindow.get() );
m_statisticsTabController.initStage2( this, m_pWindow.get() );
@@ -428,6 +427,7 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
m_reviveTabController.initStage2( this, m_pWindow.get() );
m_utilitiesTabController.initStage2( this, m_pWindow.get() );
m_videoTabController.initStage2( this, m_pWindow.get() );
m_moveCenterTabController.initStage2( this, m_pWindow.get() );
}
void OverlayController::OnRenderRequest()
src/tabcontrollers/MoveCenterTabController.cpp
+33 -6
View File
@@ -131,7 +131,6 @@ void MoveCenterTabController::initStage1()
settings->endGroup();
m_lastDragUpdateTimePoint = std::chrono::steady_clock::now();
m_lastGravityUpdateTimePoint = std::chrono::steady_clock::now();
zeroOffsets();
}
void MoveCenterTabController::initStage2( OverlayController* var_parent,
@@ -139,6 +138,7 @@ void MoveCenterTabController::initStage2( OverlayController* var_parent,
{
this->parent = var_parent;
this->widget = var_widget;
zeroOffsets();
}
void MoveCenterTabController::outputLogPoses()
@@ -961,7 +961,13 @@ void MoveCenterTabController::updateSeatedResetData()
emit offsetYChanged( m_offsetY );
emit offsetZChanged( m_offsetZ );
emit rotationChanged( m_rotation );
parent->chaperoneUtils().loadChaperoneData( false );
unsigned checkQuadCount = 0;
vr::VRChaperoneSetup()->GetWorkingCollisionBoundsInfo( nullptr,
&checkQuadCount );
if ( checkQuadCount > 0 )
{
parent->chaperoneUtils().loadChaperoneData( false );
}
}
void MoveCenterTabController::updateChaperoneResetData()
@@ -1024,7 +1030,13 @@ void MoveCenterTabController::updateChaperoneResetData()
}
}
parent->chaperoneUtils().loadChaperoneData( false );
unsigned checkQuadCount = 0;
vr::VRChaperoneSetup()->GetWorkingCollisionBoundsInfo( nullptr,
&checkQuadCount );
if ( checkQuadCount > 0 )
{
parent->chaperoneUtils().loadChaperoneData( false );
}
}
void MoveCenterTabController::applyChaperoneResetData()
@@ -1043,7 +1055,13 @@ void MoveCenterTabController::applyChaperoneResetData()
vr::VRChaperoneSetup()->CommitWorkingCopy( vr::EChaperoneConfigFile_Live );
parent->chaperoneUtils().loadChaperoneData( false );
unsigned checkQuadCount = 0;
vr::VRChaperoneSetup()->GetWorkingCollisionBoundsInfo( nullptr,
&checkQuadCount );
if ( checkQuadCount > 0 )
{
parent->chaperoneUtils().loadChaperoneData( false );
}
}
// START of drag bindings:
@@ -1760,7 +1778,13 @@ void MoveCenterTabController::saveUncommittedChaperone()
vr::VRChaperoneSetup()->CommitWorkingCopy(
vr::EChaperoneConfigFile_Live );
m_chaperoneCommitted = true;
parent->chaperoneUtils().loadChaperoneData( false );
unsigned checkQuadCount = 0;
vr::VRChaperoneSetup()->GetWorkingCollisionBoundsInfo(
nullptr, &checkQuadCount );
if ( checkQuadCount > 0 )
{
parent->chaperoneUtils().loadChaperoneData( false );
}
}
}
@@ -2240,7 +2264,10 @@ void MoveCenterTabController::updateSpace()
// loadChaperoneData( false ), false so that we don't load live data, and
// reference the working set instead.
parent->chaperoneUtils().loadChaperoneData( false );
if ( m_collisionBoundsCountForReset > 0 )
{
parent->chaperoneUtils().loadChaperoneData( false );
}
m_oldOffsetX = m_offsetX;
m_oldOffsetY = m_offsetY;