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

draft: upgrade codebase to qt6 and cmake (#657)

Browse Source 
* update qt6 upgrade progress

* add flawed addition for QRenderTarget and link needed libs

* update to better logging format

* move many assets and qml files into qrc

* get rid of deprecation messages

* remove additional deprecation notices

* make Qt6 finally render on desktop with some progress on vr

* initialize QRhi with QQuickRenderControl

* use default values to stop SegFaults

* fix compilation on windows

* add windows files for aiding in running exe

* fix formatting of testing qt.conf

* first attempt on using textures instead of files in AudioTabController

* Fix public/private access issue

* use getter instead of directly accessing class members

* use QImage as a base to set overlay textures

* use native  logging

* add more QImage Overlays

* implement faulty vulkan implementation

---------

Co-authored-by: ykeara <ykeara1@gmail.com>
This commit is contained in:
RTUnreal
2024-05-01 15:19:36 -05:00
committed by GitHub
co-authored by ykeara
parent ca0ec3e07d
commit 383f153c54
15 changed files with 234 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/RotationTabController.cpp
+18 -34
View File
@@ -39,29 +39,14 @@ void RotationTabController::initStage2( OverlayController* var_parent )
return;
}
m_autoturnValues.autoturnImg.reset(
new QImage( QString( ":/rotation/autoturn.png" ) ) );
m_autoturnValues.noautoturnImg.reset(
new QImage( QString( ":/rotation/noautoturn.png" ) ) );
constexpr auto autoturnIconFilepath = "/res/img/rotation/autoturn.png";
constexpr auto noautoturnIconFilepath = "/res/img/rotation/noautoturn.png";
ovr_overlay_wrapper::setOverlayFromQImage( m_autoturnValues.overlayHandle,
*m_autoturnValues.autoturnImg );
const auto autoturnIconFilePath
= paths::verifyIconFilePath( autoturnIconFilepath );
const auto noautoturnIconFilePath
= paths::verifyIconFilePath( noautoturnIconFilepath );
if ( !autoturnIconFilePath.has_value()
|| !noautoturnIconFilePath.has_value() )
{
emit defaultProfileDisplay();
return;
}
m_autoturnValues.autoturnPath = *autoturnIconFilePath;
m_autoturnValues.noautoturnPath = *noautoturnIconFilePath;
auto pushToPath = m_autoturnValues.autoturnPath.c_str();
vr::VROverlay()->SetOverlayFromFile( m_autoturnValues.overlayHandle,
pushToPath );
vr::VROverlay()->SetOverlayWidthInMeters( m_autoturnValues.overlayHandle,
0.02f );
vr::HmdMatrix34_t notificationTransform
@@ -677,22 +662,21 @@ void RotationTabController::setAutoTurnEnabled( bool value, bool notify )
emit autoTurnEnabledChanged( value );
}
if ( !value )
{
vr::VROverlay()->SetOverlayFromFile(
m_autoturnValues.overlayHandle,
m_autoturnValues.noautoturnPath.c_str() );
}
else
{
vr::VROverlay()->SetOverlayFromFile(
m_autoturnValues.overlayHandle,
m_autoturnValues.autoturnPath.c_str() );
}
if ( autoTurnShowNotification()
&& getNotificationOverlayHandle() != vr::k_ulOverlayHandleInvalid )
{
if ( !value )
{
ovr_overlay_wrapper::setOverlayFromQImage(
m_autoturnValues.overlayHandle,
*m_autoturnValues.noautoturnImg );
}
else
{
ovr_overlay_wrapper::setOverlayFromQImage(
m_autoturnValues.overlayHandle, *m_autoturnValues.autoturnImg );
}
vr::VROverlay()->SetOverlayAlpha( getNotificationOverlayHandle(),
1.0f );
vr::VROverlay()->ShowOverlay( getNotificationOverlayHandle() );