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
38 }38 }
39 39
40 Label {40 Label {
41 id: labelValue
41 text: sliderControl.value.toFixed(root.integral ? 0 : 2)42 text: sliderControl.value.toFixed(root.integral ? 0 : 2)
42 anchors.left: root.left43 anchors.left: root.left
43 anchors.leftMargin: 20044 anchors.leftMargin: 200
scripts/developer/utilities/render/debugFade.js+1−2
@@ -15,8 +15,7 @@ var window = new OverlayWindow({ · 14 unmodified lines
15 title: 'Fade',15 title: 'Fade',
16 source: qml,16 source: qml,
17 width: 500, 17 width: 500,
18 height: 90018 height: 900,
19});19});
20window.setPosition(50, 50);20window.setPosition(50, 50);
21window.closed.connect(function() { Script.stop(); });21window.closed.connect(function() { Script.stop(); });
22Render.getConfig("RenderMainView.DrawFadedOpaqueBounds").enabled = true
scripts/developer/utilities/render/fade.qml+218−194
@@ -23,220 +23,244 @@ Column { · 22 unmodified lines
23 CheckBox {23 CheckBox {
24 text: "Edit Fade"24 text: "Edit Fade"
25 checked: root.switchConfig["editFade"]25 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 }
27 }30 }
28 ComboBox {31 ComboBox {
32 id: categoryBox
29 width: 40033 width: 400
30 model: ["Elements enter/leave domain", "Bubble isect. - Owner POV", "Bubble isect. - Trespasser POV", "Another user leaves/arrives", "Changing an avatar"]34 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 }
32 }47 }
33 }48 }
34 Column {
35 spacing: 8
36 49
37 ConfigSlider {50 Component {
38 label: "Duration"51 id: paramWidgets
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
51 52
52 ConfigSlider {53 Column {
53 label: "Size X"54 spacing: 8
54 integral: false55
55 config: root.config56 ConfigSlider {
56 property: "baseSizeX"57 label: "Duration"
57 max: 1.058 integral: false
58 min: 0.059 config: root.config
59 width: 40060 property: "duration"
60 }61 max: 10.0
61 ConfigSlider {62 min: 0.1
62 label: "Size Y"63 width: 400
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 }
93 }64 }
94 }65 GroupBox {
95 GroupBox {66 title: "Base Gradient"
96 title: "Noise Gradient"67 width: 500
97 width: 50068 Column {
98 Column {69 spacing: 8
99 spacing: 8
100 70
101 ConfigSlider {71 ConfigSlider {
102 label: "Size X"72 label: "Size X"
103 integral: false73 integral: false
104 config: root.config74 config: root.config
105 property: "noiseSizeX"75 property: "baseSizeX"
106 max: 1.076 max: 1.0
107 min: 0.077 min: 0.0
108 width: 40078 width: 400
109 }79 }
110 ConfigSlider {80 ConfigSlider {
111 label: "Size Y"81 label: "Size Y"
112 integral: false82 integral: false
113 config: root.config83 config: root.config
114 property: "noiseSizeY"84 property: "baseSizeY"
115 max: 1.085 max: 1.0
116 min: 0.086 min: 0.0
117 width: 40087 width: 400
118 } 88 }
119 ConfigSlider {89 ConfigSlider {
120 label: "Size Z"90 label: "Size Z"
121 integral: false91 integral: false
122 config: root.config92 config: root.config
123 property: "noiseSizeZ"93 property: "baseSizeZ"
124 max: 1.094 max: 1.0
125 min: 0.095 min: 0.0
126 width: 40096 width: 400
127 } 97 }
128 ConfigSlider {98 ConfigSlider {
129 label: "Level"99 label: "Level"
130 integral: false100 integral: false
131 config: root.config101 config: root.config
132 property: "noiseLevel"102 property: "baseLevel"
133 max: 1.0103 max: 1.0
134 min: 0.0104 min: 0.0
135 width: 400105 width: 400
106 }
107 CheckBox {
108 text: "Invert"
109 checked: root.config["baseInverted"]
110 onCheckedChanged: { root.config["baseInverted"] = checked }
111 }
136 }112 }
137 }113 }
138 }114 GroupBox {
139 GroupBox {115 title: "Noise Gradient"
140 title: "Edge"116 width: 500
141 width: 500117 Column {
142 Column {118 spacing: 8
143 spacing: 8
144 119
145 ConfigSlider {120 ConfigSlider {
146 label: "Width"121 label: "Size X"
147 integral: false122 integral: false
148 config: root.config123 config: root.config
149 property: "edgeWidth"124 property: "noiseSizeX"
150 max: 1.0125 max: 1.0
151 min: 0.0126 min: 0.0
152 width: 400127 width: 400
153 }128 }
154 GroupBox {129 ConfigSlider {
155 title: "Inner color"130 label: "Size Y"
156 Column {131 integral: false
157 spacing: 8132 config: root.config
158 ConfigSlider {133 property: "noiseSizeY"
159 label: "Color R"134 max: 1.0
160 integral: false135 min: 0.0
161 config: root.config136 width: 400
162 property: "edgeInnerColorR"137 }
163 max: 1.0138 ConfigSlider {
164 min: 0.0139 label: "Size Z"
165 width: 400140 integral: false
166 } 141 config: root.config
167 ConfigSlider {142 property: "noiseSizeZ"
168 label: "Color G"143 max: 1.0
169 integral: false144 min: 0.0
170 config: root.config145 width: 400
171 property: "edgeInnerColorG"146 }
172 max: 1.0147 ConfigSlider {
173 min: 0.0148 label: "Level"
174 width: 400149 integral: false
175 }150 config: root.config
176 ConfigSlider {151 property: "noiseLevel"
177 label: "Color B"152 max: 1.0
178 integral: false153 min: 0.0
179 config: root.config154 width: 400
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 }
194 }155 }
195 }156 }
196 GroupBox {157 }
197 title: "Outer color"158 GroupBox {
198 Column {159 title: "Edge"
199 spacing: 8160 width: 500
200 ConfigSlider {161 Column {
201 label: "Color R"162 spacing: 8
202 integral: false163
203 config: root.config164 ConfigSlider {
204 property: "edgeOuterColorR"165 label: "Width"
205 max: 1.0166 integral: false
206 min: 0.0167 config: root.config
207 width: 400168 property: "edgeWidth"
208 } 169 max: 1.0
209 ConfigSlider {170 min: 0.0
210 label: "Color G"171 width: 400
211 integral: false172 }
212 config: root.config173 GroupBox {
213 property: "edgeOuterColorG"174 title: "Inner color"
214 max: 1.0175 Column {
215 min: 0.0176 spacing: 8
216 width: 400177 ConfigSlider {
217 }178 label: "Color R"
218 ConfigSlider {179 integral: false
219 label: "Color B"180 config: root.config
220 integral: false181 property: "edgeInnerColorR"
221 config: root.config182 max: 1.0
222 property: "edgeOuterColorB"183 min: 0.0
223 max: 1.0184 width: 400
224 min: 0.0185 }
225 width: 400186 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 }
226 }213 }
227 ConfigSlider {214 }
228 label: "Color intensity"215 GroupBox {
229 integral: false216 title: "Outer color"
230 config: root.config217 Column {
231 property: "edgeOuterIntensity"218 spacing: 8
232 max: 5.0219 ConfigSlider {
233 min: 0.0220 label: "Color R"
234 width: 400221 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 }
235 }255 }
236 }256 }
237 }257 }
238 }258 }
239 }259 }
240 }260 }
241}
242 261
262 Loader {
263 id: paramWidgetLoader
264 sourceComponent: paramWidgets
265 }
266}