Normand Briere
2019-06-13 4629090fafbef256abd0686a85ee12042d658868
ParticleEditor.java
....@@ -70,6 +70,8 @@
7070 oe.aConstraints.gridwidth = 1;
7171 */
7272 super.SetupUI2(oe);
73
+
74
+ particlesPanel = AddSlider(oe.ctrlPanel, "Particles", 0, 1000, particlesystem.numParticles);
7375
7476 // oe.aConstraints.gridx = 0;
7577 // oe.aConstraints.gridwidth = 1;
....@@ -82,32 +84,44 @@
8284 //
8385 // frameField.setFloat(particlesystem.initialVelocity);
8486
85
- particlesField = AddSlider(oe.ctrlPanel, "Particles", 0, 1000, particlesystem.numParticles); //, 1);
86
- Return();
87
- velocityField = AddSlider(oe.ctrlPanel, "Speed", 0, 10, particlesystem.initialVelocity, 1);
88
- Return();
89
- timestepField = AddSlider(oe.ctrlPanel, "Timestep", 0.001f, 1, particlesystem.controller.timestep, 1);
90
- Return();
91
- delayField = AddSlider(oe.ctrlPanel, "Delay", 0, 10, particlesystem.creationdelay, 1);
92
- Return();
93
- angleminField = AddSlider(oe.ctrlPanel, "Angle min", 0, (float)Math.PI, particlesystem.minimumAngle, 1);
94
- Return();
95
- anglemaxField = AddSlider(oe.ctrlPanel, "Angle max", 0, (float)Math.PI, particlesystem.maximumAngle, 1);
96
- Return();
97
- sizeminField = AddSlider(oe.ctrlPanel, "Size min", 0, 10, particlesystem.minimumSize, 1);
98
- Return();
99
- sizemaxField = AddSlider(oe.ctrlPanel, "Size max", 0, 10, particlesystem.maximumSize, 1);
100
- Return();
101
- lifeminField = AddSlider(oe.ctrlPanel, "Life min", 0, 100, particlesystem.minimumLifeTime, 1);
102
- Return();
103
- lifemaxField = AddSlider(oe.ctrlPanel, "Life max", 0, 100, particlesystem.maximumLifeTime, 1);
104
- Return();
105
- densityField = AddSlider(oe.ctrlPanel, "Density", 0, 1, particlesystem.density, 1);
106
- Return();
107
- gravityField = AddSlider(oe.ctrlPanel, "Gravity", 0, 1, -particlesystem.controller.gvector.y, 1);
108
- Return();
109
- standbyField = AddSlider(oe.ctrlPanel, "Standby", 0, 1, particlesystem.standby, 1);
110
- Return();
87
+ particlesField = (cNumberSlider)particlesPanel.getComponent(1); //, 1);
88
+ oe.ctrlPanel.Return();
89
+ speedPanel = AddSlider(oe.ctrlPanel, "Speed", 0, 10, particlesystem.initialVelocity, 1);
90
+ speedField = (cNumberSlider)speedPanel.getComponent(1);
91
+ oe.ctrlPanel.Return();
92
+ timestepPanel = AddSlider(oe.ctrlPanel, "Timestep", 0.001f, 1, particlesystem.controller.timestep, 1);
93
+ timestepField = (cNumberSlider)timestepPanel.getComponent(1);
94
+ oe.ctrlPanel.Return();
95
+ delayPanel = AddSlider(oe.ctrlPanel, "Delay", 0, 10, particlesystem.creationdelay, 1);
96
+ delayField = (cNumberSlider)delayPanel.getComponent(1);
97
+ oe.ctrlPanel.Return();
98
+ angleminPanel = AddSlider(oe.ctrlPanel, "Angle min", 0, (float)Math.PI, particlesystem.minimumAngle, 1);
99
+ angleminField = (cNumberSlider)angleminPanel.getComponent(1);
100
+ oe.ctrlPanel.Return();
101
+ anglemaxPanel = AddSlider(oe.ctrlPanel, "Angle max", 0, (float)Math.PI, particlesystem.maximumAngle, 1);
102
+ anglemaxField = (cNumberSlider)anglemaxPanel.getComponent(1);
103
+ oe.ctrlPanel.Return();
104
+ sizeminPanel = AddSlider(oe.ctrlPanel, "Size min", 0, 10, particlesystem.minimumSize, 1);
105
+ sizeminField = (cNumberSlider)sizeminPanel.getComponent(1);
106
+ oe.ctrlPanel.Return();
107
+ sizemaxPanel = AddSlider(oe.ctrlPanel, "Size max", 0, 10, particlesystem.maximumSize, 1);
108
+ sizemaxField = (cNumberSlider)sizemaxPanel.getComponent(1);
109
+ oe.ctrlPanel.Return();
110
+ lifeminPanel = AddSlider(oe.ctrlPanel, "Life min", 0, 100, particlesystem.minimumLifeTime, 1);
111
+ lifeminField = (cNumberSlider)lifeminPanel.getComponent(1);
112
+ oe.ctrlPanel.Return();
113
+ lifemaxPanel = AddSlider(oe.ctrlPanel, "Life max", 0, 100, particlesystem.maximumLifeTime, 1);
114
+ lifemaxField = (cNumberSlider)lifemaxPanel.getComponent(1);
115
+ oe.ctrlPanel.Return();
116
+ densityPanel = AddSlider(oe.ctrlPanel, "Density", 0, 1, particlesystem.density, 1);
117
+ densityField = (cNumberSlider)densityPanel.getComponent(1);
118
+ oe.ctrlPanel.Return();
119
+ gravityPanel = AddSlider(oe.ctrlPanel, "Gravity", 0, 1, -particlesystem.controller.gvector.y, 1);
120
+ gravityField = (cNumberSlider)gravityPanel.getComponent(1);
121
+ oe.ctrlPanel.Return();
122
+ standbyPanel = AddSlider(oe.ctrlPanel, "Standby", 0, 1, particlesystem.standby, 1);
123
+ standbyField = (cNumberSlider)standbyPanel.getComponent(1);
124
+ oe.ctrlPanel.Return();
111125
112126 // oe.aConstraints.gridy += 1;
113127 // oe.aConstraints.gridx = 0;
....@@ -177,7 +191,7 @@
177191 {
178192 //System.out.println("Biparam :: stateChanged");
179193 if (e.getSource() == particlesField ||
180
- e.getSource() == velocityField ||
194
+ e.getSource() == speedField ||
181195 e.getSource() == delayField ||
182196 e.getSource() == timestepField ||
183197 e.getSource() == angleminField ||
....@@ -204,7 +218,7 @@
204218 {
205219 // System.out.println("Biparam :: Refresh");
206220 new Exception().printStackTrace();
207
- particlesystem.initialVelocity = (float) velocityField.getFloat(); // biparam.minUDivs, 99);
221
+ particlesystem.initialVelocity = (float) speedField.getFloat(); // biparam.minUDivs, 99);
208222 particlesystem.controller.timestep = (float) timestepField.getFloat();
209223
210224 refreshContents();
....@@ -232,7 +246,7 @@
232246 //System.out.println("Biparam :: applySelf");
233247 //super.applySelf();
234248 particlesystem.numParticles = particlesField.getInteger(); // biparam.minUDivs, 99);
235
- particlesystem.initialVelocity = (float) velocityField.getFloat(); // biparam.minUDivs, 99);
249
+ particlesystem.initialVelocity = (float) speedField.getFloat(); // biparam.minUDivs, 99);
236250 particlesystem.controller.timestep = (float) timestepField.getFloat();
237251 particlesystem.creationdelay = (float) delayField.getFloat();
238252 particlesystem.minimumSize = (float) sizeminField.getFloat();
....@@ -253,19 +267,32 @@
253267
254268 public void closeUI()
255269 {
256
- Remove(particlesField);
257
- Remove(velocityField);
258
- Remove(timestepField);
259
- Remove(delayField);
260
- Remove(sizeminField);
261
- Remove(sizemaxField);
262
- Remove(angleminField);
263
- Remove(anglemaxField);
264
- Remove(lifeminField);
265
- Remove(lifemaxField);
266
- Remove(densityField);
267
- Remove(gravityField);
268
- Remove(standbyField);
270
+// Remove(particlesField);
271
+// Remove(speedField);
272
+// Remove(timestepField);
273
+// Remove(delayField);
274
+// Remove(sizeminField);
275
+// Remove(sizemaxField);
276
+// Remove(angleminField);
277
+// Remove(anglemaxField);
278
+// Remove(lifeminField);
279
+// Remove(lifemaxField);
280
+// Remove(densityField);
281
+// Remove(gravityField);
282
+// Remove(standbyField);
283
+ objEditor.ctrlPanel.remove(particlesPanel);
284
+ objEditor.ctrlPanel.remove(speedPanel);
285
+ objEditor.ctrlPanel.remove(timestepPanel);
286
+ objEditor.ctrlPanel.remove(delayPanel);
287
+ objEditor.ctrlPanel.remove(sizeminPanel);
288
+ objEditor.ctrlPanel.remove(sizemaxPanel);
289
+ objEditor.ctrlPanel.remove(angleminPanel);
290
+ objEditor.ctrlPanel.remove(anglemaxPanel);
291
+ objEditor.ctrlPanel.remove(lifeminPanel);
292
+ objEditor.ctrlPanel.remove(lifemaxPanel);
293
+ objEditor.ctrlPanel.remove(densityPanel);
294
+ objEditor.ctrlPanel.remove(gravityPanel);
295
+ objEditor.ctrlPanel.remove(standbyPanel);
269296
270297 // ObjEditor oe = objEditor;
271298
....@@ -292,7 +319,7 @@
292319 ParticleSystem particlesystem;
293320
294321 cNumberSlider particlesField;
295
- cNumberSlider velocityField;
322
+ cNumberSlider speedField;
296323 cNumberSlider timestepField;
297324 cNumberSlider delayField;
298325 cNumberSlider sizeminField;
....@@ -305,6 +332,20 @@
305332 cNumberSlider gravityField;
306333 cNumberSlider standbyField;
307334
335
+ cGridBag particlesPanel;
336
+ cGridBag speedPanel;
337
+ cGridBag timestepPanel;
338
+ cGridBag delayPanel;
339
+ cGridBag sizeminPanel;
340
+ cGridBag sizemaxPanel;
341
+ cGridBag angleminPanel;
342
+ cGridBag anglemaxPanel;
343
+ cGridBag lifeminPanel;
344
+ cGridBag lifemaxPanel;
345
+ cGridBag densityPanel;
346
+ cGridBag gravityPanel;
347
+ cGridBag standbyPanel;
348
+
308349 ObjectUI parent;
309350 //ObjEditor objEditor;
310351 }