Commented out reprojection logic

This commit is contained in:
ykeara
2019-01-08 17:33:48 -06:00
parent 16f5438ab0
commit 2fadca76d0
3 changed files with 41 additions and 25 deletions
+14 -3
View File
@@ -74,6 +74,7 @@ void SteamVRTabController::reloadSteamVRProfiles()
entry.supersampleFiltering
= settings->value( "supersampleFiltering", true ).toBool();
}
/*
entry.includesReprojectionSettings
= settings->value( "includesReprojectionSettings", false ).toBool();
if ( entry.includesReprojectionSettings )
@@ -85,6 +86,7 @@ void SteamVRTabController::reloadSteamVRProfiles()
entry.alwaysOnReprojection
= settings->value( "alwaysOnReprojection", true ).toBool();
}
*/
}
settings->endArray();
settings->endGroup();
@@ -113,6 +115,7 @@ void SteamVRTabController::saveSteamVRProfiles()
settings->setValue( "supersampleFiltering",
p.supersampleFiltering );
}
/*
settings->setValue( "includesReprojectionSettings",
p.includesReprojectionSettings );
if ( p.includesReprojectionSettings )
@@ -124,6 +127,7 @@ void SteamVRTabController::saveSteamVRProfiles()
settings->setValue( "alwaysOnReprojection",
p.alwaysOnReprojection );
}
*/
i++;
}
settings->endArray();
@@ -210,6 +214,7 @@ void SteamVRTabController::eventLoopTick()
<< m_compositorSuperSampling << " => " << css;
setCompositorSuperSampling( css );
}
/*
auto air = vr::VRSettings()->GetBool(
vr::k_pch_SteamVR_Section,
vr::k_pch_SteamVR_AllowReprojection_Bool,
@@ -249,6 +254,7 @@ void SteamVRTabController::eventLoopTick()
vrSettingsError );
}
setForceReprojection( fr );
*/
auto sf = vr::VRSettings()->GetBool(
vr::k_pch_SteamVR_Section,
vrsettings_steamvr_allowSupersampleFiltering,
@@ -333,7 +339,7 @@ float SteamVRTabController::compositorSuperSampling() const
{
return m_compositorSuperSampling;
}
/*
bool SteamVRTabController::allowInterleavedReprojection() const
{
return m_allowInterleavedReprojection;
@@ -399,7 +405,7 @@ void SteamVRTabController::setForceReprojection( bool value, bool notify )
}
}
}
*/
bool SteamVRTabController::allowSupersampleFiltering() const
{
return m_allowSupersampleFiltering;
@@ -452,7 +458,7 @@ void SteamVRTabController::reset()
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
/*
vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_SteamVR_Section,
vr::k_pch_SteamVR_AllowReprojection_Bool,
@@ -492,6 +498,7 @@ void SteamVRTabController::reset()
vrSettingsError );
}
*/
vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_SteamVR_Section,
vrsettings_steamvr_allowSupersampleFiltering,
@@ -549,6 +556,7 @@ void SteamVRTabController::addSteamVRProfile( QString name,
{
profile->supersampleFiltering = m_allowSupersampleFiltering;
}
/*
profile->includesReprojectionSettings = includeReprojectionSettings;
if ( includeReprojectionSettings )
{
@@ -556,6 +564,7 @@ void SteamVRTabController::addSteamVRProfile( QString name,
profile->interleavedReprojection = m_allowInterleavedReprojection;
profile->alwaysOnReprojection = m_forceReprojection;
}
*/
saveSteamVRProfiles();
OverlayController::appSettings()->sync();
emit steamVRProfilesUpdated();
@@ -574,12 +583,14 @@ void SteamVRTabController::applySteamVRProfile( unsigned index )
{
setAllowSupersampleFiltering( profile.supersampleFiltering );
}
/*
if ( profile.includesReprojectionSettings )
{
setAllowAsyncReprojection( profile.asynchronousReprojection );
setAllowInterleavedReprojection( profile.interleavedReprojection );
setForceReprojection( profile.alwaysOnReprojection );
}
*/
vr::VRSettings()->Sync( true );
}
}
+19 -17
View File
@@ -20,10 +20,10 @@ struct SteamVRProfile
bool includesSupersampleFiltering = false;
bool supersampleFiltering = false;
bool includesReprojectionSettings = false;
bool asynchronousReprojection = true;
bool interleavedReprojection = true;
bool alwaysOnReprojection = true;
//bool includesReprojectionSettings = false;
//bool asynchronousReprojection = true;
//bool interleavedReprojection = true;
//bool alwaysOnReprojection = true;
};
class SteamVRTabController : public QObject
@@ -34,7 +34,8 @@ class SteamVRTabController : public QObject
Q_PROPERTY(
float compositorSuperSampling READ compositorSuperSampling WRITE
setCompositorSuperSampling NOTIFY compositorSuperSamplingChanged )
Q_PROPERTY(
/*
Q_PROPERTY(
bool allowInterleavedReprojection READ allowInterleavedReprojection
WRITE setAllowInterleavedReprojection NOTIFY
allowInterleavedReprojectionChanged )
@@ -43,6 +44,7 @@ class SteamVRTabController : public QObject
setAllowAsyncReprojection NOTIFY allowAsyncReprojectionChanged )
Q_PROPERTY( bool forceReprojection READ forceReprojection WRITE
setForceReprojection NOTIFY forceReprojectionChanged )
*/
Q_PROPERTY( bool allowSupersampleFiltering READ allowSupersampleFiltering
WRITE setAllowSupersampleFiltering NOTIFY
allowSupersampleFilteringChanged )
@@ -53,9 +55,9 @@ private:
float m_superSampling = 1.0;
float m_compositorSuperSampling = 1.0;
bool m_allowInterleavedReprojection = true;
bool m_allowAsyncReprojection = true;
bool m_forceReprojection = false;
//bool m_allowInterleavedReprojection = true;
//bool m_allowAsyncReprojection = true;
//bool m_forceReprojection = false;
bool m_allowSupersampleFiltering = true;
std::vector<SteamVRProfile> steamvrProfiles;
@@ -70,9 +72,9 @@ public:
float superSampling() const;
float compositorSuperSampling() const;
bool allowInterleavedReprojection() const;
bool allowAsyncReprojection() const;
bool forceReprojection() const;
//bool allowInterleavedReprojection() const;
//bool allowAsyncReprojection() const;
//bool forceReprojection() const;
bool allowSupersampleFiltering() const;
void reloadSteamVRProfiles();
@@ -84,9 +86,9 @@ public:
public slots:
void setSuperSampling( float value, bool notify = true );
void setCompositorSuperSampling( float value, bool notify = true );
void setAllowInterleavedReprojection( bool value, bool notify = true );
void setAllowAsyncReprojection( bool value, bool notify = true );
void setForceReprojection( bool value, bool notify = true );
//void setAllowInterleavedReprojection( bool value, bool notify = true );
//void setAllowAsyncReprojection( bool value, bool notify = true );
//void setForceReprojection( bool value, bool notify = true );
void setAllowSupersampleFiltering( bool value, bool notify = true );
void addSteamVRProfile( QString name,
@@ -102,9 +104,9 @@ public slots:
signals:
void superSamplingChanged( float value );
void compositorSuperSamplingChanged( float value );
void allowInterleavedReprojectionChanged( bool value );
void allowAsyncReprojectionChanged( bool value );
void forceReprojectionChanged( bool value );
//void allowInterleavedReprojectionChanged( bool value );
//void allowAsyncReprojectionChanged( bool value );
//void forceReprojectionChanged( bool value );
void allowSupersampleFilteringChanged( bool value );
void steamVRProfilesUpdated();