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

Convert m_brightnessOpacityValue to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent ec73c54f3e
commit 0710432933
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/VideoTabController.cpp
+11 -8
View File
@@ -1,6 +1,7 @@
#include "VideoTabController.h" #include "VideoTabController.h"
#include <QQuickWindow> #include <QQuickWindow>
#include <QApplication> #include <QApplication>
#include "../settings/settings.h"
#include "../overlaycontroller.h" #include "../overlaycontroller.h"
#include <cmath> #include <cmath>
@@ -223,8 +224,6 @@ void VideoTabController::reloadVideoConfig()
settings->beginGroup( getSettingsName() ); settings->beginGroup( getSettingsName() );
setBrightnessEnabled( setBrightnessEnabled(
settings->value( "brightnessEnabled", false ).toBool(), true ); settings->value( "brightnessEnabled", false ).toBool(), true );
m_brightnessOpacityValue
= settings->value( "brightnessOpacityValue", 0.0f ).toFloat();
m_brightnessValue = settings->value( "brightnessValue", 1.0f ).toFloat(); m_brightnessValue = settings->value( "brightnessValue", 1.0f ).toFloat();
setColorOverlayEnabled( setColorOverlayEnabled(
settings->value( "colorOverlayEnabled", false ).toBool(), true ); settings->value( "colorOverlayEnabled", false ).toBool(), true );
@@ -247,7 +246,6 @@ void VideoTabController::saveVideoConfig()
auto settings = OverlayController::appSettings(); auto settings = OverlayController::appSettings();
settings->beginGroup( getSettingsName() ); settings->beginGroup( getSettingsName() );
settings->setValue( "brightnessEnabled", brightnessEnabled() ); settings->setValue( "brightnessEnabled", brightnessEnabled() );
settings->setValue( "brightnessOpacityValue", brightnessOpacityValue() );
settings->setValue( "brightnessValue", brightnessValue() ); settings->setValue( "brightnessValue", brightnessValue() );
settings->setValue( "colorOverlayEnabled", colorOverlayEnabled() ); settings->setValue( "colorOverlayEnabled", colorOverlayEnabled() );
settings->setValue( "colorOverlayOpacity", colorOverlayOpacity() ); settings->setValue( "colorOverlayOpacity", colorOverlayOpacity() );
@@ -262,7 +260,8 @@ void VideoTabController::saveVideoConfig()
float VideoTabController::brightnessOpacityValue() const float VideoTabController::brightnessOpacityValue() const
{ {
return m_brightnessOpacityValue; return static_cast<float>( settings::getSetting(
settings::DoubleSetting::VIDEO_brightnessOpacityValue ) );
} }
float VideoTabController::brightnessValue() const float VideoTabController::brightnessValue() const
@@ -317,13 +316,16 @@ void VideoTabController::setBrightnessValue( float percvalue, bool notify )
float realvalue = static_cast<float>( float realvalue = static_cast<float>(
std::pow( static_cast<double>( 1.0f - percvalue ), 1 / 3. ) ); std::pow( static_cast<double>( 1.0f - percvalue ), 1 / 3. ) );
if ( fabs( static_cast<double>( realvalue - m_brightnessOpacityValue ) ) if ( fabs( static_cast<double>( realvalue - brightnessOpacityValue() ) )
> .005 ) > .005 )
{ {
m_brightnessValue = percvalue; m_brightnessValue = percvalue;
if ( realvalue <= 1.0f && realvalue >= 0.0f ) if ( realvalue <= 1.0f && realvalue >= 0.0f )
{ {
m_brightnessOpacityValue = realvalue; settings::setSetting(
settings::DoubleSetting::VIDEO_brightnessOpacityValue,
static_cast<double>( realvalue ) );
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha( vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha(
m_brightnessOverlayHandle, realvalue ); m_brightnessOverlayHandle, realvalue );
if ( overlayError != vr::VROverlayError_None ) if ( overlayError != vr::VROverlayError_None )
@@ -338,7 +340,8 @@ void VideoTabController::setBrightnessValue( float percvalue, bool notify )
else else
{ {
LOG( WARNING ) << "alpha value is invalid setting to 1.0"; LOG( WARNING ) << "alpha value is invalid setting to 1.0";
m_brightnessOpacityValue = 0.0f; settings::setSetting(
settings::DoubleSetting::VIDEO_brightnessOpacityValue, 0.0 );
} }
if ( notify ) if ( notify )
@@ -351,7 +354,7 @@ void VideoTabController::setBrightnessValue( float percvalue, bool notify )
void VideoTabController::setBrightnessOpacityValue() void VideoTabController::setBrightnessOpacityValue()
{ {
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha( vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha(
m_brightnessOverlayHandle, m_brightnessOpacityValue ); m_brightnessOverlayHandle, brightnessOpacityValue() );
if ( overlayError != vr::VROverlayError_None ) if ( overlayError != vr::VROverlayError_None )
{ {
LOG( ERROR ) << "Could not set alpha: " LOG( ERROR ) << "Could not set alpha: "
src/tabcontrollers/VideoTabController.h
-1
View File
@@ -82,7 +82,6 @@ private:
vr::VROverlayHandle_t m_colorOverlayHandle = vr::k_ulOverlayHandleInvalid; vr::VROverlayHandle_t m_colorOverlayHandle = vr::k_ulOverlayHandleInvalid;
float m_brightnessOpacityValue = 0.0f;
float m_brightnessValue = 1.0f; float m_brightnessValue = 1.0f;
bool m_brightnessEnabled = false; bool m_brightnessEnabled = false;