"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/GUI/qml/Settings.qml" between
flightgear-2020.1.1.tar.bz2 and flightgear-2020.1.2.tar.bz2

About: FlightGear is a multi-platform, cooperative flight simulator development project.

Settings.qml  (flightgear-2020.1.1.tar.bz2):Settings.qml  (flightgear-2020.1.2.tar.bz2)
skipping to change at line 414 skipping to change at line 414
} }
} }
} }
Section { Section {
id: renderSection id: renderSection
title: qsTr("Rendering") title: qsTr("Rendering")
width: parent.width width: parent.width
settingGroup: "render" settingGroup: "render"
readonly property bool rembrandt: (renderer.selectedIndex == 2) readonly property bool rembrandt: !_haveCompositor && (renderer. selectedIndex == 2)
readonly property bool alsEnabled: (renderer.selectedIndex == 1) readonly property bool alsEnabled: (renderer.selectedIndex == 1)
readonly property bool msaaEnabled: !rembrandt && (msaa.selected Index > 0) readonly property bool msaaEnabled: !rembrandt && (msaa.selected Index > 0)
function summary() function summary()
{ {
var result = []; var result = [];
if (rembrandt) result.push(qsTr("Rembrandt")); if (rembrandt) result.push(qsTr("Rembrandt"));
else if (alsEnabled) result.push("ALS"); else if (alsEnabled) result.push("ALS");
if (msaaEnabled) result.push(qsTr("anti-aliasing")); if (msaaEnabled) result.push(qsTr("anti-aliasing"));
return result; return result;
} }
readonly property var __traditionalRendererChoices: [qsTr("Defau
lt"),
qsTr("Atmospheric Light Scattering"),
qsTr("Rembrandt")]
readonly property var __compositorRendererChoices: [qsTr("Defaul
t"),
qsTr("Atmospheric Light Scattering"),
qsTr("Low-spec")]
readonly property string __defaultRenderDesc: qsTr("The default
renderer provides standard visuals with maximum compatibility.")
readonly property string __alsRenderDesc: qsTr("The ALS renderer
uses a sophisticated physical atmospheric model and several " +
"other effects to
give realistic rendering of large distances.")
readonly property string __rembrandtDesc: qsTr("Rembrandt is a c
onfigurable multi-pass renderer which supports shadow-maps, cinematic " +
"effects and more
. However, not all aircraft appear correctly and performance will " +
"depend greatly o
n your system hardware.")
readonly property string __lowSpecDesc: qsTr("The low-spec rende
rer ensures maximum performance on older computers.")
readonly property var descriptions: _haveCompositor
? [__defaultRenderDesc, __al
sRenderDesc, __lowSpecDesc]
: [__defaultRenderDesc, __al
sRenderDesc, __rembrandtDesc]
contents: [ contents: [
SettingsComboBox { SettingsComboBox {
id: renderer id: renderer
label: qsTr("Renderer") label: qsTr("Renderer")
choices: [qsTr("Default"), choices: _haveCompositor
qsTr("Atmospheric Light Scattering"), ? renderSection.__compositorRendererChoices
qsTr("Rembrandt")] : renderSection.__traditionalRendererChoices
description: descriptions[selectedIndex] description: renderSection.descriptions[selectedIndex]
defaultIndex: 0 defaultIndex: 1
setting: "renderer" setting: "renderer"
keywords: ["als", "rembrandt", "render", "shadow", "low-
readonly property var descriptions: [ spec", "graphics", "performance"]
qsTr("The default renderer provides standard visuals
with maximum compatibility."),
qsTr("The ALS renderer uses a sophisticated physical
atmospheric model and several " +
"other effects to give realistic rendering of large
distances."),
qsTr("Rembrandt is a configurable multi-pass rendere
r which supports shadow-maps, cinematic " +
"effects and more. However, not all aircraft appear
correctly and performance will " +
"depend greatly on your system hardware.")
]
keywords: ["als", "rembrandt", "render", "shadow"]
}, },
SettingsComboBox { SettingsComboBox {
id: msaa id: msaa
label: qsTr("Anti-aliasing") label: qsTr("Anti-aliasing")
setting: "aa" setting: "aa"
description: renderSection.rembrandt? qsTr("Anti-aliasin g is disabled when Rembrandt is enabled.") description: renderSection.rembrandt? qsTr("Anti-aliasin g is disabled when Rembrandt is enabled.")
: qsTr("Anti-aliasing improves the appearance of hi gh-contrast edges and lines. " + : qsTr("Anti-aliasing improves the appearance of hi gh-contrast edges and lines. " +
"This is especially noticeable on sloping or diagona l edges. " + "This is especially noticeable on sloping or diagona l edges. " +
"Higher settings can reduce performance.") "Higher settings can reduce performance.")
skipping to change at line 487 skipping to change at line 497
} }
] ]
onApply: { onApply: {
if (msaaEnabled) { if (msaaEnabled) {
_config.setProperty("/sim/rendering/multi-sample-buffers ", 1) _config.setProperty("/sim/rendering/multi-sample-buffers ", 1)
_config.setProperty("/sim/rendering/multi-samples", msaa .data[msaa.selectedIndex]) _config.setProperty("/sim/rendering/multi-samples", msaa .data[msaa.selectedIndex])
} }
_config.setEnableDisableOption("rembrandt", rembrandt); if (_haveCompositor) {
if (alsEnabled) {
if (alsEnabled) { _config.setArg("compositor", "Compositor/ALS");
_config.setProperty("/sim/rendering/shaders/skydome", tr } else if (renderer.selectedIndex == 2) {
ue); _config.setArg("compositor", "Compositor/low-spec")
}
} else {
_config.setEnableDisableOption("rembrandt", rembrandt);
if (alsEnabled) {
_config.setProperty("/sim/rendering/shaders/skydome"
, true);
}
} }
_config.setProperty("/sim/rendering/texture-cache/cache-enab led", compressTextures.value); _config.setProperty("/sim/rendering/texture-cache/cache-enab led", compressTextures.value);
} }
} }
Section { Section {
id: extraArgsSection id: extraArgsSection
title: qsTr("Additional Settings") title: qsTr("Additional Settings")
settingGroup: "extraArgs" settingGroup: "extraArgs"
 End of changes. 5 change blocks. 
27 lines changed or deleted 51 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)