fixed naming bug in qml

This commit is contained in:
ykeara
2019-01-08 21:02:52 -06:00
parent 7bd02049a2
commit 9351267fb5
3 changed files with 15 additions and 10 deletions
+11 -10
View File
@@ -68,11 +68,11 @@ MyStackViewPage {
Layout.leftMargin: 32 Layout.leftMargin: 32
text: "Supersample Filtering" text: "Supersample Filtering"
} }
MyToggleButton { //MyToggleButton {
id: steamvrNewProfileIncludeReprojectionSettingsg // id: steamvrNewProfileIncludeReprojectionSettingsg
Layout.leftMargin: 32 // Layout.leftMargin: 32
text: "Reprojection Settings" // text: "Reprojection Settings"
} //}
} }
onClosed: { onClosed: {
if (okClicked) { if (okClicked) {
@@ -80,13 +80,14 @@ MyStackViewPage {
steamvrMessageDialog.showMessage("Create New Profile", "ERROR: Empty profile name.") steamvrMessageDialog.showMessage("Create New Profile", "ERROR: Empty profile name.")
} else if (!steamvrNewProfileIncludeSupersampling.checked } else if (!steamvrNewProfileIncludeSupersampling.checked
&& !steamvrNewProfileIncludeSupersampleFiltering.checked && !steamvrNewProfileIncludeSupersampleFiltering.checked
&& !steamvrNewProfileIncludeReprojectionSettingsg.checked) { ) {
steamvrMessageDialog.showMessage("Create New Profile", "ERROR: Nothing included.") steamvrMessageDialog.showMessage("Create New Profile", "ERROR: Nothing included.")
} else { } else {
SteamVRTabController.addSteamVRProfile(steamvrNewProfileName.text, SteamVRTabController.addSteamVRProfile(steamvrNewProfileName.text,
steamvrNewProfileIncludeSupersampling.checked, steamvrNewProfileIncludeSupersampling.checked,
steamvrNewProfileIncludeSupersampleFiltering.checked, steamvrNewProfileIncludeSupersampleFiltering.checked
steamvrNewProfileIncludeReprojectionSettingsg.checked) // steamvrNewProfileIncludeReprojectionSettingsg.checked
)
} }
} }
@@ -95,7 +96,7 @@ MyStackViewPage {
steamvrNewProfileName.text = "" steamvrNewProfileName.text = ""
steamvrNewProfileIncludeSupersampling.checked = false steamvrNewProfileIncludeSupersampling.checked = false
steamvrNewProfileIncludeSupersampleFiltering.checked = false steamvrNewProfileIncludeSupersampleFiltering.checked = false
steamvrNewProfileIncludeReprojectionSettingsg.checked = false //steamvrNewProfileIncludeReprojectionSettingsg.checked = false
open() open()
} }
} }
@@ -397,7 +398,7 @@ MyStackViewPage {
//steamvrAllowInterleavedReprojectionToggle.checked = SteamVRTabController.allowInterleavedReprojection //steamvrAllowInterleavedReprojectionToggle.checked = SteamVRTabController.allowInterleavedReprojection
//steamvrAllowAsyncReprojectionToggle.checked = SteamVRTabController.allowAsyncReprojection //steamvrAllowAsyncReprojectionToggle.checked = SteamVRTabController.allowAsyncReprojection
//steamvrForceReprojectionToggle.checked = SteamVRTabController.forceReprojection //steamvrForceReprojectionToggle.checked = SteamVRTabController.forceReprojection
steamvrMotionSmoothingToggle.checked = SteamVRTabController.allowMotionSmoothing steamvrMotionSmoothingToggle.checked = SteamVRTabController.motionSmoothing
reloadSteamVRProfiles() reloadSteamVRProfiles()
} }
@@ -75,6 +75,7 @@ void SteamVRTabController::reloadSteamVRProfiles()
entry.supersampleFiltering entry.supersampleFiltering
= settings->value( "supersampleFiltering", true ).toBool(); = settings->value( "supersampleFiltering", true ).toBool();
} }
entry.motionSmooth = settings->value("motionSmooth", true).toBool();
/* /*
entry.includesReprojectionSettings entry.includesReprojectionSettings
= settings->value( "includesReprojectionSettings", false ).toBool(); = settings->value( "includesReprojectionSettings", false ).toBool();
@@ -627,6 +628,7 @@ void SteamVRTabController::addSteamVRProfile( QString name,
{ {
profile->supersampleFiltering = m_allowSupersampleFiltering; profile->supersampleFiltering = m_allowSupersampleFiltering;
} }
profile->motionSmooth = m_motionSmoothing;
/* /*
profile->includesReprojectionSettings = includeReprojectionSettings; profile->includesReprojectionSettings = includeReprojectionSettings;
if ( includeReprojectionSettings ) if ( includeReprojectionSettings )
@@ -654,6 +656,7 @@ void SteamVRTabController::applySteamVRProfile( unsigned index )
{ {
setAllowSupersampleFiltering( profile.supersampleFiltering ); setAllowSupersampleFiltering( profile.supersampleFiltering );
} }
setMotionSmoothing(profile.motionSmooth);
/* /*
if ( profile.includesReprojectionSettings ) if ( profile.includesReprojectionSettings )
{ {
@@ -19,6 +19,7 @@ struct SteamVRProfile
bool includesSupersampleFiltering = false; bool includesSupersampleFiltering = false;
bool supersampleFiltering = false; bool supersampleFiltering = false;
bool motionSmooth = false;
//bool includesReprojectionSettings = false; //bool includesReprojectionSettings = false;
//bool asynchronousReprojection = true; //bool asynchronousReprojection = true;