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

Fix default Brightness value/behavior adds shutdown button (#412)

Browse Source 
* added exit button

* fixed visible state

* added shutdown button fixed default brightness issues

* fixed compiler warning
This commit is contained in:
ykeara
2020-04-16 21:53:15 -05:00
committed by GitHub
parent 31f92df4b1
commit b3e9e63cba
5 changed files with 72 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/VideoTabController.cpp
+21 -26
View File
@@ -70,6 +70,7 @@ void VideoTabController::initBrightnessOverlay()
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
overlayError );
}
setBrightnessOpacityValue( brightnessOpacityValue(), false );
}
void VideoTabController::initColorOverlay()
@@ -286,6 +287,7 @@ void VideoTabController::setBrightnessEnabled( bool value,
{
if ( overlayHandle != vr::k_ulOverlayHandleInvalid )
{
setBrightnessOpacityValue( brightnessOpacityValue(), false );
vr::VROverlay()->ShowOverlay( getBrightnessOverlayHandle() );
LOG( INFO ) << "Brightness Overlay toggled on";
}
@@ -314,35 +316,28 @@ void VideoTabController::setBrightnessOpacityValue( float percvalue,
float realvalue = static_cast<float>(
std::pow( static_cast<double>( 1.0f - percvalue ), 1 / 3. ) );
if ( fabs( static_cast<double>( percvalue - brightnessOpacityValue() ) )
> .005 )
settings::setSetting( settings::DoubleSetting::VIDEO_brightnessOpacityValue,
static_cast<double>( percvalue ) );
if ( realvalue >= 0.97f || realvalue <= 0.00f )
{
LOG( WARNING ) << "alpha value is invalid setting to 1.0";
settings::setSetting(
settings::DoubleSetting::VIDEO_brightnessOpacityValue,
static_cast<double>( percvalue ) );
settings::DoubleSetting::VIDEO_brightnessOpacityValue, 1.0 );
realvalue = 0;
}
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha(
m_brightnessOverlayHandle, realvalue );
if ( overlayError != vr::VROverlayError_None )
{
LOG( ERROR ) << "Could not set alpha for brightness overlay: "
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
overlayError );
}
if ( realvalue <= 1.0f && realvalue >= 0.00f )
{
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha(
m_brightnessOverlayHandle, realvalue );
if ( overlayError != vr::VROverlayError_None )
{
LOG( ERROR ) << "Could not set alpha for brightness overlay: "
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
overlayError );
}
}
else
{
LOG( WARNING ) << "alpha value is invalid setting to 1.0";
settings::setSetting(
settings::DoubleSetting::VIDEO_brightnessOpacityValue, 0.0 );
}
if ( notify )
{
emit brightnessOpacityValueChanged( percvalue );
}
if ( notify )
{
emit brightnessOpacityValueChanged( percvalue );
}
}