From 9351267fb564f425e304d3d6048dc62efe175a19 Mon Sep 17 00:00:00 2001 From: ykeara Date: Tue, 8 Jan 2019 21:02:52 -0600 Subject: [PATCH] fixed naming bug in qml --- src/res/qml/SteamVRPage.qml | 21 +++++++++++---------- src/tabcontrollers/SteamVRTabController.cpp | 3 +++ src/tabcontrollers/SteamVRTabController.h | 1 + 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/res/qml/SteamVRPage.qml b/src/res/qml/SteamVRPage.qml index 6ef9b30..4b627a7 100644 --- a/src/res/qml/SteamVRPage.qml +++ b/src/res/qml/SteamVRPage.qml @@ -68,11 +68,11 @@ MyStackViewPage { Layout.leftMargin: 32 text: "Supersample Filtering" } - MyToggleButton { - id: steamvrNewProfileIncludeReprojectionSettingsg - Layout.leftMargin: 32 - text: "Reprojection Settings" - } + //MyToggleButton { + // id: steamvrNewProfileIncludeReprojectionSettingsg + // Layout.leftMargin: 32 + // text: "Reprojection Settings" + //} } onClosed: { if (okClicked) { @@ -80,13 +80,14 @@ MyStackViewPage { steamvrMessageDialog.showMessage("Create New Profile", "ERROR: Empty profile name.") } else if (!steamvrNewProfileIncludeSupersampling.checked && !steamvrNewProfileIncludeSupersampleFiltering.checked - && !steamvrNewProfileIncludeReprojectionSettingsg.checked) { + ) { steamvrMessageDialog.showMessage("Create New Profile", "ERROR: Nothing included.") } else { SteamVRTabController.addSteamVRProfile(steamvrNewProfileName.text, steamvrNewProfileIncludeSupersampling.checked, - steamvrNewProfileIncludeSupersampleFiltering.checked, - steamvrNewProfileIncludeReprojectionSettingsg.checked) + steamvrNewProfileIncludeSupersampleFiltering.checked + // steamvrNewProfileIncludeReprojectionSettingsg.checked + ) } } @@ -95,7 +96,7 @@ MyStackViewPage { steamvrNewProfileName.text = "" steamvrNewProfileIncludeSupersampling.checked = false steamvrNewProfileIncludeSupersampleFiltering.checked = false - steamvrNewProfileIncludeReprojectionSettingsg.checked = false + //steamvrNewProfileIncludeReprojectionSettingsg.checked = false open() } } @@ -397,7 +398,7 @@ MyStackViewPage { //steamvrAllowInterleavedReprojectionToggle.checked = SteamVRTabController.allowInterleavedReprojection //steamvrAllowAsyncReprojectionToggle.checked = SteamVRTabController.allowAsyncReprojection //steamvrForceReprojectionToggle.checked = SteamVRTabController.forceReprojection - steamvrMotionSmoothingToggle.checked = SteamVRTabController.allowMotionSmoothing + steamvrMotionSmoothingToggle.checked = SteamVRTabController.motionSmoothing reloadSteamVRProfiles() } diff --git a/src/tabcontrollers/SteamVRTabController.cpp b/src/tabcontrollers/SteamVRTabController.cpp index 7ae92d4..6504f63 100644 --- a/src/tabcontrollers/SteamVRTabController.cpp +++ b/src/tabcontrollers/SteamVRTabController.cpp @@ -75,6 +75,7 @@ void SteamVRTabController::reloadSteamVRProfiles() entry.supersampleFiltering = settings->value( "supersampleFiltering", true ).toBool(); } + entry.motionSmooth = settings->value("motionSmooth", true).toBool(); /* entry.includesReprojectionSettings = settings->value( "includesReprojectionSettings", false ).toBool(); @@ -627,6 +628,7 @@ void SteamVRTabController::addSteamVRProfile( QString name, { profile->supersampleFiltering = m_allowSupersampleFiltering; } + profile->motionSmooth = m_motionSmoothing; /* profile->includesReprojectionSettings = includeReprojectionSettings; if ( includeReprojectionSettings ) @@ -654,6 +656,7 @@ void SteamVRTabController::applySteamVRProfile( unsigned index ) { setAllowSupersampleFiltering( profile.supersampleFiltering ); } + setMotionSmoothing(profile.motionSmooth); /* if ( profile.includesReprojectionSettings ) { diff --git a/src/tabcontrollers/SteamVRTabController.h b/src/tabcontrollers/SteamVRTabController.h index 17f0c01..27e0d0c 100644 --- a/src/tabcontrollers/SteamVRTabController.h +++ b/src/tabcontrollers/SteamVRTabController.h @@ -19,6 +19,7 @@ struct SteamVRProfile bool includesSupersampleFiltering = false; bool supersampleFiltering = false; + bool motionSmooth = false; //bool includesReprojectionSettings = false; //bool asynchronousReprojection = true;