Ssbugs, removal of re-vive, and dashboard loop tick (#277)
* minor changes * debugging testing * removed un-needed log calls * moved some logic to run only when dashboard is active * fixed linker error * added casting * removed revive tab * removed stray revive reference * removed revive from sources * fixed misc formatting issues * added newline
This commit is contained in:
@@ -137,8 +137,6 @@ OverlayController::OverlayController( bool desktopMode,
|
||||
m_moveCenterTabController.initStage1();
|
||||
m_audioTabController.initStage1();
|
||||
m_settingsTabController.initStage1();
|
||||
m_reviveTabController.initStage1(
|
||||
m_settingsTabController.forceRevivePage() );
|
||||
m_utilitiesTabController.initStage1();
|
||||
m_videoTabController.initStage1();
|
||||
|
||||
@@ -250,16 +248,6 @@ OverlayController::OverlayController( bool desktopMode,
|
||||
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
|
||||
return obj;
|
||||
} );
|
||||
qmlRegisterSingletonType<SteamVRTabController>(
|
||||
qmlSingletonImportName,
|
||||
1,
|
||||
0,
|
||||
"ReviveTabController",
|
||||
[]( QQmlEngine*, QJSEngine* ) {
|
||||
QObject* obj = &( objectAddress->m_reviveTabController );
|
||||
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
|
||||
return obj;
|
||||
} );
|
||||
qmlRegisterSingletonType<SteamVRTabController>(
|
||||
qmlSingletonImportName,
|
||||
1,
|
||||
@@ -488,7 +476,6 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
|
||||
m_audioTabController.initStage2();
|
||||
m_statisticsTabController.initStage2( this );
|
||||
m_settingsTabController.initStage2( this );
|
||||
m_reviveTabController.initStage2( this );
|
||||
m_utilitiesTabController.initStage2( this );
|
||||
m_moveCenterTabController.initStage2( this );
|
||||
}
|
||||
@@ -1055,16 +1042,19 @@ void OverlayController::mainEventLoop()
|
||||
m_moveCenterTabController.eventLoopTick(
|
||||
vr::VRCompositor()->GetTrackingSpace(), devicePoses );
|
||||
m_utilitiesTabController.eventLoopTick();
|
||||
m_fixFloorTabController.eventLoopTick( devicePoses );
|
||||
m_statisticsTabController.eventLoopTick(
|
||||
devicePoses, leftSpeed, rightSpeed );
|
||||
m_steamVRTabController.eventLoopTick();
|
||||
m_chaperoneTabController.eventLoopTick(
|
||||
devicePoses, leftSpeed, rightSpeed, hmdSpeed );
|
||||
m_settingsTabController.eventLoopTick();
|
||||
m_reviveTabController.eventLoopTick();
|
||||
m_audioTabController.eventLoopTick();
|
||||
|
||||
if ( vr::VROverlay()->IsDashboardVisible() )
|
||||
{
|
||||
m_settingsTabController.dashboardLoopTick();
|
||||
m_steamVRTabController.dashboardLoopTick();
|
||||
m_fixFloorTabController.dashboardLoopTick( devicePoses );
|
||||
}
|
||||
|
||||
if ( m_ulOverlayThumbnailHandle != vr::k_ulOverlayHandleInvalid )
|
||||
{
|
||||
while ( vr::VROverlay()->PollNextOverlayEvent(
|
||||
|
||||
Reference in New Issue
Block a user