From 8e5c94abb0f17215753c0415f359d063789561fb Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 31 May 2019 11:08:51 -0700 Subject: [PATCH 1/2] BUGZ-447: New performance preset API --- .../settingsApp/general/General.qml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index e32890a2dd..76aa35d4ea 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -101,7 +101,7 @@ Flickable { HifiStylesUit.GraphikRegular { id: performanceTitle - text: "Performance" + text: "Graphics Preset" Layout.maximumWidth: parent.width height: paintedHeight size: 22 @@ -115,28 +115,28 @@ Flickable { SimplifiedControls.RadioButton { id: performanceLow - text: "Eco" - checked: Performance.getRefreshRateProfile() === RefreshRate.ECO + text: "Low" + checked: Performance.getPerformancePreset() === PerformacePreset.LOW onClicked: { - Performance.setRefreshRateProfile(RefreshRate.ECO); + Performance.setPerformancePreset(PerformacePreset.LOW); } } SimplifiedControls.RadioButton { id: performanceMedium - text: "Interactive" - checked: Performance.getRefreshRateProfile() === RefreshRate.INTERACTIVE + text: "Medium" + checked: Performance.getPerformancePreset() === PerformacePreset.MID onClicked: { - Performance.setRefreshRateProfile(RefreshRate.INTERACTIVE); + Performance.setPerformancePreset(PerformacePreset.MID); } } SimplifiedControls.RadioButton { id: performanceHigh - text: "Realtime" - checked: Performance.getRefreshRateProfile() === RefreshRate.REALTIME + text: "High" + checked: Performance.getPerformancePreset() === PerformacePreset.HIGH onClicked: { - Performance.setRefreshRateProfile(RefreshRate.REALTIME); + Performance.setPerformancePreset(PerformacePreset.HIGH); } } } From 97bd0d5413ad57e3393e6a1d8f2a06b7bb07d41e Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 31 May 2019 12:50:32 -0700 Subject: [PATCH 2/2] Make this work! --- .../simplifiedUI/settingsApp/general/General.qml | 12 ++++++------ .../src/scripting/PerformanceScriptingInterface.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index 76aa35d4ea..9c3a33412e 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -116,27 +116,27 @@ Flickable { SimplifiedControls.RadioButton { id: performanceLow text: "Low" - checked: Performance.getPerformancePreset() === PerformacePreset.LOW + checked: Performance.getPerformancePreset() === PerformanceEnums.LOW onClicked: { - Performance.setPerformancePreset(PerformacePreset.LOW); + Performance.setPerformancePreset(PerformanceEnums.LOW); } } SimplifiedControls.RadioButton { id: performanceMedium text: "Medium" - checked: Performance.getPerformancePreset() === PerformacePreset.MID + checked: Performance.getPerformancePreset() === PerformanceEnums.MID onClicked: { - Performance.setPerformancePreset(PerformacePreset.MID); + Performance.setPerformancePreset(PerformanceEnums.MID); } } SimplifiedControls.RadioButton { id: performanceHigh text: "High" - checked: Performance.getPerformancePreset() === PerformacePreset.HIGH + checked: Performance.getPerformancePreset() === PerformanceEnums.HIGH onClicked: { - Performance.setPerformancePreset(PerformacePreset.HIGH); + Performance.setPerformancePreset(PerformanceEnums.HIGH); } } } diff --git a/interface/src/scripting/PerformanceScriptingInterface.cpp b/interface/src/scripting/PerformanceScriptingInterface.cpp index 4f7c2b0fda..d47404a601 100644 --- a/interface/src/scripting/PerformanceScriptingInterface.cpp +++ b/interface/src/scripting/PerformanceScriptingInterface.cpp @@ -15,7 +15,7 @@ std::once_flag PerformanceScriptingInterface::registry_flag; PerformanceScriptingInterface::PerformanceScriptingInterface() { std::call_once(registry_flag, [] { - qmlRegisterType("PerformanceEnums", 1, 0, "RefreshRate"); + qmlRegisterType("PerformanceEnums", 1, 0, "PerformanceEnums"); }); }