Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 15:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Moved graphics settings to GraphicsSettings.qml.

Browse source 
Signed-off-by: armored-dragon <publicmail@armoreddragon.com>
This commit is contained in:
armored-dragon 2025-04-12 18:12:00 -05:00
parent 0050a2d76e
commit 19a9636c27
No known key found for this signature in database
GPG key ID: C7207ACC3382AD8B
3 changed files with 283 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

278
scripts/system/settings/Settings.qml
View file

@ -2,6 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "./qml_widgets" import "./qml_widgets"
import "./qml_widgets/pages"
Rectangle { Rectangle {
signal sendToScript(var message); signal sendToScript(var message);
@ -49,282 +50,7 @@ Rectangle {
} }
// Graphics // Graphics
Flickable { GraphicsSettings {}
id: graphics_page
visible: current_page == "Graphics"
width: parent.width
Layout.fillHeight: true
y: header.height + 10
contentWidth: parent.width
contentHeight: graphics_page_column.height
clip: true
ColumnLayout {
id: graphics_page_column
width: parent.width - 10
anchors.horizontalCenter: parent.horizontalCenter
spacing: 10
// Graphics Presets
SettingComboBox {
settingText: "Graphics preset";
optionIndex: Performance.getPerformancePreset() - 1;
options: ["Low Power", "Low", "Medium", "High", "Custom"];
onValueChanged: {
Performance.setPerformancePreset(index + 1)
}
}
// Rendering Effects
SettingBoolean {
settingText: "Rendering effects";
settingEnabled: Render.renderMethod == 0
onSettingEnabledChanged: {
Render.renderMethod = settingEnabled ? 0 : 1;
}
}
// Rendering Effects sub options
Item {
Layout.fillWidth: true;
visible: Render.renderMethod == 0;
height: children[0].height;
width: parent.width;
Rectangle {
color: "#222222";
width: parent.width;
height: children[0].height;
radius: 10;
ColumnLayout {
width: parent.width - 10;
id: renderSettingsContainer;
SettingBoolean {
settingText: "Shadows";
settingEnabled: Render.shadowsEnabled;
onSettingEnabledChanged: {
Render.shadowsEnabled = settingEnabled;
}
}
SettingBoolean {
settingText: "Local Lights";
settingEnabled: Render.localLightsEnabled
onSettingEnabledChanged: {
Render.localLightsEnabled = settingEnabled;
}
}
SettingBoolean {
settingText: "Fog";
settingEnabled: Render.fogEnabled
onSettingEnabledChanged: {
Render.fogEnabled = settingEnabled;
}
}
SettingBoolean {
settingText: "Haze";
settingEnabled: Render.hazeEnabled
onSettingEnabledChanged: {
Render.hazeEnabled = settingEnabled;
}
}
SettingBoolean {
settingText: "Bloom";
settingEnabled: Render.bloomEnabled
onSettingEnabledChanged: {
Render.bloomEnabled = settingEnabled;
}
}
}
}
}
// FPS
SettingComboBox {
settingText: "Refresh rate";
options: ["Economical", "Interactive", "Real-Time", "Custom"];
optionIndex: Performance.getRefreshRateProfile();
onValueChanged: {
Performance.setRefreshRateProfile(index);
customFPSVaulesContainer.visible = index == 3;
}
}
// Custom FPS
Item {
id: customFPSVaulesContainer
Layout.fillWidth: true;
height: children[0].height;
width: parent.width;
Rectangle {
color: "#222222";
width: parent.width;
height: children[0].height;
radius: 10;
ColumnLayout {
width: parent.width - 10;
SettingNumber {
settingText: "Focus Active";
minValue: 5;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(0)
onValueChanged: {
Performance.setCustomRefreshRate(0, value);
}
}
SettingNumber {
settingText: "Focus Inactive";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(1)
onValueChanged: {
Performance.setCustomRefreshRate(1, value);
}
}
SettingNumber {
settingText: "Unfocused";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(2)
onValueChanged: {
Performance.setCustomRefreshRate(2, value);
}
}
SettingNumber {
settingText: "Minimized";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(3)
onValueChanged: {
Performance.setCustomRefreshRate(3, value);
}
}
SettingNumber {
settingText: "Startup";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(4)
onValueChanged: {
Performance.setCustomRefreshRate(4, value);
}
}
SettingNumber {
settingText: "Shutdown";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(5)
onValueChanged: {
Performance.setCustomRefreshRate(5, value);
}
}
}
}
}
// Resolution Scale
SettingSlider {
settingText: "Resolution scale";
sliderStepSize: 0.1;
minValue: 0.1;
maxValue: 2;
settingValue: Render.viewportResolutionScale.toFixed(1)
onSliderValueChanged: {
Render.viewportResolutionScale = value.toFixed(1)
}
}
// Fullscreen Display
SettingComboBox {
settingText: "Fullscreen Display";
Component.onCompleted: {
var screens = Render.getScreens();
var selected = Render.getFullScreenScreen();
setOptions(screens);
for (let i = 0; screens.length > i; i++) {
if (screens[i] == selected) {
optionIndex = i;
return;
}
}
}
onValueChanged: {
Render.setFullScreenScreen(optionText);
}
}
// FOV
SettingSlider {
settingText: "Field of View";
sliderStepSize: 1;
minValue: 20;
maxValue: 130;
settingValue: Render.verticalFieldOfView.toFixed(1);
roundDisplay: 0;
onSliderValueChanged: {
Render.verticalFieldOfView = value.toFixed(1);
}
}
// Camera clipping
SettingBoolean {
settingText: "Allow camera clipping";
settingEnabled: !Render.cameraClippingEnabled
onSettingEnabledChanged: {
Render.cameraClippingEnabled = settingEnabled ? 0 : 1;
}
}
// Anti Aliasing
SettingComboBox {
settingText: "Anti-aliasing";
optionIndex: Render.antialiasingMode;
options: ["None", "TAA", "FXAA"];
onValueChanged: {
Render.antialiasingMode = index;
}
}
}
}
// Audio // Audio
SettingCenterContainer { SettingCenterContainer {

281
scripts/system/settings/qml_widgets/pages/GraphicsSettings.qml Normal file
View file

@ -0,0 +1,281 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3
import "../"
Flickable {
id: graphics_page
visible: current_page == "Graphics"
width: parent.width
Layout.fillHeight: true
y: header.height + 10
contentWidth: parent.width
contentHeight: graphics_page_column.height
clip: true
ColumnLayout {
id: graphics_page_column
width: parent.width - 10
anchors.horizontalCenter: parent.horizontalCenter
spacing: 10
// Graphics Presets
SettingComboBox {
settingText: "Graphics preset";
optionIndex: Performance.getPerformancePreset() - 1;
options: ["Low Power", "Low", "Medium", "High", "Custom"];
onValueChanged: {
Performance.setPerformancePreset(index + 1)
}
}
// Rendering Effects
SettingBoolean {
settingText: "Rendering effects";
settingEnabled: Render.renderMethod == 0
onSettingEnabledChanged: {
Render.renderMethod = settingEnabled ? 0 : 1;
}
}
// Rendering Effects sub options
Item {
Layout.fillWidth: true;
visible: Render.renderMethod == 0;
height: children[0].height;
width: parent.width;
Rectangle {
color: "#222222";
width: parent.width;
height: children[0].height;
radius: 10;
ColumnLayout {
width: parent.width - 10;
id: renderSettingsContainer;
SettingBoolean {
settingText: "Shadows";
settingEnabled: Render.shadowsEnabled;
onSettingEnabledChanged: {
Render.shadowsEnabled = settingEnabled;
}
}
SettingBoolean {
settingText: "Local Lights";
settingEnabled: Render.localLightsEnabled
onSettingEnabledChanged: {
Render.localLightsEnabled = settingEnabled;
}
}
SettingBoolean {
settingText: "Fog";
settingEnabled: Render.fogEnabled
onSettingEnabledChanged: {
Render.fogEnabled = settingEnabled;
}
}
SettingBoolean {
settingText: "Haze";
settingEnabled: Render.hazeEnabled
onSettingEnabledChanged: {
Render.hazeEnabled = settingEnabled;
}
}
SettingBoolean {
settingText: "Bloom";
settingEnabled: Render.bloomEnabled
onSettingEnabledChanged: {
Render.bloomEnabled = settingEnabled;
}
}
}
}
}
// FPS
SettingComboBox {
settingText: "Refresh rate";
options: ["Economical", "Interactive", "Real-Time", "Custom"];
optionIndex: Performance.getRefreshRateProfile();
onValueChanged: {
Performance.setRefreshRateProfile(index);
customFPSVaulesContainer.visible = index == 3;
}
}
// Custom FPS
Item {
id: customFPSVaulesContainer
Layout.fillWidth: true;
height: children[0].height;
width: parent.width;
Rectangle {
color: "#222222";
width: parent.width;
height: children[0].height;
radius: 10;
ColumnLayout {
width: parent.width - 10;
SettingNumber {
settingText: "Focus Active";
minValue: 5;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(0)
onValueChanged: {
Performance.setCustomRefreshRate(0, value);
}
}
SettingNumber {
settingText: "Focus Inactive";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(1)
onValueChanged: {
Performance.setCustomRefreshRate(1, value);
}
}
SettingNumber {
settingText: "Unfocused";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(2)
onValueChanged: {
Performance.setCustomRefreshRate(2, value);
}
}
SettingNumber {
settingText: "Minimized";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(3)
onValueChanged: {
Performance.setCustomRefreshRate(3, value);
}
}
SettingNumber {
settingText: "Startup";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(4)
onValueChanged: {
Performance.setCustomRefreshRate(4, value);
}
}
SettingNumber {
settingText: "Shutdown";
minValue: 1;
maxValue: 9999;
suffixText: "fps";
settingValue: Performance.getCustomRefreshRate(5)
onValueChanged: {
Performance.setCustomRefreshRate(5, value);
}
}
}
}
}
// Resolution Scale
SettingSlider {
settingText: "Resolution scale";
sliderStepSize: 0.1;
minValue: 0.1;
maxValue: 2;
settingValue: Render.viewportResolutionScale.toFixed(1)
onSliderValueChanged: {
Render.viewportResolutionScale = value.toFixed(1)
}
}
// Fullscreen Display
SettingComboBox {
settingText: "Fullscreen Display";
Component.onCompleted: {
var screens = Render.getScreens();
var selected = Render.getFullScreenScreen();
setOptions(screens);
for (let i = 0; screens.length > i; i++) {
if (screens[i] == selected) {
optionIndex = i;
return;
}
}
}
onValueChanged: {
Render.setFullScreenScreen(optionText);
}
}
// FOV
SettingSlider {
settingText: "Field of View";
sliderStepSize: 1;
minValue: 20;
maxValue: 130;
settingValue: Render.verticalFieldOfView.toFixed(1);
roundDisplay: 0;
onSliderValueChanged: {
Render.verticalFieldOfView = value.toFixed(1);
}
}
// Camera clipping
SettingBoolean {
settingText: "Allow camera clipping";
settingEnabled: !Render.cameraClippingEnabled
onSettingEnabledChanged: {
Render.cameraClippingEnabled = settingEnabled ? 0 : 1;
}
}
// Anti Aliasing
SettingComboBox {
settingText: "Anti-aliasing";
optionIndex: Render.antialiasingMode;
options: ["None", "TAA", "FXAA"];
onValueChanged: {
Render.antialiasingMode = index;
}
}
}
}

1
scripts/system/settings/settings.js
View file

@ -12,7 +12,6 @@
/* global Script Tablet */ /* global Script Tablet */
// TODO: Fullscreen display? // TODO: Fullscreen display?
// TODO: Move Graphics Settings part of the UI to its own widget
// TODO: Replace bool setting with switch? // TODO: Replace bool setting with switch?
// FIXME: Setting slider handle // FIXME: Setting slider handle
// TODO: Setting slider incorrect radius around filled background? // TODO: Setting slider incorrect radius around filled background?