Video and Steam VR Tab Re-work + keyboard binds (#289)
* changed color overlay to use gain values instead of overlay * moved SS/Motion smoothing, and filter to video tab * began refactor of steamVR qml page * added misc toggles to steamvr tab * added imu fallback and DND, and some qml formatting * added Camera Settings to SteamVR page * changed formatting to minimize height * added video profiles cleaned up steamvr controller * delta comparison change * added profiles for video * fixed display bug in colorgroupbox and removed frivoulous saves * removed commented code * added custom keybind buttons
This commit is contained in:
ykeara
@@ -9,9 +9,12 @@ namespace advsettings
|
||||
void VideoTabController::initStage1()
|
||||
{
|
||||
initBrightnessOverlay();
|
||||
initColorOverlay();
|
||||
initColorGain();
|
||||
initMotionSmoothing();
|
||||
initSupersampleOverride();
|
||||
m_overlayInit = true;
|
||||
reloadVideoConfig();
|
||||
reloadVideoProfiles();
|
||||
}
|
||||
|
||||
void VideoTabController::initBrightnessOverlay()
|
||||
@@ -53,50 +56,99 @@ void VideoTabController::initBrightnessOverlay()
|
||||
overlayError );
|
||||
}
|
||||
}
|
||||
void VideoTabController::initColorOverlay()
|
||||
{
|
||||
std::string notifKey
|
||||
= std::string( application_strings::applicationKey ) + ".coloroverlay";
|
||||
|
||||
vr::VROverlayError overlayError = vr::VROverlay()->CreateOverlay(
|
||||
notifKey.c_str(), notifKey.c_str(), &m_colorOverlayHandle );
|
||||
if ( overlayError == vr::VROverlayError_None )
|
||||
void VideoTabController::eventLoopTick() {}
|
||||
|
||||
void VideoTabController::dashboardLoopTick()
|
||||
{
|
||||
// TODO different key
|
||||
if ( settingsUpdateCounter >= k_steamVrSettingsUpdateCounter )
|
||||
{
|
||||
const auto notifIconPath = paths::binaryDirectoryFindFile(
|
||||
video_keys::k_colorOverlayFilename );
|
||||
if ( notifIconPath.has_value() )
|
||||
vr::EVRSettingsError vrSettingsError;
|
||||
|
||||
// checks supersampling override and resynchs if necessry
|
||||
// also prints error if can't find.
|
||||
auto sso = vr::VRSettings()->GetBool(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_SupersampleManualOverride_Bool,
|
||||
&vrSettingsError );
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
vr::VROverlay()->SetOverlayFromFile( m_colorOverlayHandle,
|
||||
notifIconPath->c_str() );
|
||||
vr::VROverlay()->SetOverlayWidthInMeters( m_colorOverlayHandle,
|
||||
k_overlayWidth );
|
||||
// position it just slightly further out so we don't have to worry
|
||||
// about render order.
|
||||
vr::HmdMatrix34_t notificationTransform
|
||||
= { { { 1.0f, 0.0f, 0.0f, 0.00f },
|
||||
{ 0.0f, 1.0f, 0.0f, 0.00f },
|
||||
{ 0.0f, 0.0f, 1.0f, ( k_hmdDistance - 0.01f ) } } };
|
||||
vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(
|
||||
m_colorOverlayHandle,
|
||||
vr::k_unTrackedDeviceIndex_Hmd,
|
||||
¬ificationTransform );
|
||||
LOG( WARNING ) << "Could not read \""
|
||||
<< vr::k_pch_SteamVR_SupersampleManualOverride_Bool
|
||||
<< "\" setting: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
else
|
||||
|
||||
setAllowSupersampleOverride( sso );
|
||||
// checks supersampling and re-synchs if necessary
|
||||
auto ss = vr::VRSettings()->GetFloat(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_SupersampleScale_Float,
|
||||
&vrSettingsError );
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not find Base color overlay: \""
|
||||
<< video_keys::k_colorOverlayFilename << "\"";
|
||||
LOG( WARNING ) << "Could not read \""
|
||||
<< vr::k_pch_SteamVR_SupersampleScale_Float
|
||||
<< "\" setting: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
if ( m_superSampling != 1.0f )
|
||||
{
|
||||
LOG( DEBUG ) << "OpenVR returns an error and we have a custom "
|
||||
"supersampling value: "
|
||||
<< m_superSampling;
|
||||
setSuperSampling( 1.0 );
|
||||
}
|
||||
}
|
||||
else if ( fabs( static_cast<double>( m_superSampling - ss ) ) > 0.05 )
|
||||
{
|
||||
LOG( INFO ) << "OpenVR reports a changed supersampling value: "
|
||||
<< m_superSampling << " => " << ss;
|
||||
setSuperSampling( ss );
|
||||
}
|
||||
// checks if Supersampling filter is on and changes if it has been
|
||||
// changed elsewhere
|
||||
|
||||
auto sf = vr::VRSettings()->GetBool(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_AllowSupersampleFiltering_Bool,
|
||||
&vrSettingsError );
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( WARNING ) << "Could not read \""
|
||||
<< vr::k_pch_SteamVR_AllowSupersampleFiltering_Bool
|
||||
<< "\" setting: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
setAllowSupersampleFiltering( sf );
|
||||
|
||||
// Checks if Motion smoothing setting can be read and synchs adv
|
||||
// settings to steamvr/openvr
|
||||
auto ms
|
||||
= vr::VRSettings()->GetBool( vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_MotionSmoothing_Bool,
|
||||
&vrSettingsError );
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( WARNING ) << "Could not read \""
|
||||
<< vr::k_pch_SteamVR_MotionSmoothing_Bool
|
||||
<< "\" setting: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
setMotionSmoothing( ms );
|
||||
|
||||
settingsUpdateCounter = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG( ERROR ) << "Could not create color overlay: "
|
||||
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
|
||||
overlayError );
|
||||
settingsUpdateCounter++;
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::eventLoopTick() {}
|
||||
|
||||
void VideoTabController::reloadVideoConfig()
|
||||
{
|
||||
auto settings = OverlayController::appSettings();
|
||||
@@ -106,15 +158,9 @@ void VideoTabController::reloadVideoConfig()
|
||||
m_brightnessOpacityValue
|
||||
= settings->value( "brightnessOpacityValue", 0.0f ).toFloat();
|
||||
m_brightnessValue = settings->value( "brightnessValue", 1.0f ).toFloat();
|
||||
setColorEnabled( settings->value( "colorEnabled", false ).toBool(), true );
|
||||
m_colorOpacity = settings->value( "colorOpacity", 0.0f ).toFloat();
|
||||
m_colorOpacityPerc = settings->value( "colorOpacityPerc", 1.0f ).toFloat();
|
||||
setColorRed( settings->value( "colorRed", 0.0f ).toFloat() );
|
||||
setColorGreen( settings->value( "colorGreen", 0.0f ).toFloat() );
|
||||
setColorBlue( settings->value( "colorBlue", 0.0f ).toFloat() );
|
||||
|
||||
settings->endGroup();
|
||||
setBrightnessOpacityValue();
|
||||
loadColorOverlay();
|
||||
settings->sync();
|
||||
}
|
||||
|
||||
@@ -125,12 +171,7 @@ void VideoTabController::saveVideoConfig()
|
||||
settings->setValue( "brightnessEnabled", brightnessEnabled() );
|
||||
settings->setValue( "brightnessOpacityValue", brightnessOpacityValue() );
|
||||
settings->setValue( "brightnessValue", brightnessValue() );
|
||||
settings->setValue( "colorEnabled", colorEnabled() );
|
||||
settings->setValue( "colorOpacity", colorOpacity() );
|
||||
settings->setValue( "colorOpacityPerc", colorOpacityPerc() );
|
||||
settings->setValue( "colorRed", colorRed() );
|
||||
settings->setValue( "colorGreen", colorGreen() );
|
||||
settings->setValue( "colorBlue", colorBlue() );
|
||||
|
||||
settings->endGroup();
|
||||
settings->sync();
|
||||
}
|
||||
@@ -187,7 +228,8 @@ void VideoTabController::setBrightnessValue( float percvalue, bool notify )
|
||||
float realvalue = static_cast<float>(
|
||||
std::pow( static_cast<double>( 1.0f - percvalue ), 1 / 3. ) );
|
||||
|
||||
if ( realvalue != m_brightnessOpacityValue )
|
||||
if ( fabs( static_cast<double>( realvalue - m_brightnessOpacityValue ) )
|
||||
> .005 )
|
||||
{
|
||||
m_brightnessValue = percvalue;
|
||||
if ( realvalue <= 1.0f && realvalue >= 0.0f )
|
||||
@@ -237,20 +279,6 @@ void VideoTabController::setBrightnessOpacityValue()
|
||||
*/
|
||||
|
||||
// getters
|
||||
bool VideoTabController::colorEnabled() const
|
||||
{
|
||||
return m_colorEnabled;
|
||||
}
|
||||
|
||||
float VideoTabController::colorOpacity() const
|
||||
{
|
||||
return m_colorOpacity;
|
||||
}
|
||||
|
||||
float VideoTabController::colorOpacityPerc() const
|
||||
{
|
||||
return m_colorOpacityPerc;
|
||||
}
|
||||
|
||||
float VideoTabController::colorRed() const
|
||||
{
|
||||
@@ -268,71 +296,27 @@ float VideoTabController::colorBlue() const
|
||||
}
|
||||
|
||||
// setters
|
||||
void VideoTabController::setColorEnabled( bool value, bool notify )
|
||||
{
|
||||
if ( value != m_colorEnabled )
|
||||
{
|
||||
m_colorEnabled = value;
|
||||
auto overlayHandle = getColorOverlayHandle();
|
||||
if ( value )
|
||||
{
|
||||
if ( overlayHandle != vr::k_ulOverlayHandleInvalid )
|
||||
{
|
||||
vr::VROverlay()->ShowOverlay( getColorOverlayHandle() );
|
||||
LOG( INFO ) << "Color Overlay toggled on";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( overlayHandle != vr::k_ulOverlayHandleInvalid )
|
||||
{
|
||||
vr::VROverlay()->HideOverlay( getColorOverlayHandle() );
|
||||
LOG( INFO ) << "Color Overlay toggled off";
|
||||
}
|
||||
}
|
||||
saveVideoConfig();
|
||||
if ( notify )
|
||||
{
|
||||
emit colorEnabledChanged( value );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::setColorOpacity( float value, bool notify )
|
||||
{
|
||||
if ( value != m_colorOpacity )
|
||||
{
|
||||
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha(
|
||||
m_colorOverlayHandle, m_colorOpacity );
|
||||
m_colorOpacity = value;
|
||||
if ( overlayError != vr::VROverlayError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not set alpha for color overlay: "
|
||||
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
|
||||
overlayError );
|
||||
}
|
||||
saveVideoConfig();
|
||||
if ( notify )
|
||||
{
|
||||
emit colorOpacityChanged( m_colorOpacity );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::setColorRed( float value, bool notify )
|
||||
{
|
||||
if ( value != m_colorRed )
|
||||
if ( fabs( static_cast<double>( value - m_colorRed ) ) > .005 )
|
||||
{
|
||||
m_colorRed = value;
|
||||
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayColor(
|
||||
m_colorOverlayHandle, m_colorRed, m_colorGreen, m_colorBlue );
|
||||
if ( overlayError != vr::VROverlayError_None )
|
||||
vr::EVRSettingsError vrSettingsError;
|
||||
vr::VRSettings()->SetFloat(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_HmdDisplayColorGainR_Float,
|
||||
m_colorRed,
|
||||
&vrSettingsError );
|
||||
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not set Red for color overlay: "
|
||||
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
|
||||
overlayError );
|
||||
LOG( ERROR ) << "could not set Red Gain Value, Error: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
saveVideoConfig();
|
||||
LOG( DEBUG ) << "Changed Red Gain to: " << m_colorRed;
|
||||
vr::VRSettings()->Sync();
|
||||
if ( notify )
|
||||
{
|
||||
emit colorRedChanged( m_colorRed );
|
||||
@@ -342,18 +326,24 @@ void VideoTabController::setColorRed( float value, bool notify )
|
||||
|
||||
void VideoTabController::setColorGreen( float value, bool notify )
|
||||
{
|
||||
if ( value != m_colorGreen )
|
||||
if ( fabs( static_cast<double>( value - m_colorGreen ) ) > .005 )
|
||||
{
|
||||
m_colorGreen = value;
|
||||
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayColor(
|
||||
m_colorOverlayHandle, m_colorRed, m_colorGreen, m_colorBlue );
|
||||
if ( overlayError != vr::VROverlayError_None )
|
||||
vr::EVRSettingsError vrSettingsError;
|
||||
vr::VRSettings()->SetFloat(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_HmdDisplayColorGainG_Float,
|
||||
m_colorGreen,
|
||||
&vrSettingsError );
|
||||
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not set Green for color overlay: "
|
||||
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
|
||||
overlayError );
|
||||
LOG( ERROR ) << "could not set Green Gain Value, Error: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
saveVideoConfig();
|
||||
LOG( DEBUG ) << "Changed Green Gain to: " << m_colorGreen;
|
||||
vr::VRSettings()->Sync();
|
||||
if ( notify )
|
||||
{
|
||||
emit colorGreenChanged( m_colorGreen );
|
||||
@@ -363,18 +353,24 @@ void VideoTabController::setColorGreen( float value, bool notify )
|
||||
|
||||
void VideoTabController::setColorBlue( float value, bool notify )
|
||||
{
|
||||
if ( value != m_colorBlue )
|
||||
if ( fabs( static_cast<double>( value - m_colorBlue ) ) > .005 )
|
||||
{
|
||||
m_colorBlue = value;
|
||||
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayColor(
|
||||
m_colorOverlayHandle, m_colorRed, m_colorGreen, m_colorBlue );
|
||||
if ( overlayError != vr::VROverlayError_None )
|
||||
vr::EVRSettingsError vrSettingsError;
|
||||
vr::VRSettings()->SetFloat(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_HmdDisplayColorGainB_Float,
|
||||
m_colorBlue,
|
||||
&vrSettingsError );
|
||||
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not set Blue for color overlay: "
|
||||
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
|
||||
overlayError );
|
||||
LOG( ERROR ) << "could not set Blue Gain Value, Error: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
saveVideoConfig();
|
||||
LOG( DEBUG ) << "Changed Blue Gain to: " << m_colorBlue;
|
||||
vr::VRSettings()->Sync();
|
||||
if ( notify )
|
||||
{
|
||||
emit colorBlueChanged( m_colorBlue );
|
||||
@@ -382,68 +378,370 @@ void VideoTabController::setColorBlue( float value, bool notify )
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::loadColorOverlay()
|
||||
void VideoTabController::initColorGain()
|
||||
{
|
||||
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayColor(
|
||||
m_colorOverlayHandle, m_colorRed, m_colorGreen, m_colorBlue );
|
||||
if ( overlayError != vr::VROverlayError_None )
|
||||
float temporary = 0.0f;
|
||||
vr::EVRSettingsError vrSettingsError;
|
||||
temporary = vr::VRSettings()->GetFloat(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_HmdDisplayColorGainR_Float,
|
||||
&vrSettingsError );
|
||||
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not set Colors for color overlay: "
|
||||
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
|
||||
overlayError );
|
||||
LOG( ERROR ) << "Could not get Red Gain Value ERROR: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_colorRed = temporary;
|
||||
setColorRed( temporary );
|
||||
}
|
||||
|
||||
overlayError = vr::VROverlay()->SetOverlayAlpha( m_colorOverlayHandle,
|
||||
m_colorOpacity );
|
||||
if ( overlayError != vr::VROverlayError_None )
|
||||
temporary = vr::VRSettings()->GetFloat(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_HmdDisplayColorGainG_Float,
|
||||
&vrSettingsError );
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not set alpha: "
|
||||
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
|
||||
overlayError );
|
||||
LOG( ERROR ) << "Could not get Green Gain Value ERROR: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_colorGreen = temporary;
|
||||
setColorGreen( temporary );
|
||||
}
|
||||
|
||||
temporary = vr::VRSettings()->GetFloat(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_HmdDisplayColorGainB_Float,
|
||||
&vrSettingsError );
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not get Blue Gain Value ERROR: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_colorBlue = temporary;
|
||||
setColorBlue( temporary );
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::setColorOpacityPerc( float percvalue, bool notify )
|
||||
/*
|
||||
* -------------------------
|
||||
* SuperSampling
|
||||
* -------------------------
|
||||
*/
|
||||
|
||||
// Getters
|
||||
|
||||
float VideoTabController::superSampling() const
|
||||
{
|
||||
// This takes the Perceived value, and converts it to allow more accurate
|
||||
// linear positioning. (human perception logarithmic)
|
||||
return m_superSampling;
|
||||
}
|
||||
|
||||
// clamp the "percieved" value to 50% this is to ensure useability.
|
||||
if ( percvalue <= 0.5f )
|
||||
bool VideoTabController::allowSupersampleOverride() const
|
||||
{
|
||||
return m_allowSupersampleOverride;
|
||||
}
|
||||
|
||||
void VideoTabController::initSupersampleOverride()
|
||||
{
|
||||
bool temporary = false;
|
||||
vr::EVRSettingsError vrSettingsError;
|
||||
temporary = vr::VRSettings()->GetBool(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_SupersampleManualOverride_Bool,
|
||||
&vrSettingsError );
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
percvalue = 0.5f;
|
||||
LOG( WARNING ) << "Could not get SuperSampling Override State \""
|
||||
<< vr::k_pch_SteamVR_SupersampleManualOverride_Bool
|
||||
<< "\" setting: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
float realvalue = static_cast<float>(
|
||||
std::pow( static_cast<double>( 1.0f - percvalue ), 0.5555f ) );
|
||||
vr::VRSettings()->Sync();
|
||||
setAllowSupersampleOverride( temporary, true );
|
||||
}
|
||||
|
||||
if ( realvalue != m_colorOpacity )
|
||||
void VideoTabController::setSuperSampling( float value, const bool notify )
|
||||
{
|
||||
bool override = false;
|
||||
// Mirrors Desktop Clamp
|
||||
if ( value < 0.2f )
|
||||
{
|
||||
m_colorOpacityPerc = percvalue;
|
||||
if ( realvalue <= 1.0f && realvalue >= 0.0f )
|
||||
{
|
||||
m_colorOpacity = realvalue;
|
||||
vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha(
|
||||
m_colorOverlayHandle, realvalue );
|
||||
if ( overlayError != vr::VROverlayError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Could not set alpha of color overlay: "
|
||||
<< vr::VROverlay()->GetOverlayErrorNameFromEnum(
|
||||
overlayError );
|
||||
}
|
||||
// only saves if opacity Value is valid. [1-0]
|
||||
saveVideoConfig();
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG( WARNING ) << "alpha value is invalid setting to 1.0";
|
||||
m_brightnessOpacityValue = 0.0f;
|
||||
}
|
||||
LOG( WARNING ) << "Encountered a supersampling value <= 0.2, setting "
|
||||
"supersampling to 1.0";
|
||||
value = 1.0f;
|
||||
override = true;
|
||||
}
|
||||
|
||||
if ( override
|
||||
|| fabs( static_cast<double>( m_superSampling - value ) ) > .005 )
|
||||
{
|
||||
LOG( DEBUG ) << "Supersampling value changed: " << m_superSampling
|
||||
<< " => " << value;
|
||||
m_superSampling = value;
|
||||
vr::VRSettings()->SetFloat( vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_SupersampleScale_Float,
|
||||
m_superSampling );
|
||||
vr::VRSettings()->Sync();
|
||||
if ( notify )
|
||||
{
|
||||
emit brightnessValueChanged( percvalue );
|
||||
emit superSamplingChanged( m_superSampling );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::setAllowSupersampleOverride( const bool value,
|
||||
const bool notify )
|
||||
{
|
||||
if ( m_allowSupersampleOverride != value )
|
||||
{
|
||||
m_allowSupersampleOverride = value;
|
||||
vr::VRSettings()->SetBool(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_SupersampleManualOverride_Bool,
|
||||
m_allowSupersampleOverride );
|
||||
vr::VRSettings()->Sync();
|
||||
if ( notify )
|
||||
{
|
||||
emit allowSupersampleOverrideChanged( m_allowSupersampleOverride );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* -------------------------
|
||||
* motion smoothing/antistropic (misc)
|
||||
* -------------------------
|
||||
*/
|
||||
|
||||
bool VideoTabController::motionSmoothing() const
|
||||
{
|
||||
return m_motionSmoothing;
|
||||
}
|
||||
|
||||
void VideoTabController::setMotionSmoothing( const bool value,
|
||||
const bool notify )
|
||||
{
|
||||
if ( m_motionSmoothing != value )
|
||||
{
|
||||
m_motionSmoothing = value;
|
||||
vr::VRSettings()->SetBool( vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_MotionSmoothing_Bool,
|
||||
m_motionSmoothing );
|
||||
vr::VRSettings()->Sync();
|
||||
if ( notify )
|
||||
{
|
||||
emit motionSmoothingChanged( m_motionSmoothing );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::initMotionSmoothing()
|
||||
{
|
||||
bool temporary = false;
|
||||
vr::EVRSettingsError vrSettingsError;
|
||||
temporary
|
||||
= vr::VRSettings()->GetBool( vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_MotionSmoothing_Bool,
|
||||
&vrSettingsError );
|
||||
if ( vrSettingsError != vr::VRSettingsError_None )
|
||||
{
|
||||
LOG( WARNING ) << "Could not get MotionSmoothing State \""
|
||||
<< vr::k_pch_SteamVR_MotionSmoothing_Bool
|
||||
<< "\" setting: "
|
||||
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
|
||||
vrSettingsError );
|
||||
}
|
||||
vr::VRSettings()->Sync();
|
||||
setMotionSmoothing( temporary, true );
|
||||
}
|
||||
|
||||
bool VideoTabController::allowSupersampleFiltering() const
|
||||
{
|
||||
return m_allowSupersampleFiltering;
|
||||
}
|
||||
|
||||
void VideoTabController::setAllowSupersampleFiltering( const bool value,
|
||||
const bool notify )
|
||||
{
|
||||
if ( m_allowSupersampleFiltering != value )
|
||||
{
|
||||
m_allowSupersampleFiltering = value;
|
||||
vr::VRSettings()->SetBool(
|
||||
vr::k_pch_SteamVR_Section,
|
||||
vr::k_pch_SteamVR_AllowSupersampleFiltering_Bool,
|
||||
m_allowSupersampleFiltering );
|
||||
vr::VRSettings()->Sync();
|
||||
if ( notify )
|
||||
{
|
||||
emit allowSupersampleFilteringChanged(
|
||||
m_allowSupersampleFiltering );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* -----------------------------------------*/
|
||||
/*------------------------------------------*/
|
||||
/*Profile Logic Functions*/
|
||||
|
||||
void VideoTabController::addVideoProfile( const QString name )
|
||||
{
|
||||
VideoProfile* profile = nullptr;
|
||||
for ( auto& p : videoProfiles )
|
||||
{
|
||||
if ( p.profileName.compare( name.toStdString() ) == 0 )
|
||||
{
|
||||
profile = &p;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ( !profile )
|
||||
{
|
||||
auto i = videoProfiles.size();
|
||||
videoProfiles.emplace_back();
|
||||
profile = &videoProfiles[i];
|
||||
}
|
||||
profile->profileName = name.toStdString();
|
||||
|
||||
profile->supersampleOverride = m_allowSupersampleOverride;
|
||||
profile->supersampling = m_superSampling;
|
||||
profile->anisotropicFiltering = m_allowSupersampleFiltering;
|
||||
profile->motionSmooth = m_motionSmoothing;
|
||||
profile->colorRed = m_colorRed;
|
||||
profile->colorGreen = m_colorGreen;
|
||||
profile->colorBlue = m_colorBlue;
|
||||
profile->brightnessToggle = m_brightnessEnabled;
|
||||
profile->brightnessValue = m_brightnessValue;
|
||||
|
||||
saveVideoProfiles();
|
||||
OverlayController::appSettings()->sync();
|
||||
emit videoProfilesUpdated();
|
||||
emit videoProfileAdded();
|
||||
}
|
||||
|
||||
void VideoTabController::applyVideoProfile( const unsigned index )
|
||||
{
|
||||
if ( index < videoProfiles.size() )
|
||||
{
|
||||
auto& profile = videoProfiles[index];
|
||||
|
||||
setAllowSupersampleOverride( profile.supersampleOverride );
|
||||
setSuperSampling( profile.supersampling );
|
||||
setAllowSupersampleFiltering( profile.anisotropicFiltering );
|
||||
setMotionSmoothing( profile.motionSmooth );
|
||||
setColorRed( profile.colorRed );
|
||||
setColorBlue( profile.colorBlue );
|
||||
setColorGreen( profile.colorGreen );
|
||||
setBrightnessEnabled( profile.brightnessToggle );
|
||||
setBrightnessValue( profile.brightnessValue );
|
||||
vr::VRSettings()->Sync( true );
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::deleteVideoProfile( const unsigned index )
|
||||
{
|
||||
if ( index < videoProfiles.size() )
|
||||
{
|
||||
auto pos = videoProfiles.begin() + index;
|
||||
videoProfiles.erase( pos );
|
||||
saveVideoProfiles();
|
||||
OverlayController::appSettings()->sync();
|
||||
emit videoProfilesUpdated();
|
||||
}
|
||||
}
|
||||
|
||||
void VideoTabController::reloadVideoProfiles()
|
||||
{
|
||||
videoProfiles.clear();
|
||||
auto settings = OverlayController::appSettings();
|
||||
settings->beginGroup( "steamVRSettings" );
|
||||
auto profileCount = settings->beginReadArray( "steamVRProfiles" );
|
||||
for ( int i = 0; i < profileCount; i++ )
|
||||
{
|
||||
settings->setArrayIndex( i );
|
||||
videoProfiles.emplace_back();
|
||||
auto& entry = videoProfiles[static_cast<size_t>( i )];
|
||||
entry.profileName
|
||||
= settings->value( "profileName" ).toString().toStdString();
|
||||
|
||||
entry.supersampleOverride
|
||||
= settings->value( "supersamplingOverride", false ).toBool();
|
||||
entry.supersampling
|
||||
= settings->value( "supersampling", 1.0f ).toFloat();
|
||||
entry.anisotropicFiltering
|
||||
= settings->value( "anisotropicFiltering", true ).toBool();
|
||||
entry.motionSmooth = settings->value( "motionSmooth", true ).toBool();
|
||||
|
||||
entry.colorRed = settings->value( "colorRed", 1.0f ).toFloat();
|
||||
entry.colorBlue = settings->value( "colorBlue", 1.0f ).toFloat();
|
||||
entry.colorGreen = settings->value( "colorGreen", 1.0f ).toFloat();
|
||||
|
||||
entry.brightnessToggle
|
||||
= settings->value( "brightnessToggle", false ).toBool();
|
||||
entry.brightnessValue
|
||||
= settings->value( "brightnessValue", 1.0f ).toFloat();
|
||||
}
|
||||
settings->endArray();
|
||||
settings->endGroup();
|
||||
}
|
||||
|
||||
void VideoTabController::saveVideoProfiles()
|
||||
{
|
||||
auto settings = OverlayController::appSettings();
|
||||
settings->beginGroup( "VideoSettings" );
|
||||
settings->beginWriteArray( "videoProfiles" );
|
||||
unsigned i = 0;
|
||||
for ( auto& p : videoProfiles )
|
||||
{
|
||||
settings->setArrayIndex( static_cast<int>( i ) );
|
||||
settings->setValue( "profileName",
|
||||
QString::fromStdString( p.profileName ) );
|
||||
|
||||
settings->setValue( "supersamplingOverride", p.supersampleOverride );
|
||||
settings->setValue( "supersampling", p.supersampling );
|
||||
settings->setValue( "anisotropicFiltering", p.anisotropicFiltering );
|
||||
settings->setValue( "motionSmooth", p.motionSmooth );
|
||||
|
||||
settings->setValue( "colorRed", p.colorRed );
|
||||
settings->setValue( "colorBlue", p.colorBlue );
|
||||
settings->setValue( "colorGreen", p.colorGreen );
|
||||
|
||||
settings->setValue( "brightnessToggle", p.brightnessToggle );
|
||||
settings->setValue( "brightnessValue", p.brightnessValue );
|
||||
|
||||
i++;
|
||||
}
|
||||
settings->endArray();
|
||||
settings->endGroup();
|
||||
}
|
||||
|
||||
int VideoTabController::getVideoProfileCount()
|
||||
{
|
||||
return static_cast<int>( videoProfiles.size() );
|
||||
}
|
||||
|
||||
QString VideoTabController::getVideoProfileName( const unsigned index )
|
||||
{
|
||||
if ( index >= videoProfiles.size() )
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
else
|
||||
{
|
||||
return QString::fromStdString( videoProfiles[index].profileName );
|
||||
}
|
||||
}
|
||||
|
||||
/*------------------------------------------*/
|
||||
/* -----------------------------------------*/
|
||||
|
||||
} // namespace advsettings
|
||||
|
||||
Reference in New Issue
Block a user