Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-07 20:34:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Custom refresh rate profile WIP

Browse source 
This adds a Custom refresh rate profile with configurable refresh rate regimes.

Unfortunately this commit does not work yet. The SpinBoxes inside GraphicsSettings are on top of each other, and changing the values for the Custom profile through e.g. the JS API does not actually affect the refresh rate cap at all for some reason.
This commit is contained in:
latex 2023-11-29 22:29:02 +01:00 committed by HifiExperiments
parent f1475e49ee
commit a6646d8dff
6 changed files with 190 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml
View file

@ -347,6 +347,10 @@ Flickable {
text: "Real-Time"
refreshRatePreset: 2 // RefreshRateProfile::REALTIME
}
ListElement {
text: "Custom"
refreshRatePreset: 3 // RefreshRateProfile::CUSTOM
}
}
HifiControlsUit.ComboBox {
@ -366,8 +370,10 @@ Flickable {
refreshRateDropdown.currentIndex = 0;
} else if (Performance.getRefreshRateProfile() === 1) {
refreshRateDropdown.currentIndex = 1;
} else {
} else if (Performance.getRefreshRateProfile() === 2) {
refreshRateDropdown.currentIndex = 2;
} else {
refreshRateDropdown.currentIndex = 3;
}
}
@ -380,6 +386,132 @@ Flickable {
refreshRateDropdown.displayText = model.get(currentIndex).text;
}
}
HifiControlsUit.SpinBox {
id: refreshRateCustomFocusActive
decimals: 0
width: 160
height: parent.height
suffix: " FPS"
label: "Focus Active"
minimumValue: 1.0
realStepSize: 1.0
realValue: 60.0
colorScheme: hifi.colorSchemes.dark
Component.onCompleted: {
realValue = Performance.getCustomRefreshRate(0)
}
onRealValueChanged: {
Performance.setCustomRefreshRate(0, realValue);
}
}
HifiControlsUit.SpinBox {
id: refreshRateCustomFocusInactive
decimals: 0
width: 160
height: parent.height
suffix: " FPS"
label: "Focus Inactive"
minimumValue: 1.0
realStepSize: 1.0
realValue: 60.0
colorScheme: hifi.colorSchemes.dark
Component.onCompleted: {
realValue = Performance.getCustomRefreshRate(1)
}
onRealValueChanged: {
Performance.setCustomRefreshRate(1, realValue);
}
}
HifiControlsUit.SpinBox {
id: refreshRateCustomUnfocus
decimals: 0
width: 160
height: parent.height
suffix: " FPS"
label: "Unfocus"
minimumValue: 1.0
realStepSize: 1.0
realValue: 60.0
colorScheme: hifi.colorSchemes.dark
Component.onCompleted: {
realValue = Performance.getCustomRefreshRate(2)
}
onRealValueChanged: {
Performance.setCustomRefreshRate(2, realValue);
}
}
HifiControlsUit.SpinBox {
id: refreshRateCustomMinimized
decimals: 0
width: 160
height: parent.height
suffix: " FPS"
label: "Minimized"
minimumValue: 1.0
realStepSize: 1.0
realValue: 60.0
colorScheme: hifi.colorSchemes.dark
Component.onCompleted: {
realValue = Performance.getCustomRefreshRate(3)
}
onRealValueChanged: {
Performance.setCustomRefreshRate(3, realValue);
}
}
HifiControlsUit.SpinBox {
id: refreshRateCustomStartup
decimals: 0
width: 160
height: parent.height
suffix: " FPS"
label: "Startup"
minimumValue: 1.0
realStepSize: 1.0
realValue: 60.0
colorScheme: hifi.colorSchemes.dark
Component.onCompleted: {
realValue = Performance.getCustomRefreshRate(4)
}
onRealValueChanged: {
Performance.setCustomRefreshRate(4, realValue);
}
}
HifiControlsUit.SpinBox {
id: refreshRateCustomShutdown
decimals: 0
width: 160
height: parent.height
suffix: " FPS"
label: "Shutdown"
minimumValue: 1.0
realStepSize: 1.0
realValue: 60.0
colorScheme: hifi.colorSchemes.dark
Component.onCompleted: {
realValue = Performance.getCustomRefreshRate(5)
}
onRealValueChanged: {
Performance.setCustomRefreshRate(5, realValue);
}
}
}
Item {

22
interface/src/RefreshRateManager.cpp
View file

@ -94,7 +94,8 @@ static const std::array<std::string, RefreshRateManager::UXMode::UX_NUM> UX_MODE
static const std::map<std::string, RefreshRateManager::RefreshRateProfile> REFRESH_RATE_PROFILE_FROM_STRING =
{ { "Eco", RefreshRateManager::RefreshRateProfile::ECO },
{ "Interactive", RefreshRateManager::RefreshRateProfile::INTERACTIVE },
{ "Realtime", RefreshRateManager::RefreshRateProfile::REALTIME } };
{ "Realtime", RefreshRateManager::RefreshRateProfile::REALTIME },
{ "Custom", RefreshRateManager::RefreshRateProfile::CUSTOM } };
// Porfile regimes are:
@ -168,6 +169,25 @@ void RefreshRateManager::setRefreshRateProfile(RefreshRateManager::RefreshRatePr
}
}
int RefreshRateManager::getCustomRefreshRate(RefreshRateRegime regime)
{
Q_ASSERT(regime >= 0 && regime < RefreshRateRegime::REGIME_NUM);
if (regime < 0 && regime >= RefreshRateRegime::REGIME_NUM)
return -1;
return _customProfile[regime];
}
int RefreshRateManager::setCustomRefreshRate(RefreshRateRegime regime, int value)
{
Q_ASSERT(regime >= 0 && regime < RefreshRateRegime::REGIME_NUM);
if (regime < 0 && regime >= RefreshRateRegime::REGIME_NUM)
return -1;
_customProfile[regime] = value;
return 0;
}
RefreshRateManager::RefreshRateProfile RefreshRateManager::getRefreshRateProfile() const {
RefreshRateManager::RefreshRateProfile profile = RefreshRateManager::RefreshRateProfile::REALTIME;

7
interface/src/RefreshRateManager.h
View file

@ -32,6 +32,7 @@ public:
ECO = 0,
INTERACTIVE,
REALTIME,
CUSTOM,
PROFILE_NUM
};
Q_ENUM(RefreshRateProfile)
@ -106,6 +107,9 @@ public:
// query the refresh rate target at the specified combination
int queryRefreshRateTarget(RefreshRateProfile profile, RefreshRateRegime regime, UXMode uxMode) const;
int getCustomRefreshRate(RefreshRateRegime regime);
int setCustomRefreshRate(RefreshRateRegime regime, int value);
void resetInactiveTimer();
void toggleInactive();
@ -115,6 +119,9 @@ public:
static std::string refreshRateRegimeToString(RefreshRateRegime refreshRateRegime);
private:
std::array<int, RefreshRateRegime::REGIME_NUM> _customProfile =
{ { 0, 0, 0, 0, 0, 0 } };
mutable int _activeRefreshRate { 20 };
RefreshRateProfile _refreshRateProfile { RefreshRateProfile::INTERACTIVE};
RefreshRateRegime _refreshRateRegime { RefreshRateRegime::STARTUP };

12
interface/src/scripting/PerformanceScriptingInterface.cpp
View file

@ -56,12 +56,22 @@ void PerformanceScriptingInterface::setRefreshRateProfile(RefreshRateProfile ref
emit settingsChanged();
}
void PerformanceScriptingInterface::setCustomRefreshRate(RefreshRateManager::RefreshRateRegime refreshRateRegime, int value)
{
qApp->getRefreshRateManager().setCustomRefreshRate(refreshRateRegime, value);
emit settingsChanged();
}
int PerformanceScriptingInterface::getCustomRefreshRate(RefreshRateManager::RefreshRateRegime refreshRateRegime) const {
return qApp->getRefreshRateManager().getCustomRefreshRate(refreshRateRegime);
}
PerformanceScriptingInterface::RefreshRateProfile PerformanceScriptingInterface::getRefreshRateProfile() const {
return (PerformanceScriptingInterface::RefreshRateProfile)qApp->getRefreshRateManager().getRefreshRateProfile();
}
QStringList PerformanceScriptingInterface::getRefreshRateProfileNames() const {
static const QStringList refreshRateProfileNames = { "ECO", "INTERACTIVE", "REALTIME" };
static const QStringList refreshRateProfileNames = { "ECO", "INTERACTIVE", "REALTIME", "CUSTOM" };
return refreshRateProfileNames;
}

16
interface/src/scripting/PerformanceScriptingInterface.h
View file

@ -127,6 +127,22 @@ public slots:
*/
void setRefreshRateProfile(RefreshRateProfile refreshRateProfile);
/*@jsdoc
* Sets a custom refresh rate.
* @function Performance.setCustomRefreshRate
* @param {RefreshRateRegime} refreshRateRegime - The refresh rate regime
* @param {int} value - The value for the regime
*/
void setCustomRefreshRate(RefreshRateManager::RefreshRateRegime refreshRateRegime, int value);
/*@jsdoc
* Gets the value for a specific RefreshRateRegime.
* @function Performance.getCustomRefreshRate
* @param {RefreshRateRegime} - The regime to get the value from
* @returns {int} - The value from the specified regime
*/
int getCustomRefreshRate(RefreshRateManager::RefreshRateRegime regime) const;
/*@jsdoc
* Gets the current refresh rate profile in use.
* @function Performance.getRefreshRateProfile

3
interface/src/ui/PreferencesDialog.cpp
View file

@ -100,7 +100,8 @@ void setupPreferences() {
QStringList refreshRateProfiles
{ QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::ECO)),
QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::INTERACTIVE)),
QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::REALTIME)) };
QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::REALTIME)),
QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::CUSTOM)) };
preference->setItems(refreshRateProfiles);
preferences->addPreference(preference);