From 803cfd9bdc92f905b18fa43ded641ae6200b6bad Mon Sep 17 00:00:00 2001 From: Penguin-Guru Date: Sat, 23 Oct 2021 17:16:48 -0700 Subject: [PATCH 1/3] Separated shadow rendering setting. Replaced drop-down with radio. --- .../dialogs/graphics/GraphicsSettings.qml | 103 +++++++++--------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml b/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml index 6e345caaf7..27407b328a 100644 --- a/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml +++ b/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml @@ -169,9 +169,8 @@ Item { } } - Item { + ColumnLayout { Layout.preferredWidth: parent.width - Layout.preferredHeight: 35 Layout.topMargin: 20 HifiStylesUit.RalewayRegular { @@ -185,61 +184,64 @@ Item { color: "#FFFFFF" } - ListModel { - id: renderingEffectsModel - - ListElement { - text: "No Rendering Effects" - preferredRenderMethod: 1 // "FORWARD" - shadowsEnabled: false - } - ListElement { - text: "Local Lights, Fog, Bloom" - preferredRenderMethod: 0 // "DEFERRED" - shadowsEnabled: false - } - ListElement { - text: "Local Lights, Fog, Bloom, Shadows" - preferredRenderMethod: 0 // "DEFERRED" - shadowsEnabled: true - } - } - - HifiControlsUit.ComboBox { - id: renderingEffectsDropdown - enabled: performanceCustom.checked + ColumnLayout { anchors.left: renderingEffectsHeader.right anchors.leftMargin: 20 - anchors.top: parent.top - width: 280 - height: parent.height - colorScheme: hifi.colorSchemes.dark - model: renderingEffectsModel - currentIndex: -1 + Layout.preferredWidth: parent.width + spacing: 0 + enabled: performanceCustom.checked - function refreshRenderingEffectsDropdownDisplay() { - if (Render.shadowsEnabled) { - renderingEffectsDropdown.currentIndex = 2; - } else if (Render.renderMethod === 0) { - renderingEffectsDropdown.currentIndex = 1; - } else { - renderingEffectsDropdown.currentIndex = 0; + HifiControlsUit.RadioButton { + id: renderingEffectsDisabled + colorScheme: hifi.colorSchemes.dark + height: 18 + fontSize: 16 + leftPadding: 0 + text: "Disabled" + checked: Render.renderMethod === 1 + onClicked: { + Render.renderMethod = 1; // "FORWARD" + //refreshRenderingEffectCheckboxes(); } } - Component.onCompleted: { - renderingEffectsDropdown.refreshRenderingEffectsDropdownDisplay(); - } - - onCurrentIndexChanged: { - var renderMethodToSet = 1; - if (model.get(currentIndex).preferredRenderMethod === 0 && - PlatformInfo.isRenderMethodDeferredCapable()) { - renderMethodToSet = 0; + HifiControlsUit.RadioButton { + id: renderingEffectsEnabled + enabled: PlatformInfo.isRenderMethodDeferredCapable() + colorScheme: hifi.colorSchemes.dark + height: 18 + fontSize: 16 + leftPadding: 0 + text: "Enabled (local lights, fog, bloom)" + checked: Render.renderMethod === 0 + onClicked: { + Render.renderMethod = 0; // "DEFERRED" + } + } + + ColumnLayout { + id: renderingEffectCheckboxes + Layout.preferredWidth: parent.width + anchors.left: parent.left + anchors.leftMargin: 24 + anchors.bottom: parent.bottom + anchors.bottomMargin: 5 + anchors.topMargin: 8 + enabled: performanceCustom.checked && renderingEffectsEnabled.checked + + HifiControlsUit.CheckBox { + id: renderingEffectShadows + checked: Render.shadowsEnabled + boxSize: 16 + text: "Shadows" + spacing: -1 + colorScheme: hifi.colorSchemes.dark + anchors.left: parent.left + anchors.top: parent.top + onCheckedChanged: { + Render.shadowsEnabled = renderingEffectShadows.checked; + } } - Render.renderMethod = renderMethodToSet; - Render.shadowsEnabled = model.get(currentIndex).shadowsEnabled; - renderingEffectsDropdown.displayText = model.get(currentIndex).text; } } } @@ -363,7 +365,6 @@ Item { function refreshAllDropdowns() { worldDetailDropdown.refreshWorldDetailDropdown(); - renderingEffectsDropdown.refreshRenderingEffectsDropdownDisplay(); refreshRateDropdown.refreshRefreshRateDropdownDisplay(); } } From d9d8d951ec0fa519c8b29e61ac95a866eec8a3cb Mon Sep 17 00:00:00 2001 From: Penguin-Guru Date: Sat, 23 Oct 2021 17:29:57 -0700 Subject: [PATCH 2/3] Fixed irony. --- .../resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml b/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml index 27407b328a..a7c23c96e8 100644 --- a/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml +++ b/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml @@ -234,7 +234,7 @@ Item { checked: Render.shadowsEnabled boxSize: 16 text: "Shadows" - spacing: -1 + spacing: -1 colorScheme: hifi.colorSchemes.dark anchors.left: parent.left anchors.top: parent.top From ca4a817d09d046f4a2e3f86d016dc860b064983f Mon Sep 17 00:00:00 2001 From: Penguin-Guru Date: Sun, 24 Oct 2021 11:31:15 -0700 Subject: [PATCH 3/3] Added other effect checkboxes for consistency. --- .../dialogs/graphics/GraphicsSettings.qml | 53 +++++++++++++++++-- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml b/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml index a7c23c96e8..b55ed756f7 100644 --- a/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml +++ b/interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml @@ -212,7 +212,7 @@ Item { height: 18 fontSize: 16 leftPadding: 0 - text: "Enabled (local lights, fog, bloom)" + text: "Enabled" checked: Render.renderMethod === 0 onClicked: { Render.renderMethod = 0; // "DEFERRED" @@ -224,9 +224,9 @@ Item { Layout.preferredWidth: parent.width anchors.left: parent.left anchors.leftMargin: 24 - anchors.bottom: parent.bottom - anchors.bottomMargin: 5 anchors.topMargin: 8 + anchors.bottom: parent.bottom + anchors.bottomMargin: Layout.topMargin enabled: performanceCustom.checked && renderingEffectsEnabled.checked HifiControlsUit.CheckBox { @@ -242,6 +242,51 @@ Item { Render.shadowsEnabled = renderingEffectShadows.checked; } } + HifiControlsUit.CheckBox { + id: renderingEffectLocalLights + enabled: false + //checked: Render.localLightsEnabled + checked: renderingEffectsEnabled.checked + boxSize: 16 + text: "Local lights" + spacing: -1 + colorScheme: hifi.colorSchemes.dark + anchors.left: parent.left + anchors.top: renderingEffectShadows.bottom + //onCheckedChanged: { + // Render.localLightsEnabled = renderingEffectLocalLightsEnabled.checked; + //} + } + HifiControlsUit.CheckBox { + id: renderingEffectFog + enabled: false + //checked: Render.fogEnabled + checked: renderingEffectsEnabled.checked + boxSize: 16 + text: "Fog" + spacing: -1 + colorScheme: hifi.colorSchemes.dark + anchors.left: parent.left + anchors.top: renderingEffectLocalLights.bottom + //onCheckedChanged: { + // Render.fogEnabled = renderingEffectFogEnabled.checked; + //} + } + HifiControlsUit.CheckBox { + id: renderingEffectBloom + enabled: false + //checked: Render.bloomEnabled + checked: renderingEffectsEnabled.checked + boxSize: 16 + text: "Bloom" + spacing: -1 + colorScheme: hifi.colorSchemes.dark + anchors.left: parent.left + anchors.top: renderingEffectFog.bottom + //onCheckedChanged: { + // Render.bloomEnabled = renderingEffectBloomEnabled.checked; + //} + } } } } @@ -249,7 +294,7 @@ Item { Item { Layout.preferredWidth: parent.width Layout.preferredHeight: 35 - Layout.topMargin: 20 + Layout.topMargin: 10 HifiStylesUit.RalewayRegular { id: refreshRateHeader