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

removed compositor super sampling added error checking for motion smoothing

Browse Source
This commit is contained in:
ykeara
2019-01-09 20:03:41 -06:00
parent 454131f0a0
commit 813a2b1d3f
3 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/SteamVRTabController.cpp
+26 -36
View File
@@ -31,7 +31,7 @@ namespace advsettings
//static const char* vrsettings_steamvr_supersampleScale = "supersampleScale";
//static const char* vrsettings_steamvr_allowSupersampleFiltering = "allowSupersampleFiltering";
static const char* vrsettings_compositor_category = "compositor";
//static const char* vrsettings_compositor_category = "compositor";
void SteamVRTabController::initStage1()
{
@@ -139,7 +139,7 @@ Q_INVOKABLE QString
return QString::fromStdString( steamvrProfiles[index].profileName );
}
}
//TODO
//TODO DISC does it make any sense to check these settings once every ~ 1second?
void SteamVRTabController::eventLoopTick()
{
if ( settingsUpdateCounter >= 50 )
@@ -170,38 +170,7 @@ void SteamVRTabController::eventLoopTick()
<< m_superSampling << " => " << ss;
setSuperSampling( ss );
}
auto css = vr::VRSettings()->GetFloat(
vrsettings_compositor_category,
vr::k_pch_SteamVR_RenderTargetMultiplier_Float,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
if ( vrSettingsError
!= vr::VRSettingsError_UnsetSettingHasNoDefault )
{ // does not appear in the default settings file as of beta
// 1477423729
LOG( WARNING )
<< "Could not read \"compositor::"
<< vr::k_pch_SteamVR_RenderTargetMultiplier_Float
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
if ( m_compositorSuperSampling != 1.0 )
{
LOG( DEBUG ) << "OpenVR returns an error and we have a custom "
"compositor supersampling value: "
<< m_compositorSuperSampling;
setCompositorSuperSampling( 1.0 );
}
}
else if ( m_compositorSuperSampling != css )
{
LOG( DEBUG )
<< "OpenVR reports a changed compositor supersampling value: "
<< m_compositorSuperSampling << " => " << css;
setCompositorSuperSampling( css );
}
auto sf = vr::VRSettings()->GetBool(
vr::k_pch_SteamVR_Section,
vr::k_pch_SteamVR_AllowSupersampleFiltering_Bool,
@@ -215,7 +184,24 @@ void SteamVRTabController::eventLoopTick()
vrSettingsError );
}
setAllowSupersampleFiltering( sf );
//Checks if Motion smoothing setting can be read
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
{
@@ -248,7 +234,7 @@ void SteamVRTabController::setSuperSampling( float value, bool notify )
}
}
}
/*
void SteamVRTabController::setCompositorSuperSampling( float value,
bool notify )
{
@@ -276,16 +262,18 @@ void SteamVRTabController::setCompositorSuperSampling( float value,
}
}
}
*/
float SteamVRTabController::superSampling() const
{
return m_superSampling;
}
/*
float SteamVRTabController::compositorSuperSampling() const
{
return m_compositorSuperSampling;
}
*/
bool SteamVRTabController::motionSmoothing() const
{
@@ -394,6 +382,7 @@ void SteamVRTabController::reset()
vrSettingsError );
}
/*
setCompositorSuperSampling( 1.0f ); // Is not in default.vrsettings yet
vr::VRSettings()->RemoveKeyInSection(
vrsettings_compositor_category,
@@ -408,6 +397,7 @@ void SteamVRTabController::reset()
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
*/
vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_SteamVR_Section,
src/tabcontrollers/SteamVRTabController.h
+6 -5
View File
@@ -28,9 +28,10 @@ class SteamVRTabController : public QObject
Q_OBJECT
Q_PROPERTY( float superSampling READ superSampling WRITE setSuperSampling
NOTIFY superSamplingChanged )
Q_PROPERTY(
/*Q_PROPERTY(
float compositorSuperSampling READ compositorSuperSampling WRITE
setCompositorSuperSampling NOTIFY compositorSuperSamplingChanged )
*/
Q_PROPERTY( bool motionSmoothing READ motionSmoothing WRITE
setMotionSmoothing NOTIFY motionSmoothingChanged )
@@ -43,7 +44,7 @@ private:
QQuickWindow* widget;
float m_superSampling = 1.0;
float m_compositorSuperSampling = 1.0;
//float m_compositorSuperSampling = 1.0;
bool m_motionSmoothing = true;
bool m_allowSupersampleFiltering = true;
@@ -60,7 +61,7 @@ public:
void eventLoopTick();
float superSampling() const;
float compositorSuperSampling() const;
//float compositorSuperSampling() const;
bool motionSmoothing() const;
bool allowSupersampleFiltering() const;
@@ -72,7 +73,7 @@ public:
public slots:
void setSuperSampling( float value, bool notify = true );
void setCompositorSuperSampling( float value, bool notify = true );
// void setCompositorSuperSampling( float value, bool notify = true );
void setMotionSmoothing( bool value, bool notify = true );
void setAllowSupersampleFiltering( bool value, bool notify = true );
@@ -88,7 +89,7 @@ public slots:
signals:
void superSamplingChanged( float value );
void compositorSuperSamplingChanged( float value );
//void compositorSuperSamplingChanged( float value );
void motionSmoothingChanged( bool value );
void allowSupersampleFilteringChanged( bool value );