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

compiling and various updates

Browse Source
This commit is contained in:
ykeara
2025-10-09 18:45:53 -05:00
parent 44a05dfd57
commit 1152cfee1f
25 changed files with 542 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/AudioTabController.cpp
+3 -3
View File
@@ -7,7 +7,7 @@
#include "../settings/settings.h"
#include "../settings/settings_object.h"
#include "../utils/update_rate.h"
#include "openvr/ovr_overlay_wrapper.h"
#include "../openvr/ovr_overlay_wrapper.h"
#ifdef _WIN32
# include "audiomanager/AudioManagerWindows.h"
#elif __linux__
@@ -89,9 +89,9 @@ void AudioTabController::initStage2( OverlayController* var_parent )
}
m_pushToTalkValues.pushToTalkImg.reset(
new QImage( QString( ":/microphone/ptt_notification.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/microphone/ptt_notification.png" ) );
m_pushToTalkValues.pushToMuteImg.reset(
new QImage( QString( ":/microphone/ptm_notification.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/microphone/ptm_notification.png" ) );
auto* pushToImg = m_pushToTalkValues.pushToTalkImg.get();
if ( settings::getSetting( settings::BoolSetting::AUDIO_micReversePtt ) )
src/tabcontrollers/ChaperoneTabController.cpp
+7 -7
View File
@@ -1620,19 +1620,19 @@ void ChaperoneTabController::initCenterMarkerOverlay()
if ( overlayError == ovr_overlay_wrapper::OverlayError::NoError )
{
m_floorMarkers[-3] = std::unique_ptr<QImage>(
new QImage( QString( ":/chaperone/centermarkl3.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/chaperone/centermarkl3.png" ) );
m_floorMarkers[-2] = std::unique_ptr<QImage>(
new QImage( QString( ":/chaperone/centermarkl2.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/chaperone/centermarkl2.png" ) );
m_floorMarkers[-1] = std::unique_ptr<QImage>(
new QImage( QString( ":/chaperone/centermarkl1.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/chaperone/centermarkl1.png" ) );
m_floorMarkers[0] = std::unique_ptr<QImage>(
new QImage( QString( ":/chaperone/centermark.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/chaperone/centermark.png" ) );
m_floorMarkers[1] = std::unique_ptr<QImage>(
new QImage( QString( ":/chaperone/centermarkr1.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/chaperone/centermarkr1.png" ) );
m_floorMarkers[2] = std::unique_ptr<QImage>(
new QImage( QString( ":/chaperone/centermarkr2.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/chaperone/centermarkr2.png" ) );
m_floorMarkers[3] = std::unique_ptr<QImage>(
new QImage( QString( ":/chaperone/centermarkr3.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/chaperone/centermarkr3.png" ) );
ovr_overlay_wrapper::setOverlayFromQImage(
m_chaperoneFloorOverlayHandle, *m_floorMarkers[0], "" );
ovr_overlay_wrapper::setOverlayWidthInMeters(
src/tabcontrollers/RotationTabController.cpp
+2 -2
View File
@@ -40,9 +40,9 @@ void RotationTabController::initStage2( OverlayController* var_parent )
return;
}
m_autoturnValues.autoturnImg.reset(
new QImage( QString( ":/rotation/autoturn.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/rotation/autoturn.png" ) );
m_autoturnValues.noautoturnImg.reset(
new QImage( QString( ":/rotation/noautoturn.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/rotation/noautoturn.png" ) );
ovr_overlay_wrapper::setOverlayFromQImage( m_autoturnValues.overlayHandle,
*m_autoturnValues.autoturnImg );
src/tabcontrollers/UtilitiesTabController.cpp
+7 -7
View File
@@ -7,7 +7,7 @@
#include "../keyboard_input/input_sender.h"
#include "../settings/settings.h"
#include "../utils/update_rate.h"
#include "openvr/ovr_overlay_wrapper.h"
#include "../openvr/ovr_overlay_wrapper.h"
#include <chrono>
#include <qimage.h>
#include <thread>
@@ -260,17 +260,17 @@ vr::VROverlayHandle_t UtilitiesTabController::createBatteryOverlay(
if ( overlayError == vr::VROverlayError_None )
{
m_batteryImgs[0] = std::unique_ptr<QImage>(
new QImage( QString( ":/battery/battery_0.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/battery/battery_0.png" ) );
m_batteryImgs[1] = std::unique_ptr<QImage>(
new QImage( QString( ":/battery/battery_1.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/battery/battery_1.png" ) );
m_batteryImgs[2] = std::unique_ptr<QImage>(
new QImage( QString( ":/battery/battery_2.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/battery/battery_2.png" ) );
m_batteryImgs[3] = std::unique_ptr<QImage>(
new QImage( QString( ":/battery/battery_3.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/battery/battery_3.png" ) );
m_batteryImgs[4] = std::unique_ptr<QImage>(
new QImage( QString( ":/battery/battery_4.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/battery/battery_4.png" ) );
m_batteryImgs[5] = std::unique_ptr<QImage>(
new QImage( QString( ":/battery/battery_5.png" ) ) );
new QImage( ":qt/qml/AdvancedSettings/src/res/img/battery/battery_5.png" ) );
ovr_overlay_wrapper::setOverlayFromQImage( handle, *m_batteryImgs[0] );
vr::VROverlay()->SetOverlayWidthInMeters( handle, 0.045f );
vr::HmdMatrix34_t notificationTransform;
src/tabcontrollers/VideoTabController.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ void VideoTabController::initBrightnessOverlay()
notifKey.c_str(), notifKey.c_str(), &m_brightnessOverlayHandle );
if ( overlayError == vr::VROverlayError_None )
{
QImage notifIcon( QString( ":/video/dimmer.png" ) );
QImage notifIcon( ":qt/qml/AdvancedSettings/src/res/img/video/dimmer.png" );
ovr_overlay_wrapper::setOverlayFromQImage( m_brightnessOverlayHandle,
notifIcon );
vr::VROverlay()->SetOverlayWidthInMeters( m_brightnessOverlayHandle,
@@ -86,7 +86,7 @@ void VideoTabController::initColorOverlay()
notifKey.c_str(), notifKey.c_str(), &m_colorOverlayHandle );
if ( overlayError == vr::VROverlayError_None )
{
QImage notifIcon( QString( ":/video/color.png" ) );
QImage notifIcon(":qt/qml/AdvancedSettings/src/res/img/video/color.png");
ovr_overlay_wrapper::setOverlayFromQImage( m_colorOverlayHandle,
notifIcon );
vr::VROverlay()->SetOverlayWidthInMeters( m_colorOverlayHandle,