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

Convert m_pWindow from pointer to object

Browse Source 
The extra layer of indirection was unnecessary and had no benefit.
This commit is contained in:
Vasily
2019-11-30 18:14:49 +01:00
committed by username223
parent 2b9b3d653a
commit 6c04dd25b1
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlaycontroller.cpp
+16 -18
View File
@@ -417,7 +417,6 @@ void OverlayController::Shutdown()
m_pRenderTimer->stop(); m_pRenderTimer->stop();
m_pRenderTimer.reset(); m_pRenderTimer.reset();
} }
m_pWindow.reset();
m_pFbo.reset(); m_pFbo.reset();
m_pOpenGLContext.reset(); m_pOpenGLContext.reset();
m_pOffscreenSurface.reset(); m_pOffscreenSurface.reset();
@@ -492,13 +491,12 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
static_cast<int>( quickItem->height() ), static_cast<int>( quickItem->height() ),
fboFormat ) ); fboFormat ) );
m_pWindow.reset( new QQuickWindow( &m_renderControl ) ); m_window.setRenderTarget( m_pFbo.get() );
m_pWindow->setRenderTarget( m_pFbo.get() ); quickItem->setParentItem( m_window.contentItem() );
quickItem->setParentItem( m_pWindow->contentItem() ); m_window.setGeometry( 0,
m_pWindow->setGeometry( 0, 0,
0, static_cast<int>( quickItem->width() ),
static_cast<int>( quickItem->width() ), static_cast<int>( quickItem->height() ) );
static_cast<int>( quickItem->height() ) );
m_renderControl.initialize( m_pOpenGLContext.get() ); m_renderControl.initialize( m_pOpenGLContext.get() );
vr::HmdVector2_t vecWindowSize vr::HmdVector2_t vecWindowSize
@@ -1047,12 +1045,12 @@ void OverlayController::mainEventLoop()
{ {
QMouseEvent mouseEvent( QEvent::MouseMove, QMouseEvent mouseEvent( QEvent::MouseMove,
ptNewMouse, ptNewMouse,
m_pWindow->mapToGlobal( ptNewMouse ), m_window.mapToGlobal( ptNewMouse ),
Qt::NoButton, Qt::NoButton,
m_lastMouseButtons, m_lastMouseButtons,
nullptr ); nullptr );
m_ptLastMouse = ptNewMouse; m_ptLastMouse = ptNewMouse;
QCoreApplication::sendEvent( m_pWindow.get(), &mouseEvent ); QCoreApplication::sendEvent( &m_window, &mouseEvent );
OnRenderRequest(); OnRenderRequest();
} }
} }
@@ -1068,11 +1066,11 @@ void OverlayController::mainEventLoop()
m_lastMouseButtons |= button; m_lastMouseButtons |= button;
QMouseEvent mouseEvent( QEvent::MouseButtonPress, QMouseEvent mouseEvent( QEvent::MouseButtonPress,
ptNewMouse, ptNewMouse,
m_pWindow->mapToGlobal( ptNewMouse ), m_window.mapToGlobal( ptNewMouse ),
button, button,
m_lastMouseButtons, m_lastMouseButtons,
nullptr ); nullptr );
QCoreApplication::sendEvent( m_pWindow.get(), &mouseEvent ); QCoreApplication::sendEvent( &m_window, &mouseEvent );
} }
break; break;
@@ -1086,11 +1084,11 @@ void OverlayController::mainEventLoop()
m_lastMouseButtons &= ~button; m_lastMouseButtons &= ~button;
QMouseEvent mouseEvent( QEvent::MouseButtonRelease, QMouseEvent mouseEvent( QEvent::MouseButtonRelease,
ptNewMouse, ptNewMouse,
m_pWindow->mapToGlobal( ptNewMouse ), m_window.mapToGlobal( ptNewMouse ),
button, button,
m_lastMouseButtons, m_lastMouseButtons,
nullptr ); nullptr );
QCoreApplication::sendEvent( m_pWindow.get(), &mouseEvent ); QCoreApplication::sendEvent( &m_window, &mouseEvent );
} }
break; break;
@@ -1099,7 +1097,7 @@ void OverlayController::mainEventLoop()
// Wheel speed is defined as 1/8 of a degree // Wheel speed is defined as 1/8 of a degree
QWheelEvent wheelEvent( QWheelEvent wheelEvent(
m_ptLastMouse, m_ptLastMouse,
m_pWindow->mapToGlobal( m_ptLastMouse ), m_window.mapToGlobal( m_ptLastMouse ),
QPoint(), QPoint(),
QPoint( static_cast<int>( vrEvent.data.scroll.xdelta QPoint( static_cast<int>( vrEvent.data.scroll.xdelta
* ( 360.0f * 8.0f ) ), * ( 360.0f * 8.0f ) ),
@@ -1109,13 +1107,13 @@ void OverlayController::mainEventLoop()
Qt::Vertical, Qt::Vertical,
m_lastMouseButtons, m_lastMouseButtons,
nullptr ); nullptr );
QCoreApplication::sendEvent( m_pWindow.get(), &wheelEvent ); QCoreApplication::sendEvent( &m_window, &wheelEvent );
} }
break; break;
case vr::VREvent_OverlayShown: case vr::VREvent_OverlayShown:
{ {
m_pWindow->update(); m_window.update();
} }
break; break;
@@ -1279,7 +1277,7 @@ void OverlayController::mainEventLoop()
{ {
case vr::VREvent_OverlayShown: case vr::VREvent_OverlayShown:
{ {
m_pWindow->update(); m_window.update();
} }
break; break;
} }
src/overlaycontroller.h
+1 -1
View File
@@ -107,7 +107,7 @@ private:
= vr::k_ulOverlayHandleInvalid; = vr::k_ulOverlayHandleInvalid;
QQuickRenderControl m_renderControl; QQuickRenderControl m_renderControl;
std::unique_ptr<QQuickWindow> m_pWindow; QQuickWindow m_window{ &m_renderControl };
std::unique_ptr<QOpenGLFramebufferObject> m_pFbo; std::unique_ptr<QOpenGLFramebufferObject> m_pFbo;
std::unique_ptr<QOpenGLContext> m_pOpenGLContext; std::unique_ptr<QOpenGLContext> m_pOpenGLContext;
std::unique_ptr<QOffscreenSurface> m_pOffscreenSurface; std::unique_ptr<QOffscreenSurface> m_pOffscreenSurface;