History

Changing edited fade category properly updates widgets in edit window

Olivier Prat committed 9 years ago

Commit c5ca23f1 parent fb33b8d5 files · +287 −225Browse files

Showing the changes to scripts/developer (3 of 5 files). Show all

Unified · Split

3 files
  1. scripts/developer/utilities/render/configSlider/ConfigSlider.qml +1 −0
  2. scripts/developer/utilities/render/debugFade.js +1 −2
  3. scripts/developer/utilities/render/fade.qml +218 −194
scripts/developer/utilities/render/configSlider/ConfigSlider.qml+1−0
@@ -38,6 +38,7 @@ Item { · 37 unmodified lines
3838 }
3939
4040 Label {
41+ id: labelValue
4142 text: sliderControl.value.toFixed(root.integral ? 0 : 2)
4243 anchors.left: root.left
4344 anchors.leftMargin: 200
scripts/developer/utilities/render/debugFade.js+1−2
@@ -15,8 +15,7 @@ var window = new OverlayWindow({ · 14 unmodified lines
1515 title: 'Fade',
1616 source: qml,
1717 width: 500,
18− height: 900
18+ height: 900,
1919 });
2020 window.setPosition(50, 50);
2121 window.closed.connect(function() { Script.stop(); });
22−Render.getConfig("RenderMainView.DrawFadedOpaqueBounds").enabled = true
scripts/developer/utilities/render/fade.qml+218−194
@@ -23,220 +23,244 @@ Column { · 22 unmodified lines
2323 CheckBox {
2424 text: "Edit Fade"
2525 checked: root.switchConfig["editFade"]
26− onCheckedChanged: { root.switchConfig["editFade"] = checked }
26+ onCheckedChanged: {
27+ root.switchConfig["editFade"] = checked;
28+ Render.getConfig("RenderMainView.DrawFadedOpaqueBounds").enabled = checked;
29+ }
2730 }
2831 ComboBox {
32+ id: categoryBox
2933 width: 400
3034 model: ["Elements enter/leave domain", "Bubble isect. - Owner POV", "Bubble isect. - Trespasser POV", "Another user leaves/arrives", "Changing an avatar"]
31− onCurrentIndexChanged: { root.config["editedCategory"] = currentIndex }
35+ Timer {
36+ id: postpone
37+ interval: 100; running: false; repeat: false
38+ onTriggered: { paramWidgetLoader.sourceComponent = paramWidgets }
39+ }
40+ onCurrentIndexChanged: {
41+ root.config["editedCategory"] = currentIndex;
42+ // This is a hack to be sure the widgets below properly reflect the change of category: delete the Component
43+ // by setting the loader source to Null and then recreate it 100ms later
44+ paramWidgetLoader.sourceComponent = undefined;
45+ postpone.start()
46+ }
3247 }
3348 }
34− Column {
35− spacing: 8
3649
37− ConfigSlider {
38− label: "Duration"
39− integral: false
40− config: root.config
41− property: "duration"
42− max: 10.0
43− min: 0.1
44− width: 400
45− }
46− GroupBox {
47− title: "Base Gradient"
48− width: 500
49− Column {
50− spacing: 8
50+ Component {
51+ id: paramWidgets
5152
52− ConfigSlider {
53− label: "Size X"
54− integral: false
55− config: root.config
56− property: "baseSizeX"
57− max: 1.0
58− min: 0.0
59− width: 400
60− }
61− ConfigSlider {
62− label: "Size Y"
63− integral: false
64− config: root.config
65− property: "baseSizeY"
66− max: 1.0
67− min: 0.0
68− width: 400
69− }
70− ConfigSlider {
71− label: "Size Z"
72− integral: false
73− config: root.config
74− property: "baseSizeZ"
75− max: 1.0
76− min: 0.0
77− width: 400
78− }
79− ConfigSlider {
80− label: "Level"
81− integral: false
82− config: root.config
83− property: "baseLevel"
84− max: 1.0
85− min: 0.0
86− width: 400
87− }
88− CheckBox {
89− text: "Invert"
90− checked: root.config["baseInverted"]
91− onCheckedChanged: { root.config["baseInverted"] = checked }
92− }
53+ Column {
54+ spacing: 8
55+
56+ ConfigSlider {
57+ label: "Duration"
58+ integral: false
59+ config: root.config
60+ property: "duration"
61+ max: 10.0
62+ min: 0.1
63+ width: 400
9364 }
94− }
95− GroupBox {
96− title: "Noise Gradient"
97− width: 500
98− Column {
99− spacing: 8
65+ GroupBox {
66+ title: "Base Gradient"
67+ width: 500
68+ Column {
69+ spacing: 8
10070
101− ConfigSlider {
102− label: "Size X"
103− integral: false
104− config: root.config
105− property: "noiseSizeX"
106− max: 1.0
107− min: 0.0
108− width: 400
109− }
110− ConfigSlider {
111− label: "Size Y"
112− integral: false
113− config: root.config
114− property: "noiseSizeY"
115− max: 1.0
116− min: 0.0
117− width: 400
118− }
119− ConfigSlider {
120− label: "Size Z"
121− integral: false
122− config: root.config
123− property: "noiseSizeZ"
124− max: 1.0
125− min: 0.0
126− width: 400
127− }
128− ConfigSlider {
129− label: "Level"
130− integral: false
131− config: root.config
132− property: "noiseLevel"
133− max: 1.0
134− min: 0.0
135− width: 400
71+ ConfigSlider {
72+ label: "Size X"
73+ integral: false
74+ config: root.config
75+ property: "baseSizeX"
76+ max: 1.0
77+ min: 0.0
78+ width: 400
79+ }
80+ ConfigSlider {
81+ label: "Size Y"
82+ integral: false
83+ config: root.config
84+ property: "baseSizeY"
85+ max: 1.0
86+ min: 0.0
87+ width: 400
88+ }
89+ ConfigSlider {
90+ label: "Size Z"
91+ integral: false
92+ config: root.config
93+ property: "baseSizeZ"
94+ max: 1.0
95+ min: 0.0
96+ width: 400
97+ }
98+ ConfigSlider {
99+ label: "Level"
100+ integral: false
101+ config: root.config
102+ property: "baseLevel"
103+ max: 1.0
104+ min: 0.0
105+ width: 400
106+ }
107+ CheckBox {
108+ text: "Invert"
109+ checked: root.config["baseInverted"]
110+ onCheckedChanged: { root.config["baseInverted"] = checked }
111+ }
136112 }
137113 }
138− }
139− GroupBox {
140− title: "Edge"
141− width: 500
142− Column {
143− spacing: 8
114+ GroupBox {
115+ title: "Noise Gradient"
116+ width: 500
117+ Column {
118+ spacing: 8
144119
145− ConfigSlider {
146− label: "Width"
147− integral: false
148− config: root.config
149− property: "edgeWidth"
150− max: 1.0
151− min: 0.0
152− width: 400
153− }
154− GroupBox {
155− title: "Inner color"
156− Column {
157− spacing: 8
158− ConfigSlider {
159− label: "Color R"
160− integral: false
161− config: root.config
162− property: "edgeInnerColorR"
163− max: 1.0
164− min: 0.0
165− width: 400
166− }
167− ConfigSlider {
168− label: "Color G"
169− integral: false
170− config: root.config
171− property: "edgeInnerColorG"
172− max: 1.0
173− min: 0.0
174− width: 400
175− }
176− ConfigSlider {
177− label: "Color B"
178− integral: false
179− config: root.config
180− property: "edgeInnerColorB"
181− max: 1.0
182− min: 0.0
183− width: 400
184− }
185− ConfigSlider {
186− label: "Color intensity"
187− integral: false
188− config: root.config
189− property: "edgeInnerIntensity"
190− max: 5.0
191− min: 0.0
192− width: 400
193− }
120+ ConfigSlider {
121+ label: "Size X"
122+ integral: false
123+ config: root.config
124+ property: "noiseSizeX"
125+ max: 1.0
126+ min: 0.0
127+ width: 400
128+ }
129+ ConfigSlider {
130+ label: "Size Y"
131+ integral: false
132+ config: root.config
133+ property: "noiseSizeY"
134+ max: 1.0
135+ min: 0.0
136+ width: 400
137+ }
138+ ConfigSlider {
139+ label: "Size Z"
140+ integral: false
141+ config: root.config
142+ property: "noiseSizeZ"
143+ max: 1.0
144+ min: 0.0
145+ width: 400
146+ }
147+ ConfigSlider {
148+ label: "Level"
149+ integral: false
150+ config: root.config
151+ property: "noiseLevel"
152+ max: 1.0
153+ min: 0.0
154+ width: 400
194155 }
195156 }
196− GroupBox {
197− title: "Outer color"
198− Column {
199− spacing: 8
200− ConfigSlider {
201− label: "Color R"
202− integral: false
203− config: root.config
204− property: "edgeOuterColorR"
205− max: 1.0
206− min: 0.0
207− width: 400
208− }
209− ConfigSlider {
210− label: "Color G"
211− integral: false
212− config: root.config
213− property: "edgeOuterColorG"
214− max: 1.0
215− min: 0.0
216− width: 400
217− }
218− ConfigSlider {
219− label: "Color B"
220− integral: false
221− config: root.config
222− property: "edgeOuterColorB"
223− max: 1.0
224− min: 0.0
225− width: 400
157+ }
158+ GroupBox {
159+ title: "Edge"
160+ width: 500
161+ Column {
162+ spacing: 8
163+
164+ ConfigSlider {
165+ label: "Width"
166+ integral: false
167+ config: root.config
168+ property: "edgeWidth"
169+ max: 1.0
170+ min: 0.0
171+ width: 400
172+ }
173+ GroupBox {
174+ title: "Inner color"
175+ Column {
176+ spacing: 8
177+ ConfigSlider {
178+ label: "Color R"
179+ integral: false
180+ config: root.config
181+ property: "edgeInnerColorR"
182+ max: 1.0
183+ min: 0.0
184+ width: 400
185+ }
186+ ConfigSlider {
187+ label: "Color G"
188+ integral: false
189+ config: root.config
190+ property: "edgeInnerColorG"
191+ max: 1.0
192+ min: 0.0
193+ width: 400
194+ }
195+ ConfigSlider {
196+ label: "Color B"
197+ integral: false
198+ config: root.config
199+ property: "edgeInnerColorB"
200+ max: 1.0
201+ min: 0.0
202+ width: 400
203+ }
204+ ConfigSlider {
205+ label: "Color intensity"
206+ integral: false
207+ config: root.config
208+ property: "edgeInnerIntensity"
209+ max: 5.0
210+ min: 0.0
211+ width: 400
212+ }
226213 }
227− ConfigSlider {
228− label: "Color intensity"
229− integral: false
230− config: root.config
231− property: "edgeOuterIntensity"
232− max: 5.0
233− min: 0.0
234− width: 400
214+ }
215+ GroupBox {
216+ title: "Outer color"
217+ Column {
218+ spacing: 8
219+ ConfigSlider {
220+ label: "Color R"
221+ integral: false
222+ config: root.config
223+ property: "edgeOuterColorR"
224+ max: 1.0
225+ min: 0.0
226+ width: 400
227+ }
228+ ConfigSlider {
229+ label: "Color G"
230+ integral: false
231+ config: root.config
232+ property: "edgeOuterColorG"
233+ max: 1.0
234+ min: 0.0
235+ width: 400
236+ }
237+ ConfigSlider {
238+ label: "Color B"
239+ integral: false
240+ config: root.config
241+ property: "edgeOuterColorB"
242+ max: 1.0
243+ min: 0.0
244+ width: 400
245+ }
246+ ConfigSlider {
247+ label: "Color intensity"
248+ integral: false
249+ config: root.config
250+ property: "edgeOuterIntensity"
251+ max: 5.0
252+ min: 0.0
253+ width: 400
254+ }
235255 }
236256 }
237257 }
238258 }
239259 }
240260 }
241−}
242261
262+ Loader {
263+ id: paramWidgetLoader
264+ sourceComponent: paramWidgets
265+ }
266+}