Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314
GroupEditor.java
....@@ -12,9 +12,11 @@
1212 import com.jme.math.Vector3f;
1313 import com.jme.renderer.ColorRGBA;
1414
15
+import grafeme.ui.*;
1516 //import buoy.widget.BFileChooser;
1617
1718 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1820 ObjectUI,
1921 Runnable,
2022 ActionListener,
....@@ -22,6 +24,360 @@
2224 DragGestureListener, DragSourceListener, DropTargetListener,
2325 ItemListener // ListSelectionListener
2426 {
27
+
28
+ public void AddSkyboxButton(String f, String s, cGridBag row)
29
+ {
30
+ cButton skyboxButton;
31
+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
33
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
+ skyboxButton.addActionListener(new ActionListener()
36
+ {
37
+ @Override
38
+ public void actionPerformed(ActionEvent e)
39
+ {
40
+ ChangeSkybox(path);
41
+ }
42
+ });
43
+ }
44
+
45
+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46
+ {
47
+ cButton textureButton;
48
+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
+ textureButton.setToolTipText(c + count);
51
+ textureButton.addActionListener(new ActionListener()
52
+ {
53
+ @Override
54
+ public void actionPerformed(ActionEvent e)
55
+ {
56
+ ChangeTexture(path + t);
57
+ }
58
+ });
59
+ }
60
+
61
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
62
+ {
63
+ cGridBag tab0 = new cGridBag().setVertical(true);
64
+
65
+ tab0.setName("Urban");
66
+ skyboxpanel.add(tab0);
67
+
68
+ cGridBag row0 = new cGridBag();
69
+ cGridBag row1 = new cGridBag();
70
+ cGridBag row2 = new cGridBag();
71
+ cGridBag row3 = new cGridBag();
72
+ cGridBag row4 = new cGridBag();
73
+ cGridBag row5 = new cGridBag();
74
+ cGridBag row6 = new cGridBag();
75
+
76
+ AddSkyboxButton("default", "", row0);
77
+ //AddSkyboxButton("default", "cornell", row0);
78
+ AddSkyboxButton("penguins", "dust", row0);
79
+ AddSkyboxButton("penguins", "tropic", row0);
80
+ AddSkyboxButton("penguins", "yonder", row0);
81
+
82
+ AddSkyboxButton("default", "uffizi", row1);
83
+ AddSkyboxButton("bridge", "Bridge", row1);
84
+ AddSkyboxButton("bridge", "Bridge2", row1);
85
+ AddSkyboxButton("urban", "GamlaStan2", row1);
86
+
87
+ AddSkyboxButton("urban", "Parliament", row2);
88
+ AddSkyboxButton("urban", "Roundabout", row2);
89
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
90
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
91
+
92
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
93
+ AddSkyboxButton("urban", "UnionSquare", row3);
94
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
95
+ AddSkyboxButton("park", "BerzeliiPark", row3);
96
+
97
+ AddSkyboxButton("park", "Buddha", row4);
98
+ AddSkyboxButton("park", "CNTower2", row4);
99
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
100
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
101
+
102
+ AddSkyboxButton("park", "Park", row5);
103
+ AddSkyboxButton("park", "Pond", row5);
104
+ AddSkyboxButton("park", "Skansen", row5);
105
+ AddSkyboxButton("park", "Skansen2", row5);
106
+
107
+ AddSkyboxButton("park", "Skansen3", row6);
108
+ AddSkyboxButton("park", "Skansen4", row6);
109
+ AddSkyboxButton("park", "Skansen5", row6);
110
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
111
+
112
+ tab0.add(row0);
113
+ tab0.add(row1);
114
+ tab0.add(row2);
115
+ tab0.add(row3);
116
+ tab0.add(row4);
117
+ tab0.add(row5);
118
+ tab0.add(row6);
119
+
120
+ for (int i=5; --i>=0;)
121
+ {
122
+ //oe.toolboxPanel.Return();
123
+ //tab0.add(new cGridBag());
124
+ }
125
+ }
126
+
127
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
128
+ {
129
+ cGridBag tab0 = new cGridBag().setVertical(true);
130
+
131
+ tab0.setName("Nature");
132
+ skyboxpanel.add(tab0);
133
+
134
+ cGridBag row0 = new cGridBag();
135
+ cGridBag row1 = new cGridBag();
136
+ cGridBag row2 = new cGridBag();
137
+ cGridBag row3 = new cGridBag();
138
+ cGridBag row4 = new cGridBag();
139
+ cGridBag row5 = new cGridBag();
140
+ cGridBag row6 = new cGridBag();
141
+
142
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
143
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
144
+ AddSkyboxButton("beach", "PalmTrees", row0);
145
+ AddSkyboxButton("beach", "Tenerife", row0);
146
+
147
+ AddSkyboxButton("beach", "Tenerife2", row1);
148
+ AddSkyboxButton("beach", "Tenerife3", row1);
149
+ AddSkyboxButton("field", "FishPond", row1);
150
+ AddSkyboxButton("field", "Footballfield", row1);
151
+
152
+ AddSkyboxButton("field", "Meadow", row2);
153
+ AddSkyboxButton("field", "Sorsele", row2);
154
+ AddSkyboxButton("field", "Sorsele2", row2);
155
+ AddSkyboxButton("field", "Sorsele3", row2);
156
+
157
+ AddSkyboxButton("forest", "Brudslojan", row3);
158
+ AddSkyboxButton("forest", "Langholmen2", row3);
159
+ AddSkyboxButton("forest", "Plants", row3);
160
+ AddSkyboxButton("mountain", "Maskonaive", row3);
161
+
162
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
163
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
164
+ AddSkyboxButton("mountain", "Teide", row4);
165
+ AddSkyboxButton("park", "Tantolunden4", row4);
166
+
167
+ AddSkyboxButton("park", "Stairs", row5);
168
+ AddSkyboxButton("default", "skycube", row6);
169
+ AddSkyboxButton("rocky", "Langholmen", row5);
170
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
171
+
172
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
173
+ AddSkyboxButton("default", "CloudyHills", row6);
174
+ AddSkyboxButton("daz", "Autumn", row6);
175
+ AddSkyboxButton("daz", "MountainTrail", row6);
176
+ /*
177
+Autumn
178
+Greenlands
179
+MountainTrail
180
+Oasis
181
+TheRock
182
+TopOfTheWorld
183
+Winter
184
+ */
185
+
186
+ tab0.add(row0);
187
+ tab0.add(row1);
188
+ tab0.add(row2);
189
+ tab0.add(row3);
190
+ tab0.add(row4);
191
+ tab0.add(row5);
192
+ tab0.add(row6);
193
+
194
+ for (int i=5; --i>=0;)
195
+ {
196
+ //oe.toolboxPanel.Return();
197
+ //tab0.add(new cGridBag());
198
+ }
199
+ }
200
+
201
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
202
+ {
203
+ cGridBag tab0 = new cGridBag().setVertical(true);
204
+
205
+ tab0.setName("Night");
206
+ skyboxpanel.add(tab0);
207
+
208
+ cGridBag row0 = new cGridBag();
209
+ cGridBag row1 = new cGridBag();
210
+ cGridBag row2 = new cGridBag();
211
+ cGridBag row3 = new cGridBag();
212
+ cGridBag row4 = new cGridBag();
213
+ cGridBag row5 = new cGridBag();
214
+ cGridBag row6 = new cGridBag();
215
+
216
+ AddSkyboxButton("night", "NightPath", row0);
217
+ AddSkyboxButton("night", "PondNight", row0);
218
+ AddSkyboxButton("night", "Powerlines", row0);
219
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
220
+
221
+ AddSkyboxButton("urban", "CNTower", row1);
222
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
223
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
224
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
225
+
226
+ AddSkyboxButton("penguins", "kenon_star", row2);
227
+ AddSkyboxButton("persson", "corona", row2);
228
+ AddSkyboxButton("persson", "spaceskybox", row2);
229
+ AddSkyboxButton("indoors", "Vasa", row2);
230
+
231
+ AddSkyboxButton("winter", "Backyard", row3);
232
+ AddSkyboxButton("winter", "Creek", row3);
233
+ AddSkyboxButton("winter", "FootballField3", row3);
234
+ AddSkyboxButton("winter", "Forest", row3);
235
+
236
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
237
+ AddSkyboxButton("winter", "House", row4);
238
+ AddSkyboxButton("winter", "IceLake", row4);
239
+ AddSkyboxButton("winter", "IceRiver", row4);
240
+
241
+ AddSkyboxButton("winter", "Park3", row5);
242
+ AddSkyboxButton("winter", "PondWinter", row5);
243
+ AddSkyboxButton("winter", "Tantolunden5", row5);
244
+ AddSkyboxButton("winter", "Vindelalven", row5);
245
+
246
+ AddSkyboxButton("daz", "TheRock", row6);
247
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
248
+ AddSkyboxButton("daz", "Winter", row6);
249
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
250
+
251
+ tab0.add(row0);
252
+ tab0.add(row1);
253
+ tab0.add(row2);
254
+ tab0.add(row3);
255
+ tab0.add(row4);
256
+ tab0.add(row5);
257
+ tab0.add(row6);
258
+
259
+ for (int i=5; --i>=0;)
260
+ {
261
+ //oe.toolboxPanel.Return();
262
+ //tab0.add(new cGridBag());
263
+ }
264
+ }
265
+
266
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
267
+ {
268
+ cGridBag tab0 = new cGridBag().setVertical(true);
269
+
270
+ tab0.setName("Others");
271
+ skyboxpanel.add(tab0);
272
+
273
+ cGridBag row0 = new cGridBag();
274
+ cGridBag row1 = new cGridBag();
275
+ cGridBag row2 = new cGridBag();
276
+ cGridBag row3 = new cGridBag();
277
+ cGridBag row4 = new cGridBag();
278
+ cGridBag row5 = new cGridBag();
279
+ cGridBag row6 = new cGridBag();
280
+
281
+ AddSkyboxButton("mayhem", "afterrain", row0);
282
+ AddSkyboxButton("mayhem", "aqua4", row0);
283
+ AddSkyboxButton("mayhem", "aqua9", row0);
284
+ AddSkyboxButton("mayhem", "flame", row0);
285
+
286
+ AddSkyboxButton("mayhem", "h2s", row1);
287
+ AddSkyboxButton("mayhem", "prehistoric", row1);
288
+ AddSkyboxButton("mayhem", "scorched", row1);
289
+ AddSkyboxButton("penguins", "desertdawn", row1);
290
+
291
+ AddSkyboxButton("persson", "Citadella", row2);
292
+ AddSkyboxButton("persson", "Citadella2", row2);
293
+ AddSkyboxButton("persson", "clouds1", row2);
294
+ AddSkyboxButton("penguins", "wrath", row2);
295
+
296
+ AddSkyboxButton("persson", "FishermansBastion", row3);
297
+ AddSkyboxButton("persson", "HeroesSquare", row3);
298
+ AddSkyboxButton("indoors", "DallasW", row3);
299
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
300
+
301
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
302
+ AddSkyboxButton("persson", "PereaBeach1", row4);
303
+ AddSkyboxButton("persson", "PereaBeach2", row4);
304
+ AddSkyboxButton("persson", "redeclipse", row4);
305
+
306
+ AddSkyboxButton("daz", "Greenlands", row5);
307
+ AddSkyboxButton("daz", "Oasis", row5);
308
+ AddSkyboxButton("elyvisions", "arch3", row5);
309
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
310
+
311
+ AddSkyboxButton("elyvisions", "rainbow", row6);
312
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
313
+ AddSkyboxButton("elyvisions", "heaven", row6);
314
+ AddSkyboxButton("elyvisions", "hot", row6);
315
+
316
+ tab0.add(row0);
317
+ tab0.add(row1);
318
+ tab0.add(row2);
319
+ tab0.add(row3);
320
+ tab0.add(row4);
321
+ tab0.add(row5);
322
+ tab0.add(row6);
323
+
324
+ for (int i=5; --i>=0;)
325
+ {
326
+ //oe.toolboxPanel.Return();
327
+ //tab0.add(new cGridBag());
328
+ }
329
+ }
330
+
331
+ public void ChangeSkybox(String skybox)
332
+ {
333
+ if (skybox.endsWith("/"))
334
+ {
335
+ group.skyboxname = null;
336
+ group.skyboxext = null;
337
+ cameraView.repaint();
338
+ }
339
+ else
340
+ {
341
+ //cameraView.envyoff = false;
342
+ group.skyboxname = skybox;
343
+ group.skyboxext = "jpg";
344
+ cameraView.repaint();
345
+ }
346
+ }
347
+
348
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
+ {
350
+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
+
352
+ AddSkyboxTab0(skyboxpane);
353
+ AddSkyboxTab1(skyboxpane);
354
+ AddSkyboxTab2(skyboxpane);
355
+ AddSkyboxTab3(skyboxpane);
356
+
357
+ skyboxPanel.add(skyboxpane);
358
+ }
359
+
360
+ public void ChangeTexture(String texture)
361
+ {
362
+ for (int i=0; i<group.selection.size(); i++)
363
+ {
364
+ Object3D obj = group.selection.get(i);
365
+ obj.SetPigmentTexture("@" + texture);
366
+ }
367
+
368
+ refreshContents();
369
+ }
370
+
371
+ public void Show3DView()
372
+ {
373
+ // bug
374
+ //gridPanel.setDividerLocation(1.0);
375
+ //bigPanel.setDividerLocation(0.0);
376
+ bigThree.ClearUI();
377
+ bigThree.add(centralPanel);
378
+ bigThree.FlushUI();
379
+ }
380
+
25381 //ObjEditor objEditor;
26382 public void closeUI2()
27383 {
....@@ -59,6 +415,16 @@
59415 this.copy = this.group = group;
60416 //selectees = this.group.selectees;
61417
418
+ assert(false);
419
+
420
+// if (copy.versionlist == null)
421
+// {
422
+// copy.versionlist = new Object3D[100];
423
+// copy.versionindex = -1;
424
+//
425
+// //Save(true);
426
+// }
427
+
62428 if(ui)
63429 SetupUI(objEditor);
64430 }
....@@ -73,16 +439,28 @@
73439 this.copy = this.group = copy;
74440 //selectees = this.group.selectees;
75441
76
- SetupMenu2(objEditor);
442
+ SetupMenu2(this); //objEditor);
77443 SetupUI2(objEditor);
78444 objEditor.SetupUI(true);
79445 SetupViews(objEditor);
80446
81447 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
448
+
449
+// if (copy.versionlist == null)
450
+// {
451
+// copy.versionlist = new Object3D[100];
452
+// copy.versionindex = -1;
453
+//
454
+// //Save(true);
455
+// }
82456 }
83457
84458 void CloneSelection(boolean supports)
85459 {
460
+ if (Globals.REPLACEONMAKE)
461
+ Save();
462
+ boolean keep = Globals.REPLACEONMAKE;
463
+ Globals.REPLACEONMAKE = false;
86464 // Object3D keep = GrafreeD.clipboard;
87465 //Object3D obj;
88466 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -93,18 +471,19 @@
93471
94472 makeSomething(clone, i==group.selection.size()-1);
95473 }
474
+ Globals.REPLACEONMAKE = keep;
96475 }
97476
98477 void CloneClipboard(boolean supports)
99478 {
100
- assert(GrafreeD.clipboard.parent == null);
101
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
102
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104
- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
479
+ assert(Grafreed.clipboard.parent == null);
480
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
481
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
482
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
483
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105484 else
106
- makeSomething(CloneObject(GrafreeD.clipboard, false));
107
- GrafreeD.clipboard.get(0).parent = keepparent;
485
+ makeSomething(CloneObject(Grafreed.clipboard, false));
486
+ Grafreed.clipboard.get(0).parent = keepparent;
108487 }
109488
110489 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -118,7 +497,7 @@
118497 // obj.support = null;
119498 if (!supports)
120499 obj.SaveSupports();
121
- Object3D clone = (Object3D)GrafreeD.clone(obj);
500
+ Object3D clone = (Object3D)Grafreed.clone(obj);
122501 obj.parent = parent;
123502 // obj.support = support;
124503 // clone.support = support; // aout 2013
....@@ -147,58 +526,153 @@
147526
148527 //JTextField nameField;
149528
150
- void SetupMenu2(ObjEditor oe)
529
+ void SetupMenu2(GroupEditor oe)
151530 {
152
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156
- oe.cameraMenu.add("-");
157
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158
- openWindowItem.addActionListener(this);
159
- editLeafItem.addActionListener(this);
160
- lookAtItem.addActionListener(this);
161
- //lookFromItem.addActinoListener(this);
162
- //switchItem.addActionListener(this);
531
+ oe.jTree = new cTree();
532
+
163533 Menu menu;
164534 oe.menuBar.add(menu = new Menu("Edit"));
165535 //editItem = menu.add(new MenuItem("Edit"));
166536 //editItem.addActionListener(this);
167
- duplicateItem = menu.add(new MenuItem("Duplicate"));
537
+
538
+// undoItem = menu.add(new MenuItem("Undo"));
539
+// undoItem.addActionListener(this);
540
+// redoItem = menu.add(new MenuItem("Redo"));
541
+// redoItem.addActionListener(this);
542
+// menu.add("-");
543
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168544 duplicateItem.addActionListener(this);
169
- menu.add("-");
170
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171547 cloneItem.addActionListener(this);
548
+ //if (Globals.ADVANCED)
549
+ {
172550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173551 cloneSupportItem.addActionListener(this);
552
+ }
553
+ oe.jTree.popup.addSeparator();
174554 menu.add("-");
175
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176556 cutItem.addActionListener(this);
177
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178558 copyItem.addActionListener(this);
179559 pasteItem = menu.add(new MenuItem("Paste"));
180560 pasteItem.addActionListener(this);
181
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
561
+
562
+ oe.jTree.popup.addSeparator();
563
+ //menu.add("-");
564
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
565
+ pasteIntoItem.addActionListener(this);
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182567 pasteLinkItem.addActionListener(this);
183
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184569 pasteCloneItem.addActionListener(this);
185
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186571 // pasteExpandItem.addActionListener(this);
187
- clearItem = menu.add(new MenuItem("Clear"));
188
- clearItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
574
+
575
+ if (Globals.ADVANCED)
576
+ {
577
+ // Deletes the cameras...
189578 clearAllItem = menu.add(new MenuItem("Clear All"));
190579 clearAllItem.addActionListener(this);
580
+ }
581
+
582
+ menuBar.add(cameraMenu = new Menu("View"));
583
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
584
+ //zBufferItem.addActionListener(this);
585
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
586
+ //normalLensItem.addActionListener(this);
587
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
588
+ restoreCameraItem.addActionListener(this);
589
+
590
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
591
+// toggleFullScreenItem.addItemListener(this);
592
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
593
+// cameraMenu.add("-");
594
+//
595
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
596
+// toggleTextureItem.addItemListener(this);
597
+// toggleTextureItem.setState(CameraPane.textureon);
598
+//
599
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
600
+// toggleSwitchItem.addItemListener(this);
601
+// toggleSwitchItem.setState(CameraPane.SWITCH);
602
+
603
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
604
+ toggleHandleItem.addItemListener(this);
605
+ toggleHandleItem.setState(CameraPane.HANDLES);
606
+
607
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
608
+ togglePaintItem.addItemListener(this);
609
+ togglePaintItem.setState(CameraPane.PAINTMODE);
610
+
611
+ if (Globals.ADVANCED)
612
+ {
613
+ cameraMenu.add("-");
614
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
615
+ toggleLiveItem.addItemListener(this);
616
+ toggleLiveItem.setState(Globals.isLIVE());
191617
618
+ cameraMenu.add(stepItem = new MenuItem("Step"));
619
+ stepItem.addActionListener(this);
620
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
621
+ // toggleDLItem.addItemListener(this);
622
+ // toggleDLItem.setState(false);
623
+
624
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
625
+ toggleRenderItem.addItemListener(this);
626
+ toggleRenderItem.setState(!CameraPane.frozen);
627
+
628
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
629
+ toggleDebugItem.addItemListener(this);
630
+ toggleDebugItem.setState(Globals.DEBUG);
631
+
632
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
633
+ toggleFrustumItem.addItemListener(this);
634
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
635
+
636
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
637
+ toggleFootContactItem.addItemListener(this);
638
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
639
+
640
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
641
+ toggleTimelineItem.addItemListener(this);
642
+ }
643
+
644
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
645
+// toggleRootItem.addItemListener(this);
646
+// toggleRootItem.setState(false);
647
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
648
+// animationItem.addItemListener(this);
649
+// animationItem.setState(CameraPane.ANIMATION);
650
+ cameraMenu.add("-");
651
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
652
+ editCameraItem.addActionListener(this);
653
+
654
+ if (Globals.ADVANCED)
655
+ {
656
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
657
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
658
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
659
+ oe.cameraMenu.add("-");
660
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
661
+ openWindowItem.addActionListener(this);
662
+ lookAtItem.addActionListener(this);
663
+ //lookFromItem.addActinoListener(this);
664
+ //switchViewItem.addActionListener(this);
665
+ }
666
+
192667 oe.menuBar.add(menu = new Menu("Setting"));
193
- resetMeshItem = menu.add(new MenuItem("Reset All"));
194
- resetMeshItem.addActionListener(this);
195
- stepAllItem = menu.add(new MenuItem("Step All"));
196
- stepAllItem.addActionListener(this);
668
+ if (Globals.ADVANCED)
669
+ {
197670 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198671 revertMeshItem.addActionListener(this);
199672 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200673 resetreferencesItem.addActionListener(this);
201674 menu.add("-");
675
+ }
202676 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203677 overwriteGeoItem.addActionListener(this);
204678 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -210,79 +684,111 @@
210684 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211685 overwriteUVItem.addActionListener(this);
212686 menu.add("-");
687
+ if (Globals.ADVANCED)
688
+ {
213689 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214690 generateMeshItem.addActionListener(this);
215691 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216692 poseMeshItem.addActionListener(this);
217693 menu.add("-");
694
+ }
218695 resetsupportItem = menu.add(new MenuItem("Reset support"));
219696 resetsupportItem.addActionListener(this);
220697 linkverticesItem = menu.add(new MenuItem("Link to Support"));
221698 linkverticesItem.addActionListener(this);
222699 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223700 relinkverticesItem.addActionListener(this);
701
+
702
+ if (Globals.ADVANCED)
703
+ {
224704 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225705 setMasterItem.addActionListener(this);
706
+ }
226707
227
- oe.menuBar.add(menu = new Menu("Group"));
228
- grabItem = menu.add(new MenuItem("Grab"));
229
- grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
230710 backItem = menu.add(new MenuItem("Back"));
231711 backItem.addActionListener(this);
232712 frontItem = menu.add(new MenuItem("Front"));
233713 frontItem.addActionListener(this);
234
- compositeItem = menu.add(new MenuItem("Composite"));
235
- compositeItem.addActionListener(this);
236
- hideItem = menu.add(new MenuItem("Hide"));
714
+// compositeItem = menu.add(new MenuItem("Composite"));
715
+// compositeItem.addActionListener(this);
716
+
717
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+ grabItem.addActionListener(this);
719
+
720
+ if (Globals.ADVANCED)
721
+ {
722
+ hideItem = menu.add(new MenuItem("Hidden Group"));
237723 hideItem.addActionListener(this);
238
- ungroupItem = menu.add(new MenuItem("Ungroup"));
724
+ }
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
239726 ungroupItem.addActionListener(this);
240
- menu.add("-");
241
- randomItem = menu.add(new MenuItem("Random"));
242
- randomItem.addActionListener(this);
243
- physicsItem = menu.add(new MenuItem("Physics"));
244
- physicsItem.addActionListener(this);
245
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246
- frameselectorItem.addActionListener(this);
727
+
728
+ oe.jTree.popup.addSeparator();
729
+
730
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+ deleteItem.addActionListener(this);
732
+
733
+// menu.add("-");
734
+//
735
+// switchItem = menu.add(new MenuItem("Switch node"));
736
+// switchItem.addActionListener(this);
737
+ if (Globals.ADVANCED)
738
+ {
247739 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248740 switchGeoItem.addActionListener(this);
249741 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250742 switchTransfoItem.addActionListener(this);
251
- morphItem = menu.add(new MenuItem("Morph"));
743
+ morphItem = menu.add(new MenuItem("Morph Group"));
252744 morphItem.addActionListener(this);
745
+
746
+ menu.add("-");
747
+ physicsItem = menu.add(new MenuItem("Physics"));
748
+ physicsItem.addActionListener(this);
749
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
750
+ frameselectorItem.addActionListener(this);
253751 scriptNodeItem = menu.add(new MenuItem("Script Node"));
254752 scriptNodeItem.addActionListener(this);
255
- cameraItem = menu.add(new MenuItem("Camera"));
256
- cameraItem.addActionListener(this);
753
+ }
257754
258755 oe.menuBar.add(menu = new Menu("Object"));
259
- textureItem = menu.add(new MenuItem("Texture"));
260
- textureItem.addActionListener(this);
756
+// textureItem = menu.add(new MenuItem("Texture"));
757
+// textureItem.addActionListener(this);
261758 billboardItem = menu.add(new MenuItem("Billboard"));
262759 billboardItem.addActionListener(this);
263760 csgItem = menu.add(new MenuItem("CSG"));
264761 csgItem.addActionListener(this);
265
- shadowXItem = menu.add(new MenuItem("Shadow X"));
762
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266763 shadowXItem.addActionListener(this);
267
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
764
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268765 shadowYItem.addActionListener(this);
269
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
766
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270767 shadowZItem.addActionListener(this);
768
+ attributeItem = menu.add(new MenuItem("Attribute"));
769
+ attributeItem.addActionListener(this);
770
+
771
+ if (Globals.ADVANCED)
772
+ {
773
+ menu.add("-");
271774 linkerItem = menu.add(new MenuItem("Linker"));
272775 linkerItem.addActionListener(this);
273776 templateItem = menu.add(new MenuItem("Template"));
274777 templateItem.addActionListener(this);
275
- attributeItem = menu.add(new MenuItem("Attribute"));
276
- attributeItem.addActionListener(this);
277778 pointflowItem = menu.add(new MenuItem("Point Flow"));
278779 pointflowItem.addActionListener(this);
780
+ }
279781 menu.add("-");
280782 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281783 resetTransformItem.addActionListener(this);
282784 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283785 resetCentroidItem.addActionListener(this);
284
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285
- transformgeometryItem.addActionListener(this);
786
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
787
+ resetCentroidXZItem.addActionListener(this);
788
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
789
+ transformGeometryItem.addActionListener(this);
790
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
791
+ transformChildrenItem.addActionListener(this);
286792
287793 oe.menuBar.add(menu = new Menu("Geometry"));
288794 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -293,8 +799,11 @@
293799 genNormalsCADItem.addActionListener(this);
294800 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295801 genNormalsMESHItem.addActionListener(this);
296
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
802
+ if (Globals.ADVANCED)
803
+ {
804
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297805 genNormalsMINEItem.addActionListener(this);
806
+ }
298807 stripifyItem = menu.add(new MenuItem("Stripify"));
299808 stripifyItem.addActionListener(this);
300809 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -316,31 +825,52 @@
316825 reduce34MeshItem.addActionListener(this);
317826 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318827 increaseMeshItem.addActionListener(this);
319
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320
- smoothMeshItem.addActionListener(this);
321828 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322829 clipMeshItem.addActionListener(this);
830
+
831
+ if (Globals.ADVANCED)
832
+ {
833
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
834
+ smoothMeshItem.addActionListener(this);
835
+ }
323836
324837 oe.menuBar.add(menu = new Menu("Attributes"));
838
+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
839
+ clearVersionsItem.addActionListener(this);
325840 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326841 clearMaterialsItem.addActionListener(this);
842
+ resetAllItem = menu.add(new MenuItem("Reset All"));
843
+ resetAllItem.addActionListener(this);
844
+ stepAllItem = menu.add(new MenuItem("Step All"));
845
+ stepAllItem.addActionListener(this);
327846 menu.add("-");
328847 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329848 liveleavesItem.addActionListener(this);
330849 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331850 unliveleavesItem.addActionListener(this);
851
+ if (Globals.ADVANCED)
852
+ {
332853 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333854 supportleavesItem.addActionListener(this);
334855 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335856 unsupportleavesItem.addActionListener(this);
857
+ }
336858 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337859 hideleavesItem.addActionListener(this);
338860 showleavesItem = menu.add(new MenuItem("Show Leaves"));
339861 showleavesItem.addActionListener(this);
340
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
862
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
341863 markleavesItem.addActionListener(this);
342
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
864
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
343865 unmarkleavesItem.addActionListener(this);
866
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
867
+ rewindleavesItem.addActionListener(this);
868
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
869
+ unrewindleavesItem.addActionListener(this);
870
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
871
+ randomleavesItem.addActionListener(this);
872
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
873
+ unrandomleavesItem.addActionListener(this);
344874 menu.add("-");
345875 flipVItem = menu.add(new MenuItem("Flip V"));
346876 flipVItem.addActionListener(this);
....@@ -366,53 +896,135 @@
366896 attachBumpItem.addActionListener(this);
367897 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368898 pigmentBumpItem.addActionListener(this);
899
+ //embedTexturesItem
369900 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370901 detachPigmentItem.addActionListener(this);
371902 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372903 detachBumpItem.addActionListener(this);
904
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
905
+ embedTexturesItem.addActionListener(this);
906
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
907
+ deEmbedTexturesItem.addActionListener(this);
373908 menu.add("-");
374909 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375910 sortbysizeItem.addActionListener(this);
376911 sortbynameItem = menu.add(new MenuItem("Sort by name"));
377912 sortbynameItem.addActionListener(this);
378913 menu.add("-");
914
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
915
+ shareGeometriesItem.addActionListener(this);
916
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
917
+ mergeGeometriesItem.addActionListener(this);
918
+ menu.add("-");
919
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
920
+ editLeafItem.addActionListener(this);
921
+ if (Globals.ADVANCED)
922
+ {
923
+ // Pretty much the same as duplicate and clone.
379924 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380925 extractGeometriesItem.addActionListener(this);
381926 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382927 cloneGeometriesItem.addActionListener(this);
383
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384
- shareGeometriesItem.addActionListener(this);
385
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386
- mergeGeometriesItem.addActionListener(this);
928
+ }
387929
388930 oe.menuBar.add(menu = new Menu("Insert"));
389931 buildCreateMenu(menu);
390932
391
-
392
- oe.menuBar.add(menu = new Menu("Include"));
393
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394
- importGFDItem.addActionListener(this);
395
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396
- importVRMLX3DItem.addActionListener(this);
397
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398
- importOBJItem.addActionListener(this);
399
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400
- import3DSItem.addActionListener(this);
401
-
402933 oe.menuBar.add(menu = new Menu("Tools"));
403934 buildToolsMenu(menu);
404935 }
405936
937
+ JTabbedPane resourcecontainer;
938
+ cGridBag currenttab;
939
+ //boolean added; // patch for jar
940
+
941
+ int totalcount = 0;
942
+
943
+ int tabcount = 0;
944
+ int colcount = 0;
945
+ int rowcount = 0;
946
+ int texturecount = 0;
947
+
948
+ int columns = 5;
949
+ int rows = 7;
950
+
951
+ public void ResourceCallBack(String[] path)
952
+ {
953
+// for (int i = 0; i < path.length; i++)
954
+// System.out.print(path[i] + "/");
955
+// System.out.println();
956
+
957
+ if (//rowcount == 0 ||
958
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
959
+ {
960
+ currenttab = new cGridBag();
961
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
962
+ currenttab.setName(tabname);
963
+ //added = false;
964
+ resourcecontainer.add(currenttab);
965
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
966
+ rowcount = 1;
967
+ colcount = 0;
968
+ texturecount = 0;
969
+ }
970
+
971
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
972
+ {
973
+ //if (!added)
974
+ {
975
+ //added = true;
976
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
977
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
978
+ }
979
+
980
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
981
+ totalcount++;
982
+
983
+ if (++colcount >= columns)
984
+ {
985
+ colcount = 0;
986
+ currenttab.Return();
987
+
988
+ if (rowcount++ >= rows)
989
+ {
990
+ rowcount = 0;
991
+ }
992
+ }
993
+ }
994
+ else
995
+ {
996
+// if (!path[path.length-1].equals("icons"))
997
+// resourcecontainer.Return();
998
+ }
999
+ }
1000
+
1001
+ void CreateTexturePanel(cGridBag container)
1002
+ {
1003
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1004
+ container.add(resourcecontainer);
1005
+
1006
+ Grafreed.ParseResources("textures", this);
1007
+
1008
+ // 935. System.out.println("Total = " + totalcount);
1009
+ }
1010
+
4061011 void SetupUI2(ObjEditor oe)
4071012 {
1013
+ // June 2019
1014
+ if (oe == null)
1015
+ {
1016
+ //super.SetupUI2(this);
1017
+ //return;
1018
+ }
1019
+
1020
+ if (copy != group)
1021
+ {
1022
+ //super.SetupUI2(this);
1023
+ }
1024
+
4081025 //new Exception().printStackTrace();
4091026
4101027 oe.radioPanel = new JPanel(new GridBagLayout());
411
- oe.aConstraints.weightx = 1;
412
- oe.aConstraints.weighty = 0;
413
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414
- oe.aConstraints.gridwidth = 100;
415
- oe.aConstraints.gridheight = 1;
4161028 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
4171029
4181030 oe.buttonGroup = new ButtonGroup();
....@@ -433,153 +1045,269 @@
4331045 oe.radioPanel.add(dummyButton);
4341046 oe.buttonGroup.add(dummyButton);
4351047 */
436
- aConstraints.gridy += 1;
437
- oe.aConstraints.gridwidth = 1;
438
- oe.aConstraints.gridx = 0;
1048
+ cGridBag versionManagerPanel = new cGridBag();
1049
+
1050
+ versionManagerPanel.preferredHeight = 4;
4391051
440
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
1052
+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1053
+
1054
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
+ //minButton.setToolTipText("Minimize window");
1056
+ //minButton.addActionListener(this);
1057
+
1058
+ if (Globals.ADVANCED)
1059
+ {
1060
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// maxButton.setToolTipText("Maximize window");
1062
+// maxButton.addActionListener(this);
1063
+ }
1064
+
1065
+ cButton gcButton;
1066
+
1067
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+// gcButton.setToolTipText("Garbage collect");
1069
+// gcButton.addActionListener(new ActionListener()
1070
+// {
1071
+// public void actionPerformed(ActionEvent e)
1072
+// {
1073
+// System.gc();
1074
+// }
1075
+// });
1076
+
1077
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1078
+ collapseButton.setToolTipText("Collapse toolbar");
1079
+ collapseButton.addActionListener(this);
1080
+
1081
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
+ maximize3DButton.setToolTipText("Maximize 3D view");
1083
+ maximize3DButton.addActionListener(this);
1084
+
1085
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1086
+ twoButton.setToolTipText("Show 3D view only");
1087
+ twoButton.addActionListener(this);
1088
+ this.fullscreenLayout = twoButton;
1089
+
1090
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1091
+ threeButton.setToolTipText("Show controls and 3D view");
1092
+ threeButton.addActionListener(this);
1093
+ if (Globals.ADVANCED)
1094
+ {
1095
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096
+ sixButton.setToolTipText("Show 3D view and controls");
1097
+ sixButton.addActionListener(this);
1098
+ }
1099
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+// sevenButton.setToolTipText("3-column layout");
1101
+// sevenButton.addActionListener(this);
1102
+ //
1103
+
1104
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1105
+ fullButton.setToolTipText("Full-screen window");
1106
+ fullButton.addActionListener(this);
1107
+
1108
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1109
+ screenfitButton.setToolTipText("Screen fit");
1110
+ screenfitButton.addActionListener(this);
1111
+
1112
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1113
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1114
+ restoreCameraButton.addActionListener(this);
1115
+
1116
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
+ saveVersionButton.setToolTipText("Duplicate current version");
1118
+ saveVersionButton.addActionListener(this);
1119
+
1120
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1121
+ deleteVersionButton.setToolTipText("Delete current version");
1122
+ deleteVersionButton.addActionListener(this);
1123
+ deleteVersionButton.setEnabled(false);
1124
+
1125
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1126
+ previousVersionButton.setToolTipText("Previous version");
1127
+ previousVersionButton.addActionListener(this);
1128
+ previousVersionButton.setEnabled(false);
1129
+
1130
+ cGridBag updown = new cGridBag().setVertical(true);
1131
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1132
+ restoreButton.setToolTipText("Undo (restore current version)");
1133
+ restoreButton.addActionListener(this);
1134
+ restoreButton.setEnabled(false);
1135
+
1136
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1137
+ replaceButton.setToolTipText("Save (replace current version)");
1138
+ replaceButton.addActionListener(this);
1139
+ replaceButton.setEnabled(false);
1140
+
1141
+ versionManagerPanel.add(updown);
1142
+
1143
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144
+ nextVersionButton.setToolTipText("Next version");
1145
+ nextVersionButton.addActionListener(this);
1146
+ nextVersionButton.setEnabled(false);
1147
+
1148
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1149
+ oneStepButton.setToolTipText("Animate one step forward");
1150
+ oneStepButton.addActionListener(this);
1151
+
1152
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1153
+ liveCB.setToolTipText("Enable animation");
4411154 liveCB.addItemListener(this);
4421155
443
- oe.aConstraints.gridx += 1;
444
- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445
- supportCB.addItemListener(this);
446
-
447
- // oe.aConstraints.gridx += 1;
448
- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449
- // localCB.addItemListener(this);
450
-
451
- oe.aConstraints.gridx += 1;
452
- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453
- crowdCB.addItemListener(this);
454
-
455
- oe.aConstraints.gridx += 1;
456
- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457
- smoothCB.addItemListener(this);
458
-
459
- oe.aConstraints.gridx += 1;
460
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
1156
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1157
+ fastCB.setToolTipText("Fast mode");
4611158 fastCB.addItemListener(this);
462
- oe.aConstraints.gridx += 1;
463
- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464
- slowCB.addItemListener(this);
465
- oe.aConstraints.gridx += 1;
466
- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467
- boxCB.addItemListener(this);
1159
+
1160
+ //oe.toolboxPanel.Return();
1161
+
1162
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1163
+// trackCB.setToolTipText("Enable tracking");
1164
+// trackCB.addItemListener(this);
4681165
469
-// oe.aConstraints.gridx += 1;
470
-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471
-// speakerMocapCB.addItemListener(this);
472
-
473
- if (false)
474
- {
475
- // handled in scripts
476
- oe.aConstraints.gridx += 1;
477
- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478
- speakerCameraCB.addItemListener(this);
479
-
480
- oe.aConstraints.gridx += 1;
481
- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482
- speakerFocusCB.addItemListener(this);
483
-
484
- oe.aConstraints.gridx += 1;
485
- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486
- smoothfocusCB.addItemListener(this);
487
- }
488
-
489
-//oe.aConstraints.gridx += 1;
490
-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491
-// debugCB.addItemListener(this);
492
-
493
- oe.aConstraints.gridx += 1;
494
- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495
- oeilCB.addItemListener(this);
496
-
497
- oe.aConstraints.gridx += 1;
498
- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499
- lookAtCB.addItemListener(this);
500
-
501
- oe.aConstraints.gridx += 1;
502
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503
- trackCB.addItemListener(this);
504
-
505
- oe.aConstraints.gridx += 1;
506
- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507
- screenfitButton.addActionListener(this);
508
- oe.aConstraints.gridx += 1;
5091166 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
5101167 // screenfitpointButton.addActionListener(this);
511
-// oe.aConstraints.gridx += 1;
512
- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513
- snapobjectButton.addActionListener(this);
514
- oe.aConstraints.gridx += 1;
5151168
516
- //aConstraints.gridx = 0;
517
- //aConstraints.gridy += 1;
518
- oe.aConstraints.weighty = 0;
519
- oe.aConstraints.gridwidth = 1;
520
-
521
- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522
- flashSelectionButton.addActionListener(this);
523
-
524
- oe.toolbarPanel.add(new cButton(" ", false));
525
-
526
- oe.aConstraints.gridx += 1;
527
- oe.aConstraints.weighty = 0;
528
- oe.aConstraints.gridwidth = 1;
529
-
530
- //
531
- oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
532
- twoButton.addActionListener(this);
533
- oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
1169
+ if (Globals.ADVANCED)
1170
+ {
1171
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1172
+ snapobjectButton.addActionListener(this);
1173
+ snapobjectButton.setToolTipText("Snap Object");
1174
+
1175
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
5341176 fourButton.addActionListener(this);
535
- oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
536
- sixButton.addActionListener(this);
537
- oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
538
- threeButton.addActionListener(this);
539
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
540
- sevenButton.addActionListener(this);
541
- //
1177
+ fourButton.setToolTipText("Show control panel only");
1178
+ }
5421179
543
- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
1180
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1181
+
1182
+
1183
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1184
+ rootButton.setToolTipText("Open selection in new tab");
5441185 rootButton.addActionListener(this);
545
- oe.aConstraints.gridx += 1;
546
- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
1186
+
1187
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1188
+ closeButton.setToolTipText("Close tab");
5471189 closeButton.addActionListener(this);
5481190 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
5491191 //clearButton.addActionListener(this);
550
- oe.aConstraints.gridx += 1;
551
-
552
- oe.aConstraints.gridx = 1; //
553
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554
- editButton.addActionListener(this);
555
- oe.aConstraints.gridx += 1;
556
- oe.aConstraints.weighty = 0;
557
- oe.aConstraints.gridwidth = 1;
5581192
559
- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
1193
+ cGridBag row1 = new cGridBag();
1194
+
1195
+ // INSERT
1196
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
+ gridButton.setToolTipText("Create ground");
1198
+ gridButton.addActionListener(this);
1199
+
1200
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1201
+ boxButton.setToolTipText("Create box");
1202
+ boxButton.addActionListener(this);
1203
+
1204
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1205
+ superButton.setToolTipText("Create superellipsoid");
1206
+ superButton.addActionListener(this);
1207
+
1208
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1209
+ sphereButton.setToolTipText("Create sphere");
1210
+ sphereButton.addActionListener(this);
1211
+
1212
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
+ coneButton.setToolTipText("Create cone");
1214
+ coneButton.addActionListener(this);
1215
+
1216
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1217
+ torusButton.setToolTipText("Create torus");
1218
+ torusButton.addActionListener(this);
1219
+
1220
+ if (Globals.ADVANCED)
1221
+ {
1222
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1223
+ kleinButton.setToolTipText("Create Klein bottle");
1224
+ kleinButton.addActionListener(this);
1225
+ }
1226
+
1227
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
+ particlesButton.setToolTipText("Create particle system");
1229
+ particlesButton.addActionListener(this);
1230
+
1231
+ oe.toolboxPanel.add(row1);
1232
+
1233
+ cGridBag row2 = new cGridBag();
1234
+
1235
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
+ groupButton.setToolTipText("Create group");
1237
+ groupButton.addActionListener(this);
1238
+
1239
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1240
+ compositeButton.setToolTipText("Create composite");
1241
+ compositeButton.addActionListener(this);
1242
+
1243
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1244
+ switchButton.setToolTipText("Create item switcher");
1245
+ switchButton.addActionListener(this);
1246
+
1247
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1248
+ loopButton.setToolTipText("Create loop");
1249
+ loopButton.addActionListener(this);
1250
+
1251
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1252
+ textureButton.setToolTipText("Create texture");
1253
+ textureButton.addActionListener(this);
1254
+
1255
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1256
+ overlayButton.setToolTipText("Create overlay");
1257
+ overlayButton.addActionListener(this);
1258
+
1259
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1260
+ lightButton.setToolTipText("Create light");
1261
+ lightButton.addActionListener(this);
1262
+
1263
+ oe.toolboxPanel.add(row2);
1264
+
1265
+ cGridBag textures = new cGridBag();
1266
+
1267
+ CreateTexturePanel(textures);
1268
+
1269
+ int tabCount = resourcecontainer.getTabCount();
1270
+
1271
+ if (tabCount > 0)
1272
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1273
+
1274
+ oe.toolboxPanel.add(textures);
1275
+
1276
+ textures.preferredHeight = 100;
1277
+
1278
+ CreateSkyboxPanel(oe.skyboxPanel);
1279
+
1280
+ // EDIT panel
1281
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1282
+ editButton.setToolTipText("Pin selection controls");
1283
+ editButton.addActionListener(this);
1284
+
1285
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1286
+ uneditButton.setToolTipText("Unpin and remove selection controls");
5601287 uneditButton.addActionListener(this);
5611288
562
- oe.aConstraints.gridx += 1;
563
- oe.aConstraints.weighty = 0;
564
- oe.aConstraints.gridwidth = 1;
565
-
566
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567
- clearPanelButton.addActionListener(this);
568
-
569
- oe.aConstraints.gridx += 1;
570
- oe.aConstraints.weighty = 0;
571
- oe.aConstraints.gridwidth = 1;
572
-
573
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
1289
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1290
+ allParamsButton.setToolTipText("Show all controls");
5741291 allParamsButton.addActionListener(this);
5751292
576
- oe.aConstraints.gridx += 1;
577
- oe.aConstraints.weighty = 0;
578
- oe.aConstraints.gridwidth = 1;
579
-
580
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
581
- unselectButton.addActionListener(this);
1293
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1294
+ clearPanelButton.setToolTipText("Clear all controls");
1295
+ clearPanelButton.addActionListener(this);
5821296
1297
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1298
+ //unselectButton.setToolTipText("Unselect");
1299
+ //unselectButton.addActionListener(this);
1300
+
1301
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1302
+ flashSelectionButton.setToolTipText("Highlight selection");
1303
+ flashSelectionButton.addActionListener(this);
1304
+
1305
+ editCommandsPanel.preferredHeight = 1;
1306
+
1307
+ SetPinStates(false);
1308
+// oe.treePanel.add(commandsPanel);
1309
+// oe.treePanel.Return();
1310
+
5831311 // oe.aConstraints.gridx += 1;
5841312 // oe.aConstraints.weighty = 0;
5851313 // oe.aConstraints.gridwidth = 1;
....@@ -591,47 +1319,34 @@
5911319 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
5921320 // gcButton.addActionListener(this);
5931321
594
- oe.aConstraints.gridx = 0;
595
- oe.aConstraints.gridy += 1;
596
-
597
- //ctrlPanel.add(objList = new List(5, true));
598
- oe.aConstraints.gridwidth = 100;
599
- // oe.aConstraints.gridheight = 100;
600
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601
- oe.aConstraints.gridheight = 1;
602
- oe.aConstraints.weighty = 0.5;
603
- oe.aConstraints.gridx = 0;
604
- JScrollPane jSP;
1322
+ cGridBag jSPPanel = new cGridBag();
1323
+
1324
+ jSPPanel.preferredHeight = 20;
1325
+
1326
+ JScrollPane jSP;
6051327 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
1328
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
6071329 ResetModel();
608
- oe.aConstraints.weighty = 0.5;
609
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610
- oe.aConstraints.gridy += 1;
611
- oe.aConstraints.gridwidth = 1;
612
-
613
- oe.aConstraints.weighty = 0;
614
- oe.aConstraints.gridwidth = 2;
615
-
616
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617
- colorCB.addItemListener(this);
618
- oe.aConstraints.gridx += 2;
619
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620
- materialCB.addItemListener(this);
621
- oe.aConstraints.gridx += 2;
622
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623
- textureCB.addItemListener(this);
624
-
625
- oe.aConstraints.gridx = 0;
626
- oe.aConstraints.gridy += 1;
6271330
1331
+ oe.treePanel.add(jSPPanel);
1332
+ oe.treePanel.Return();
1333
+
1334
+ oe.treePanel.add(versionManagerPanel);
1335
+ oe.treePanel.Return();
1336
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1337
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1338
+ versionSliderPane.preferredHeight = 3;
1339
+
1340
+// mainPanel.setDividerLocation(0.1); //1.0);
1341
+ mainPanel.setResizeWeight(0.4);
1342
+
6281343 //jList.addListSelectionListener(this);
6291344 oe.jTree.addTreeSelectionListener(this);
6301345 //jTree.setRootVisible(false);
6311346 //jTree.setEditable(true);
6321347 oe.jTree.setDragEnabled(true);
6331348 //jTree.setPreferredSize(new Dimension(10,10));
634
- jSP.setPreferredSize(new Dimension(100,200));
1349
+ //jSP.setPreferredSize(new Dimension(100,200));
6351350
6361351 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6371352
....@@ -643,47 +1358,204 @@
6431358 dgr.addDragGestureListener(this);
6441359 }catch(Exception e) {}
6451360 */
646
- radio.layout = sevenButton;
1361
+ radio.layout = threeButton; // sixButton;
6471362 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6481363 }
1364
+
1365
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1366
+ {
1367
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1368
+ colorCB.setToolTipText("Copy color when dropped");
1369
+ colorCB.addItemListener(this);
1370
+
1371
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1372
+ materialCB.setToolTipText("Copy material when dropped");
1373
+ materialCB.addItemListener(this);
1374
+
1375
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1376
+ textureCB.setToolTipText("Copy texture when dropped");
1377
+ textureCB.addItemListener(this);
1378
+
1379
+ panel.Return();
1380
+
1381
+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
1382
+ boxCB.setToolTipText("Display bounding boxes");
1383
+ boxCB.addItemListener(this);
1384
+
1385
+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
1386
+ zoomBoxCB.setToolTipText("Display only for wheel");
1387
+ zoomBoxCB.addItemListener(this);
1388
+
1389
+ if (true) // Globals.ADVANCED)
1390
+ {
1391
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1392
+// supportCB.setToolTipText("Enable rigging");
1393
+// supportCB.addItemListener(this);
1394
+
1395
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1396
+ freezeCB.setToolTipText("Fast moving camera");
1397
+ freezeCB.addItemListener(this);
1398
+
1399
+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
1400
+ // localCB.addItemListener(this);
1401
+
1402
+ panel.Return();
1403
+
1404
+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1405
+ crowdCB.setToolTipText("Used for crowds");
1406
+ crowdCB.addItemListener(this);
1407
+
1408
+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1409
+ smoothCB.setToolTipText("Snapping delay");
1410
+ smoothCB.addItemListener(this);
1411
+
1412
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1413
+// slowCB.setToolTipText("Smooth interpolation");
1414
+// slowCB.addItemListener(this);
1415
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1416
+ minshaderCB.setToolTipText("Minimal fast shader");
1417
+ minshaderCB.addItemListener(this);
1418
+
1419
+// constraints.gridy += 1;
1420
+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1421
+// speakerMocapCB.addItemListener(this);
1422
+
1423
+ panel.Return();
1424
+
1425
+ if (false)
1426
+ {
1427
+ // handled in scripts
1428
+ //constraints.gridy += 1;
1429
+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1430
+ speakerCameraCB.addItemListener(this);
1431
+
1432
+ //constraints.gridy += 1;
1433
+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1434
+ speakerFocusCB.addItemListener(this);
1435
+
1436
+ //constraints.gridy += 1;
1437
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1438
+ smoothfocusCB.addItemListener(this);
1439
+ panel.Return();
1440
+ }
1441
+
1442
+//constraints.gridx += 1;
1443
+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1444
+// debugCB.addItemListener(this);
1445
+
1446
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1447
+ trackCB.setToolTipText("Enable tracking target");
1448
+ trackCB.addItemListener(this);
1449
+
1450
+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1451
+ oeilCB.setToolTipText("Move camera when tracking");
1452
+ oeilCB.addItemListener(this);
1453
+
1454
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1455
+ shadowCB.setToolTipText("When live compute shadows");
1456
+ shadowCB.addItemListener(this);
1457
+
1458
+ panel.Return();
1459
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1460
+ toggleTextureCB.setToolTipText("Load textures");
1461
+ toggleTextureCB.addItemListener(this);
1462
+
1463
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1464
+ toggleSwitchCB.setToolTipText("Choose a single item");
1465
+ toggleSwitchCB.addItemListener(this);
1466
+
1467
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1468
+ autokeepCB.setToolTipText("On structure change");
1469
+ autokeepCB.addItemListener(this);
1470
+
1471
+ panel.Return();
1472
+ if (Globals.ADVANCED)
1473
+ {
1474
+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
1475
+ lookAtCB.setToolTipText("Look-at target");
1476
+ lookAtCB.addItemListener(this);
1477
+ }
1478
+
1479
+ }
1480
+
1481
+ cGridBag fill = new cGridBag();
1482
+ fill.preferredHeight = 200;
1483
+ cGridBag fill2 = new cGridBag();
1484
+ fill2.preferredHeight = 200;
1485
+ cGridBag fill3 = new cGridBag();
1486
+ fill3.preferredHeight = 200;
1487
+
1488
+ panel.add(fill);
1489
+ panel.add(fill2);
1490
+ panel.add(fill3);
1491
+
1492
+ }
6491493
6501494 void EditObject(Object3D obj)
6511495 {
1496
+ assert(obj instanceof Composite);
1497
+
1498
+// if (obj.versionlist == null)
1499
+// {
1500
+// obj.versionlist = new Object3D[100];
1501
+// obj.versionindex = -1;
1502
+// }
1503
+
6521504 cRadio radioButton = new cRadio(obj.name);
1505
+
1506
+ // June 2019. Patch to avoid bug with transparency.
1507
+ radioButton.hadMaterial = obj.material != null;
1508
+ if (!radioButton.hadMaterial)
1509
+ {
1510
+ obj.material = new cMaterial();
1511
+ }
1512
+
6531513 radioButton.SetObject(obj);
654
- radioButton.layout = sevenButton;
1514
+ radioButton.layout = threeButton; // sixButton;
6551515 radioButton.SetCamera(cameraView.renderCamera, false);
6561516 radioButton.addActionListener(this);
6571517 radioPanel.add(radioButton);
6581518 buttonGroup.add(radioButton);
6591519 radioButton.doClick();
6601520 }
1521
+
6611522 void SetupViews(ObjEditor oe)
6621523 {
1524
+ theFrame = this;
1525
+
6631526 oe.SetupViews();
6641527
1528
+ if (Globals.DEBUG)
6651529 System.out.println("SetupViews");
6661530 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
6671531 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
6681532 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
6691533 }
6701534
671
- JCheckBox liveCB;
672
- JCheckBox supportCB;
673
- JCheckBox localCB;
674
- JCheckBox crowdCB;
675
- JCheckBox smoothCB;
676
- JCheckBox fastCB;
677
- JCheckBox slowCB;
678
- JCheckBox boxCB;
679
- JCheckBox trackCB;
680
- JCheckBox smoothfocusCB;
1535
+ cToggleButton liveCB;
1536
+ cCheckBox supportCB;
1537
+ cCheckBox localCB;
1538
+ cCheckBox crowdCB;
1539
+ cCheckBox smoothCB;
1540
+ cCheckBox minshaderCB;
1541
+
1542
+ cToggleButton fastCB;
1543
+ cCheckBox slowCB;
1544
+ cCheckBox boxCB;
1545
+ cCheckBox zoomBoxCB;
1546
+ cCheckBox freezeCB;
1547
+ //cToggleButton trackCB;
1548
+ cCheckBox trackCB;
1549
+ cCheckBox smoothfocusCB;
6811550 // JCheckBox speakerMocapCB;
682
- JCheckBox speakerCameraCB;
683
- JCheckBox speakerFocusCB;
684
- JCheckBox debugCB;
685
- JCheckBox oeilCB;
686
- JCheckBox lookAtCB;
1551
+ cCheckBox speakerCameraCB;
1552
+ cCheckBox speakerFocusCB;
1553
+ cCheckBox debugCB;
1554
+
1555
+ cCheckBox oeilCB;
1556
+ cCheckBox shadowCB;
1557
+ cCheckBox autokeepCB;
1558
+ cCheckBox lookAtCB;
6871559
6881560 // static int COLOR = 1;
6891561 // static int MATERIAL = 2;
....@@ -691,9 +1563,9 @@
6911563
6921564 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
6931565
694
- JCheckBox colorCB;
695
- JCheckBox materialCB;
696
- JCheckBox textureCB;
1566
+ cCheckBox colorCB;
1567
+ cCheckBox materialCB;
1568
+ cCheckBox textureCB;
6971569
6981570 public void itemStateChanged(ItemEvent e)
6991571 {
....@@ -721,6 +1593,7 @@
7211593 } else if(e.getSource() == liveCB)
7221594 {
7231595 cameraView.ToggleLive();
1596
+ refreshContents(false);
7241597 }
7251598 else if(e.getSource() == supportCB)
7261599 {
....@@ -736,6 +1609,12 @@
7361609 {
7371610 cameraView.ToggleInertia();
7381611 cameraView.repaint();
1612
+ }
1613
+ else if(e.getSource() == minshaderCB)
1614
+ {
1615
+ Globals.MINSHADER ^= true;
1616
+ cameraView.programInitialized = false;
1617
+ cameraView.repaint();
7391618 }
7401619 else if(e.getSource() == localCB)
7411620 {
....@@ -755,6 +1634,10 @@
7551634 Recompile();
7561635 cameraView.repaint();
7571636 // refreshContents();
1637
+ }
1638
+ else if(e.getSource() == zoomBoxCB)
1639
+ {
1640
+ cameraView.ToggleZoomBoxMode();
7581641 }
7591642 else if(e.getSource() == smoothfocusCB)
7601643 {
....@@ -781,6 +1664,18 @@
7811664 {
7821665 cameraView.ToggleOeil();
7831666 }
1667
+ else if(e.getSource() == shadowCB)
1668
+ {
1669
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1670
+ }
1671
+ else if(e.getSource() == freezeCB)
1672
+ {
1673
+ Globals.FREEZEONMOVE ^= true;
1674
+ }
1675
+ else if(e.getSource() == autokeepCB)
1676
+ {
1677
+ Globals.REPLACEONMAKE ^= true;
1678
+ }
7841679 else if(e.getSource() == lookAtCB)
7851680 {
7861681 cameraView.ToggleLookAt();
....@@ -797,7 +1692,8 @@
7971692
7981693 /**/
7991694 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1695
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1696
+ TreePath path = objEditor.jTree.getSelectionPath();
8011697 if ((path == null) || (path.getPathCount() <= 1)) {
8021698 // We can't move the root node or an empty selection
8031699 return;
....@@ -860,8 +1756,6 @@
8601756 }
8611757 }
8621758
863
- String string = (String) object;
864
-
8651759 System.out.println("Transfer = " + object + "; drop : " + target);
8661760 // if( object instanceof java.io.File[])
8671761 // {
....@@ -869,7 +1763,11 @@
8691763 // objEditor.DropFile((java.io.File[]) object, true);
8701764 // return;
8711765 // }
872
- if (string.charAt(0) == '/')
1766
+
1767
+ String string = object.toString();
1768
+
1769
+ // File path for Mac and Windows
1770
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
8731771 {
8741772 // file(s)
8751773 String[] names = string.split("\n");
....@@ -896,7 +1794,7 @@
8961794
8971795 flashIt = false;
8981796 CameraPane pane = (CameraPane) target;
899
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1797
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
9001798 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
9011799
9021800 if (group.selection.size() == 1)
....@@ -912,23 +1810,33 @@
9121810
9131811 assert target == objEditor.jTree;
9141812 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1813
+ Object3D destinationLeaf;
9151814 try {
916
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1815
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9171816 } catch (Exception e) {
9181817 System.out.println("destinationPath : " + destinationPath);
9191818 return;
9201819 }
9211820
922
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1821
+ for (int i=group.selection.size(); --i>=0;)
9231822 {
1823
+ Object3D child = (Object3D)group.selection.elementAt(i);
1824
+
1825
+ // Cannot move into itself
1826
+ if (child == destinationLeaf)
1827
+ return;
1828
+ }
1829
+
1830
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1831
+// {
9241832 loadClipboard(true);
9251833 objEditor.jTree.setSelectionPath(destinationPath);
926
- pasteInto(false);
927
- } else {
928
- loadClipboard(false);
929
- objEditor.jTree.setSelectionPath(destinationPath);
930
- pasteInto(false); // true); // ???
931
- }
1834
+ pasteInto(false, false);
1835
+// } else {
1836
+// loadClipboard(false);
1837
+// objEditor.jTree.setSelectionPath(destinationPath);
1838
+// pasteInto(false, false); // true); // ???
1839
+// }
9321840 }
9331841 public void dropActionChanged(DropTargetDragEvent dtde)
9341842 // Called if the user has modified the current drop gesture
....@@ -984,7 +1892,12 @@
9841892 TreePath path;
9851893
9861894 public TransferableTreePath(TreePath tp) {
987
- path = tp;
1895
+ Object[] objs = new Object[tp.getPathCount()];
1896
+ for (int i=0; i<objs.length; i++)
1897
+ {
1898
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1899
+ }
1900
+ path = new TreePath(objs);
9881901 }
9891902
9901903 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1033,85 +1946,107 @@
10331946 {
10341947 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10351948 //heightFieldItem.addActionListener(this);
1036
- gridItem = menu.add(new MenuItem("Grid"));
1037
- gridItem.addActionListener(this);
1038
- rectoidItem = menu.add(new MenuItem("Box"));
1039
- rectoidItem.addActionListener(this);
1040
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041
- ellipsoidItem.addActionListener(this);
1042
- coneItem = menu.add(new MenuItem("Cone"));
1043
- coneItem.addActionListener(this);
1044
- torusItem = menu.add(new MenuItem("Torus"));
1045
- torusItem.addActionListener(this);
1046
- superItem = menu.add(new MenuItem("Superellipsoid"));
1047
- superItem.addActionListener(this);
1949
+// gridItem = menu.add(new MenuItem("Grid"));
1950
+// gridItem.addActionListener(this);
1951
+// rectoidItem = menu.add(new MenuItem("Box"));
1952
+// rectoidItem.addActionListener(this);
1953
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1954
+// ellipsoidItem.addActionListener(this);
1955
+// coneItem = menu.add(new MenuItem("Cone"));
1956
+// coneItem.addActionListener(this);
1957
+// torusItem = menu.add(new MenuItem("Torus"));
1958
+// torusItem.addActionListener(this);
1959
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1960
+// superItem.addActionListener(this);
1961
+
1962
+ cameraItem = menu.add(new MenuItem("Camera"));
1963
+ cameraItem.addActionListener(this);
1964
+
1965
+ if (!Globals.ADVANCED)
1966
+ {
10481967 kleinItem = menu.add(new MenuItem("Klein Bottle"));
10491968 kleinItem.addActionListener(this);
1050
- particleItem = menu.add(new MenuItem("Particle system"));
1051
- particleItem.addActionListener(this);
1969
+ }
1970
+
1971
+// particleItem = menu.add(new MenuItem("Particle system"));
1972
+// particleItem.addActionListener(this);
1973
+ if (Globals.ADVANCED)
1974
+ {
10521975 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10531976 ragdollItem.addActionListener(this);
10541977 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10551978 ragdoll2Item.addActionListener(this);
1979
+ }
10561980 menu.add("-");
1057
- meshItem = menu.add(new MenuItem("Mesh"));
1981
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10581982 meshItem.addActionListener(this);
10591983 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10601984 // meshGroupItem.addActionListener(this);
1985
+ if (Globals.ADVANCED)
1986
+ {
10611987 springItem = menu.add(new MenuItem("Spring"));
10621988 springItem.addActionListener(this);
10631989 flagItem = menu.add(new MenuItem("Flag"));
10641990 flagItem.addActionListener(this);
1065
- bezierItem = menu.add(new MenuItem("Patch"));
1066
- bezierItem.addActionListener(this);
1067
- checkerItem = menu.add(new MenuItem("Checker"));
1068
- checkerItem.addActionListener(this);
10691991 blobItem = menu.add(new MenuItem("Blob"));
10701992 blobItem.addActionListener(this);
10711993 latheItem = menu.add(new MenuItem("Lathe"));
10721994 latheItem.addActionListener(this);
1073
- lightItem = menu.add(new MenuItem("Light"));
1074
- lightItem.addActionListener(this);
1995
+ }
1996
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
1997
+ bezierItem.addActionListener(this);
1998
+// overlayItem = menu.add(new MenuItem("Overlay"));
1999
+// overlayItem.addActionListener(this);
2000
+// lightItem = menu.add(new MenuItem("Light"));
2001
+// lightItem.addActionListener(this);
10752002 menu.add("-");
10762003 //superLoopItem = menu.add(new MenuItem("Super Loop"));
10772004 //superLoopItem.addActionListener(this);
1078
- loopItem = menu.add(new MenuItem("Loop"));
1079
- loopItem.addActionListener(this);
2005
+// loopItem = menu.add(new MenuItem("Loop"));
2006
+// loopItem.addActionListener(this);
10802007 doubleItem = menu.add(new MenuItem("Fork"));
10812008 doubleItem.addActionListener(this);
2009
+ if (Globals.ADVANCED)
2010
+ {
10822011 tripleItem = menu.add(new MenuItem("Trident"));
10832012 tripleItem.addActionListener(this);
2013
+ }
10842014 }
10852015
10862016 void buildToolsMenu(Menu menu)
10872017 {
10882018 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
10892019 animationItem.addItemListener(this);
1090
- animationItem.setState(CameraPane.ANIMATION);
2020
+ animationItem.setState(Globals.ANIMATION);
2021
+
2022
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2023
+ archiveItem.addActionListener(this);
10912024
10922025 menu.add("-");
10932026 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
10942027 parseverticesItem.addActionListener(this);
10952028 textureFieldItem = menu.add(new MenuItem("Texture Field"));
10962029 textureFieldItem.addActionListener(this);
1097
- alignItem = menu.add(new MenuItem("Align"));
2030
+ alignItem = menu.add(new MenuItem("Align Objects"));
10982031 alignItem.addActionListener(this);
1099
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100
- mirrorItem.addActionListener(this);
11012032 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11022033 reduceMorphItem.addActionListener(this);
11032034 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11042035 reduce34MorphItem.addActionListener(this);
1105
-
1106
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107
- computeAOItem.addActionListener(this);
11082036 menu.add("-");
1109
-
11102037 menu.add(memoryItem = new MenuItem("Memory Usage"));
11112038 memoryItem.addActionListener(this);
2039
+ menu.add(computeAOItem = new MenuItem("Compute AO"));
2040
+ computeAOItem.addActionListener(this);
2041
+
2042
+ if (Globals.ADVANCED)
2043
+ {
2044
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
2045
+ mirrorItem.addActionListener(this);
2046
+ menu.add("-");
11122047 menu.add(analyzeItem = new MenuItem("Analyze"));
11132048 analyzeItem.addActionListener(this);
1114
- menu.add(dumpItem = new MenuItem("Dump"));
2049
+ menu.add(dumpItem = new MenuItem("Print"));
11152050 dumpItem.addActionListener(this);
11162051 // menu.add(pathItem = new MenuItem("From-to path"));
11172052 // pathItem.addActionListener(this);
....@@ -1129,6 +2064,7 @@
11292064 menu.add("-");
11302065 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11312066 editScriptItem.addActionListener(this);
2067
+ }
11322068 }
11332069
11342070 void ScreenFit()
....@@ -1193,24 +2129,24 @@
11932129 switch(axis)
11942130 {
11952131 case 0 :
1196
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1197
- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1198
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1199
- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2132
+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2133
+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2134
+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2135
+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
12002136 norm = cVector.X;
12012137 break;
12022138 case 1 :
1203
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1204
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1205
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1206
- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2139
+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2140
+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2141
+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2142
+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
12072143 norm = cVector.Y;
12082144 break;
12092145 case 2 :
1210
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1211
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1212
- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1213
- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2146
+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2147
+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2148
+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2149
+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
12142150 norm = cVector.Z;
12152151 break;
12162152 }
....@@ -1251,9 +2187,38 @@
12512187 shadow.material = new cMaterial(obj.material);
12522188 shadow.material.diffuse = 0.0001f;
12532189 shadow.material.specular = 0.0001f;
2190
+ shadow.material.opacity = 0.75f;
2191
+
2192
+ AllocProjectedVertices(shadow);
2193
+
2194
+ shadow.projectedVertices[1].x = 300;
12542195
12552196 makeSomething(shadow);
12562197 }
2198
+
2199
+ private void ClearUnpinned()
2200
+ {
2201
+ //for (Object3D obj : listUI)
2202
+ for (int i=listUI.size(); --i>=0;)
2203
+ {
2204
+ Object3D obj = listUI.elementAt(i);
2205
+ if (!obj.pinned)
2206
+ {
2207
+ obj.CloseUI();
2208
+ listUI.remove(i);
2209
+ }
2210
+ }
2211
+ }
2212
+
2213
+ private void EditElement(Object3D elem, boolean newWindow)
2214
+ {
2215
+ // if (!(elem instanceof Composite))
2216
+ // newWindow = false;
2217
+ listUI.add(elem);
2218
+ elem.openEditWindow(this, newWindow); //, false);
2219
+ System.out.println("edit : " + elem);
2220
+ elem.editWindow.refreshContents(true); // ? new
2221
+ }
12572222
12582223 /**
12592224 * applyExample
....@@ -1457,9 +2422,9 @@
14572422
14582423 void Overwrite(int mask)
14592424 {
1460
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2425
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14612426 {
1462
- Object3D content = GrafreeD.clipboard.get(0);
2427
+ Object3D content = Grafreed.clipboard.get(0);
14632428
14642429 if (content instanceof cGroup && ((cGroup)content).transientlink )
14652430 content = ((cGroup)content).get(0);
....@@ -1482,6 +2447,7 @@
14822447 //
14832448 public void actionPerformed(ActionEvent event) // , Object arg)
14842449 {
2450
+ Object source = event.getSource();
14852451 /*
14862452 if (event.getSource() == nameField)
14872453 {
....@@ -1493,11 +2459,11 @@
14932459 }
14942460 else
14952461 */
1496
- if (event.getSource() == lookAtItem || event.getSource() == lookFromItem)
2462
+ if (source == lookAtItem || source == lookFromItem)
14972463 {
14982464 ScreenFit();
14992465 } else
1500
- if (event.getSource() == switchItem)
2466
+ if (source == switchViewItem)
15012467 {
15022468 cVector v1 = new cVector();
15032469 cVector v2 = new cVector();
....@@ -1506,11 +2472,11 @@
15062472 objEditor.cameraView.renderCamera.setAim(v2, v1);
15072473 objEditor.cameraView.repaint();
15082474 } else
1509
- if (event.getSource() == rectoidItem)
2475
+ if (source == rectoidItem || source == boxButton)
15102476 {
15112477 makeSomething(new Box());
15122478 } else
1513
- if (event.getSource() == particleItem)
2479
+ if (source == particleItem || source == particlesButton)
15142480 {
15152481 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15162482 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1531,9 +2497,9 @@
15312497 applyExample(particleGeom, "SMOKE");
15322498 makeSomething(particleGeom);
15332499 } else
1534
- if (event.getSource() == ragdollItem || event.getSource() == ragdoll2Item)
2500
+ if (source == ragdollItem || source == ragdoll2Item)
15352501 {
1536
- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
2502
+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
15372503
15382504 ragdoll.toParent = LA.newMatrix();
15392505 ragdoll.fromParent = LA.newMatrix();
....@@ -1551,7 +2517,7 @@
15512517 } else
15522518 /*
15532519 */
1554
- if (event.getSource() == heightFieldItem)
2520
+ if (source == heightFieldItem)
15552521 {
15562522 Object3D obj = new Object3D();
15572523
....@@ -1589,31 +2555,31 @@
15892555
15902556 makeSomething(obj);
15912557 } else
1592
- if (event.getSource() == gridItem)
2558
+ if (source == gridItem || source == gridButton)
15932559 {
15942560 makeSomething(new Grid());
15952561 } else
1596
- if (event.getSource() == ellipsoidItem)
2562
+ if (source == ellipsoidItem || source == sphereButton)
15972563 {
15982564 makeSomething(new Sphere());
15992565 } else
1600
- if (event.getSource() == coneItem)
2566
+ if (source == coneItem || source == coneButton)
16012567 {
16022568 makeSomething(new Cone());
16032569 } else
1604
- if (event.getSource() == torusItem)
2570
+ if (source == torusItem || source == torusButton)
16052571 {
16062572 makeSomething(new Torus());
16072573 } else
1608
- if (event.getSource() == superItem)
2574
+ if (source == superItem || source == superButton)
16092575 {
16102576 makeSomething(new Superellipsoid());
16112577 } else
1612
- if (event.getSource() == kleinItem)
2578
+ if (source == kleinItem || source == kleinButton)
16132579 {
16142580 makeSomething(new Klein());
16152581 } else
1616
- if (event.getSource() == blobItem)
2582
+ if (source == blobItem)
16172583 {
16182584 Blob blob = new Blob();
16192585 BlobComponent comp = new BlobComponent();
....@@ -1621,15 +2587,15 @@
16212587 //blob.retile();
16222588 makeSomething(blob);
16232589 } else
1624
- if (event.getSource() == latheItem)
2590
+ if (source == latheItem)
16252591 {
16262592 makeSomething(new Lathe());
16272593 } else
1628
- if (event.getSource() == bezierItem)
2594
+ if (source == bezierItem)
16292595 {
16302596 makeSomething(new BezierSurface());
16312597 } else
1632
- if (event.getSource() == checkerItem)
2598
+ if (source == overlayItem || source == overlayButton)
16332599 {
16342600 /*
16352601 Object3D obj = new BezierSurface(5,8);
....@@ -1644,7 +2610,7 @@
16442610 */
16452611 makeSomething(new Checker());
16462612 } else
1647
- if (event.getSource() == meshItem)
2613
+ if (source == meshItem)
16482614 {
16492615 Object3D itemtomake = new Object3D();
16502616 Object3D child;
....@@ -1665,35 +2631,52 @@
16652631 makeSomething(child);
16662632 }
16672633 } else
1668
- if (event.getSource() == springItem)
2634
+ if (source == springItem)
16692635 {
16702636 cSpring s = new cSpring();
16712637 s.setup();
16722638 makeSomething(s);
16732639 } else
1674
- if (event.getSource() == flagItem)
2640
+ if (source == flagItem)
16752641 {
16762642 cSpring s = new cFlag();
16772643 s.setup();
16782644 makeSomething(s);
16792645 } else
1680
- if (event.getSource() == lightItem)
2646
+ if (source == lightItem || source == lightButton)
16812647 {
16822648 makeSomething(new Light());
16832649 } else
1684
- if (event.getSource() == csgItem)
2650
+// if (source == skybox1Button ||
2651
+// source == skybox2Button ||
2652
+// source == skybox3Button ||
2653
+// source == skybox4Button ||
2654
+// source == skybox5Button ||
2655
+// source == skybox6Button ||
2656
+// source == skybox7Button ||
2657
+// source == skybox11Button ||
2658
+// source == skybox12Button ||
2659
+// source == skybox13Button ||
2660
+// source == skybox14Button ||
2661
+// source == skybox15Button ||
2662
+// source == skybox16Button ||
2663
+// source == skybox17Button)
2664
+// {
2665
+// ChangeSkybox(source);
2666
+// } else
2667
+ if (source == csgItem)
16852668 {
16862669 group(new CSG());
16872670 } else
1688
- if (event.getSource() == templateItem)
2671
+ if (source == templateItem)
16892672 {
16902673 group(new cTemplate());
16912674 } else
1692
- if (event.getSource() == attributeItem)
2675
+ if (source == attributeItem)
16932676 {
16942677 makeSomething(new Attribute());
16952678 } else
1696
- if (event.getSource() == pointflowItem)
2679
+ if (source == pointflowItem)
16972680 {
16982681 makeSomething(new PointFlow());
16992682 } else
....@@ -1705,7 +2688,7 @@
17052688 } else
17062689 */
17072690
1708
- if (event.getSource() == superLoopItem)
2691
+ if (source == superLoopItem)
17092692 {
17102693 Composite g = new cGroup();
17112694 for (int i=0; i<15; i++)
....@@ -1727,30 +2710,38 @@
17272710
17282711 group(g);
17292712 } else
1730
- if (event.getSource() == loopItem)
2713
+ if (source == loopItem || source == loopButton)
17312714 {
2715
+ if (!group.selection.isEmpty())
2716
+ {
17322717 Composite csg = new GroupLeaf();
17332718 csg.count = 5;
1734
- group(csg);
1735
- Composite child = new cGroup();
2719
+ Composite child = new cGroup("Branch");
17362720 csg.addChild(child);
17372721 child.addChild(csg);
2722
+ group(csg);
2723
+ }
17382724 } else
1739
- if (event.getSource() == doubleItem)
2725
+ if (source == doubleItem)
17402726 {
1741
- Composite csg = new GroupLeaf();
2727
+ if (!group.selection.isEmpty())
2728
+ {
2729
+ Composite csg = new GroupLeaf("Fork");
17422730 csg.count = 5;
2731
+ Composite child = new cGroup("Branch A");
2732
+ csg.addChild(child);
2733
+ child.addChild(csg);
2734
+ child = new cGroup("Branch B");
2735
+ csg.addChild(child);
2736
+ child.addChild(csg);
17432737 group(csg);
1744
- Composite child = new cGroup();
1745
- csg.addChild(child);
1746
- child.addChild(csg);
1747
- child = new cGroup();
1748
- csg.addChild(child);
1749
- child.addChild(csg);
2738
+ }
17502739 } else
1751
- if (event.getSource() == tripleItem)
2740
+ if (source == tripleItem)
17522741 {
1753
- Composite csg = new GroupLeaf();
2742
+ if (!group.selection.isEmpty())
2743
+ {
2744
+ Composite csg = new GroupLeaf("Trident");
17542745 csg.count = 4;
17552746 group(csg);
17562747 Composite child = new cGroup();
....@@ -1762,74 +2753,119 @@
17622753 child = new cGroup();
17632754 csg.addChild(child);
17642755 child.addChild(csg);
2756
+ }
17652757 } else
1766
-
1767
- if (event.getSource() == importGFDItem)
2758
+ if (source == computeAOItem)
17682759 {
1769
- ImportGFD();
2760
+ Globals.drawMode = CameraPane.OCCLUSION;
2761
+ cameraView.repaint();
17702762 } else
1771
- if (event.getSource() == importVRMLX3DItem)
1772
- {
1773
- ImportVRMLX3D();
1774
- } else
1775
- if (event.getSource() == import3DSItem)
1776
- {
1777
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778
- } else
1779
- if (event.getSource() == importOBJItem)
1780
- {
1781
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782
- } else
1783
- if (event.getSource() == computeAOItem)
1784
- {
1785
- CameraPane.drawMode = CameraPane.OCCLUSION;
1786
- CameraPane.theRenderer.repaint();
1787
- } else
1788
- if (event.getSource() == recompileItem)
2763
+ if (source == recompileItem)
17892764 {
17902765 Recompile();
17912766 refreshContents();
17922767 } else
1793
- if (event.getSource() == editScriptItem)
2768
+ if (source == editScriptItem)
17942769 {
17952770 OpenDialog();
17962771 refreshContents();
17972772 } else
1798
- if (event.getSource() == invariantsItem)
2773
+ if (source == invariantsItem)
17992774 {
18002775 System.out.println("Invariants:");
1801
- GrafreeD.grafreeD.universe.invariants();
2776
+ Grafreed.grafreed.universe.invariants();
18022777 } else
1803
- if (event.getSource() == memoryItem)
2778
+ if (source == memoryItem)
18042779 {
18052780 //System.out.println("Invariants:");
18062781 PrintMemory();
18072782 } else
1808
- if (event.getSource() == pathItem)
2783
+ if (source == pathItem)
18092784 {
18102785 PrintPath();
18112786 } else
1812
- if (event.getSource() == analyzeItem)
2787
+ if (source == analyzeItem)
18132788 {
18142789 AnalyzeObject();
18152790 } else
1816
- if (event.getSource() == dumpItem)
2791
+ if (source == dumpItem)
18172792 {
18182793 DumpObject();
18192794 } else
1820
- if (event.getSource() == screenfitButton)
2795
+ if (source == minButton)
18212796 {
1822
- //Reload(lastConverter, lastFilename, true);
2797
+ Minimize();
2798
+ } else
2799
+ if (source == maxButton)
2800
+ {
2801
+ Maximize();
2802
+ } else
2803
+ if (source == fullButton)
2804
+ {
2805
+ ToggleFullScreen();
2806
+ } else
2807
+ if (source == collapseButton)
2808
+ {
2809
+ this.expandedLayout = radio.layout;
2810
+ CollapseToolbar();
2811
+ } else
2812
+ if (source == maximize3DButton)
2813
+ {
2814
+ this.expandedLayout = radio.layout;
2815
+ radio.layout = twoButton;
2816
+ Show3DView();
2817
+ CollapseToolbar();
2818
+ } else
2819
+ if (source == previousVersionButton)
2820
+ {
2821
+ // Go to previous version
2822
+ //if (!Undo())
2823
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2824
+ PreviousVersion();
2825
+ } else
2826
+ if (source == restoreButton)
2827
+ {
2828
+ // Restore current version
2829
+ Restore();
2830
+ //restoreButton.setEnabled(false);
2831
+ } else
2832
+ if (source == replaceButton)
2833
+ {
2834
+ // Overwrite current version
2835
+ Replace();
2836
+ //replaceButton.setEnabled(false);
2837
+ } else
2838
+ if (source == nextVersionButton)
2839
+ {
2840
+ // Go to next version
2841
+ NextVersion();
2842
+ } else
2843
+ if (source == saveVersionButton)
2844
+ {
2845
+ // Save a new version
2846
+ if (!Save(true))
2847
+ java.awt.Toolkit.getDefaultToolkit().beep();
2848
+ } else
2849
+ if (source == deleteVersionButton)
2850
+ {
2851
+ // Delete a new version
2852
+ DeleteVersion();
2853
+ } else
2854
+ if (source == oneStepButton)
2855
+ {
2856
+ Globals.ONESTEP = true;
2857
+ cameraView.repaint();
2858
+ } else
2859
+ if (source == screenfitButton)
2860
+ {
18232861 ScreenFit();
18242862 } else
1825
- if (event.getSource() == screenfitpointButton)
2863
+ if (source == screenfitpointButton)
18262864 {
1827
- //Reload(lastConverter, lastFilename, true);
18282865 ScreenFitPoint();
18292866 } else
1830
- if (event.getSource() == snapobjectButton)
2867
+ if (source == snapobjectButton)
18312868 {
1832
- //Reload(lastConverter, lastFilename, true);
18332869 SnapObject();
18342870 } else
18352871 // if (event.getSource() == recompileButton)
....@@ -1838,13 +2874,13 @@
18382874 // Recompile();
18392875 // refreshContents();
18402876 // } else
1841
- if (event.getSource() == gcButton)
2877
+ if (source == gcButton)
18422878 {
18432879 System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18442880 System.gc();
18452881 System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18462882 } else
1847
- if (event.getSource() == editLeafItem)
2883
+ if (source == editLeafItem)
18482884 {
18492885 Object3D obj;
18502886 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -1858,62 +2894,74 @@
18582894 }
18592895 refreshContents(true);
18602896 } else
1861
- if (event.getSource() == openWindowItem)
2897
+ if (source == openWindowItem)
18622898 {
18632899 EditSelection(true);
18642900 } else
1865
- if (event.getSource() == cutItem || event.getSource() == clearButton)
2901
+ if (source == cutItem || source == clearButton)
18662902 {
18672903 loadClipboard(true);
18682904 } else
1869
- if (event.getSource() == duplicateItem)
2905
+ if (source == undoItem)
18702906 {
1871
- Object3D keep = GrafreeD.clipboard;
2907
+ PreviousVersion();
2908
+ } else
2909
+ if (source == redoItem)
2910
+ {
2911
+ NextVersion();
2912
+ } else
2913
+ if (source == duplicateItem)
2914
+ {
2915
+ Object3D keep = Grafreed.clipboard;
18722916 loadClipboard(false);
18732917 paste(false);
1874
- GrafreeD.clipboard = keep;
2918
+ Grafreed.clipboard = keep;
18752919 } else
1876
- if (event.getSource() == cloneItem)
2920
+ if (source == cloneItem)
18772921 {
18782922 CloneSelection(false);
18792923 } else
1880
- if (event.getSource() == cloneSupportItem)
2924
+ if (source == cloneSupportItem)
18812925 {
18822926 CloneSelection(true);
18832927 } else
1884
- if (event.getSource() == copyItem)
2928
+ if (source == copyItem)
18852929 {
18862930 loadClipboard(false);
18872931 } else
1888
- if (event.getSource() == pasteItem)
2932
+ if (source == pasteItem)
18892933 {
18902934 paste(false);
18912935 } else
1892
- if (event.getSource() == pasteLinkItem)
2936
+ if (source == pasteIntoItem)
18932937 {
1894
- pasteInto(false);
2938
+ pasteInto(true, false);
18952939 } else
1896
- if (event.getSource() == pasteCloneItem)
2940
+ if (source == pasteLinkItem)
18972941 {
1898
- pasteInto(true);
2942
+ pasteInto(false, false);
18992943 } else
1900
- if (event.getSource() == pasteExpandItem)
2944
+ if (source == pasteCloneItem)
2945
+ {
2946
+ pasteInto(true, true);
2947
+ } else
2948
+ if (source == pasteExpandItem)
19012949 {
19022950 paste(true);
19032951 } else
1904
- if (event.getSource() == synchronizeItem)
2952
+ if (source == synchronizeItem)
19052953 {
19062954 Overwrite(Object3D.TRANSFORM);
19072955 } else
1908
- if (event.getSource() == overwriteNameItem)
2956
+ if (source == overwriteNameItem)
19092957 {
19102958 Overwrite(Object3D.NAME);
19112959 } else
1912
- if (event.getSource() == overwriteUVItem)
2960
+ if (source == overwriteUVItem)
19132961 {
19142962 Overwrite(Object3D.UV);
19152963 } else
1916
- if (event.getSource() == overwriteMatItem)
2964
+ if (source == overwriteMatItem)
19172965 {
19182966 /* july 2015
19192967 if ((dropAttributes & Object3D.TEXTURE) == 0)
....@@ -1933,7 +2981,7 @@
19332981
19342982 Overwrite(dropAttributes);
19352983 }
1936
- if (event.getSource() == overwriteGeoItem)
2984
+ if (source == overwriteGeoItem)
19372985 {
19382986 Overwrite(Object3D.GEOMETRY);
19392987 // if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
....@@ -1950,7 +2998,7 @@
19502998 // refreshContents();
19512999 // }
19523000 } else
1953
- if (event.getSource() == generateMeshItem)
3001
+ if (source == generateMeshItem)
19543002 {
19553003 //if (group.selection.size() == 1)
19563004 // for (int i=0; i<group.selection.size(); i++)
....@@ -1961,7 +3009,7 @@
19613009 ResetModel();
19623010 refreshContents();
19633011 } else
1964
- if (event.getSource() == extractGeometriesItem)
3012
+ if (source == extractGeometriesItem)
19653013 {
19663014 boolean one = false;
19673015
....@@ -1988,7 +3036,7 @@
19883036 ResetModel();
19893037 refreshContents();
19903038 } else
1991
- if (event.getSource() == cloneGeometriesItem)
3039
+ if (source == cloneGeometriesItem)
19923040 {
19933041 boolean one = false;
19943042
....@@ -2014,7 +3062,7 @@
20143062 ResetModel();
20153063 refreshContents();
20163064 } else
2017
- if (event.getSource() == shareGeometriesItem)
3065
+ if (source == shareGeometriesItem)
20183066 {
20193067 boolean one = false;
20203068
....@@ -2044,7 +3092,7 @@
20443092 refreshContents();
20453093 }
20463094 } else
2047
- if (event.getSource() == mergeGeometriesItem)
3095
+ if (source == mergeGeometriesItem)
20483096 {
20493097 boolean one = false;
20503098
....@@ -2074,7 +3122,7 @@
20743122 ResetModel();
20753123 refreshContents();
20763124 } else
2077
- if (event.getSource() == linkverticesItem)
3125
+ if (source == linkverticesItem)
20783126 {
20793127 // if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
20803128 // {
....@@ -2087,48 +3135,48 @@
20873135 // group.selection.get(0).setMasterThis(content); // should be identity
20883136 // refreshContents();
20893137 // }
2090
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3138
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
20913139 {
2092
- Object3D content = GrafreeD.clipboard.get(0);
3140
+ Object3D content = Grafreed.clipboard.get(0);
20933141
20943142 if (content instanceof cGroup && ((cGroup)content).transientlink )
20953143 content = ((cGroup)content).get(0);
20963144
2097
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
3145
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
20983146 for (int i=0; i<group.selection.size(); i++)
20993147 {
2100
- boolean random = CameraPane.RANDOM;
2101
- CameraPane.RANDOM = false; // parse all random nodes
3148
+ boolean random = CameraPane.SWITCH;
3149
+ CameraPane.SWITCH = false; // parse all random nodes
21023150 group.selection.get(i).linkVerticesThis(content);
21033151 // group.selection.get(i).setMasterThis(content); // should be identity
2104
- CameraPane.RANDOM = random;
3152
+ CameraPane.SWITCH = random;
21053153 }
2106
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3154
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21073155 refreshContents();
21083156 }
21093157 } else
2110
- if (event.getSource() == resetsupportItem)
3158
+ if (source == resetsupportItem)
21113159 {
21123160 for (int i=0; i<group.selection.size(); i++)
21133161 {
2114
- boolean random = CameraPane.RANDOM;
2115
- CameraPane.RANDOM = false; // parse all random nodes
3162
+ boolean random = CameraPane.SWITCH;
3163
+ CameraPane.SWITCH = false; // parse all random nodes
21163164 group.selection.get(i).linkVerticesThis(null);
2117
- CameraPane.RANDOM = random;
3165
+ CameraPane.SWITCH = random;
21183166 }
21193167
21203168 refreshContents();
21213169 } else
2122
- if (event.getSource() == relinkverticesItem)
3170
+ if (source == relinkverticesItem)
21233171 {
2124
- boolean random = CameraPane.RANDOM;
2125
- CameraPane.RANDOM = false; // parse all random nodes
3172
+ boolean random = CameraPane.SWITCH;
3173
+ CameraPane.SWITCH = false; // parse all random nodes
21263174 group.selection.RelinkToSupport();
2127
- CameraPane.RANDOM = random;
3175
+ CameraPane.SWITCH = random;
21283176
21293177 refreshContents();
21303178 } else
2131
- if (event.getSource() == resetreferencesItem)
3179
+ if (source == resetreferencesItem)
21323180 {
21333181 for (int i=0; i<group.selection.size(); i++)
21343182 {
....@@ -2137,11 +3185,11 @@
21373185
21383186 refreshContents();
21393187 } else
2140
- if (event.getSource() == setMasterItem)
3188
+ if (source == setMasterItem)
21413189 {
2142
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
3190
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21433191 {
2144
- Object3D content = GrafreeD.clipboard.get(0);
3192
+ Object3D content = Grafreed.clipboard.get(0);
21453193
21463194 if (content instanceof cGroup && ((cGroup)content).transientlink )
21473195 content = ((cGroup)content).get(0);
....@@ -2150,13 +3198,13 @@
21503198 refreshContents();
21513199 }
21523200 } else
2153
- if (event.getSource() == poseMeshItem)
3201
+ if (source == poseMeshItem)
21543202 {
21553203 if (group.selection.size() == 1)
21563204 {
2157
- if (GrafreeD.clipboard.size() == 1)
3205
+ if (Grafreed.clipboard.size() == 1)
21583206 {
2159
- Object3D content = GrafreeD.clipboard.get(0);
3207
+ Object3D content = Grafreed.clipboard.get(0);
21603208
21613209 if (content instanceof cGroup && ((cGroup)content).transientlink )
21623210 content = ((cGroup)content).get(0);
....@@ -2169,19 +3217,19 @@
21693217 }
21703218
21713219 } else
2172
- if (event.getSource() == revertMeshItem)
3220
+ if (source == revertMeshItem)
21733221 {
21743222 RevertMeshes();
21753223 } else
2176
- if (event.getSource() == resetMeshItem)
3224
+ if (source == resetAllItem)
21773225 {
21783226 ResetAll();
21793227 } else
2180
- if (event.getSource() == stepAllItem)
3228
+ if (source == stepAllItem)
21813229 {
21823230 StepAll();
21833231 } else
2184
- if (event.getSource() == clearItem) // || event.getSource() == clearButton)
3232
+ if (source == deleteItem) // || event.getSource() == clearButton)
21853233 {
21863234 //int indices[] = jList.getSelectedIndices();
21873235 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2189,46 +3237,46 @@
21893237
21903238 ClearSelection(false);
21913239 } else
2192
- if (event.getSource() == clearAllItem)
3240
+ if (source == clearAllItem)
21933241 {
21943242 ClearSelection(true);
21953243 } else
2196
- if (event.getSource() == grabItem)
3244
+ if (source == grabItem || source == groupButton)
21973245 {
2198
- group(new cGroup(), true);
3246
+ group(new cGroup(), false); // true);
21993247 } else
2200
- if (event.getSource() == hideItem)
3248
+ if (source == hideItem)
22013249 {
22023250 group(new HiddenObject());
22033251 } else
2204
- if (event.getSource() == frontItem)
3252
+ if (source == frontItem)
22053253 {
22063254 front();
22073255 } else
2208
- if (event.getSource() == backItem)
3256
+ if (source == backItem)
22093257 {
22103258 back();
22113259 } else
2212
- if (event.getSource() == cameraItem)
3260
+ if (source == cameraItem)
22133261 {
22143262 makeSomething(new Camera());
22153263 } else
2216
- if (event.getSource() == compositeItem)
3264
+ if (source == compositeItem || source == compositeButton)
22173265 {
22183266 group(new Composite());
22193267 } else
2220
- if (event.getSource() == randomItem)
3268
+ if (source == switchItem || source == switchButton)
22213269 {
22223270 RandomNode random = new RandomNode();
22233271 group(random);
22243272 if (random.size() > 0)
2225
- random.name = random.get(0).name + "Rnd";
3273
+ random.name = random.get(0).name + "Switch";
22263274 } else
2227
- if (event.getSource() == physicsItem)
3275
+ if (source == physicsItem)
22283276 {
22293277 group(new PhysicsNode());
22303278 } else
2231
- if (event.getSource() == frameselectorItem)
3279
+ if (source == frameselectorItem)
22323280 {
22333281 for (int i=0; i<group.selection.size(); i++)
22343282 {
....@@ -2240,7 +3288,7 @@
22403288 ResetModel();
22413289 refreshContents();
22423290 } else
2243
- if (event.getSource() == switchGeoItem)
3291
+ if (source == switchGeoItem)
22443292 {
22453293 for (int i=0; i<group.selection.size(); i++)
22463294 {
....@@ -2252,7 +3300,7 @@
22523300 ResetModel();
22533301 refreshContents();
22543302 } else
2255
- if (event.getSource() == switchTransfoItem)
3303
+ if (source == switchTransfoItem)
22563304 {
22573305 for (int i=0; i<group.selection.size(); i++)
22583306 {
....@@ -2264,7 +3312,7 @@
22643312 ResetModel();
22653313 refreshContents();
22663314 } else
2267
- if (event.getSource() == morphItem)
3315
+ if (source == morphItem)
22683316 {
22693317 for (int i=0; i<group.selection.size(); i++)
22703318 {
....@@ -2276,7 +3324,7 @@
22763324 ResetModel();
22773325 refreshContents();
22783326 } else
2279
- if (event.getSource() == scriptNodeItem)
3327
+ if (source == scriptNodeItem)
22803328 {
22813329 boolean atleastone = false;
22823330
....@@ -2315,215 +3363,268 @@
23153363 }
23163364 }
23173365 } else
2318
- if (event.getSource() == linkerItem)
3366
+ if (source == linkerItem)
23193367 {
23203368 group(new cLinker());
23213369 } else
2322
- if (event.getSource() == textureItem)
3370
+ if (source == textureItem || source == textureButton)
23233371 {
23243372 group(new TextureNode());
23253373 } else
2326
- if (event.getSource() == billboardItem)
3374
+ if (source == billboardItem)
23273375 {
23283376 group(new BillboardNode());
23293377 } else
2330
- if (event.getSource() == shadowXItem)
3378
+ if (source == shadowXItem)
23313379 {
23323380 CastShadow(0);
23333381 } else
2334
- if (event.getSource() == shadowYItem)
3382
+ if (source == shadowYItem)
23353383 {
23363384 CastShadow(1);
23373385 } else
2338
- if (event.getSource() == shadowZItem)
3386
+ if (source == shadowZItem)
23393387 {
23403388 CastShadow(2);
23413389 } else
2342
- if (event.getSource() == ungroupItem)
3390
+ if (source == ungroupItem || source == ungroupButton)
23433391 {
2344
- //ungroup();
3392
+ boolean canUngroup = true;
3393
+
23453394 for (int i=0; i<group.selection.size(); i++)
23463395 {
2347
- Ungroup(group.selection.get(i));
3396
+ Object3D selectedItem = group.selection.get(i);
3397
+
3398
+ if (selectedItem.Size() == 0)
3399
+ {
3400
+ // Cannot ungroup leaves
3401
+ canUngroup = false;
3402
+ break;
3403
+ }
3404
+
3405
+ if (selectedItem == group)
3406
+ {
3407
+ // Cannot ungroup root
3408
+ canUngroup = false;
3409
+ break;
3410
+ }
23483411 }
23493412
2350
- ClearSelection(false);
2351
-
2352
- refreshContents();
3413
+ if (canUngroup)
3414
+ {
3415
+ for (int i=0; i<group.selection.size(); i++)
3416
+ {
3417
+ Object3D selectedItem = group.selection.get(i);
3418
+
3419
+ Ungroup(selectedItem);
3420
+ }
3421
+
3422
+ ClearSelection(false);
3423
+
3424
+ refreshContents();
3425
+ }
23533426 } else
2354
- if (event.getSource() == genUVItem)
3427
+ if (source == genUVItem)
23553428 {
23563429 GenUV();
23573430 } else
2358
- if (event.getSource() == genNormalsCADItem)
3431
+ if (source == genNormalsCADItem)
23593432 {
23603433 GenNormals(true);
23613434 } else
2362
- if (event.getSource() == genNormalsMESHItem)
3435
+ if (source == genNormalsMESHItem)
23633436 {
2364
- GenNormals(true); // TODO
3437
+ GenNormalsMESH();
23653438 } else
2366
- if (event.getSource() == genNormalsORGANItem)
3439
+ if (source == genNormalsORGANItem)
23673440 {
23683441 GenNormals(false);
23693442 } else
2370
- if (event.getSource() == genNormalsMINEItem)
3443
+ if (source == genNormalsMINEItem)
23713444 {
23723445 GenNormalsMINE();
23733446 } else
2374
- if (event.getSource() == stripifyItem)
3447
+ if (source == stripifyItem)
23753448 {
23763449 Stripify();
23773450 } else
2378
- if (event.getSource() == unstripifyItem)
3451
+ if (source == unstripifyItem)
23793452 {
23803453 Unstripify();
23813454 } else
2382
- if (event.getSource() == trimItem)
3455
+ if (source == trimItem)
23833456 {
23843457 Trim();
23853458 } else
2386
- if (event.getSource() == untrimItem)
3459
+ if (source == untrimItem)
23873460 {
23883461 Untrim();
23893462 } else
2390
- if (event.getSource() == clearColorsItem)
3463
+ if (source == clearColorsItem)
23913464 {
23923465 ClearColors();
23933466 } else
2394
- if (event.getSource() == clearMaterialsItem)
3467
+ if (source == clearMaterialsItem)
23953468 {
23963469 ClearMaterials();
23973470 } else
2398
- if (event.getSource() == liveleavesItem)
3471
+ if (source == clearVersionsItem)
3472
+ {
3473
+ ClearVersions();
3474
+ } else
3475
+ if (source == liveleavesItem)
23993476 {
24003477 LiveLeaves(true);
24013478 } else
2402
- if (event.getSource() == unliveleavesItem)
3479
+ if (source == unliveleavesItem)
24033480 {
24043481 LiveLeaves(false);
24053482 } else
2406
- if (event.getSource() == supportleavesItem)
3483
+ if (source == supportleavesItem)
24073484 {
24083485 SupportLeaves(true);
24093486 } else
2410
- if (event.getSource() == unsupportleavesItem)
3487
+ if (source == unsupportleavesItem)
24113488 {
24123489 SupportLeaves(false);
24133490 } else
2414
- if (event.getSource() == hideleavesItem)
3491
+ if (source == hideleavesItem)
24153492 {
24163493 HideLeaves(true);
24173494 } else
2418
- if (event.getSource() == showleavesItem)
3495
+ if (source == showleavesItem)
24193496 {
24203497 HideLeaves(false);
24213498 } else
2422
- if (event.getSource() == markleavesItem)
3499
+ if (source == markleavesItem)
24233500 {
24243501 MarkLeaves(true);
24253502 } else
2426
- if (event.getSource() == unmarkleavesItem)
3503
+ if (source == unmarkleavesItem)
24273504 {
24283505 MarkLeaves(false);
24293506 } else
2430
- if (event.getSource() == flipVItem)
3507
+ if (source == rewindleavesItem)
3508
+ {
3509
+ RewindLeaves(true);
3510
+ } else
3511
+ if (source == unrewindleavesItem)
3512
+ {
3513
+ RewindLeaves(false);
3514
+ } else
3515
+ if (source == randomleavesItem)
3516
+ {
3517
+ RandomLeaves(true);
3518
+ } else
3519
+ if (source == unrandomleavesItem)
3520
+ {
3521
+ RandomLeaves(false);
3522
+ } else
3523
+ if (source == flipVItem)
24313524 {
24323525 FlipV(true);
24333526 } else
2434
- if (event.getSource() == unflipVItem)
3527
+ if (source == unflipVItem)
24353528 {
24363529 FlipV(false);
24373530 } else
2438
- if (event.getSource() == lowTexturesItem)
3531
+ if (source == lowTexturesItem)
24393532 {
24403533 SetTexRes(0);
24413534 } else
2442
- if (event.getSource() == normalTexturesItem)
3535
+ if (source == normalTexturesItem)
24433536 {
24443537 SetTexRes(1);
24453538 } else
2446
- if (event.getSource() == highTexturesItem)
3539
+ if (source == highTexturesItem)
24473540 {
24483541 SetTexRes(2);
24493542 } else
2450
- if (event.getSource() == veryhighTexturesItem)
3543
+ if (source == veryhighTexturesItem)
24513544 {
24523545 SetTexRes(3);
24533546 } else
2454
- if (event.getSource() == maxTexturesItem)
3547
+ if (source == maxTexturesItem)
24553548 {
24563549 SetTexRes(4);
24573550 } else
2458
- if (event.getSource() == panoTexturesItem)
3551
+ if (source == panoTexturesItem)
24593552 {
24603553 SetTexRes(5);
24613554 } else
2462
- if (event.getSource() == reverseNormalsItem)
3555
+ if (source == reverseNormalsItem)
24633556 {
24643557 ReverseNormals();
24653558 } else
2466
- if (event.getSource() == parseverticesItem)
3559
+ if (source == parseverticesItem)
24673560 {
24683561 ParseVertices();
24693562 } else
2470
- if (event.getSource() == textureFieldItem)
3563
+ if (source == textureFieldItem)
24713564 {
24723565 TextureVertices();
24733566 } else
2474
- if (event.getSource() == alignItem)
3567
+ if (source == alignItem)
24753568 {
24763569 Align();
24773570 } else
2478
- if (event.getSource() == mirrorItem)
3571
+ if (source == mirrorItem)
24793572 {
24803573 MirrorPoses();
24813574 } else
2482
- if (event.getSource() == reduceMorphItem)
3575
+ if (source == reduceMorphItem)
24833576 {
24843577 MeshReduction(false);
24853578 } else
2486
- if (event.getSource() == reduce34MorphItem)
3579
+ if (source == reduce34MorphItem)
24873580 {
24883581 MeshReduction(true);
24893582 } else
2490
- if (event.getSource() == reverseTrianglesItem)
3583
+ if (source == reverseTrianglesItem)
24913584 {
24923585 ReverseTriangles();
24933586 } else
2494
- if (event.getSource() == reduceMeshItem)
3587
+ if (source == reduceMeshItem)
24953588 {
24963589 ReduceMesh(false);
24973590 } else
2498
- if (event.getSource() == reduce34MeshItem)
3591
+ if (source == reduce34MeshItem)
24993592 {
25003593 ReduceMesh(true);
25013594 } else
2502
- if (event.getSource() == increaseMeshItem)
3595
+ if (source == increaseMeshItem)
25033596 {
25043597 IncreaseMesh();
25053598 } else
2506
- if (event.getSource() == clipMeshItem)
3599
+ if (source == clipMeshItem)
25073600 {
25083601 ClipMesh();
25093602 } else
2510
- if (event.getSource() == smoothMeshItem)
3603
+ if (source == smoothMeshItem)
25113604 {
25123605 SmoothMesh();
25133606 } else
2514
- if (event.getSource() == transformgeometryItem)
3607
+ if (source == transformGeometryItem)
25153608 {
25163609 TransformGeometry();
25173610 } else
2518
- if (event.getSource() == resetTransformItem)
3611
+ if (source == transformChildrenItem)
3612
+ {
3613
+ TransformChildren();
3614
+ } else
3615
+ if (source == resetTransformItem)
25193616 {
25203617 ResetTransform();
25213618 } else
2522
- if (event.getSource() == resetCentroidItem)
3619
+ if (source == resetCentroidItem)
25233620 {
2524
- ResetCentroid();
3621
+ ResetCentroid(true);
25253622 } else
2526
- if (event.getSource() == resetParentItem)
3623
+ if (source == resetCentroidXZItem)
3624
+ {
3625
+ ResetCentroid(false);
3626
+ } else
3627
+ if (source == resetParentItem)
25273628 {
25283629 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25293630 {
....@@ -2533,7 +3634,7 @@
25333634
25343635 refreshContents();
25353636 } else
2536
- if (event.getSource() == repairParentItem)
3637
+ if (source == repairParentItem)
25373638 {
25383639 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25393640 {
....@@ -2547,7 +3648,7 @@
25473648
25483649 refreshContents();
25493650 } else
2550
- if (event.getSource() == repairShadowItem)
3651
+ if (source == repairShadowItem)
25513652 {
25523653 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25533654 {
....@@ -2561,7 +3662,7 @@
25613662
25623663 refreshContents();
25633664 } else
2564
- if (event.getSource() == sortbysizeItem)
3665
+ if (source == sortbysizeItem)
25653666 {
25663667 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25673668 {
....@@ -2573,7 +3674,7 @@
25733674 ResetModel();
25743675 refreshContents();
25753676 } else
2576
- if (event.getSource() == sortbynameItem)
3677
+ if (source == sortbynameItem)
25773678 {
25783679 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25793680 {
....@@ -2585,7 +3686,7 @@
25853686 ResetModel();
25863687 refreshContents();
25873688 } else
2588
- if (event.getSource() == attachPigmentItem)
3689
+ if (source == attachPigmentItem)
25893690 {
25903691 String texture = GetFile("Attach pigment");
25913692 Object3D obj;
....@@ -2597,7 +3698,7 @@
25973698
25983699 refreshContents();
25993700 } else
2600
- if (event.getSource() == detachPigmentItem)
3701
+ if (source == detachPigmentItem)
26013702 {
26023703 Object3D obj;
26033704 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2608,7 +3709,7 @@
26083709
26093710 refreshContents();
26103711 } else
2611
- if (event.getSource() == attachBumpItem)
3712
+ if (source == attachBumpItem)
26123713 {
26133714 String texture = GetFile("Attach bump");
26143715 Object3D obj;
....@@ -2620,18 +3721,18 @@
26203721
26213722 refreshContents();
26223723 } else
2623
- if (event.getSource() == detachBumpItem)
3724
+ if (source == detachBumpItem)
26243725 {
26253726 Object3D obj;
26263727 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
26273728 {
26283729 obj = (Object3D)e.nextElement();
2629
- obj.SetBumpTexture(null);
3730
+ obj.ResetBumpTexture();
26303731 }
26313732
26323733 refreshContents();
26333734 } else
2634
- if (event.getSource() == pigmentBumpItem)
3735
+ if (source == pigmentBumpItem)
26353736 {
26363737 Object3D obj;
26373738 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2642,159 +3743,233 @@
26423743
26433744 refreshContents();
26443745 } else
2645
- if (event.getSource() == flashSelectionButton)
3746
+ if (source == embedTexturesItem)
3747
+ {
3748
+ Object3D obj;
3749
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3750
+ {
3751
+ obj = (Object3D)e.nextElement();
3752
+ obj.EmbedTextures(true);
3753
+ }
3754
+
3755
+ refreshContents();
3756
+ } else
3757
+ if (source == deEmbedTexturesItem)
3758
+ {
3759
+ Object3D obj;
3760
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3761
+ {
3762
+ obj = (Object3D)e.nextElement();
3763
+ obj.EmbedTextures(false);
3764
+ }
3765
+
3766
+ CameraPane.texturepigment.clear();
3767
+ CameraPane.texturebump.clear();
3768
+
3769
+ refreshContents();
3770
+ } else
3771
+ if (source == flashSelectionButton)
26463772 {
26473773 CameraPane.flash = true;
26483774 refreshContents();
26493775 } else
2650
- if (event.getSource() == oneButton)
3776
+ if (source == oneButton)
26513777 {
26523778 } else
2653
- if (event.getSource() == twoButton)
3779
+ if (source == twoButton)
26543780 {
26553781 radio.layout = twoButton;
2656
- // bug
2657
- //gridPanel.setDividerLocation(1.0);
2658
- //bigPanel.setDividerLocation(0.0);
2659
- bigThree.remove(scenePanel);
2660
- bigThree.remove(centralPanel);
2661
- bigThree.remove(XYZPanel);
2662
- aWindowConstraints.gridx = 0;
2663
- aWindowConstraints.gridy = 0;
2664
- aWindowConstraints.gridwidth = 1;
2665
- // aConstraints.gridheight = 3;
2666
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667
- aWindowConstraints.weightx = 0;
2668
- aWindowConstraints.weighty = 1;
2669
- //bigThree.add(jtp, aWindowConstraints);
2670
- aWindowConstraints.weightx = 1;
2671
- aWindowConstraints.gridwidth = 3;
2672
- // aConstraints.gridheight = 3;
2673
- aWindowConstraints.gridx = 1;
2674
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675
- bigThree.add(centralPanel, aWindowConstraints);
2676
- aWindowConstraints.weightx = 0;
2677
- aWindowConstraints.gridx = 4;
2678
- aWindowConstraints.gridwidth = 1;
2679
- // aConstraints.gridheight = 3;
2680
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681
- //bigThree.add(XYZPanel, aWindowConstraints);
2682
- bigThree.revalidate();
3782
+
3783
+ if (CameraPane.FULLSCREEN)
3784
+ fullscreenLayout = radio.layout;
3785
+
3786
+ Show3DView();
3787
+
3788
+ cameraView.requestFocusInWindow();
3789
+
3790
+// refreshContents(true);
3791
+//
3792
+// try
3793
+// {
3794
+// java.awt.Robot bot = new java.awt.Robot();
3795
+// int mask = InputEvent.BUTTON1_MASK;
3796
+// bot.mouseMove(100, 100);
3797
+// bot.mousePress(mask);
3798
+// bot.mouseRelease(mask);
3799
+// }
3800
+// catch (Exception e)
3801
+// {
3802
+//
3803
+// }
3804
+
26833805 } else
2684
- if (event.getSource() == threeButton)
3806
+ if (source == threeButton)
26853807 {
26863808 radio.layout = threeButton;
2687
- bigThree.remove(scenePanel);
2688
- bigThree.remove(centralPanel);
2689
- bigThree.remove(XYZPanel);
2690
- aWindowConstraints.gridx = 0;
2691
- aWindowConstraints.gridy = 0;
2692
- aWindowConstraints.gridwidth = 1;
2693
- // aConstraints.gridheight = 3;
2694
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695
- aWindowConstraints.weightx = 0;
2696
- aWindowConstraints.weighty = 1;
2697
- //bigThree.add(jtp, aWindowConstraints);
2698
- aWindowConstraints.weightx = 1;
2699
- aWindowConstraints.gridwidth = 3;
2700
- // aConstraints.gridheight = 3;
2701
- aWindowConstraints.gridx = 1;
2702
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703
- bigThree.add(centralPanel, aWindowConstraints);
2704
- aWindowConstraints.weightx = 0;
2705
- aWindowConstraints.gridx = 4;
2706
- aWindowConstraints.gridwidth = 1;
2707
- // aConstraints.gridheight = 3;
2708
- aConstraints.fill = GridBagConstraints.VERTICAL;
2709
- bigThree.add(XYZPanel, aWindowConstraints);
2710
- bigThree.revalidate();
3809
+
3810
+ if (CameraPane.FULLSCREEN)
3811
+ fullscreenLayout = radio.layout;
3812
+
3813
+// bigThree.remove(scenePanel);
3814
+// bigThree.remove(centralPanel);
3815
+// bigThree.remove(XYZPanel);
3816
+// aWindowConstraints.gridx = 0;
3817
+// aWindowConstraints.gridy = 0;
3818
+// aWindowConstraints.gridwidth = 1;
3819
+// // aConstraints.gridheight = 3;
3820
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3821
+// aWindowConstraints.weightx = 0;
3822
+// aWindowConstraints.weighty = 1;
3823
+// //bigThree.add(jtp, aWindowConstraints);
3824
+// aWindowConstraints.weightx = 1;
3825
+// aWindowConstraints.gridwidth = 3;
3826
+// // aConstraints.gridheight = 3;
3827
+// aWindowConstraints.gridx = 1;
3828
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3829
+// bigThree.add(centralPanel, aWindowConstraints);
3830
+// aWindowConstraints.weightx = 0;
3831
+// aWindowConstraints.gridx = 4;
3832
+// aWindowConstraints.gridwidth = 1;
3833
+// // aConstraints.gridheight = 3;
3834
+// aConstraints.fill = GridBagConstraints.VERTICAL;
3835
+// bigThree.add(XYZPanel, aWindowConstraints);
3836
+// bigThree.validate();
3837
+// scenePanel.setVisible(false);
3838
+// centralPanel.setVisible(true);
3839
+// XYZPanel.setVisible(true);
3840
+ bigThree.ClearUI();
3841
+ bigThree.add(scenePanel);
3842
+ bigThree.add(centralPanel);
3843
+ bigThree.FlushUI();
3844
+
3845
+ cameraView.requestFocusInWindow();
27113846 } else
2712
- if (event.getSource() == fourButton)
3847
+ if (source == fourButton)
27133848 {
27143849 radio.layout = fourButton;
2715
- bigThree.remove(scenePanel);
2716
- bigThree.remove(centralPanel);
2717
- bigThree.remove(XYZPanel);
2718
- aWindowConstraints.gridx = 0;
2719
- aWindowConstraints.gridy = 0;
2720
- aWindowConstraints.gridwidth = 1;
2721
- // aWindowConstraints.gridheight = 3;
2722
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723
- aWindowConstraints.weightx = 1;
2724
- aWindowConstraints.weighty = 1;
2725
- bigThree.add(scenePanel, aWindowConstraints);
2726
- aWindowConstraints.weightx = 1;
2727
- aWindowConstraints.gridwidth = 3;
2728
- // aConstraints.gridheight = 3;
2729
- aWindowConstraints.gridx = 1;
2730
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731
- //bigThree.add(cameraPanel, aWindowConstraints);
2732
- aWindowConstraints.weightx = 0;
2733
- aWindowConstraints.gridx = 4;
2734
- aWindowConstraints.gridwidth = 1;
2735
- // aWindowConstraints.gridheight = 3;
2736
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737
- //bigThree.add(XYZPanel, aWindowConstraints);
2738
- bigThree.revalidate();
3850
+
3851
+ if (CameraPane.FULLSCREEN)
3852
+ fullscreenLayout = radio.layout;
3853
+
3854
+// bigThree.remove(scenePanel);
3855
+// bigThree.remove(centralPanel);
3856
+// bigThree.remove(XYZPanel);
3857
+// aWindowConstraints.gridx = 0;
3858
+// aWindowConstraints.gridy = 0;
3859
+// aWindowConstraints.gridwidth = 1;
3860
+// // aWindowConstraints.gridheight = 3;
3861
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3862
+// aWindowConstraints.weightx = 1;
3863
+// aWindowConstraints.weighty = 1;
3864
+// bigThree.add(scenePanel, aWindowConstraints);
3865
+// aWindowConstraints.weightx = 1;
3866
+// aWindowConstraints.gridwidth = 3;
3867
+// // aConstraints.gridheight = 3;
3868
+// aWindowConstraints.gridx = 1;
3869
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3870
+// //bigThree.add(cameraPanel, aWindowConstraints);
3871
+// aWindowConstraints.weightx = 0;
3872
+// aWindowConstraints.gridx = 4;
3873
+// aWindowConstraints.gridwidth = 1;
3874
+// // aWindowConstraints.gridheight = 3;
3875
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3876
+// //bigThree.add(XYZPanel, aWindowConstraints);
3877
+// bigThree.validate();
3878
+// scenePanel.setVisible(true);
3879
+// centralPanel.setVisible(false);
3880
+// XYZPanel.setVisible(false);
3881
+ bigThree.ClearUI();
3882
+ bigThree.add(scenePanel);
3883
+ bigThree.FlushUI();
3884
+
3885
+ cameraView.requestFocusInWindow();
27393886 } else
2740
- if (event.getSource() == sixButton)
3887
+ if (source == sixButton)
27413888 {
27423889 radio.layout = sixButton;
2743
- bigThree.remove(scenePanel);
2744
- bigThree.remove(centralPanel);
2745
- bigThree.remove(XYZPanel);
2746
- aWindowConstraints.gridx = 0;
2747
- aWindowConstraints.gridy = 0;
2748
- aWindowConstraints.gridwidth = 1;
2749
- // aConstraints.gridheight = 3;
2750
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751
- aWindowConstraints.weightx = 0;
2752
- aWindowConstraints.weighty = 1;
2753
- bigThree.add(scenePanel, aWindowConstraints);
2754
- aWindowConstraints.weightx = 1;
2755
- aWindowConstraints.gridwidth = 3;
2756
- // aWindowConstraints.gridheight = 3;
2757
- aWindowConstraints.gridx = 1;
2758
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759
- bigThree.add(centralPanel, aWindowConstraints);
2760
- aWindowConstraints.weightx = 0;
2761
- aWindowConstraints.gridx = 4;
2762
- aWindowConstraints.gridwidth = 1;
2763
- // aWindowConstraints.gridheight = 3;
2764
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765
- //bigThree.add(XYZPanel, aConstraints);
2766
- bigThree.revalidate();
3890
+
3891
+ if (CameraPane.FULLSCREEN)
3892
+ fullscreenLayout = radio.layout;
3893
+
3894
+// bigThree.remove(scenePanel);
3895
+// bigThree.remove(centralPanel);
3896
+// bigThree.remove(XYZPanel);
3897
+// aWindowConstraints.gridx = 0;
3898
+// aWindowConstraints.gridy = 0;
3899
+// aWindowConstraints.gridwidth = 1;
3900
+// // aConstraints.gridheight = 3;
3901
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3902
+// aWindowConstraints.weightx = 0;
3903
+// aWindowConstraints.weighty = 1;
3904
+// bigThree.add(scenePanel, aWindowConstraints);
3905
+// aWindowConstraints.weightx = 1;
3906
+// aWindowConstraints.gridwidth = 3;
3907
+// // aWindowConstraints.gridheight = 3;
3908
+// aWindowConstraints.gridx = 1;
3909
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3910
+// bigThree.add(centralPanel, aWindowConstraints);
3911
+// aWindowConstraints.weightx = 0;
3912
+// aWindowConstraints.gridx = 4;
3913
+// aWindowConstraints.gridwidth = 1;
3914
+// // aWindowConstraints.gridheight = 3;
3915
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3916
+// //bigThree.add(XYZPanel, aConstraints);
3917
+// bigThree.validate();
3918
+// scenePanel.setVisible(true);
3919
+// centralPanel.setVisible(true);
3920
+// XYZPanel.setVisible(false);
3921
+ bigThree.ClearUI();
3922
+ bigThree.add(centralPanel);
3923
+ bigThree.add(scenePanel);
3924
+ bigThree.FlushUI();
3925
+
3926
+ cameraView.requestFocusInWindow();
27673927 } else
2768
- if (event.getSource() == sevenButton)
3928
+ if (source == sevenButton)
27693929 {
27703930 radio.layout = sevenButton;
2771
- bigThree.remove(scenePanel);
2772
- bigThree.remove(centralPanel);
2773
- bigThree.remove(XYZPanel);
2774
- aWindowConstraints.gridx = 0;
2775
- aWindowConstraints.gridy = 0;
2776
- aWindowConstraints.gridwidth = 1;
2777
- // aWindowConstraints.gridheight = 3;
2778
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779
- aWindowConstraints.weightx = 0;
2780
- aWindowConstraints.weighty = 1;
2781
- bigThree.add(scenePanel, aWindowConstraints);
2782
- aWindowConstraints.weightx = 1;
2783
- aWindowConstraints.gridwidth = 3;
2784
- // aWindowConstraints.gridheight = 3;
2785
- aWindowConstraints.gridx = 1;
2786
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787
- bigThree.add(centralPanel, aWindowConstraints);
2788
- aWindowConstraints.weightx = 0;
2789
- aWindowConstraints.gridx = 4;
2790
- aWindowConstraints.gridwidth = 1;
2791
- // aConstraints.gridheight = 3;
2792
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793
- bigThree.add(XYZPanel, aWindowConstraints);
2794
- bigThree.revalidate();
3931
+
3932
+ if (CameraPane.FULLSCREEN)
3933
+ fullscreenLayout = radio.layout;
3934
+
3935
+// bigThree.remove(scenePanel);
3936
+// bigThree.remove(centralPanel);
3937
+// bigThree.remove(XYZPanel);
3938
+// aWindowConstraints.gridx = 0;
3939
+// aWindowConstraints.gridy = 0;
3940
+// aWindowConstraints.gridwidth = 1;
3941
+// // aWindowConstraints.gridheight = 3;
3942
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3943
+// aWindowConstraints.weightx = 0;
3944
+// aWindowConstraints.weighty = 1;
3945
+// bigThree.add(scenePanel, aWindowConstraints);
3946
+// aWindowConstraints.weightx = 1;
3947
+// aWindowConstraints.gridwidth = 3;
3948
+// // aWindowConstraints.gridheight = 3;
3949
+// aWindowConstraints.gridx = 1;
3950
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3951
+// bigThree.add(centralPanel, aWindowConstraints);
3952
+// aWindowConstraints.weightx = 0;
3953
+// aWindowConstraints.gridx = 4;
3954
+// aWindowConstraints.gridwidth = 1;
3955
+// // aConstraints.gridheight = 3;
3956
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3957
+// bigThree.add(XYZPanel, aWindowConstraints);
3958
+// bigThree.validate();
3959
+// scenePanel.setVisible(true);
3960
+// centralPanel.setVisible(true);
3961
+// XYZPanel.setVisible(true);
3962
+ bigThree.ClearUI();
3963
+ bigThree.add(scenePanel);
3964
+ bigThree.add(centralPanel);
3965
+ bigThree.add(XYZPanel);
3966
+ bigThree.FlushUI();
3967
+
3968
+ cameraView.requestFocusInWindow();
27953969 } else
2796
- if (event.getSource() == rootButton)
3970
+ if (source == rootButton)
27973971 {
3972
+ Replace();
27983973 Object3D obj;
27993974 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28003975 {
....@@ -2803,66 +3978,87 @@
28033978 EditObject(obj);
28043979 }
28053980
3981
+ cameraView.requestFocusInWindow();
28063982 refreshContents(true);
28073983 } else
2808
- if (event.getSource() == closeButton)
3984
+ if (source == closeButton)
28093985 {
28103986 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3987
+ Replace();
3988
+
28113989 cRadio ab;
28123990 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
28133991 {
28143992 ab = (cRadio)e.nextElement();
2815
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3993
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
28163994 {
3995
+ // Patch to avoid bug with transparency.
3996
+ if (!ab.hadMaterial)
3997
+ {
3998
+ ab.object.material = null;
3999
+ }
4000
+
28174001 buttonGroup.remove(ab);
28184002 radioPanel.remove(ab);
28194003
2820
- ab.GetObject().editWindow = null;
4004
+ //ab.GetObject().editWindow = null;
4005
+ ab.GetObject().manipWindow = null;
28214006 // ab.GetObject().objectUI = null; // ?????????
28224007
28234008 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
28244009 break;
28254010 }
28264011 }
4012
+
4013
+ cameraView.requestFocusInWindow();
28274014 refreshContents(true);
28284015 } else
2829
- if (event.getSource() == editItem || event.getSource() == editButton)
4016
+ if (source == editItem || source == editButton)
28304017 {
4018
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4019
+ {
4020
+ Object3D child = (Object3D)e.nextElement();
4021
+ child.pinned = true;
4022
+ }
4023
+
28314024 EditSelection(false);
28324025 } else
2833
- if (event.getSource() == uneditButton)
4026
+ if (source == uneditButton)
28344027 {
28354028 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28364029 {
28374030 Object3D child = (Object3D)e.nextElement();
28384031 if(child.editWindow != null)
2839
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4032
+ child.pinned = false;
28404033 child.CloseUI();
28414034 listUI.remove(child);
4035
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
28424036
2843
- child.editWindow = null; // ???????????
4037
+ //child.editWindow = null; // ???????????
28444038 }
2845
- objEditor.ctrlPanel.revalidate();
4039
+ objEditor.ctrlPanel.FlushUI();
28464040 //objEditor.jTree.clearSelection();
28474041 //objEditor.ResetSliders();
28484042 refreshContents(true);
28494043 } else
2850
- if (event.getSource() == clearPanelButton)
4044
+ if (source == clearPanelButton)
28514045 {
28524046 assert(copy == group);
28534047 //copy.ClearUI();
28544048 for (Object3D obj : listUI)
28554049 {
4050
+ obj.pinned = false;
28564051 obj.CloseUI();
28574052 }
28584053 listUI.clear();
4054
+ SetPinStates(group.selection.size() > 0);
28594055 refreshContents(true);
28604056 } else
2861
- if (event.getSource() == allParamsButton)
4057
+ if (source == allParamsButton)
28624058 {
28634059 assert(copy == group);
28644060
2865
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4061
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
28664062
28674063 for (Object3D obj : listUI)
28684064 {
....@@ -2879,19 +4075,21 @@
28794075
28804076 refreshContents(true);
28814077 } else
2882
- if (event.getSource() == unselectButton)
4078
+ if (source == unselectButton)
28834079 {
28844080 objEditor.jTree.clearSelection();
28854081 // ?? oct 2012 GrafreeD.clipboard.clear();
28864082 objEditor.ResetSliders();
28874083 refreshContents(true);
28884084 } else
2889
- if(event.getSource() instanceof cRadio)
4085
+ if(source instanceof cRadio)
28904086 {
4087
+ Replace();
4088
+
28914089 group.parent = keepparent;
28924090 group.attributes = 0;
28934091 //group.editWindow = null;
2894
- /*cRadio*/ radio = (cRadio)event.getSource();
4092
+ /*cRadio*/ radio = (cRadio)source;
28954093 Object3D obj = radio.GetObject();
28964094 System.out.println("Edit " + obj);
28974095 if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
....@@ -2911,7 +4109,8 @@
29114109 }
29124110
29134111 copy = group;
2914
- //CameraPane.theRenderer.object = group;
4112
+
4113
+ //Globals.theRenderer.object = group;
29154114 if(!useclient)
29164115 {
29174116 cameraView.renderCamera = radio.camera;
....@@ -2920,25 +4119,80 @@
29204119 cameraView.cameras[cameraView.cameracount] = radio.camera;
29214120 cameraView.targetLookAt.set(radio.camera.lookAt);
29224121 cameraView.object = group;
2923
- cameraView.lighttouched = true;
4122
+ //cameraView.lighttouched = true;
4123
+ Globals.lighttouched = true;
29244124 topView.object = group;
29254125 frontView.object = group;
29264126 sideView.object = group;
29274127 }
2928
- group.editWindow = this;
4128
+
4129
+// fix "+" issue
4130
+ //group.editWindow = this;
4131
+ group.manipWindow = this;
4132
+
29294133 /*
29304134 currentLayout = radio.layout;
29314135 if (currentLayout == null)
29324136 currentLayout = sevenButton;
29334137 */
29344138 radio.layout.doClick();
4139
+
4140
+ assert(copy instanceof Composite);
4141
+
4142
+ if (copy.versionlist == null)
4143
+ {
4144
+ copy.versionindex = -1;
4145
+
4146
+ // Cannot work with loops
4147
+ // To fix this issue, we first mark all nodes above the root,
4148
+ // and check if any of these nodes are reachable below the root.
4149
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4150
+
4151
+ if (copy.versionlist == null && !copy.HasTags())
4152
+ {
4153
+ copy.versionlist = new Object3D[100];
4154
+
4155
+ //Save(true);
4156
+ }
4157
+ else
4158
+ copy.versionindex = -2;
4159
+
4160
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4161
+ }
4162
+
4163
+ SetVersionStates();
4164
+
4165
+ ClearUnpinned();
4166
+
4167
+ //Grafreed.Assert(group != null);
4168
+ //Grafreed.Assert(group.selection != null);
4169
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4170
+ if (group.selection == null || group.selection.size() == 1)
4171
+ EditSelection(false);
29354172 keepparent = group.parent;
29364173 // PARENT = NULL or not???
29374174 //group.parent = null; // ROOT
29384175 //group.attributes = -1;
29394176 ResetModel();
4177
+
4178
+ cameraView.requestFocusInWindow();
29404179 refreshContents(true);
2941
- }
4180
+ } else if (event.getSource() == editCameraItem)
4181
+ {
4182
+ cameraView.ProtectCamera();
4183
+ cameraView.requestFocusInWindow();
4184
+ cameraView.repaint();
4185
+ return;
4186
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
4187
+ {
4188
+ cameraView.RevertCamera();
4189
+ cameraView.requestFocusInWindow();
4190
+ cameraView.repaint();
4191
+ return;
4192
+ // } else if (event.getSource() == textureButton)
4193
+ // {
4194
+ // return; // true;
4195
+ }
29424196 else
29434197 {
29444198 //return super.action(event, arg);
....@@ -2947,7 +4201,6 @@
29474201 }
29484202
29494203 boolean useclient = false;
2950
- cRadio radio;
29514204
29524205 void ToggleRoot()
29534206 {
....@@ -2956,7 +4209,7 @@
29564209 if (useclient)
29574210 {
29584211 cameraView.object = client;
2959
- cameraView.lighttouched = true;
4212
+ Globals.lighttouched = true;
29604213 //topView.object = client;
29614214 //frontView.object = client;
29624215 //sideView.object = client;
....@@ -2964,7 +4217,7 @@
29644217 else
29654218 {
29664219 cameraView.object = group;
2967
- cameraView.lighttouched = true;
4220
+ Globals.lighttouched = true;
29684221 //topView.object = group;
29694222 //frontView.object = group;
29704223 //sideView.object = group;
....@@ -2999,6 +4252,28 @@
29994252 refreshContents();
30004253 }
30014254
4255
+ void TransformChildren()
4256
+ {
4257
+ Object3D obj;
4258
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4259
+ {
4260
+ obj = (Object3D)e.nextElement();
4261
+ obj.KeepTextureMatrices();
4262
+ obj.TransformChildren();
4263
+ obj.RestoreTextureMatrices();
4264
+
4265
+// if (obj.parent == null)
4266
+// {
4267
+// System.out.println("NULL PARENT!");
4268
+// new Exception().printStackTrace();
4269
+// }
4270
+// else
4271
+// TouchTransform(obj);
4272
+// //obj.parent.Touch();
4273
+ }
4274
+
4275
+ refreshContents();
4276
+ }
30024277
30034278 void ResetTransform()
30044279 {
....@@ -3030,7 +4305,7 @@
30304305 TouchTransform(obj);
30314306 continue;
30324307 }
3033
- if ((mask&2) != 0) // Scale
4308
+ if ((mask&2) != 0) // Scale/rotation
30344309 {
30354310 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
30364311 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -3038,10 +4313,6 @@
30384313 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
30394314 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
30404315 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3041
- }
3042
- if ((mask&4) != 0) // Rotation
3043
- {
3044
- // ?
30454316 }
30464317 if ((mask&1) != 0) // Translation
30474318 {
....@@ -3111,7 +4382,7 @@
31114382 refreshContents();
31124383 }
31134384
3114
- void ResetCentroid()
4385
+ void ResetCentroid(boolean full)
31154386 {
31164387 Object3D obj;
31174388 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3126,12 +4397,16 @@
31264397 LA.matIdentity(Object3D.mat);
31274398 obj.getBounds(minima, maxima, false);
31284399 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3129
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4400
+ if (full)
4401
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
31304402 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
31314403 obj.TransformMesh(Object3D.mat);
4404
+
31324405 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3133
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4406
+ if (full)
4407
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
31344408 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4409
+
31354410 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
31364411 //Object3D.mat[3][0] = -Object3D.mat[3][0];
31374412 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3160,7 +4435,8 @@
31604435
31614436 int size = obj.MemorySize();
31624437
3163
- System.err.println((size/1024) + " KB is the size of " + obj);
4438
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4439
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
31644440 }
31654441 }
31664442 catch (Exception e)
....@@ -3197,9 +4473,9 @@
31974473 obj = (Object3D)e.nextElement();
31984474
31994475 System.out.println("Object is: " + obj);
3200
- GrafreeD.AnalyzeObject(obj);
4476
+ Grafreed.AnalyzeObject(obj);
32014477 System.out.println("Boundary rep: " + obj.bRep);
3202
- GrafreeD.AnalyzeObject(obj.bRep);
4478
+ Grafreed.AnalyzeObject(obj.bRep);
32034479
32044480 // System.err.println((size/1024) + " KB is the size of " + obj);
32054481 }
....@@ -3241,6 +4517,13 @@
32414517 void GenNormals(boolean crease)
32424518 {
32434519 group.GenNormalsS(crease);
4520
+
4521
+ refreshContents();
4522
+ }
4523
+
4524
+ void GenNormalsMESH()
4525
+ {
4526
+ group.GenNormalsMeshS();
32444527
32454528 refreshContents();
32464529 }
....@@ -3413,8 +4696,8 @@
34134696
34144697 void ParseVertices()
34154698 {
3416
- boolean epsequal = GrafreeD.epsequal;
3417
- GrafreeD.epsequal = true;
4699
+ boolean epsequal = Grafreed.epsequal;
4700
+ Grafreed.epsequal = true;
34184701
34194702 for (int i=0; i<group.selection.size(); i++)
34204703 {
....@@ -3439,7 +4722,7 @@
34394722 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
34404723 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
34414724
3442
- g.add(GrafreeD.clipboard);
4725
+ g.add(Grafreed.clipboard);
34434726
34444727 buffer.add(g);
34454728 }
....@@ -3454,7 +4737,7 @@
34544737 makeSomething(buffer, i==group.selection.size()-1);
34554738 }
34564739
3457
- GrafreeD.epsequal = epsequal;
4740
+ Grafreed.epsequal = epsequal;
34584741
34594742 refreshContents();
34604743 }
....@@ -3472,7 +4755,16 @@
34724755 String pigment = Object3D.GetPigment(tex);
34734756 //String bump = Object3D.GetBump(tex);
34744757
3475
- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
4758
+ com.sun.opengl.util.texture.TextureData texturedata = null;
4759
+
4760
+ try
4761
+ {
4762
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4763
+ }
4764
+ catch (Exception e)
4765
+ {
4766
+ System.err.println("FAIL: " + node);
4767
+ }
34764768
34774769 double s = v.s;
34784770
....@@ -3560,11 +4852,11 @@
35604852
35614853 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
35624854
3563
- boolean random = CameraPane.RANDOM;
3564
- CameraPane.RANDOM = false; // parse all random nodes
4855
+ boolean random = CameraPane.SWITCH;
4856
+ CameraPane.SWITCH = false; // parse all random nodes
35654857 lowres.linkVerticesThis(null);
35664858 lowres.linkVerticesThis(sn);
3567
- CameraPane.RANDOM = random;
4859
+ CameraPane.SWITCH = random;
35684860
35694861 System.err.flush();
35704862
....@@ -3604,7 +4896,7 @@
36044896 return;
36054897
36064898 Object3D poses = group.selection.get(0);
3607
- Object3D ref = GrafreeD.clipboard.get(0);
4899
+ Object3D ref = Grafreed.clipboard.get(0);
36084900
36094901 Object3D newgroup = new Object3D("Po:" + poses.name);
36104902
....@@ -3773,7 +5065,7 @@
37735065 group.selection.RelinkToSupport(); // july 2014
37745066 System.out.println("DONE.");
37755067 refreshContents();
3776
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
5068
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
37775069 }
37785070
37795071 void ReduceMesh(boolean reduction34)
....@@ -3798,9 +5090,9 @@
37985090
37995091 void ClipMesh()
38005092 {
3801
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
5093
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
38025094 {
3803
- Object3D content = GrafreeD.clipboard.get(0);
5095
+ Object3D content = Grafreed.clipboard.get(0);
38045096
38055097 if (content instanceof cGroup && ((cGroup)content).transientlink )
38065098 content = ((cGroup)content).get(0);
....@@ -3809,7 +5101,7 @@
38095101 // {
38105102 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
38115103 // }
3812
- group.selection.ClipMesh(GrafreeD.clipboard);
5104
+ group.selection.ClipMesh(Grafreed.clipboard);
38135105 }
38145106 // group.selection.ClipMesh(GrafreeD.clipboard);
38155107 System.out.println("DONE.");
....@@ -3826,6 +5118,12 @@
38265118 void ClearMaterials()
38275119 {
38285120 group.selection.ClearMaterials();
5121
+ refreshContents();
5122
+ }
5123
+
5124
+ void ClearVersions()
5125
+ {
5126
+ group.selection.ClearVersions();
38295127 refreshContents();
38305128 }
38315129
....@@ -3856,6 +5154,18 @@
38565154 void MarkLeaves(boolean hide)
38575155 {
38585156 group.selection.MarkLeaves(hide);
5157
+ refreshContents();
5158
+ }
5159
+
5160
+ void RewindLeaves(boolean hide)
5161
+ {
5162
+ group.selection.RewindLeaves(hide);
5163
+ refreshContents();
5164
+ }
5165
+
5166
+ void RandomLeaves(boolean hide)
5167
+ {
5168
+ group.selection.RandomLeaves(hide);
38595169 refreshContents();
38605170 }
38615171
....@@ -3930,28 +5240,25 @@
39305240 // }
39315241 // }
39325242
3933
- static boolean allparams = true;
3934
-
3935
- static Vector<Object3D> listUI = new Vector<Object3D>();
3936
-
39375243 void EditSelection(boolean newWindow)
39385244 {
5245
+ if (group.selection == null)
5246
+ {
5247
+ EditElement(group, newWindow); // ? new
5248
+ return;
5249
+ }
5250
+
39395251 // aConstraints.gridy = 0;
39405252 for (int i=0; i<group.selection.size(); i++)
39415253 {
39425254 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
39435255 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3944
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5256
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
39455257
39465258 Object3D elem = (Object3D)group.selection.elementAt(i);
3947
- if(elem != group)
5259
+ if(elem != group || !newWindow)
39485260 {
3949
- // if (!(elem instanceof Composite))
3950
- // newWindow = false;
3951
- listUI.add(elem);
3952
- elem.openEditWindow(this, newWindow); //, false);
3953
- System.out.println("edit : " + elem);
3954
- elem.editWindow.refreshContents(true); // ? new
5261
+ EditElement(elem, newWindow); // ? new
39555262 }
39565263 }
39575264 }
....@@ -4014,9 +5321,7 @@
40145321
40155322 freezemodel = false;
40165323 }
4017
-
4018
- boolean flashIt = true;
4019
-
5324
+
40205325 public void valueChanged(TreeSelectionEvent e)
40215326 //public boolean handleEvent(Event event)
40225327 {
....@@ -4026,7 +5331,8 @@
40265331 //new Exception().printStackTrace();
40275332
40285333 freezemodel = true;
4029
-
5334
+ ClearUnpinned();
5335
+
40305336 /**/
40315337 //switch (event.id)
40325338 {
....@@ -4034,7 +5340,6 @@
40345340 //case 702: // Event.LIST_DESELECT
40355341 group.deselectAll();
40365342 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4037
- objEditor.ClearInfo(); // .GetMaterial());
40385343 if (tps != null)
40395344 {
40405345 for (int i=0; i < tps.length; i++)
....@@ -4043,33 +5348,39 @@
40435348
40445349 //if (child.parent != null)
40455350 //child.parent.addSelectee(child);
5351
+ objEditor.SetMaterial(child);
40465352 group.addSelectee(child);
4047
- objEditor.SetMaterial(child); // .GetMaterial());
4048
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4049
- System.err.println("info : " + child.GetPath());
40505353 }
40515354 }
4052
- else
4053
- {
4054
- objEditor.SetMaterial(group); // .GetMaterial());
4055
- objEditor.AddInfo(group, this, true); // .GetMaterial());
4056
- System.err.println("info : " + group.GetPath());
4057
- }
5355
+// else
5356
+// {
5357
+// objEditor.SetMaterial(group); // .GetMaterial());
5358
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
5359
+// System.err.println("info : " + group.GetPath());
5360
+// }
40585361
4059
- objEditor.SetText(); // jan 2014
4060
-
4061
- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5362
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
40625363 CameraPane.flash = true;
40635364
4064
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5365
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
40655366 // a camera
40665367 {
4067
- CameraPane.camerachangeframe = 0; // don't refuse it
4068
- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4069
- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4070
- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
5368
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5369
+ {
5370
+ CameraPane.camerachangeframe = 0; // don't refuse it
5371
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5372
+ }
5373
+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5374
+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
40715375 }
40725376
5377
+ if (tps != null && tps.length == 1)
5378
+ {
5379
+ EditSelection(false);
5380
+ }
5381
+
5382
+ SetPinStates(tps != null && tps.length > 0);
5383
+
40735384 refreshContents();
40745385 //return true;
40755386 }
....@@ -4078,6 +5389,53 @@
40785389
40795390 freezemodel = false;
40805391 }
5392
+
5393
+ void SetPinStates(boolean enabled)
5394
+ {
5395
+ editButton.setEnabled(enabled);
5396
+ uneditButton.setEnabled(enabled);
5397
+ //unselectButton.setEnabled(enabled);
5398
+ flashSelectionButton.setEnabled(enabled);
5399
+
5400
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5401
+
5402
+ boolean allComposites = true;
5403
+
5404
+ if (group.selection != null)
5405
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5406
+ {
5407
+ Object next = e.nextElement();
5408
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5409
+ {
5410
+ allComposites = false;
5411
+ break;
5412
+ }
5413
+ }
5414
+
5415
+ rootButton.setEnabled(allComposites);
5416
+ }
5417
+
5418
+ void refreshContents(boolean cp)
5419
+ {
5420
+ if (Globals.ADVANCED)
5421
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5422
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5423
+ {
5424
+ objEditor.ClearInfo(); // .GetMaterial());
5425
+
5426
+ for (int i=0; i < group.selection.Size(); i++)
5427
+ {
5428
+ Object3D child = (Object3D) group.selection.get(i);
5429
+
5430
+ objEditor.AddInfo(child, this, true);
5431
+// System.err.println("info : " + child.GetPath());
5432
+ }
5433
+
5434
+ objEditor.SetText(); // jan 2014
5435
+ }
5436
+
5437
+ super.refreshContents(cp);
5438
+ }
40815439
40825440 void linkSomething(Object3D thing)
40835441 {
....@@ -4149,16 +5507,19 @@
41495507 {
41505508 if (group.selection.isEmpty())
41515509 return;
4152
- GrafreeD.clipboardIsTempGroup = false;
5510
+
5511
+ Grafreed.clipboardIsTempGroup = false;
41535512 Composite tGroup = null;
41545513 if (group.selection.size() > 0) // 1)
41555514 {
41565515 tGroup = new cGroup();
4157
- GrafreeD.clipboardIsTempGroup = true;
5516
+ Grafreed.clipboardIsTempGroup = true;
41585517 }
41595518
41605519 if (cut)
41615520 {
5521
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5522
+// Save();
41625523 //int indices[] = jList.getSelectedIndices();
41635524 //for (int i = indices.length - 1; i >= 0; i--)
41645525 //jList.remove(indices[i]);
....@@ -4194,16 +5555,16 @@
41945555 //System.out.println("cut " + child);
41955556 //System.out.println("parent = " + child.parent);
41965557 // tmp.addChild(child);
4197
- if (GrafreeD.clipboardIsTempGroup)
5558
+ if (Grafreed.clipboardIsTempGroup)
41985559 tGroup.add/*Child*/(tmp);
41995560 else
4200
- GrafreeD.clipboard = tmp;
5561
+ Grafreed.clipboard = tmp;
42015562 }
42025563 else
4203
- if (GrafreeD.clipboardIsTempGroup)
5564
+ if (Grafreed.clipboardIsTempGroup)
42045565 tGroup.add/*Child*/(child);
42055566 else
4206
- GrafreeD.clipboard = child;
5567
+ Grafreed.clipboard = child;
42075568 }
42085569
42095570 //ResetModel();
....@@ -4235,21 +5596,23 @@
42355596 //System.out.println("cut " + elem);
42365597 //System.out.println("parent = " + elem.parent);
42375598 // tmp.addChild(elem);
4238
- if (GrafreeD.clipboardIsTempGroup)
5599
+ if (Grafreed.clipboardIsTempGroup)
42395600 tGroup.add/*Child*/(tmp);
42405601 else
4241
- GrafreeD.clipboard = tmp;
5602
+ Grafreed.clipboard = tmp;
42425603 }
42435604 else
4244
- if (GrafreeD.clipboardIsTempGroup)
5605
+ if (Grafreed.clipboardIsTempGroup)
42455606 tGroup.add/*Child*/(child);
42465607 else
4247
- GrafreeD.clipboard = child;
5608
+ Grafreed.clipboard = child;
42485609 }
42495610
42505611 }
4251
- if (GrafreeD.clipboardIsTempGroup)
4252
- GrafreeD.clipboard = tGroup;
5612
+
5613
+ if (Grafreed.clipboardIsTempGroup)
5614
+ Grafreed.clipboard = tGroup;
5615
+
42535616 if (cut)
42545617 {
42555618 ResetModel();
....@@ -4259,11 +5622,15 @@
42595622
42605623 void paste(boolean expand)
42615624 {
5625
+ if (Globals.REPLACEONMAKE)
5626
+ Save();
5627
+ boolean keep = Globals.REPLACEONMAKE;
5628
+ Globals.REPLACEONMAKE = false;
42625629 // if (GrafreeD.clipboard == null)
42635630 // return;
42645631 boolean first = true;
42655632
4266
- if (GrafreeD.clipboardIsTempGroup)
5633
+ if (Grafreed.clipboardIsTempGroup)
42675634 {
42685635 Composite temp;
42695636
....@@ -4274,7 +5641,7 @@
42745641 temp = (Composite)Applet3D.clipboard.deepCopy();
42755642 */
42765643 Object3D elem;
4277
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
5644
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
42785645 {
42795646 Object3D child = (Object3D)e.nextElement();
42805647
....@@ -4308,21 +5675,22 @@
43085675 //Object3D cb = Applet3D.clipboard;
43095676 //temp.addChild(cb);
43105677 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4311
- assert(GrafreeD.clipboard.parent == null);
4312
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4313
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4314
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4315
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
5678
+ assert(Grafreed.clipboard.parent == null);
5679
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
5680
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
5681
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
5682
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
43165683 else
4317
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4318
- GrafreeD.clipboard.get(0).parent = keepparent;
5684
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5685
+ Grafreed.clipboard.get(0).parent = keepparent;
43195686 }
43205687
5688
+ Globals.REPLACEONMAKE = keep;
43215689 ResetModel();
43225690 refreshContents();
43235691 }
43245692
4325
- void pasteInto(boolean copyit)
5693
+ void pasteInto(boolean copyit, boolean clone)
43265694 {
43275695 // if (GrafreeD.clipboard == null)
43285696 // return;
....@@ -4351,15 +5719,22 @@
43515719 if (copyit)
43525720 {
43535721 // paste(false);
4354
- CloneClipboard(false); // sept 2014
5722
+ if (clone)
5723
+ {
5724
+ CloneClipboard(false); // sept 2014
5725
+ }
5726
+ else
5727
+ {
5728
+ paste(false);
5729
+ }
43555730 }
43565731 else
43575732 {
43585733 boolean first = true;
43595734
4360
- if (GrafreeD.clipboardIsTempGroup)
5735
+ if (Grafreed.clipboardIsTempGroup)
43615736 {
4362
- Composite temp = (Composite)GrafreeD.clipboard;
5737
+ Composite temp = (Composite)Grafreed.clipboard;
43635738 Object3D copy;
43645739 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
43655740 {
....@@ -4369,7 +5744,7 @@
43695744 }
43705745 } else
43715746 {
4372
- linkSomething(GrafreeD.clipboard); //.get(0));
5747
+ linkSomething(Grafreed.clipboard); //.get(0));
43735748 }
43745749 }
43755750 }
....@@ -4446,6 +5821,10 @@
44465821
44475822 void group(Object3D csg, boolean grab)
44485823 {
5824
+ if (Globals.REPLACEONMAKE)
5825
+ Save();
5826
+ boolean keep = Globals.REPLACEONMAKE;
5827
+ Globals.REPLACEONMAKE = false;
44495828 if (//false) // why??
44505829 !group.selection.isEmpty())
44515830 {
....@@ -4559,10 +5938,15 @@
45595938 //node.add(csg);
45605939 //makeSomething(node);
45615940 makeSomething(csg);
5941
+ Globals.REPLACEONMAKE = keep;
45625942 }
45635943
45645944 void Ungroup(Object3D g)
45655945 {
5946
+ if (Globals.REPLACEONMAKE)
5947
+ Save();
5948
+ boolean keep = Globals.REPLACEONMAKE;
5949
+ Globals.REPLACEONMAKE = false;
45665950 if (g instanceof HiddenObject)
45675951 {
45685952 HiddenObject h = (HiddenObject) g;
....@@ -4579,6 +5963,7 @@
45795963 objEditor.makeSomething(g.get(i), false);
45805964 }
45815965 }
5966
+ Globals.REPLACEONMAKE = keep;
45825967 }
45835968
45845969 void ungroup()
....@@ -4774,21 +6159,6 @@
47746159 }
47756160 */
47766161
4777
- void ImportGFD()
4778
- {
4779
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4780
- browser.show();
4781
- String filename = browser.getFile();
4782
- if (filename != null && filename.length() > 0)
4783
- {
4784
- String fullname = browser.getDirectory() + filename;
4785
-
4786
- //Object3D readobj =
4787
- objEditor.ReadGFD(fullname, objEditor);
4788
- //makeSomething(readobj);
4789
- }
4790
- }
4791
-
47926162 /*
47936163 public void Callback(Object obj)
47946164 {
....@@ -4812,26 +6182,9 @@
48126182 }
48136183 */
48146184
4815
- void ImportVRMLX3D()
4816
- {
4817
- if (GrafreeD.standAlone)
4818
- {
4819
- /**/
4820
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4821
- browser.show();
4822
- String filename = browser.getFile();
4823
- if (filename != null && filename.length() > 0)
4824
- {
4825
- String fullname = browser.getDirectory() + filename;
4826
- LoadVRMLX3D(fullname);
4827
- }
4828
- /**/
4829
- }
4830
- }
4831
-
48326185 String GetFile(String dialogName)
48336186 {
4834
- if (GrafreeD.standAlone)
6187
+ if (Grafreed.standAlone)
48356188 {
48366189 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
48376190 browser.show();
....@@ -4895,10 +6248,48 @@
48956248 cButton flashSelectionButton;
48966249 cButton editButton;
48976250 cButton uneditButton;
6251
+ JCheckBox allParamsButton;
48986252 cButton clearpanelButton;
4899
- cButton allParamsButton;
49006253 cButton unselectButton;
49016254
6255
+ cButton restoreCameraButton;
6256
+
6257
+ cButton oneStepButton;
6258
+
6259
+ cButton groupButton;
6260
+ cButton ungroupButton;
6261
+ cButton compositeButton;
6262
+ cButton switchButton;
6263
+ cButton loopButton;
6264
+ cButton textureButton;
6265
+
6266
+ cButton skybox1Button;
6267
+ cButton skybox2Button;
6268
+ cButton skybox3Button;
6269
+ cButton skybox4Button;
6270
+ cButton skybox5Button;
6271
+ cButton skybox6Button;
6272
+ cButton skybox7Button;
6273
+
6274
+ cButton skybox11Button;
6275
+ cButton skybox12Button;
6276
+ cButton skybox13Button;
6277
+ cButton skybox14Button;
6278
+ cButton skybox15Button;
6279
+ cButton skybox16Button;
6280
+ cButton skybox17Button;
6281
+
6282
+ cButton gridButton;
6283
+ cButton boxButton;
6284
+ cButton sphereButton;
6285
+ cButton coneButton;
6286
+ cButton torusButton;
6287
+ cButton superButton;
6288
+ cButton kleinButton;
6289
+ cButton particlesButton;
6290
+ cButton overlayButton;
6291
+ cButton lightButton;
6292
+
49026293 cButton screenfitButton;
49036294 cButton screenfitpointButton;
49046295 cButton snapobjectButton;
....@@ -4910,14 +6301,6 @@
49106301
49116302 cButton setsupportButton;
49126303
4913
- cButton twoButton;
4914
- cButton sixButton;
4915
- cButton threeButton;
4916
- cButton sevenButton;
4917
- cButton fourButton; // full panel
4918
- cButton oneButton; // full XYZ
4919
- //cButton currentLayout;
4920
-
49216304 //
49226305 //Composite
49236306 Object3D // to do !!
....@@ -4927,10 +6310,12 @@
49276310 //JTree jTree;
49286311 private MenuItem lookAtItem;
49296312 private MenuItem lookFromItem;
4930
- private MenuItem switchItem;
4931
- private MenuItem cutItem;
4932
- private MenuItem duplicateItem;
4933
- private MenuItem cloneItem;
6313
+ private MenuItem switchViewItem;
6314
+ private JMenuItem cutItem;
6315
+ private MenuItem undoItem;
6316
+ private MenuItem redoItem;
6317
+ private JMenuItem duplicateItem;
6318
+ private JMenuItem cloneItem;
49346319 private MenuItem cloneSupportItem;
49356320 private MenuItem overwriteGeoItem;
49366321 private MenuItem overwriteMatItem;
....@@ -4942,7 +6327,7 @@
49426327 private MenuItem linkverticesItem;
49436328 private MenuItem relinkverticesItem;
49446329 private MenuItem setMasterItem;
4945
- private MenuItem resetMeshItem;
6330
+ private MenuItem resetAllItem;
49466331 private MenuItem stepAllItem;
49476332 private MenuItem revertMeshItem;
49486333 private MenuItem poseMeshItem;
....@@ -4951,12 +6336,13 @@
49516336 private MenuItem cloneGeometriesItem;
49526337 private MenuItem shareGeometriesItem;
49536338 private MenuItem mergeGeometriesItem;
4954
- private MenuItem copyItem;
6339
+ private JMenuItem copyItem;
49556340 private MenuItem pasteItem;
4956
- private MenuItem pasteLinkItem;
4957
- private MenuItem pasteCloneItem;
4958
- private MenuItem pasteExpandItem;
4959
- private MenuItem clearItem;
6341
+ private JMenuItem pasteIntoItem;
6342
+ private JMenuItem pasteLinkItem;
6343
+ private JMenuItem pasteCloneItem;
6344
+ private JMenuItem pasteExpandItem;
6345
+ private JMenuItem deleteItem;
49606346 private MenuItem clearAllItem;
49616347 private MenuItem genUVItem;
49626348 private MenuItem genNormalsMESHItem;
....@@ -4982,6 +6368,7 @@
49826368 private MenuItem clipMeshItem;
49836369 private MenuItem smoothMeshItem;
49846370 private MenuItem clearMaterialsItem;
6371
+ private MenuItem clearVersionsItem;
49856372
49866373 private MenuItem liveleavesItem;
49876374 private MenuItem unliveleavesItem;
....@@ -4991,6 +6378,10 @@
49916378 private MenuItem showleavesItem;
49926379 private MenuItem markleavesItem;
49936380 private MenuItem unmarkleavesItem;
6381
+ private MenuItem rewindleavesItem;
6382
+ private MenuItem unrewindleavesItem;
6383
+ private MenuItem randomleavesItem;
6384
+ private MenuItem unrandomleavesItem;
49946385
49956386 private MenuItem flipVItem;
49966387 private MenuItem unflipVItem;
....@@ -5002,15 +6393,17 @@
50026393 private MenuItem panoTexturesItem;
50036394
50046395 private MenuItem resetCentroidItem;
5005
- private MenuItem transformgeometryItem;
6396
+ private MenuItem resetCentroidXZItem;
50066397 private MenuItem resetTransformItem;
6398
+ private MenuItem transformGeometryItem;
6399
+ private MenuItem transformChildrenItem;
50076400 private MenuItem hideItem;
5008
- private MenuItem grabItem;
6401
+ private JMenuItem grabItem;
50096402 private MenuItem backItem;
50106403 private MenuItem frontItem;
50116404 private MenuItem cameraItem;
50126405 private MenuItem compositeItem;
5013
- private MenuItem randomItem;
6406
+ private MenuItem switchItem;
50146407 private MenuItem physicsItem;
50156408 private MenuItem frameselectorItem;
50166409 private MenuItem scriptNodeItem;
....@@ -5018,7 +6411,7 @@
50186411 private MenuItem switchTransfoItem;
50196412 private MenuItem morphItem;
50206413 private MenuItem linkerItem;
5021
- private MenuItem ungroupItem;
6414
+ private JMenuItem ungroupItem;
50226415 private MenuItem editItem;
50236416 private MenuItem openWindowItem;
50246417 private MenuItem editLeafItem;
....@@ -5034,6 +6427,8 @@
50346427 private MenuItem attachBumpItem;
50356428 private MenuItem detachBumpItem;
50366429 private MenuItem pigmentBumpItem;
6430
+ private MenuItem embedTexturesItem;
6431
+ private MenuItem deEmbedTexturesItem;
50376432
50386433 private MenuItem particleItem;
50396434 private MenuItem ragdollItem;
....@@ -5050,7 +6445,7 @@
50506445 private MenuItem blobItem;
50516446 private MenuItem latheItem;
50526447 private MenuItem bezierItem;
5053
- private MenuItem checkerItem;
6448
+ private MenuItem overlayItem;
50546449 private MenuItem meshItem;
50556450 // private MenuItem meshGroupItem;
50566451 private MenuItem springItem;
....@@ -5072,11 +6467,6 @@
50726467 private MenuItem doubleItem;
50736468 private MenuItem tripleItem;
50746469
5075
- private MenuItem importGFDItem;
5076
- private MenuItem importVRMLX3DItem;
5077
- private MenuItem import3DSItem;
5078
- private MenuItem importOBJItem;
5079
-
50806470 private MenuItem computeAOItem;
50816471 private MenuItem recompileItem;
50826472 private MenuItem editScriptItem;
....@@ -5086,4 +6476,8 @@
50866476 private MenuItem analyzeItem;
50876477 private MenuItem dumpItem;
50886478 //boolean freezemodel = false;
6479
+
6480
+ Menu cameraMenu;
6481
+ MenuItem editCameraItem;
6482
+ MenuItem restoreCameraItem;
50896483 }