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

Prefix OverlayController TabController members with m_

Browse Source
This commit is contained in:
Vasily
2019-01-11 23:04:57 +01:00
parent d4fbdf5877
commit 148acf08ef
3 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlaycontroller.cpp
+44 -42
View File
@@ -222,16 +222,17 @@ OverlayController::OverlayController( bool desktopMode,
} }
// Init controllers // Init controllers
steamVRTabController.initStage1(); m_steamVRTabController.initStage1();
chaperoneTabController.initStage1(); m_chaperoneTabController.initStage1();
moveCenterTabController.initStage1(); m_moveCenterTabController.initStage1();
fixFloorTabController.initStage1(); m_fixFloorTabController.initStage1();
audioTabController.initStage1(); m_audioTabController.initStage1();
statisticsTabController.initStage1(); m_statisticsTabController.initStage1();
settingsTabController.initStage1(); m_settingsTabController.initStage1();
reviveTabController.initStage1( settingsTabController.forceRevivePage() ); m_reviveTabController.initStage1(
utilitiesTabController.initStage1(); m_settingsTabController.forceRevivePage() );
accessibilityTabController.initStage1(); m_utilitiesTabController.initStage1();
m_accessibilityTabController.initStage1();
// Set qml context // Set qml context
qmlEngine.rootContext()->setContextProperty( "applicationVersion", qmlEngine.rootContext()->setContextProperty( "applicationVersion",
@@ -266,7 +267,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"SteamVRTabController", "SteamVRTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->steamVRTabController ); QObject* obj = &( objectAddress->m_steamVRTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -276,7 +277,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"ChaperoneTabController", "ChaperoneTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->chaperoneTabController ); QObject* obj = &( objectAddress->m_chaperoneTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -286,7 +287,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"MoveCenterTabController", "MoveCenterTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->moveCenterTabController ); QObject* obj = &( objectAddress->m_moveCenterTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -296,7 +297,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"FixFloorTabController", "FixFloorTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->fixFloorTabController ); QObject* obj = &( objectAddress->m_fixFloorTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -306,7 +307,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"AudioTabController", "AudioTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->audioTabController ); QObject* obj = &( objectAddress->m_audioTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -316,7 +317,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"StatisticsTabController", "StatisticsTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->statisticsTabController ); QObject* obj = &( objectAddress->m_statisticsTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -326,7 +327,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"SettingsTabController", "SettingsTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->settingsTabController ); QObject* obj = &( objectAddress->m_settingsTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -336,7 +337,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"ReviveTabController", "ReviveTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->reviveTabController ); QObject* obj = &( objectAddress->m_reviveTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -346,7 +347,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"UtilitiesTabController", "UtilitiesTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->utilitiesTabController ); QObject* obj = &( objectAddress->m_utilitiesTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -356,7 +357,7 @@ OverlayController::OverlayController( bool desktopMode,
0, 0,
"AccessibilityTabController", "AccessibilityTabController",
[]( QQmlEngine*, QJSEngine* ) { []( QQmlEngine*, QJSEngine* ) {
QObject* obj = &( objectAddress->accessibilityTabController ); QObject* obj = &( objectAddress->m_accessibilityTabController );
QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership ); QQmlEngine::setObjectOwnership( obj, QQmlEngine::CppOwnership );
return obj; return obj;
} ); } );
@@ -493,16 +494,16 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
m_pPumpEventsTimer->setInterval( 20 ); m_pPumpEventsTimer->setInterval( 20 );
m_pPumpEventsTimer->start(); m_pPumpEventsTimer->start();
steamVRTabController.initStage2( this, m_pWindow.get() ); m_steamVRTabController.initStage2( this, m_pWindow.get() );
chaperoneTabController.initStage2( this, m_pWindow.get() ); m_chaperoneTabController.initStage2( this, m_pWindow.get() );
moveCenterTabController.initStage2( this, m_pWindow.get() ); m_moveCenterTabController.initStage2( this, m_pWindow.get() );
fixFloorTabController.initStage2( this, m_pWindow.get() ); m_fixFloorTabController.initStage2( this, m_pWindow.get() );
audioTabController.initStage2( this, m_pWindow.get() ); m_audioTabController.initStage2( this, m_pWindow.get() );
statisticsTabController.initStage2( this, m_pWindow.get() ); m_statisticsTabController.initStage2( this, m_pWindow.get() );
settingsTabController.initStage2( this, m_pWindow.get() ); m_settingsTabController.initStage2( this, m_pWindow.get() );
reviveTabController.initStage2( this, m_pWindow.get() ); m_reviveTabController.initStage2( this, m_pWindow.get() );
utilitiesTabController.initStage2( this, m_pWindow.get() ); m_utilitiesTabController.initStage2( this, m_pWindow.get() );
accessibilityTabController.initStage2( this, m_pWindow.get() ); m_accessibilityTabController.initStage2( this, m_pWindow.get() );
} }
void OverlayController::OnRenderRequest() void OverlayController::OnRenderRequest()
@@ -665,8 +666,8 @@ void OverlayController::OnTimeoutPumpEvents()
LOG( INFO ) << "Received quit request."; LOG( INFO ) << "Received quit request.";
vr::VRSystem()->AcknowledgeQuit_Exiting(); // Let us buy some time vr::VRSystem()->AcknowledgeQuit_Exiting(); // Let us buy some time
// just in case // just in case
moveCenterTabController.reset(); m_moveCenterTabController.reset();
chaperoneTabController.shutdown(); m_chaperoneTabController.shutdown();
Shutdown(); Shutdown();
QApplication::exit(); QApplication::exit();
return; return;
@@ -765,18 +766,19 @@ void OverlayController::OnTimeoutPumpEvents()
= std::sqrt( vel[0] * vel[0] + vel[1] * vel[1] + vel[2] * vel[2] ); = std::sqrt( vel[0] * vel[0] + vel[1] * vel[1] + vel[2] * vel[2] );
} }
fixFloorTabController.eventLoopTick( devicePoses ); m_fixFloorTabController.eventLoopTick( devicePoses );
statisticsTabController.eventLoopTick( devicePoses, leftSpeed, rightSpeed ); m_statisticsTabController.eventLoopTick(
moveCenterTabController.eventLoopTick( devicePoses, leftSpeed, rightSpeed );
m_moveCenterTabController.eventLoopTick(
vr::VRCompositor()->GetTrackingSpace(), devicePoses ); vr::VRCompositor()->GetTrackingSpace(), devicePoses );
steamVRTabController.eventLoopTick(); m_steamVRTabController.eventLoopTick();
chaperoneTabController.eventLoopTick( m_chaperoneTabController.eventLoopTick(
devicePoses, leftSpeed, rightSpeed, hmdSpeed ); devicePoses, leftSpeed, rightSpeed, hmdSpeed );
settingsTabController.eventLoopTick(); m_settingsTabController.eventLoopTick();
reviveTabController.eventLoopTick(); m_reviveTabController.eventLoopTick();
audioTabController.eventLoopTick(); m_audioTabController.eventLoopTick();
utilitiesTabController.eventLoopTick(); m_utilitiesTabController.eventLoopTick();
accessibilityTabController.eventLoopTick( m_accessibilityTabController.eventLoopTick(
vr::VRCompositor()->GetTrackingSpace() ); vr::VRCompositor()->GetTrackingSpace() );
if ( m_ulOverlayThumbnailHandle != vr::k_ulOverlayHandleInvalid ) if ( m_ulOverlayThumbnailHandle != vr::k_ulOverlayHandleInvalid )
src/overlaycontroller.h
+10 -10
View File
@@ -82,16 +82,16 @@ private:
public: // I know it's an ugly hack to make them public to enable external public: // I know it's an ugly hack to make them public to enable external
// access, but I am too lazy to implement getters. // access, but I am too lazy to implement getters.
SteamVRTabController steamVRTabController; SteamVRTabController m_steamVRTabController;
ChaperoneTabController chaperoneTabController; ChaperoneTabController m_chaperoneTabController;
MoveCenterTabController moveCenterTabController; MoveCenterTabController m_moveCenterTabController;
FixFloorTabController fixFloorTabController; FixFloorTabController m_fixFloorTabController;
AudioTabController audioTabController; AudioTabController m_audioTabController;
StatisticsTabController statisticsTabController; StatisticsTabController m_statisticsTabController;
SettingsTabController settingsTabController; SettingsTabController m_settingsTabController;
ReviveTabController reviveTabController; ReviveTabController m_reviveTabController;
UtilitiesTabController utilitiesTabController; UtilitiesTabController m_utilitiesTabController;
AccessibilityTabController accessibilityTabController; AccessibilityTabController m_accessibilityTabController;
private: private:
QPoint getMousePositionForEvent( vr::VREvent_Mouse_t mouse ); QPoint getMousePositionForEvent( vr::VREvent_Mouse_t mouse );
src/tabcontrollers/ReviveTabController.cpp
+1 -1
View File
@@ -307,7 +307,7 @@ void ReviveTabController::initStage2( OverlayController* var_parent,
void ReviveTabController::eventLoopTick() void ReviveTabController::eventLoopTick()
{ {
if ( m_isOverlayInstalled if ( m_isOverlayInstalled
|| parent->settingsTabController.forceRevivePage() ) || parent->m_settingsTabController.forceRevivePage() )
{ {
if ( settingsUpdateCounter >= 50 ) if ( settingsUpdateCounter >= 50 )
{ {