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
13import "../lib/plotperf"13import "../lib/plotperf"
14 14
15Column {15Column {
16 property var mainViewTask: Render.getConfig("RenderMainView")
16 spacing: 817 spacing: 8
17 Column {18 Column {
18 id: surfaceGeometry19 id: surfaceGeometry
@@ -32,7 +33,7 @@ Column { · 13 unmodified lines
32 ConfigSlider {33 ConfigSlider {
33 label: qsTr(modelData.split(":")[0])34 label: qsTr(modelData.split(":")[0])
34 integral: (modelData.split(":")[3] == 'true')35 integral: (modelData.split(":")[3] == 'true')
35 config: Render.getConfig("AmbientOcclusion")36 config: mainViewTask.getConfig("AmbientOcclusion")
36 property: modelData.split(":")[1]37 property: modelData.split(":")[1]
37 max: modelData.split(":")[2]38 max: modelData.split(":")[2]
38 min: 0.039 min: 0.0
@@ -50,8 +51,8 @@ Column { · 11 unmodified lines
50 ]51 ]
51 CheckBox {52 CheckBox {
52 text: qsTr(modelData.split(":")[0])53 text: qsTr(modelData.split(":")[0])
53 checked: Render.getConfig("AmbientOcclusion")[modelData.split(":")[1]]54 checked: mainViewTask.getConfig("AmbientOcclusion")[modelData.split(":")[1]]
54 onCheckedChanged: { Render.getConfig("AmbientOcclusion")[modelData.split(":")[1]] = checked }55 onCheckedChanged: { mainViewTask.getConfig("AmbientOcclusion")[modelData.split(":")[1]] = checked }
55 } 56 }
56 }57 }
57 }58 }
@@ -62,8 +63,8 @@ Column { · 4 unmodified lines
62 ]63 ]
63 CheckBox {64 CheckBox {
64 text: qsTr(modelData.split(":")[0])65 text: qsTr(modelData.split(":")[0])
65 checked: Render.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]]66 checked: mainViewTask.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]]
66 onCheckedChanged: { Render.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]] = checked }67 onCheckedChanged: { mainViewTask.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]] = checked }
67 } 68 }
68 }69 }
69 } 70 }
@@ -72,7 +73,7 @@ Column { · 2 unmodified lines
72 PlotPerf {73 PlotPerf {
73 title: "Timing"74 title: "Timing"
74 height: 5075 height: 50
75 object: Render.getConfig("AmbientOcclusion")76 object: mainViewTask.getConfig("AmbientOcclusion")
76 valueUnit: "ms"77 valueUnit: "ms"
77 valueScale: 178 valueScale: 1
78 valueNumDigits: "3"79 valueNumDigits: "3"
scripts/developer/utilities/render/culling.qml+8−7
@@ -14,8 +14,9 @@ import "configSlider" · 13 unmodified lines
14Column {14Column {
15 id: root15 id: root
16 spacing: 816 spacing: 8
17 property var sceneOctree: Render.getConfig("DrawSceneOctree");17 property var mainViewTask: Render.getConfig("RenderMainView");
18 property var itemSelection: Render.getConfig("DrawItemSelection");18 property var sceneOctree: mainViewTask.getConfig("DrawSceneOctree");
19 property var itemSelection: mainViewTask.getConfig("DrawItemSelection");
19 20
20 Component.onCompleted: {21 Component.onCompleted: {
21 sceneOctree.enabled = true;22 sceneOctree.enabled = true;
@@ -30,8 +31,8 @@ Column { · 8 unmodified lines
30 Component.onDestruction: {31 Component.onDestruction: {
31 sceneOctree.enabled = false;32 sceneOctree.enabled = false;
32 itemSelection.enabled = false; 33 itemSelection.enabled = false;
33 Render.getConfig("FetchSceneSelection").freezeFrustum = false;34 mainViewTask.getConfig("FetchSceneSelection").freezeFrustum = false;
34 Render.getConfig("CullSceneSelection").freezeFrustum = false; 35 mainViewTask.getConfig("CullSceneSelection").freezeFrustum = false;
35 }36 }
36 37
37 GroupBox {38 GroupBox {
@@ -45,8 +46,8 @@ Column { · 7 unmodified lines
45 text: "Freeze Culling Frustum"46 text: "Freeze Culling Frustum"
46 checked: false47 checked: false
47 onCheckedChanged: { 48 onCheckedChanged: {
48 Render.getConfig("FetchSceneSelection").freezeFrustum = checked;49 mainViewTask.getConfig("FetchSceneSelection").freezeFrustum = checked;
49 Render.getConfig("CullSceneSelection").freezeFrustum = checked;50 mainViewTask.getConfig("CullSceneSelection").freezeFrustum = checked;
50 }51 }
51 }52 }
52 Label {53 Label {
@@ -103,7 +104,7 @@ Column { · 50 unmodified lines
103 ConfigSlider {104 ConfigSlider {
104 label: qsTr(modelData.split(":")[0])105 label: qsTr(modelData.split(":")[0])
105 integral: true106 integral: true
106 config: Render.getConfig(modelData.split(":")[1])107 config: mainViewTask.getConfig(modelData.split(":")[1])
107 property: "maxDrawn"108 property: "maxDrawn"
108 max: config.numDrawn109 max: config.numDrawn
109 min: -1110 min: -1
scripts/developer/utilities/render/debugAmbientOcclusionPass.js+1−1
@@ -34,5 +34,5 @@ function setDebugCursor(x, y) { · 33 unmodified lines
34 nx = (x / Window.innerWidth);34 nx = (x / Window.innerWidth);
35 ny = 1.0 - ((y) / (Window.innerHeight - 32));35 ny = 1.0 - ((y) / (Window.innerHeight - 32));
36 36
37 Render.getConfig("DebugAmbientOcclusion").debugCursorTexcoord = { x: nx, y: ny };37 Render.getConfig("RenderMainView").getConfig("DebugAmbientOcclusion").debugCursorTexcoord = { x: nx, y: ny };
38}38}
scripts/developer/utilities/render/debugSubsurfaceScattering.js+1−1
@@ -33,5 +33,5 @@ function setDebugCursor(x, y) { · 32 unmodified lines
33 nx = (x / Window.innerWidth);33 nx = (x / Window.innerWidth);
34 ny = 1.0 - ((y) / (Window.innerHeight - 32));34 ny = 1.0 - ((y) / (Window.innerHeight - 32));
35 35
36 Render.getConfig("DebugScattering").debugCursorTexcoord = { x: nx, y: ny };36 Render.getConfig("RenderMainView").getConfig("DebugScattering").debugCursorTexcoord = { x: nx, y: ny };
37}37}
scripts/developer/utilities/render/deferredLighting.qml+24−23
@@ -13,6 +13,7 @@ import "configSlider" · 12 unmodified lines
13 13
14Column {14Column {
15 spacing: 815 spacing: 8
16 property var mainViewTask: Render.getConfig("RenderMainView")
16 17
17 Row {18 Row {
18 spacing: 819 spacing: 8
@@ -29,8 +30,8 @@ Column { · 10 unmodified lines
29 ]30 ]
30 CheckBox {31 CheckBox {
31 text: modelData.split(":")[0]32 text: modelData.split(":")[0]
32 checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]33 checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
33 onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }34 onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
34 }35 }
35 }36 }
36 }37 }
@@ -49,8 +50,8 @@ Column { · 12 unmodified lines
49 ]50 ]
50 CheckBox {51 CheckBox {
51 text: modelData.split(":")[0]52 text: modelData.split(":")[0]
52 checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]53 checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
53 onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }54 onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
54 }55 }
55 }56 }
56 }57 }
@@ -69,8 +70,8 @@ Column { · 12 unmodified lines
69 ]70 ]
70 CheckBox {71 CheckBox {
71 text: modelData.split(":")[0]72 text: modelData.split(":")[0]
72 checked: Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]73 checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
73 onCheckedChanged: { Render.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }74 onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
74 }75 }
75 }76 }
76 }77 }
@@ -83,7 +84,7 @@ Column { · 6 unmodified lines
83 ConfigSlider {84 ConfigSlider {
84 label: qsTr(modelData.split(":")[0])85 label: qsTr(modelData.split(":")[0])
85 integral: false86 integral: false
86 config: Render.getConfig(modelData.split(":")[1])87 config: mainViewTask.getConfig(modelData.split(":")[1])
87 property: modelData.split(":")[2]88 property: modelData.split(":")[2]
88 max: modelData.split(":")[3]89 max: modelData.split(":")[3]
89 min: modelData.split(":")[4]90 min: modelData.split(":")[4]
@@ -107,7 +108,7 @@ Column { · 17 unmodified lines
107 ListElement { text: "Filmic"; color: "White" }108 ListElement { text: "Filmic"; color: "White" }
108 }109 }
109 width: 200110 width: 200
110 onCurrentIndexChanged: { Render.getConfig("ToneMapping")["curve"] = currentIndex }111 onCurrentIndexChanged: { mainViewTask.getConfig("ToneMapping")["curve"] = currentIndex }
111 }112 }
112 }113 }
113 }114 }
@@ -120,7 +121,7 @@ Column { · 6 unmodified lines
120 anchors.left: root.left 121 anchors.left: root.left
121 }122 }
122 123
123 property var config: Render.getConfig("DebugDeferredBuffer")124 property var config: mainViewTask.getConfig("DebugDeferredBuffer")
124 125
125 function setDebugMode(mode) {126 function setDebugMode(mode) {
126 framebuffer.config.enabled = (mode != 0);127 framebuffer.config.enabled = (mode != 0);
@@ -168,40 +169,40 @@ Column { · 41 unmodified lines
168 169
169 CheckBox {170 CheckBox {
170 text: "Opaques"171 text: "Opaques"
171 checked: Render.getConfig("DrawOpaqueBounds")["enabled"]172 checked: mainViewTask.getConfig("DrawOpaqueBounds")["enabled"]
172 onCheckedChanged: { Render.getConfig("DrawOpaqueBounds")["enabled"] = checked }173 onCheckedChanged: { mainViewTask.getConfig("DrawOpaqueBounds")["enabled"] = checked }
173 }174 }
174 CheckBox {175 CheckBox {
175 text: "Transparents"176 text: "Transparents"
176 checked: Render.getConfig("DrawTransparentBounds")["enabled"]177 checked: mainViewTask.getConfig("DrawTransparentBounds")["enabled"]
177 onCheckedChanged: { Render.getConfig("DrawTransparentBounds")["enabled"] = checked }178 onCheckedChanged: { mainViewTask.getConfig("DrawTransparentBounds")["enabled"] = checked }
178 }179 }
179 CheckBox {180 CheckBox {
180 text: "Overlay Opaques"181 text: "Overlay Opaques"
181 checked: Render.getConfig("DrawOverlayOpaqueBounds")["enabled"]182 checked: mainViewTask.getConfig("DrawOverlayOpaqueBounds")["enabled"]
182 onCheckedChanged: { Render.getConfig("DrawOverlayOpaqueBounds")["enabled"] = checked }183 onCheckedChanged: { mainViewTask.getConfig("DrawOverlayOpaqueBounds")["enabled"] = checked }
183 }184 }
184 CheckBox {185 CheckBox {
185 text: "Overlay Transparents"186 text: "Overlay Transparents"
186 checked: Render.getConfig("DrawOverlayTransparentBounds")["enabled"]187 checked: mainViewTask.getConfig("DrawOverlayTransparentBounds")["enabled"]
187 onCheckedChanged: { Render.getConfig("DrawOverlayTransparentBounds")["enabled"] = checked }188 onCheckedChanged: { mainViewTask.getConfig("DrawOverlayTransparentBounds")["enabled"] = checked }
188 }189 }
189 }190 }
190 Column {191 Column {
191 CheckBox {192 CheckBox {
192 text: "Metas"193 text: "Metas"
193 checked: Render.getConfig("DrawMetaBounds")["enabled"]194 checked: mainViewTask.getConfig("DrawMetaBounds")["enabled"]
194 onCheckedChanged: { Render.getConfig("DrawMetaBounds")["enabled"] = checked }195 onCheckedChanged: { mainViewTask.getConfig("DrawMetaBounds")["enabled"] = checked }
195 } 196 }
196 CheckBox {197 CheckBox {
197 text: "Lights"198 text: "Lights"
198 checked: Render.getConfig("DrawLightBounds")["enabled"]199 checked: mainViewTask.getConfig("DrawLightBounds")["enabled"]
199 onCheckedChanged: { Render.getConfig("DrawLightBounds")["enabled"] = checked; }200 onCheckedChanged: { mainViewTask.getConfig("DrawLightBounds")["enabled"] = checked; }
200 }201 }
201 CheckBox {202 CheckBox {
202 text: "Zones"203 text: "Zones"
203 checked: Render.getConfig("DrawZones")["enabled"]204 checked: mainViewTask.getConfig("DrawZones")["enabled"]
204 onCheckedChanged: { Render.getConfig("ZoneRenderer")["enabled"] = checked; Render.getConfig("DrawZones")["enabled"] = checked; }205 onCheckedChanged: { mainViewTask.getConfig("ZoneRenderer")["enabled"] = checked; mainViewTask.getConfig("DrawZones")["enabled"] = checked; }
205 }206 }
206 }207 }
207 }208 }
scripts/developer/utilities/render/lightClustering.qml+24−23
@@ -17,18 +17,19 @@ Column { · 16 unmodified lines
17 Column {17 Column {
18 id: lightClustering18 id: lightClustering
19 spacing: 1019 spacing: 10
20 property var mainViewTask: Render.getConfig("RenderMainView");
20 21
21 Column{22 Column{
22 PlotPerf {23 PlotPerf {
23 title: "Light CLustering Timing"24 title: "Light CLustering Timing"
24 height: 5025 height: 50
25 object: Render.getConfig("LightClustering")26 object: mainViewTask.getConfig("LightClustering")
26 valueUnit: "ms"27 valueUnit: "ms"
27 valueScale: 128 valueScale: 1
28 valueNumDigits: "4"29 valueNumDigits: "4"
29 plots: [30 plots: [
30 {31 {
31 object: Render.getConfig("LightClustering"),32 object: mainViewTask.getConfig("LightClustering"),
32 prop: "cpuRunTime",33 prop: "cpuRunTime",
33 label: "time",34 label: "time",
34 scale: 1,35 scale: 1,
@@ -40,19 +41,19 @@ Column { · 5 unmodified lines
40 PlotPerf {41 PlotPerf {
41 title: "Lights"42 title: "Lights"
42 height: 5043 height: 50
43 object: Render.getConfig("LightClustering")44 object: mainViewTask.getConfig("LightClustering")
44 valueUnit: ""45 valueUnit: ""
45 valueScale: 146 valueScale: 1
46 valueNumDigits: "0"47 valueNumDigits: "0"
47 plots: [48 plots: [
48 {49 {
49 object: Render.getConfig("LightClustering"),50 object: mainViewTask.getConfig("LightClustering"),
50 prop: "numClusteredLights",51 prop: "numClusteredLights",
51 label: "visible",52 label: "visible",
52 color: "#D959FE"53 color: "#D959FE"
53 },54 },
54 {55 {
55 object: Render.getConfig("LightClustering"),56 object: mainViewTask.getConfig("LightClustering"),
56 prop: "numInputLights",57 prop: "numInputLights",
57 label: "input",58 label: "input",
58 color: "#FED959"59 color: "#FED959"
@@ -63,25 +64,25 @@ Column { · 4 unmodified lines
63 PlotPerf {64 PlotPerf {
64 title: "Scene Lights"65 title: "Scene Lights"
65 height: 8066 height: 80
66 object: Render.getConfig("LightClustering")67 object: mainViewTask.getConfig("LightClustering")
67 valueUnit: ""68 valueUnit: ""
68 valueScale: 169 valueScale: 1
69 valueNumDigits: "0"70 valueNumDigits: "0"
70 plots: [71 plots: [
71 {72 {
72 object: Render.getConfig("LightClustering"),73 object: mainViewTask.getConfig("LightClustering"),
73 prop: "numSceneLights",74 prop: "numSceneLights",
74 label: "current",75 label: "current",
75 color: "#00B4EF"76 color: "#00B4EF"
76 },77 },
77 {78 {
78 object: Render.getConfig("LightClustering"),79 object: mainViewTask.getConfig("LightClustering"),
79 prop: "numFreeSceneLights",80 prop: "numFreeSceneLights",
80 label: "free",81 label: "free",
81 color: "#1AC567"82 color: "#1AC567"
82 },83 },
83 {84 {
84 object: Render.getConfig("LightClustering"),85 object: mainViewTask.getConfig("LightClustering"),
85 prop: "numAllocatedSceneLights",86 prop: "numAllocatedSceneLights",
86 label: "allocated",87 label: "allocated",
87 color: "#9495FF"88 color: "#9495FF"
@@ -92,7 +93,7 @@ Column { · 4 unmodified lines
92 ConfigSlider {93 ConfigSlider {
93 label: qsTr("Range Near [m]")94 label: qsTr("Range Near [m]")
94 integral: false95 integral: false
95 config: Render.getConfig("LightClustering")96 config: mainViewTask.getConfig("LightClustering")
96 property: "rangeNear"97 property: "rangeNear"
97 max: 20.098 max: 20.0
98 min: 0.199 min: 0.1
@@ -100,7 +101,7 @@ Column { · 1 unmodified line
100 ConfigSlider {101 ConfigSlider {
101 label: qsTr("Range Far [m]")102 label: qsTr("Range Far [m]")
102 integral: false103 integral: false
103 config: Render.getConfig("LightClustering")104 config: mainViewTask.getConfig("LightClustering")
104 property: "rangeFar"105 property: "rangeFar"
105 max: 500.0106 max: 500.0
106 min: 100.0107 min: 100.0
@@ -108,7 +109,7 @@ Column { · 1 unmodified line
108 ConfigSlider {109 ConfigSlider {
109 label: qsTr("Grid X")110 label: qsTr("Grid X")
110 integral: true111 integral: true
111 config: Render.getConfig("LightClustering")112 config: mainViewTask.getConfig("LightClustering")
112 property: "dimX"113 property: "dimX"
113 max: 32114 max: 32
114 min: 1115 min: 1
@@ -116,7 +117,7 @@ Column { · 1 unmodified line
116 ConfigSlider {117 ConfigSlider {
117 label: qsTr("Grid Y")118 label: qsTr("Grid Y")
118 integral: true119 integral: true
119 config: Render.getConfig("LightClustering")120 config: mainViewTask.getConfig("LightClustering")
120 property: "dimY"121 property: "dimY"
121 max: 32122 max: 32
122 min: 1123 min: 1
@@ -124,33 +125,33 @@ Column { · 1 unmodified line
124 ConfigSlider {125 ConfigSlider {
125 label: qsTr("Grid Z")126 label: qsTr("Grid Z")
126 integral: true127 integral: true
127 config: Render.getConfig("LightClustering")128 config: mainViewTask.getConfig("LightClustering")
128 property: "dimZ"129 property: "dimZ"
129 max: 31130 max: 31
130 min: 1131 min: 1
131 }132 }
132 CheckBox {133 CheckBox {
133 text: "Freeze"134 text: "Freeze"
134 checked: Render.getConfig("LightClustering")["freeze"]135 checked: mainViewTask.getConfig("LightClustering")["freeze"]
135 onCheckedChanged: { Render.getConfig("LightClustering")["freeze"] = checked }136 onCheckedChanged: { mainViewTask.getConfig("LightClustering")["freeze"] = checked }
136 }137 }
137 CheckBox {138 CheckBox {
138 text: "Draw Grid"139 text: "Draw Grid"
139 checked: Render.getConfig("DebugLightClusters")["doDrawGrid"]140 checked: mainViewTask.getConfig("DebugLightClusters")["doDrawGrid"]
140 onCheckedChanged: { Render.getConfig("DebugLightClusters")["doDrawGrid"] = checked }141 onCheckedChanged: { mainViewTask.getConfig("DebugLightClusters")["doDrawGrid"] = checked }
141 }142 }
142 CheckBox {143 CheckBox {
143 text: "Draw Cluster From Depth"144 text: "Draw Cluster From Depth"
144 checked: Render.getConfig("DebugLightClusters")["doDrawClusterFromDepth"]145 checked: mainViewTask.getConfig("DebugLightClusters")["doDrawClusterFromDepth"]
145 onCheckedChanged: { Render.getConfig("DebugLightClusters")["doDrawClusterFromDepth"] = checked }146 onCheckedChanged: { mainViewTask.getConfig("DebugLightClusters")["doDrawClusterFromDepth"] = checked }
146 }147 }
147 CheckBox {148 CheckBox {
148 text: "Draw Content"149 text: "Draw Content"
149 checked: Render.getConfig("DebugLightClusters")["doDrawContent"]150 checked: mainViewTask.getConfig("DebugLightClusters")["doDrawContent"]
150 onCheckedChanged: { Render.getConfig("DebugLightClusters")["doDrawContent"] = checked }151 onCheckedChanged: { mainViewTask.getConfig("DebugLightClusters")["doDrawContent"] = checked }
151 }152 }
152 Label {153 Label {
153 text: "Num Cluster Items = " + Render.getConfig("LightClustering")["numClusteredLightReferences"].toFixed(0)154 text: "Num Cluster Items = " + mainViewTask.getConfig("LightClustering")["numClusteredLightReferences"].toFixed(0)
154 }155 }
155 156
156 }157 }
scripts/developer/utilities/render/stats.qml+11−10
@@ -21,7 +21,8 @@ Item { · 20 unmodified lines
21 spacing: 821 spacing: 8
22 anchors.fill:parent22 anchors.fill:parent
23 23
24 property var config: Render.getConfig("Stats")24 property var mainViewTask: Render.getConfig("RenderMainView");
25 property var config: mainViewTask.getConfig("Stats")
25 26
26 function evalEvenHeight() {27 function evalEvenHeight() {
27 // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?28 // 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
182 ]183 ]
183 }184 }
184 185
185 property var drawOpaqueConfig: Render.getConfig("DrawOpaqueDeferred")186 property var drawOpaqueConfig: mainViewTask.getConfig("DrawOpaqueDeferred")
186 property var drawTransparentConfig: Render.getConfig("DrawTransparentDeferred")187 property var drawTransparentConfig: mainViewTask.getConfig("DrawTransparentDeferred")
187 property var drawLightConfig: Render.getConfig("DrawLight")188 property var drawLightConfig: mainViewTask.getConfig("DrawLight")
188 189
189 PlotPerf {190 PlotPerf {
190 title: "Items"191 title: "Items"
@@ -199,13 +200,13 @@ Item { · 8 unmodified lines
199 color: "#1AC567"200 color: "#1AC567"
200 },201 },
201 {202 {
202 object: Render.getConfig("DrawTransparentDeferred"),203 object: mainViewTask.getConfig("DrawTransparentDeferred"),
203 prop: "numDrawn",204 prop: "numDrawn",
204 label: "Translucents",205 label: "Translucents",
205 color: "#00B4EF"206 color: "#00B4EF"
206 },207 },
207 {208 {
208 object: Render.getConfig("DrawLight"),209 object: mainViewTask.getConfig("DrawLight"),
209 prop: "numDrawn",210 prop: "numDrawn",
210 label: "Lights",211 label: "Lights",
211 color: "#FED959"212 color: "#FED959"
@@ -222,25 +223,25 @@ Item { · 10 unmodified lines
222 valueNumDigits: "2"223 valueNumDigits: "2"
223 plots: [224 plots: [
224 {225 {
225 object: Render.getConfig("DrawOpaqueDeferred"),226 object: mainViewTask.getConfig("DrawOpaqueDeferred"),
226 prop: "cpuRunTime",227 prop: "cpuRunTime",
227 label: "Opaques",228 label: "Opaques",
228 color: "#1AC567"229 color: "#1AC567"
229 },230 },
230 {231 {
231 object: Render.getConfig("DrawTransparentDeferred"),232 object: mainViewTask.getConfig("DrawTransparentDeferred"),
232 prop: "cpuRunTime",233 prop: "cpuRunTime",
233 label: "Translucents",234 label: "Translucents",
234 color: "#00B4EF"235 color: "#00B4EF"
235 },236 },
236 {237 {
237 object: Render.getConfig("RenderDeferred"),238 object: mainViewTask.getConfig("RenderDeferred"),
238 prop: "cpuRunTime",239 prop: "cpuRunTime",
239 label: "Lighting",240 label: "Lighting",
240 color: "#FED959"241 color: "#FED959"
241 },242 },
242 {243 {
243 object: Render.getConfig("RenderDeferredTask"),244 object: mainViewTask.getConfig("RenderDeferredTask"),
244 prop: "cpuRunTime",245 prop: "cpuRunTime",
245 label: "RenderFrame",246 label: "RenderFrame",
246 color: "#E2334D"247 color: "#E2334D"
scripts/developer/utilities/render/statsGPU.qml+12−11
@@ -21,7 +21,8 @@ Item { · 20 unmodified lines
21 spacing: 821 spacing: 8
22 anchors.fill:parent22 anchors.fill:parent
23 23
24 property var config: Render.getConfig("Stats")24 property var mainViewTask: Render.getConfig("RenderMainView");
25 property var config: mainViewTask.getConfig("Stats")
25 26
26 function evalEvenHeight() {27 function evalEvenHeight() {
27 // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?28 // 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
38 valueNumDigits: "4"39 valueNumDigits: "4"
39 plots: [40 plots: [
40 {41 {
41 object: Render.getConfig("OpaqueRangeTimer"),42 object: mainViewTask.getConfig("OpaqueRangeTimer"),
42 prop: "gpuRunTime",43 prop: "gpuRunTime",
43 label: "Opaque",44 label: "Opaque",
44 color: "#FFFFFF"45 color: "#FFFFFF"
45 }, 46 },
46 {47 {
47 object: Render.getConfig("LinearDepth"),48 object: mainViewTask.getConfig("LinearDepth"),
48 prop: "gpuRunTime",49 prop: "gpuRunTime",
49 label: "LinearDepth",50 label: "LinearDepth",
50 color: "#00FF00"51 color: "#00FF00"
51 },{52 },{
52 object: Render.getConfig("SurfaceGeometry"),53 object: mainViewTask.getConfig("SurfaceGeometry"),
53 prop: "gpuRunTime",54 prop: "gpuRunTime",
54 label: "SurfaceGeometry",55 label: "SurfaceGeometry",
55 color: "#00FFFF"56 color: "#00FFFF"
56 },57 },
57 {58 {
58 object: Render.getConfig("RenderDeferred"),59 object: mainViewTask.getConfig("RenderDeferred"),
59 prop: "gpuRunTime",60 prop: "gpuRunTime",
60 label: "DeferredLighting",61 label: "DeferredLighting",
61 color: "#FF00FF"62 color: "#FF00FF"
62 }63 }
63 ,64 ,
64 {65 {
65 object: Render.getConfig("ToneAndPostRangeTimer"),66 object: mainViewTask.getConfig("ToneAndPostRangeTimer"),
66 prop: "gpuRunTime",67 prop: "gpuRunTime",
67 label: "tone and post",68 label: "tone and post",
68 color: "#FF0000"69 color: "#FF0000"
@@ -78,31 +79,31 @@ Item { · 9 unmodified lines
78 valueNumDigits: "3"79 valueNumDigits: "3"
79 plots: [80 plots: [
80 {81 {
81 object: Render.getConfig("OpaqueRangeTimer"),82 object: mainViewTask.getConfig("OpaqueRangeTimer"),
82 prop: "batchRunTime",83 prop: "batchRunTime",
83 label: "Opaque",84 label: "Opaque",
84 color: "#FFFFFF"85 color: "#FFFFFF"
85 }, 86 },
86 {87 {
87 object: Render.getConfig("LinearDepth"),88 object: mainViewTask.getConfig("LinearDepth"),
88 prop: "batchRunTime",89 prop: "batchRunTime",
89 label: "LinearDepth",90 label: "LinearDepth",
90 color: "#00FF00"91 color: "#00FF00"
91 },{92 },{
92 object: Render.getConfig("SurfaceGeometry"),93 object: mainViewTask.getConfig("SurfaceGeometry"),
93 prop: "batchRunTime",94 prop: "batchRunTime",
94 label: "SurfaceGeometry",95 label: "SurfaceGeometry",
95 color: "#00FFFF"96 color: "#00FFFF"
96 },97 },
97 {98 {
98 object: Render.getConfig("RenderDeferred"),99 object: mainViewTask.getConfig("RenderDeferred"),
99 prop: "batchRunTime",100 prop: "batchRunTime",
100 label: "DeferredLighting",101 label: "DeferredLighting",
101 color: "#FF00FF"102 color: "#FF00FF"
102 }103 }
103 ,104 ,
104 {105 {
105 object: Render.getConfig("ToneAndPostRangeTimer"),106 object: mainViewTask.getConfig("ToneAndPostRangeTimer"),
106 prop: "batchRunTime",107 prop: "batchRunTime",
107 label: "tone and post",108 label: "tone and post",
108 color: "#FF0000"109 color: "#FF0000"
scripts/developer/utilities/render/subsurfaceScattering.qml+18−17
@@ -16,28 +16,29 @@ Column { · 15 unmodified lines
16 Column {16 Column {
17 id: scattering17 id: scattering
18 spacing: 1018 spacing: 10
19 property var mainViewTask: Render.getConfig("RenderMainView");
19 20
20 Column{21 Column{
21 CheckBox {22 CheckBox {
22 text: "Scattering"23 text: "Scattering"
23 checked: Render.getConfig("Scattering").enableScattering24 checked: mainViewTask.getConfig("Scattering").enableScattering
24 onCheckedChanged: { Render.getConfig("Scattering").enableScattering = checked }25 onCheckedChanged: { mainViewTask.getConfig("Scattering").enableScattering = checked }
25 }26 }
26 27
27 CheckBox {28 CheckBox {
28 text: "Show Scattering BRDF"29 text: "Show Scattering BRDF"
29 checked: Render.getConfig("Scattering").showScatteringBRDF30 checked: mainViewTask.getConfig("Scattering").showScatteringBRDF
30 onCheckedChanged: { Render.getConfig("Scattering").showScatteringBRDF = checked }31 onCheckedChanged: { mainViewTask.getConfig("Scattering").showScatteringBRDF = checked }
31 }32 }
32 CheckBox {33 CheckBox {
33 text: "Show Curvature"34 text: "Show Curvature"
34 checked: Render.getConfig("Scattering").showCurvature35 checked: mainViewTask.getConfig("Scattering").showCurvature
35 onCheckedChanged: { Render.getConfig("Scattering").showCurvature = checked }36 onCheckedChanged: { mainViewTask.getConfig("Scattering").showCurvature = checked }
36 }37 }
37 CheckBox {38 CheckBox {
38 text: "Show Diffused Normal"39 text: "Show Diffused Normal"
39 checked: Render.getConfig("Scattering").showDiffusedNormal40 checked: mainViewTask.getConfig("Scattering").showDiffusedNormal
40 onCheckedChanged: { Render.getConfig("Scattering").showDiffusedNormal = checked }41 onCheckedChanged: { mainViewTask.getConfig("Scattering").showDiffusedNormal = checked }
41 }42 }
42 Repeater {43 Repeater {
43 model: [ "Scattering Bent Red:Scattering:bentRed:2.0",44 model: [ "Scattering Bent Red:Scattering:bentRed:2.0",
@@ -50,7 +51,7 @@ Column { · 6 unmodified lines
50 ConfigSlider {51 ConfigSlider {
51 label: qsTr(modelData.split(":")[0])52 label: qsTr(modelData.split(":")[0])
52 integral: false53 integral: false
53 config: Render.getConfig(modelData.split(":")[1])54 config: mainViewTask.getConfig(modelData.split(":")[1])
54 property: modelData.split(":")[2]55 property: modelData.split(":")[2]
55 max: modelData.split(":")[3]56 max: modelData.split(":")[3]
56 min: 0.057 min: 0.0
@@ -58,23 +59,23 @@ Column { · 1 unmodified line
58 }59 }
59 CheckBox {60 CheckBox {
60 text: "Scattering Profile"61 text: "Scattering Profile"
61 checked: Render.getConfig("DebugScattering").showProfile62 checked: mainViewTask.getConfig("DebugScattering").showProfile
62 onCheckedChanged: { Render.getConfig("DebugScattering").showProfile = checked }63 onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showProfile = checked }
63 }64 }
64 CheckBox {65 CheckBox {
65 text: "Scattering Table"66 text: "Scattering Table"
66 checked: Render.getConfig("DebugScattering").showLUT67 checked: mainViewTask.getConfig("DebugScattering").showLUT
67 onCheckedChanged: { Render.getConfig("DebugScattering").showLUT = checked }68 onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showLUT = checked }
68 }69 }
69 CheckBox {70 CheckBox {
70 text: "Cursor Pixel"71 text: "Cursor Pixel"
71 checked: Render.getConfig("DebugScattering").showCursorPixel72 checked: mainViewTask.getConfig("DebugScattering").showCursorPixel
72 onCheckedChanged: { Render.getConfig("DebugScattering").showCursorPixel = checked }73 onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showCursorPixel = checked }
73 }74 }
74 CheckBox {75 CheckBox {
75 text: "Skin Specular Beckmann"76 text: "Skin Specular Beckmann"
76 checked: Render.getConfig("DebugScattering").showSpecularTable77 checked: mainViewTask.getConfig("DebugScattering").showSpecularTable
77 onCheckedChanged: { Render.getConfig("DebugScattering").showSpecularTable = checked }78 onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showSpecularTable = checked }
78 }79 }
79 }80 }
80 }81 }
scripts/developer/utilities/render/surfaceGeometryPass.qml+6−5
@@ -16,12 +16,13 @@ Column { · 15 unmodified lines
16 Column {16 Column {
17 id: surfaceGeometry17 id: surfaceGeometry
18 spacing: 1018 spacing: 10
19 property var mainViewTask: Render.getConfig("RenderMainView");
19 20
20 Column{21 Column{
21 ConfigSlider {22 ConfigSlider {
22 label: qsTr("Depth Threshold [cm]")23 label: qsTr("Depth Threshold [cm]")
23 integral: false24 integral: false
24 config: Render.getConfig("SurfaceGeometry")25 config: mainViewTask.getConfig("SurfaceGeometry")
25 property: "depthThreshold"26 property: "depthThreshold"
26 max: 5.027 max: 5.0
27 min: 0.028 min: 0.0
@@ -34,7 +35,7 @@ Column { · 6 unmodified lines
34 ConfigSlider {35 ConfigSlider {
35 label: qsTr(modelData.split(":")[0])36 label: qsTr(modelData.split(":")[0])
36 integral: (modelData.split(":")[3] == 'true')37 integral: (modelData.split(":")[3] == 'true')
37 config: Render.getConfig("SurfaceGeometry")38 config: mainViewTask.getConfig("SurfaceGeometry")
38 property: modelData.split(":")[1]39 property: modelData.split(":")[1]
39 max: modelData.split(":")[2]40 max: modelData.split(":")[2]
40 min: 0.041 min: 0.0
@@ -42,8 +43,8 @@ Column { · 1 unmodified line
42 }43 }
43 CheckBox {44 CheckBox {
44 text: "Half Resolution"45 text: "Half Resolution"
45 checked: Render.getConfig("SurfaceGeometry")["resolutionLevel"]46 checked: mainViewTask.getConfig("SurfaceGeometry")["resolutionLevel"]
46 onCheckedChanged: { Render.getConfig("SurfaceGeometry")["resolutionLevel"] = checked }47 onCheckedChanged: { mainViewTask.getConfig("SurfaceGeometry")["resolutionLevel"] = checked }
47 }48 }
48 49
49 Repeater {50 Repeater {
@@ -53,7 +54,7 @@ Column { · 3 unmodified lines
53 ConfigSlider {54 ConfigSlider {
54 label: qsTr(modelData.split(":")[0])55 label: qsTr(modelData.split(":")[0])
55 integral: false56 integral: false
56 config: Render.getConfig(modelData.split(":")[1])57 config: mainViewTask.getConfig(modelData.split(":")[1])
57 property: modelData.split(":")[2]58 property: modelData.split(":")[2]
58 max: modelData.split(":")[3]59 max: modelData.split(":")[3]
59 min: 0.060 min: 0.0
scripts/developer/utilities/render/textureMonitor.qml+2−1
@@ -22,7 +22,8 @@ Item { · 21 unmodified lines
22 spacing: 822 spacing: 8
23 anchors.fill:parent23 anchors.fill:parent
24 24
25 property var config: Render.getConfig("Stats")25 property var mainViewTask: Render.getConfig("RenderMainView");
26 property var config: mainViewTask.getConfig("Stats")
26 27
27 function evalEvenHeight() {28 function evalEvenHeight() {
28 // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?29 // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?