Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:16:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15576 from zfox23/finishSettings

Browse source 
Simplified UI v1: Implement Performance settings and VR mode top bar switch
This commit is contained in:
Zach Fox 2019-05-16 17:01:04 -07:00 committed by GitHub
commit c0037c3445
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
View file

@ -13,6 +13,7 @@ import "../../simplifiedConstants" as SimplifiedConstants
import "../../simplifiedControls" as SimplifiedControls import "../../simplifiedControls" as SimplifiedControls
import stylesUit 1.0 as HifiStylesUit import stylesUit 1.0 as HifiStylesUit
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import PerformanceEnums 1.0
Flickable { Flickable {
property string avatarNametagMode: Settings.getValue("simplifiedNametag/avatarNametagMode", "on") property string avatarNametagMode: Settings.getValue("simplifiedNametag/avatarNametagMode", "on")
@ -113,16 +114,28 @@ Flickable {
SimplifiedControls.RadioButton { SimplifiedControls.RadioButton {
id: performanceLow id: performanceLow
text: "Eco" text: "Eco"
checked: Performance.getRefreshRateProfile() === RefreshRate.ECO
onClicked: {
Performance.setRefreshRateProfile(RefreshRate.ECO);
}
} }
SimplifiedControls.RadioButton { SimplifiedControls.RadioButton {
id: performanceMedium id: performanceMedium
text: "Interactive" text: "Interactive"
checked: Performance.getRefreshRateProfile() === RefreshRate.INTERACTIVE
onClicked: {
Performance.setRefreshRateProfile(RefreshRate.INTERACTIVE);
}
} }
SimplifiedControls.RadioButton { SimplifiedControls.RadioButton {
id: performanceHigh id: performanceHigh
text: "Realtime" text: "Realtime"
checked: Performance.getRefreshRateProfile() === RefreshRate.REALTIME
onClicked: {
Performance.setRefreshRateProfile(RefreshRate.REALTIME);
}
} }
} }
} }

30
interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
View file

@ -277,8 +277,34 @@ Rectangle {
} }
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
// TODO: actually do this right and change the display plugin var displayPluginCount = Window.getDisplayPluginCount();
HMD.active = !HMD.active; if (HMD.active) {
// This next line seems backwards and shouldn't be necessary - the NOTIFY handler should
// result in `displayModeImage.source` changing automatically - but that's not working.
// This is working. So, I'm keeping it.
displayModeImage.source = "./images/vrMode.svg";
// Switch to desktop mode - selects first VR display plugin
for (var i = 0; i < displayPluginCount; i++) {
if (!Window.isDisplayPluginHmd(i)) {
Window.setActiveDisplayPlugin(i);
return;
}
}
} else {
// This next line seems backwards and shouldn't be necessary - the NOTIFY handler should
// result in `displayModeImage.source` changing automatically - but that's not working.
// This is working. So, I'm keeping it.
displayModeImage.source = "./images/desktopMode.svg";
// Switch to VR mode - selects first HMD display plugin
for (var i = 0; i < displayPluginCount; i++) {
if (Window.isDisplayPluginHmd(i)) {
Window.setActiveDisplayPlugin(i);
return;
}
}
}
} }
} }
} }