History

Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...

samcake committed 9 years ago

Commit ba9dbbb1 parent ddce66512 files · +116 −111Browse files

Showing the changes to scripts/developer (11 of 12 files). Show all

Unified · Split

11 files
  1. scripts/developer/utilities/render/ambientOcclusionPass.qml +7 −6
  2. scripts/developer/utilities/render/culling.qml +8 −7
  3. scripts/developer/utilities/render/debugAmbientOcclusionPass.js +1 −1
  4. scripts/developer/utilities/render/debugSubsurfaceScattering.js +1 −1
  5. scripts/developer/utilities/render/deferredLighting.qml +24 −23
  6. scripts/developer/utilities/render/lightClustering.qml +24 −23
  7. scripts/developer/utilities/render/stats.qml +11 −10
  8. scripts/developer/utilities/render/statsGPU.qml +12 −11
  9. scripts/developer/utilities/render/subsurfaceScattering.qml +18 −17
  10. scripts/developer/utilities/render/surfaceGeometryPass.qml +6 −5
  11. scripts/developer/utilities/render/textureMonitor.qml +2 −1
scripts/developer/utilities/render/ambientOcclusionPass.qml+7−6
@@ -13,6 +13,7 @@ import "configSlider" · 12 unmodified lines
1313 import "../lib/plotperf"
1414
1515 Column {
16+ property var mainViewTask: Render.getConfig("RenderMainView")
1617 spacing: 8
1718 Column {
1819 id: surfaceGeometry
@@ -32,7 +33,7 @@ Column { · 13 unmodified lines
3233 ConfigSlider {
3334 label: qsTr(modelData.split(":")[0])
3435 integral: (modelData.split(":")[3] == 'true')
35− config: Render.getConfig("AmbientOcclusion")
36+ config: mainViewTask.getConfig("AmbientOcclusion")
3637 property: modelData.split(":")[1]
3738 max: modelData.split(":")[2]
3839 min: 0.0
@@ -50,8 +51,8 @@ Column { · 11 unmodified lines
5051 ]
5152 CheckBox {
5253 text: qsTr(modelData.split(":")[0])
53− checked: Render.getConfig("AmbientOcclusion")[modelData.split(":")[1]]
54− onCheckedChanged: { Render.getConfig("AmbientOcclusion")[modelData.split(":")[1]] = checked }
54+ checked: mainViewTask.getConfig("AmbientOcclusion")[modelData.split(":")[1]]
55+ onCheckedChanged: { mainViewTask.getConfig("AmbientOcclusion")[modelData.split(":")[1]] = checked }
5556 }
5657 }
5758 }
@@ -62,8 +63,8 @@ Column { · 4 unmodified lines
6263 ]
6364 CheckBox {
6465 text: qsTr(modelData.split(":")[0])
65− checked: Render.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]]
66− onCheckedChanged: { Render.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]] = checked }
66+ checked: mainViewTask.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]]
67+ onCheckedChanged: { mainViewTask.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]] = checked }
6768 }
6869 }
6970 }
@@ -72,7 +73,7 @@ Column { · 2 unmodified lines
7273 PlotPerf {
7374 title: "Timing"
7475 height: 50
75− object: Render.getConfig("AmbientOcclusion")
76+ object: mainViewTask.getConfig("AmbientOcclusion")
7677 valueUnit: "ms"
7778 valueScale: 1
7879 valueNumDigits: "3"
scripts/developer/utilities/render/culling.qml+8−7
@@ -14,8 +14,9 @@ import "configSlider" · 13 unmodified lines
1414 Column {
1515 id: root
1616 spacing: 8
17− property var sceneOctree: Render.getConfig("DrawSceneOctree");
18− property var itemSelection: Render.getConfig("DrawItemSelection");
17+ property var mainViewTask: Render.getConfig("RenderMainView");
18+ property var sceneOctree: mainViewTask.getConfig("DrawSceneOctree");
19+ property var itemSelection: mainViewTask.getConfig("DrawItemSelection");
1920
2021 Component.onCompleted: {
2122 sceneOctree.enabled = true;
@@ -30,8 +31,8 @@ Column { · 8 unmodified lines
3031 Component.onDestruction: {
3132 sceneOctree.enabled = false;
3233 itemSelection.enabled = false;
33− Render.getConfig("FetchSceneSelection").freezeFrustum = false;
34− Render.getConfig("CullSceneSelection").freezeFrustum = false;
34+ mainViewTask.getConfig("FetchSceneSelection").freezeFrustum = false;
35+ mainViewTask.getConfig("CullSceneSelection").freezeFrustum = false;
3536 }
3637
3738 GroupBox {
@@ -45,8 +46,8 @@ Column { · 7 unmodified lines
4546 text: "Freeze Culling Frustum"
4647 checked: false
4748 onCheckedChanged: {
48− Render.getConfig("FetchSceneSelection").freezeFrustum = checked;
49− Render.getConfig("CullSceneSelection").freezeFrustum = checked;
49+ mainViewTask.getConfig("FetchSceneSelection").freezeFrustum = checked;
50+ mainViewTask.getConfig("CullSceneSelection").freezeFrustum = checked;
5051 }
5152 }
5253 Label {
@@ -103,7 +104,7 @@ Column { · 50 unmodified lines
103104 ConfigSlider {
104105 label: qsTr(modelData.split(":")[0])
105106 integral: true
106− config: Render.getConfig(modelData.split(":")[1])
107+ config: mainViewTask.getConfig(modelData.split(":")[1])
107108 property: "maxDrawn"
108109 max: config.numDrawn
109110 min: -1
scripts/developer/utilities/render/debugAmbientOcclusionPass.js+1−1
@@ -34,5 +34,5 @@ function setDebugCursor(x, y) { · 33 unmodified lines
3434 nx = (x / Window.innerWidth);
3535 ny = 1.0 - ((y) / (Window.innerHeight - 32));
3636
37− Render.getConfig("DebugAmbientOcclusion").debugCursorTexcoord = { x: nx, y: ny };
37+ Render.getConfig("RenderMainView").getConfig("DebugAmbientOcclusion").debugCursorTexcoord = { x: nx, y: ny };
3838 }
scripts/developer/utilities/render/debugSubsurfaceScattering.js+1−1
@@ -33,5 +33,5 @@ function setDebugCursor(x, y) { · 32 unmodified lines
3333 nx = (x / Window.innerWidth);
3434 ny = 1.0 - ((y) / (Window.innerHeight - 32));
3535
36− Render.getConfig("DebugScattering").debugCursorTexcoord = { x: nx, y: ny };
36+ Render.getConfig("RenderMainView").getConfig("DebugScattering").debugCursorTexcoord = { x: nx, y: ny };
3737 }
scripts/developer/utilities/render/deferredLighting.qml+24−23
@@ -13,6 +13,7 @@ import "configSlider" · 12 unmodified lines
1313
1414 Column {
1515 spacing: 8
16+ property var mainViewTask: Render.getConfig("RenderMainView")
1617
1718 Row {
1819 spacing: 8
@@ -29,8 +30,8 @@ Column { · 10 unmodified lines
2930 ]
3031 CheckBox {
3132 text: modelData.split(":")[0]
32− checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
33− onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
33+ checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
34+ onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
3435 }
3536 }
3637 }
@@ -49,8 +50,8 @@ Column { · 12 unmodified lines
4950 ]
5051 CheckBox {
5152 text: modelData.split(":")[0]
52− checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
53− onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
53+ checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
54+ onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
5455 }
5556 }
5657 }
@@ -69,8 +70,8 @@ Column { · 12 unmodified lines
6970 ]
7071 CheckBox {
7172 text: modelData.split(":")[0]
72− checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
73− onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
73+ checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
74+ onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
7475 }
7576 }
7677 }
@@ -83,7 +84,7 @@ Column { · 6 unmodified lines
8384 ConfigSlider {
8485 label: qsTr(modelData.split(":")[0])
8586 integral: false
86− config: Render.getConfig(modelData.split(":")[1])
87+ config: mainViewTask.getConfig(modelData.split(":")[1])
8788 property: modelData.split(":")[2]
8889 max: modelData.split(":")[3]
8990 min: modelData.split(":")[4]
@@ -107,7 +108,7 @@ Column { · 17 unmodified lines
107108 ListElement { text: "Filmic"; color: "White" }
108109 }
109110 width: 200
110− onCurrentIndexChanged: { Render.getConfig("ToneMapping")["curve"] = currentIndex }
111+ onCurrentIndexChanged: { mainViewTask.getConfig("ToneMapping")["curve"] = currentIndex }
111112 }
112113 }
113114 }
@@ -120,7 +121,7 @@ Column { · 6 unmodified lines
120121 anchors.left: root.left
121122 }
122123
123− property var config: Render.getConfig("DebugDeferredBuffer")
124+ property var config: mainViewTask.getConfig("DebugDeferredBuffer")
124125
125126 function setDebugMode(mode) {
126127 framebuffer.config.enabled = (mode != 0);
@@ -168,40 +169,40 @@ Column { · 41 unmodified lines
168169
169170 CheckBox {
170171 text: "Opaques"
171− checked: Render.getConfig("DrawOpaqueBounds")["enabled"]
172− onCheckedChanged: { Render.getConfig("DrawOpaqueBounds")["enabled"] = checked }
172+ checked: mainViewTask.getConfig("DrawOpaqueBounds")["enabled"]
173+ onCheckedChanged: { mainViewTask.getConfig("DrawOpaqueBounds")["enabled"] = checked }
173174 }
174175 CheckBox {
175176 text: "Transparents"
176− checked: Render.getConfig("DrawTransparentBounds")["enabled"]
177− onCheckedChanged: { Render.getConfig("DrawTransparentBounds")["enabled"] = checked }
177+ checked: mainViewTask.getConfig("DrawTransparentBounds")["enabled"]
178+ onCheckedChanged: { mainViewTask.getConfig("DrawTransparentBounds")["enabled"] = checked }
178179 }
179180 CheckBox {
180181 text: "Overlay Opaques"
181− checked: Render.getConfig("DrawOverlayOpaqueBounds")["enabled"]
182− onCheckedChanged: { Render.getConfig("DrawOverlayOpaqueBounds")["enabled"] = checked }
182+ checked: mainViewTask.getConfig("DrawOverlayOpaqueBounds")["enabled"]
183+ onCheckedChanged: { mainViewTask.getConfig("DrawOverlayOpaqueBounds")["enabled"] = checked }
183184 }
184185 CheckBox {
185186 text: "Overlay Transparents"
186− checked: Render.getConfig("DrawOverlayTransparentBounds")["enabled"]
187− onCheckedChanged: { Render.getConfig("DrawOverlayTransparentBounds")["enabled"] = checked }
187+ checked: mainViewTask.getConfig("DrawOverlayTransparentBounds")["enabled"]
188+ onCheckedChanged: { mainViewTask.getConfig("DrawOverlayTransparentBounds")["enabled"] = checked }
188189 }
189190 }
190191 Column {
191192 CheckBox {
192193 text: "Metas"
193− checked: Render.getConfig("DrawMetaBounds")["enabled"]
194− onCheckedChanged: { Render.getConfig("DrawMetaBounds")["enabled"] = checked }
194+ checked: mainViewTask.getConfig("DrawMetaBounds")["enabled"]
195+ onCheckedChanged: { mainViewTask.getConfig("DrawMetaBounds")["enabled"] = checked }
195196 }
196197 CheckBox {
197198 text: "Lights"
198− checked: Render.getConfig("DrawLightBounds")["enabled"]
199− onCheckedChanged: { Render.getConfig("DrawLightBounds")["enabled"] = checked; }
199+ checked: mainViewTask.getConfig("DrawLightBounds")["enabled"]
200+ onCheckedChanged: { mainViewTask.getConfig("DrawLightBounds")["enabled"] = checked; }
200201 }
201202 CheckBox {
202203 text: "Zones"
203− checked: Render.getConfig("DrawZones")["enabled"]
204− onCheckedChanged: { Render.getConfig("ZoneRenderer")["enabled"] = checked; Render.getConfig("DrawZones")["enabled"] = checked; }
204+ checked: mainViewTask.getConfig("DrawZones")["enabled"]
205+ onCheckedChanged: { mainViewTask.getConfig("ZoneRenderer")["enabled"] = checked; mainViewTask.getConfig("DrawZones")["enabled"] = checked; }
205206 }
206207 }
207208 }
scripts/developer/utilities/render/lightClustering.qml+24−23
@@ -17,18 +17,19 @@ Column { · 16 unmodified lines
1717 Column {
1818 id: lightClustering
1919 spacing: 10
20+ property var mainViewTask: Render.getConfig("RenderMainView");
2021
2122 Column{
2223 PlotPerf {
2324 title: "Light CLustering Timing"
2425 height: 50
25− object: Render.getConfig("LightClustering")
26+ object: mainViewTask.getConfig("LightClustering")
2627 valueUnit: "ms"
2728 valueScale: 1
2829 valueNumDigits: "4"
2930 plots: [
3031 {
31− object: Render.getConfig("LightClustering"),
32+ object: mainViewTask.getConfig("LightClustering"),
3233 prop: "cpuRunTime",
3334 label: "time",
3435 scale: 1,
@@ -40,19 +41,19 @@ Column { · 5 unmodified lines
4041 PlotPerf {
4142 title: "Lights"
4243 height: 50
43− object: Render.getConfig("LightClustering")
44+ object: mainViewTask.getConfig("LightClustering")
4445 valueUnit: ""
4546 valueScale: 1
4647 valueNumDigits: "0"
4748 plots: [
4849 {
49− object: Render.getConfig("LightClustering"),
50+ object: mainViewTask.getConfig("LightClustering"),
5051 prop: "numClusteredLights",
5152 label: "visible",
5253 color: "#D959FE"
5354 },
5455 {
55− object: Render.getConfig("LightClustering"),
56+ object: mainViewTask.getConfig("LightClustering"),
5657 prop: "numInputLights",
5758 label: "input",
5859 color: "#FED959"
@@ -63,25 +64,25 @@ Column { · 4 unmodified lines
6364 PlotPerf {
6465 title: "Scene Lights"
6566 height: 80
66− object: Render.getConfig("LightClustering")
67+ object: mainViewTask.getConfig("LightClustering")
6768 valueUnit: ""
6869 valueScale: 1
6970 valueNumDigits: "0"
7071 plots: [
7172 {
72− object: Render.getConfig("LightClustering"),
73+ object: mainViewTask.getConfig("LightClustering"),
7374 prop: "numSceneLights",
7475 label: "current",
7576 color: "#00B4EF"
7677 },
7778 {
78− object: Render.getConfig("LightClustering"),
79+ object: mainViewTask.getConfig("LightClustering"),
7980 prop: "numFreeSceneLights",
8081 label: "free",
8182 color: "#1AC567"
8283 },
8384 {
84− object: Render.getConfig("LightClustering"),
85+ object: mainViewTask.getConfig("LightClustering"),
8586 prop: "numAllocatedSceneLights",
8687 label: "allocated",
8788 color: "#9495FF"
@@ -92,7 +93,7 @@ Column { · 4 unmodified lines
9293 ConfigSlider {
9394 label: qsTr("Range Near [m]")
9495 integral: false
95− config: Render.getConfig("LightClustering")
96+ config: mainViewTask.getConfig("LightClustering")
9697 property: "rangeNear"
9798 max: 20.0
9899 min: 0.1
@@ -100,7 +101,7 @@ Column { · 1 unmodified line
100101 ConfigSlider {
101102 label: qsTr("Range Far [m]")
102103 integral: false
103− config: Render.getConfig("LightClustering")
104+ config: mainViewTask.getConfig("LightClustering")
104105 property: "rangeFar"
105106 max: 500.0
106107 min: 100.0
@@ -108,7 +109,7 @@ Column { · 1 unmodified line
108109 ConfigSlider {
109110 label: qsTr("Grid X")
110111 integral: true
111− config: Render.getConfig("LightClustering")
112+ config: mainViewTask.getConfig("LightClustering")
112113 property: "dimX"
113114 max: 32
114115 min: 1
@@ -116,7 +117,7 @@ Column { · 1 unmodified line
116117 ConfigSlider {
117118 label: qsTr("Grid Y")
118119 integral: true
119− config: Render.getConfig("LightClustering")
120+ config: mainViewTask.getConfig("LightClustering")
120121 property: "dimY"
121122 max: 32
122123 min: 1
@@ -124,33 +125,33 @@ Column { · 1 unmodified line
124125 ConfigSlider {
125126 label: qsTr("Grid Z")
126127 integral: true
127− config: Render.getConfig("LightClustering")
128+ config: mainViewTask.getConfig("LightClustering")
128129 property: "dimZ"
129130 max: 31
130131 min: 1
131132 }
132133 CheckBox {
133134 text: "Freeze"
134− checked: Render.getConfig("LightClustering")["freeze"]
135− onCheckedChanged: { Render.getConfig("LightClustering")["freeze"] = checked }
135+ checked: mainViewTask.getConfig("LightClustering")["freeze"]
136+ onCheckedChanged: { mainViewTask.getConfig("LightClustering")["freeze"] = checked }
136137 }
137138 CheckBox {
138139 text: "Draw Grid"
139− checked: Render.getConfig("DebugLightClusters")["doDrawGrid"]
140− onCheckedChanged: { Render.getConfig("DebugLightClusters")["doDrawGrid"] = checked }
140+ checked: mainViewTask.getConfig("DebugLightClusters")["doDrawGrid"]
141+ onCheckedChanged: { mainViewTask.getConfig("DebugLightClusters")["doDrawGrid"] = checked }
141142 }
142143 CheckBox {
143144 text: "Draw Cluster From Depth"
144− checked: Render.getConfig("DebugLightClusters")["doDrawClusterFromDepth"]
145− onCheckedChanged: { Render.getConfig("DebugLightClusters")["doDrawClusterFromDepth"] = checked }
145+ checked: mainViewTask.getConfig("DebugLightClusters")["doDrawClusterFromDepth"]
146+ onCheckedChanged: { mainViewTask.getConfig("DebugLightClusters")["doDrawClusterFromDepth"] = checked }
146147 }
147148 CheckBox {
148149 text: "Draw Content"
149− checked: Render.getConfig("DebugLightClusters")["doDrawContent"]
150− onCheckedChanged: { Render.getConfig("DebugLightClusters")["doDrawContent"] = checked }
150+ checked: mainViewTask.getConfig("DebugLightClusters")["doDrawContent"]
151+ onCheckedChanged: { mainViewTask.getConfig("DebugLightClusters")["doDrawContent"] = checked }
151152 }
152153 Label {
153− text: "Num Cluster Items = " + Render.getConfig("LightClustering")["numClusteredLightReferences"].toFixed(0)
154+ text: "Num Cluster Items = " + mainViewTask.getConfig("LightClustering")["numClusteredLightReferences"].toFixed(0)
154155 }
155156
156157 }
scripts/developer/utilities/render/stats.qml+11−10
@@ -21,7 +21,8 @@ Item { · 20 unmodified lines
2121 spacing: 8
2222 anchors.fill:parent
2323
24− property var config: Render.getConfig("Stats")
24+ property var mainViewTask: Render.getConfig("RenderMainView");
25+ property var config: mainViewTask.getConfig("Stats")
2526
2627 function evalEvenHeight() {
2728 // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?
@@ -182,9 +183,9 @@ Item { · 154 unmodified lines
182183 ]
183184 }
184185
185− property var drawOpaqueConfig: Render.getConfig("DrawOpaqueDeferred")
186− property var drawTransparentConfig: Render.getConfig("DrawTransparentDeferred")
187− property var drawLightConfig: Render.getConfig("DrawLight")
186+ property var drawOpaqueConfig: mainViewTask.getConfig("DrawOpaqueDeferred")
187+ property var drawTransparentConfig: mainViewTask.getConfig("DrawTransparentDeferred")
188+ property var drawLightConfig: mainViewTask.getConfig("DrawLight")
188189
189190 PlotPerf {
190191 title: "Items"
@@ -199,13 +200,13 @@ Item { · 8 unmodified lines
199200 color: "#1AC567"
200201 },
201202 {
202− object: Render.getConfig("DrawTransparentDeferred"),
203+ object: mainViewTask.getConfig("DrawTransparentDeferred"),
203204 prop: "numDrawn",
204205 label: "Translucents",
205206 color: "#00B4EF"
206207 },
207208 {
208− object: Render.getConfig("DrawLight"),
209+ object: mainViewTask.getConfig("DrawLight"),
209210 prop: "numDrawn",
210211 label: "Lights",
211212 color: "#FED959"
@@ -222,25 +223,25 @@ Item { · 10 unmodified lines
222223 valueNumDigits: "2"
223224 plots: [
224225 {
225− object: Render.getConfig("DrawOpaqueDeferred"),
226+ object: mainViewTask.getConfig("DrawOpaqueDeferred"),
226227 prop: "cpuRunTime",
227228 label: "Opaques",
228229 color: "#1AC567"
229230 },
230231 {
231− object: Render.getConfig("DrawTransparentDeferred"),
232+ object: mainViewTask.getConfig("DrawTransparentDeferred"),
232233 prop: "cpuRunTime",
233234 label: "Translucents",
234235 color: "#00B4EF"
235236 },
236237 {
237− object: Render.getConfig("RenderDeferred"),
238+ object: mainViewTask.getConfig("RenderDeferred"),
238239 prop: "cpuRunTime",
239240 label: "Lighting",
240241 color: "#FED959"
241242 },
242243 {
243− object: Render.getConfig("RenderDeferredTask"),
244+ object: mainViewTask.getConfig("RenderDeferredTask"),
244245 prop: "cpuRunTime",
245246 label: "RenderFrame",
246247 color: "#E2334D"
scripts/developer/utilities/render/statsGPU.qml+12−11
@@ -21,7 +21,8 @@ Item { · 20 unmodified lines
2121 spacing: 8
2222 anchors.fill:parent
2323
24− property var config: Render.getConfig("Stats")
24+ property var mainViewTask: Render.getConfig("RenderMainView");
25+ property var config: mainViewTask.getConfig("Stats")
2526
2627 function evalEvenHeight() {
2728 // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?
@@ -38,31 +39,31 @@ Item { · 10 unmodified lines
3839 valueNumDigits: "4"
3940 plots: [
4041 {
41− object: Render.getConfig("OpaqueRangeTimer"),
42+ object: mainViewTask.getConfig("OpaqueRangeTimer"),
4243 prop: "gpuRunTime",
4344 label: "Opaque",
4445 color: "#FFFFFF"
4546 },
4647 {
47− object: Render.getConfig("LinearDepth"),
48+ object: mainViewTask.getConfig("LinearDepth"),
4849 prop: "gpuRunTime",
4950 label: "LinearDepth",
5051 color: "#00FF00"
5152 },{
52− object: Render.getConfig("SurfaceGeometry"),
53+ object: mainViewTask.getConfig("SurfaceGeometry"),
5354 prop: "gpuRunTime",
5455 label: "SurfaceGeometry",
5556 color: "#00FFFF"
5657 },
5758 {
58− object: Render.getConfig("RenderDeferred"),
59+ object: mainViewTask.getConfig("RenderDeferred"),
5960 prop: "gpuRunTime",
6061 label: "DeferredLighting",
6162 color: "#FF00FF"
6263 }
6364 ,
6465 {
65− object: Render.getConfig("ToneAndPostRangeTimer"),
66+ object: mainViewTask.getConfig("ToneAndPostRangeTimer"),
6667 prop: "gpuRunTime",
6768 label: "tone and post",
6869 color: "#FF0000"
@@ -78,31 +79,31 @@ Item { · 9 unmodified lines
7879 valueNumDigits: "3"
7980 plots: [
8081 {
81− object: Render.getConfig("OpaqueRangeTimer"),
82+ object: mainViewTask.getConfig("OpaqueRangeTimer"),
8283 prop: "batchRunTime",
8384 label: "Opaque",
8485 color: "#FFFFFF"
8586 },
8687 {
87− object: Render.getConfig("LinearDepth"),
88+ object: mainViewTask.getConfig("LinearDepth"),
8889 prop: "batchRunTime",
8990 label: "LinearDepth",
9091 color: "#00FF00"
9192 },{
92− object: Render.getConfig("SurfaceGeometry"),
93+ object: mainViewTask.getConfig("SurfaceGeometry"),
9394 prop: "batchRunTime",
9495 label: "SurfaceGeometry",
9596 color: "#00FFFF"
9697 },
9798 {
98− object: Render.getConfig("RenderDeferred"),
99+ object: mainViewTask.getConfig("RenderDeferred"),
99100 prop: "batchRunTime",
100101 label: "DeferredLighting",
101102 color: "#FF00FF"
102103 }
103104 ,
104105 {
105− object: Render.getConfig("ToneAndPostRangeTimer"),
106+ object: mainViewTask.getConfig("ToneAndPostRangeTimer"),
106107 prop: "batchRunTime",
107108 label: "tone and post",
108109 color: "#FF0000"
scripts/developer/utilities/render/subsurfaceScattering.qml+18−17
@@ -16,28 +16,29 @@ Column { · 15 unmodified lines
1616 Column {
1717 id: scattering
1818 spacing: 10
19+ property var mainViewTask: Render.getConfig("RenderMainView");
1920
2021 Column{
2122 CheckBox {
2223 text: "Scattering"
23− checked: Render.getConfig("Scattering").enableScattering
24− onCheckedChanged: { Render.getConfig("Scattering").enableScattering = checked }
24+ checked: mainViewTask.getConfig("Scattering").enableScattering
25+ onCheckedChanged: { mainViewTask.getConfig("Scattering").enableScattering = checked }
2526 }
2627
2728 CheckBox {
2829 text: "Show Scattering BRDF"
29− checked: Render.getConfig("Scattering").showScatteringBRDF
30− onCheckedChanged: { Render.getConfig("Scattering").showScatteringBRDF = checked }
30+ checked: mainViewTask.getConfig("Scattering").showScatteringBRDF
31+ onCheckedChanged: { mainViewTask.getConfig("Scattering").showScatteringBRDF = checked }
3132 }
3233 CheckBox {
3334 text: "Show Curvature"
34− checked: Render.getConfig("Scattering").showCurvature
35− onCheckedChanged: { Render.getConfig("Scattering").showCurvature = checked }
35+ checked: mainViewTask.getConfig("Scattering").showCurvature
36+ onCheckedChanged: { mainViewTask.getConfig("Scattering").showCurvature = checked }
3637 }
3738 CheckBox {
3839 text: "Show Diffused Normal"
39− checked: Render.getConfig("Scattering").showDiffusedNormal
40− onCheckedChanged: { Render.getConfig("Scattering").showDiffusedNormal = checked }
40+ checked: mainViewTask.getConfig("Scattering").showDiffusedNormal
41+ onCheckedChanged: { mainViewTask.getConfig("Scattering").showDiffusedNormal = checked }
4142 }
4243 Repeater {
4344 model: [ "Scattering Bent Red:Scattering:bentRed:2.0",
@@ -50,7 +51,7 @@ Column { · 6 unmodified lines
5051 ConfigSlider {
5152 label: qsTr(modelData.split(":")[0])
5253 integral: false
53− config: Render.getConfig(modelData.split(":")[1])
54+ config: mainViewTask.getConfig(modelData.split(":")[1])
5455 property: modelData.split(":")[2]
5556 max: modelData.split(":")[3]
5657 min: 0.0
@@ -58,23 +59,23 @@ Column { · 1 unmodified line
5859 }
5960 CheckBox {
6061 text: "Scattering Profile"
61− checked: Render.getConfig("DebugScattering").showProfile
62− onCheckedChanged: { Render.getConfig("DebugScattering").showProfile = checked }
62+ checked: mainViewTask.getConfig("DebugScattering").showProfile
63+ onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showProfile = checked }
6364 }
6465 CheckBox {
6566 text: "Scattering Table"
66− checked: Render.getConfig("DebugScattering").showLUT
67− onCheckedChanged: { Render.getConfig("DebugScattering").showLUT = checked }
67+ checked: mainViewTask.getConfig("DebugScattering").showLUT
68+ onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showLUT = checked }
6869 }
6970 CheckBox {
7071 text: "Cursor Pixel"
71− checked: Render.getConfig("DebugScattering").showCursorPixel
72− onCheckedChanged: { Render.getConfig("DebugScattering").showCursorPixel = checked }
72+ checked: mainViewTask.getConfig("DebugScattering").showCursorPixel
73+ onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showCursorPixel = checked }
7374 }
7475 CheckBox {
7576 text: "Skin Specular Beckmann"
76− checked: Render.getConfig("DebugScattering").showSpecularTable
77− onCheckedChanged: { Render.getConfig("DebugScattering").showSpecularTable = checked }
77+ checked: mainViewTask.getConfig("DebugScattering").showSpecularTable
78+ onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showSpecularTable = checked }
7879 }
7980 }
8081 }
scripts/developer/utilities/render/surfaceGeometryPass.qml+6−5
@@ -16,12 +16,13 @@ Column { · 15 unmodified lines
1616 Column {
1717 id: surfaceGeometry
1818 spacing: 10
19+ property var mainViewTask: Render.getConfig("RenderMainView");
1920
2021 Column{
2122 ConfigSlider {
2223 label: qsTr("Depth Threshold [cm]")
2324 integral: false
24− config: Render.getConfig("SurfaceGeometry")
25+ config: mainViewTask.getConfig("SurfaceGeometry")
2526 property: "depthThreshold"
2627 max: 5.0
2728 min: 0.0
@@ -34,7 +35,7 @@ Column { · 6 unmodified lines
3435 ConfigSlider {
3536 label: qsTr(modelData.split(":")[0])
3637 integral: (modelData.split(":")[3] == 'true')
37− config: Render.getConfig("SurfaceGeometry")
38+ config: mainViewTask.getConfig("SurfaceGeometry")
3839 property: modelData.split(":")[1]
3940 max: modelData.split(":")[2]
4041 min: 0.0
@@ -42,8 +43,8 @@ Column { · 1 unmodified line
4243 }
4344 CheckBox {
4445 text: "Half Resolution"
45− checked: Render.getConfig("SurfaceGeometry")["resolutionLevel"]
46− onCheckedChanged: { Render.getConfig("SurfaceGeometry")["resolutionLevel"] = checked }
46+ checked: mainViewTask.getConfig("SurfaceGeometry")["resolutionLevel"]
47+ onCheckedChanged: { mainViewTask.getConfig("SurfaceGeometry")["resolutionLevel"] = checked }
4748 }
4849
4950 Repeater {
@@ -53,7 +54,7 @@ Column { · 3 unmodified lines
5354 ConfigSlider {
5455 label: qsTr(modelData.split(":")[0])
5556 integral: false
56− config: Render.getConfig(modelData.split(":")[1])
57+ config: mainViewTask.getConfig(modelData.split(":")[1])
5758 property: modelData.split(":")[2]
5859 max: modelData.split(":")[3]
5960 min: 0.0
scripts/developer/utilities/render/textureMonitor.qml+2−1
@@ -22,7 +22,8 @@ Item { · 21 unmodified lines
2222 spacing: 8
2323 anchors.fill:parent
2424
25− property var config: Render.getConfig("Stats")
25+ property var mainViewTask: Render.getConfig("RenderMainView");
26+ property var config: mainViewTask.getConfig("Stats")
2627
2728 function evalEvenHeight() {
2829 // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?