Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314
GroupEditor.java
....@@ -16,6 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1920 ObjectUI,
2021 Runnable,
2122 ActionListener,
....@@ -23,6 +24,360 @@
2324 DragGestureListener, DragSourceListener, DropTargetListener,
2425 ItemListener // ListSelectionListener
2526 {
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
+
26381 //ObjEditor objEditor;
27382 public void closeUI2()
28383 {
....@@ -60,6 +415,16 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
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
+
63428 if(ui)
64429 SetupUI(objEditor);
65430 }
....@@ -74,16 +439,28 @@
74439 this.copy = this.group = copy;
75440 //selectees = this.group.selectees;
76441
77
- SetupMenu2(objEditor);
442
+ SetupMenu2(this); //objEditor);
78443 SetupUI2(objEditor);
79444 objEditor.SetupUI(true);
80445 SetupViews(objEditor);
81446
82447 ((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
+// }
83456 }
84457
85458 void CloneSelection(boolean supports)
86459 {
460
+ if (Globals.REPLACEONMAKE)
461
+ Save();
462
+ boolean keep = Globals.REPLACEONMAKE;
463
+ Globals.REPLACEONMAKE = false;
87464 // Object3D keep = GrafreeD.clipboard;
88465 //Object3D obj;
89466 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,18 +471,19 @@
94471
95472 makeSomething(clone, i==group.selection.size()-1);
96473 }
474
+ Globals.REPLACEONMAKE = keep;
97475 }
98476
99477 void CloneClipboard(boolean supports)
100478 {
101
- assert(GrafreeD.clipboard.parent == null);
102
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
103
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105
- 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));
106484 else
107
- makeSomething(CloneObject(GrafreeD.clipboard, false));
108
- GrafreeD.clipboard.get(0).parent = keepparent;
485
+ makeSomething(CloneObject(Grafreed.clipboard, false));
486
+ Grafreed.clipboard.get(0).parent = keepparent;
109487 }
110488
111489 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -119,7 +497,7 @@
119497 // obj.support = null;
120498 if (!supports)
121499 obj.SaveSupports();
122
- Object3D clone = (Object3D)GrafreeD.clone(obj);
500
+ Object3D clone = (Object3D)Grafreed.clone(obj);
123501 obj.parent = parent;
124502 // obj.support = support;
125503 // clone.support = support; // aout 2013
....@@ -148,58 +526,153 @@
148526
149527 //JTextField nameField;
150528
151
- void SetupMenu2(ObjEditor oe)
529
+ void SetupMenu2(GroupEditor oe)
152530 {
153
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157
- oe.cameraMenu.add("-");
158
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159
- openWindowItem.addActionListener(this);
160
- editLeafItem.addActionListener(this);
161
- lookAtItem.addActionListener(this);
162
- //lookFromItem.addActinoListener(this);
163
- //switchItem.addActionListener(this);
531
+ oe.jTree = new cTree();
532
+
164533 Menu menu;
165534 oe.menuBar.add(menu = new Menu("Edit"));
166535 //editItem = menu.add(new MenuItem("Edit"));
167536 //editItem.addActionListener(this);
168
- 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"));
169544 duplicateItem.addActionListener(this);
170
- menu.add("-");
171
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
172547 cloneItem.addActionListener(this);
548
+ //if (Globals.ADVANCED)
549
+ {
173550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174551 cloneSupportItem.addActionListener(this);
552
+ }
553
+ oe.jTree.popup.addSeparator();
175554 menu.add("-");
176
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
177556 cutItem.addActionListener(this);
178
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
179558 copyItem.addActionListener(this);
180559 pasteItem = menu.add(new MenuItem("Paste"));
181560 pasteItem.addActionListener(this);
182
- 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"));
183567 pasteLinkItem.addActionListener(this);
184
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
185569 pasteCloneItem.addActionListener(this);
186
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
187571 // pasteExpandItem.addActionListener(this);
188
- clearItem = menu.add(new MenuItem("Clear"));
189
- clearItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
574
+
575
+ if (Globals.ADVANCED)
576
+ {
577
+ // Deletes the cameras...
190578 clearAllItem = menu.add(new MenuItem("Clear All"));
191579 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());
192617
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
+
193667 oe.menuBar.add(menu = new Menu("Setting"));
194
- resetMeshItem = menu.add(new MenuItem("Reset All"));
195
- resetMeshItem.addActionListener(this);
196
- stepAllItem = menu.add(new MenuItem("Step All"));
197
- stepAllItem.addActionListener(this);
668
+ if (Globals.ADVANCED)
669
+ {
198670 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199671 revertMeshItem.addActionListener(this);
200672 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201673 resetreferencesItem.addActionListener(this);
202674 menu.add("-");
675
+ }
203676 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204677 overwriteGeoItem.addActionListener(this);
205678 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -211,79 +684,111 @@
211684 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212685 overwriteUVItem.addActionListener(this);
213686 menu.add("-");
687
+ if (Globals.ADVANCED)
688
+ {
214689 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215690 generateMeshItem.addActionListener(this);
216691 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217692 poseMeshItem.addActionListener(this);
218693 menu.add("-");
694
+ }
219695 resetsupportItem = menu.add(new MenuItem("Reset support"));
220696 resetsupportItem.addActionListener(this);
221697 linkverticesItem = menu.add(new MenuItem("Link to Support"));
222698 linkverticesItem.addActionListener(this);
223699 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224700 relinkverticesItem.addActionListener(this);
701
+
702
+ if (Globals.ADVANCED)
703
+ {
225704 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226705 setMasterItem.addActionListener(this);
706
+ }
227707
228
- oe.menuBar.add(menu = new Menu("Group"));
229
- grabItem = menu.add(new MenuItem("Grab"));
230
- grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
231710 backItem = menu.add(new MenuItem("Back"));
232711 backItem.addActionListener(this);
233712 frontItem = menu.add(new MenuItem("Front"));
234713 frontItem.addActionListener(this);
235
- compositeItem = menu.add(new MenuItem("Composite"));
236
- compositeItem.addActionListener(this);
237
- 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"));
238723 hideItem.addActionListener(this);
239
- ungroupItem = menu.add(new MenuItem("Ungroup"));
724
+ }
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
240726 ungroupItem.addActionListener(this);
241
- menu.add("-");
242
- randomItem = menu.add(new MenuItem("Random"));
243
- randomItem.addActionListener(this);
244
- physicsItem = menu.add(new MenuItem("Physics"));
245
- physicsItem.addActionListener(this);
246
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247
- 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
+ {
248739 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249740 switchGeoItem.addActionListener(this);
250741 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251742 switchTransfoItem.addActionListener(this);
252
- morphItem = menu.add(new MenuItem("Morph"));
743
+ morphItem = menu.add(new MenuItem("Morph Group"));
253744 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);
254751 scriptNodeItem = menu.add(new MenuItem("Script Node"));
255752 scriptNodeItem.addActionListener(this);
256
- cameraItem = menu.add(new MenuItem("Camera"));
257
- cameraItem.addActionListener(this);
753
+ }
258754
259755 oe.menuBar.add(menu = new Menu("Object"));
260
- textureItem = menu.add(new MenuItem("Texture"));
261
- textureItem.addActionListener(this);
756
+// textureItem = menu.add(new MenuItem("Texture"));
757
+// textureItem.addActionListener(this);
262758 billboardItem = menu.add(new MenuItem("Billboard"));
263759 billboardItem.addActionListener(this);
264760 csgItem = menu.add(new MenuItem("CSG"));
265761 csgItem.addActionListener(this);
266
- shadowXItem = menu.add(new MenuItem("Shadow X"));
762
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267763 shadowXItem.addActionListener(this);
268
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
764
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269765 shadowYItem.addActionListener(this);
270
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
766
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271767 shadowZItem.addActionListener(this);
768
+ attributeItem = menu.add(new MenuItem("Attribute"));
769
+ attributeItem.addActionListener(this);
770
+
771
+ if (Globals.ADVANCED)
772
+ {
773
+ menu.add("-");
272774 linkerItem = menu.add(new MenuItem("Linker"));
273775 linkerItem.addActionListener(this);
274776 templateItem = menu.add(new MenuItem("Template"));
275777 templateItem.addActionListener(this);
276
- attributeItem = menu.add(new MenuItem("Attribute"));
277
- attributeItem.addActionListener(this);
278778 pointflowItem = menu.add(new MenuItem("Point Flow"));
279779 pointflowItem.addActionListener(this);
780
+ }
280781 menu.add("-");
281782 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282783 resetTransformItem.addActionListener(this);
283784 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284785 resetCentroidItem.addActionListener(this);
285
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
- 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);
287792
288793 oe.menuBar.add(menu = new Menu("Geometry"));
289794 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -294,8 +799,11 @@
294799 genNormalsCADItem.addActionListener(this);
295800 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296801 genNormalsMESHItem.addActionListener(this);
297
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
802
+ if (Globals.ADVANCED)
803
+ {
804
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298805 genNormalsMINEItem.addActionListener(this);
806
+ }
299807 stripifyItem = menu.add(new MenuItem("Stripify"));
300808 stripifyItem.addActionListener(this);
301809 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -317,31 +825,52 @@
317825 reduce34MeshItem.addActionListener(this);
318826 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319827 increaseMeshItem.addActionListener(this);
320
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
- smoothMeshItem.addActionListener(this);
322828 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323829 clipMeshItem.addActionListener(this);
830
+
831
+ if (Globals.ADVANCED)
832
+ {
833
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
834
+ smoothMeshItem.addActionListener(this);
835
+ }
324836
325837 oe.menuBar.add(menu = new Menu("Attributes"));
838
+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
839
+ clearVersionsItem.addActionListener(this);
326840 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327841 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);
328846 menu.add("-");
329847 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330848 liveleavesItem.addActionListener(this);
331849 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332850 unliveleavesItem.addActionListener(this);
851
+ if (Globals.ADVANCED)
852
+ {
333853 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334854 supportleavesItem.addActionListener(this);
335855 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336856 unsupportleavesItem.addActionListener(this);
857
+ }
337858 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338859 hideleavesItem.addActionListener(this);
339860 showleavesItem = menu.add(new MenuItem("Show Leaves"));
340861 showleavesItem.addActionListener(this);
341
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
862
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
342863 markleavesItem.addActionListener(this);
343
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
864
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
344865 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);
345874 menu.add("-");
346875 flipVItem = menu.add(new MenuItem("Flip V"));
347876 flipVItem.addActionListener(this);
....@@ -367,53 +896,135 @@
367896 attachBumpItem.addActionListener(this);
368897 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369898 pigmentBumpItem.addActionListener(this);
899
+ //embedTexturesItem
370900 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371901 detachPigmentItem.addActionListener(this);
372902 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373903 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);
374908 menu.add("-");
375909 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376910 sortbysizeItem.addActionListener(this);
377911 sortbynameItem = menu.add(new MenuItem("Sort by name"));
378912 sortbynameItem.addActionListener(this);
379913 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.
380924 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381925 extractGeometriesItem.addActionListener(this);
382926 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383927 cloneGeometriesItem.addActionListener(this);
384
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385
- shareGeometriesItem.addActionListener(this);
386
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387
- mergeGeometriesItem.addActionListener(this);
928
+ }
388929
389930 oe.menuBar.add(menu = new Menu("Insert"));
390931 buildCreateMenu(menu);
391932
392
-
393
- oe.menuBar.add(menu = new Menu("Include"));
394
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395
- importGFDItem.addActionListener(this);
396
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397
- importVRMLX3DItem.addActionListener(this);
398
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399
- importOBJItem.addActionListener(this);
400
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401
- import3DSItem.addActionListener(this);
402
-
403933 oe.menuBar.add(menu = new Menu("Tools"));
404934 buildToolsMenu(menu);
405935 }
406936
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
+
4071011 void SetupUI2(ObjEditor oe)
4081012 {
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
+
4091025 //new Exception().printStackTrace();
4101026
4111027 oe.radioPanel = new JPanel(new GridBagLayout());
412
- oe.aConstraints.weightx = 1;
413
- oe.aConstraints.weighty = 0;
414
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
415
- oe.aConstraints.gridwidth = 100;
416
- oe.aConstraints.gridheight = 1;
4171028 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
4181029
4191030 oe.buttonGroup = new ButtonGroup();
....@@ -434,98 +1045,269 @@
4341045 oe.radioPanel.add(dummyButton);
4351046 oe.buttonGroup.add(dummyButton);
4361047 */
1048
+ cGridBag versionManagerPanel = new cGridBag();
1049
+
1050
+ versionManagerPanel.preferredHeight = 4;
1051
+
4371052 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
4381053
439
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440
- liveCB.setToolTipText("Enabled animation");
441
- liveCB.addItemListener(this);
442
-
443
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
444
- trackCB.setToolTipText("Enable tracking");
445
- trackCB.addItemListener(this);
446
-
447
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
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);
4481109 screenfitButton.setToolTipText("Screen fit");
4491110 screenfitButton.addActionListener(this);
4501111
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");
1154
+ liveCB.addItemListener(this);
1155
+
1156
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1157
+ fastCB.setToolTipText("Fast mode");
1158
+ fastCB.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);
1165
+
4511166 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
4521167 // screenfitpointButton.addActionListener(this);
453
-// oe.aConstraints.gridx += 1;
454
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
- snapobjectButton.addActionListener(this);
456
- snapobjectButton.setToolTipText("Snap Object");
457
- oe.aConstraints.gridx += 1;
4581168
459
- //aConstraints.gridx = 0;
460
- //aConstraints.gridy += 1;
461
- oe.aConstraints.weighty = 0;
462
- oe.aConstraints.gridwidth = 1;
463
-
464
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465
- flashSelectionButton.setToolTipText("Show selection");
466
- flashSelectionButton.addActionListener(this);
467
-
468
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469
-
470
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471
- twoButton.setToolTipText("Show center view only");
472
- twoButton.addActionListener(this);
473
- oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, 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);
4741176 fourButton.addActionListener(this);
475
- fourButton.setToolTipText("Show left panel only");
476
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
477
- sixButton.setToolTipText("2-column layout left");
478
- sixButton.addActionListener(this);
479
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
480
- threeButton.setToolTipText("2-column layout right");
481
- threeButton.addActionListener(this);
482
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483
- sevenButton.setToolTipText("3-column layout");
484
- sevenButton.addActionListener(this);
485
- //
1177
+ fourButton.setToolTipText("Show control panel only");
1178
+ }
4861179
487
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
- rootButton.setToolTipText("Edit object in new tab");
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");
4891185 rootButton.addActionListener(this);
490
- oe.aConstraints.gridx += 1;
491
- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
1186
+
1187
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
4921188 closeButton.setToolTipText("Close tab");
4931189 closeButton.addActionListener(this);
4941190 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
4951191 //clearButton.addActionListener(this);
496
- oe.aConstraints.gridx += 1;
497
-
498
- oe.aConstraints.gridx = 1; //
499
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
500
- editButton.addActionListener(this);
501
- oe.aConstraints.gridx += 1;
502
- oe.aConstraints.weighty = 0;
503
- oe.aConstraints.gridwidth = 1;
5041192
505
- 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");
5061287 uneditButton.addActionListener(this);
5071288
508
- oe.aConstraints.gridx += 1;
509
- oe.aConstraints.weighty = 0;
510
- oe.aConstraints.gridwidth = 1;
511
-
512
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513
- clearPanelButton.addActionListener(this);
514
-
515
- oe.aConstraints.gridx += 1;
516
- oe.aConstraints.weighty = 0;
517
- oe.aConstraints.gridwidth = 1;
518
-
519
- 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");
5201291 allParamsButton.addActionListener(this);
5211292
522
- oe.aConstraints.gridx += 1;
523
- oe.aConstraints.weighty = 0;
524
- oe.aConstraints.gridwidth = 1;
525
-
526
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
527
- 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);
5281296
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
+
5291311 // oe.aConstraints.gridx += 1;
5301312 // oe.aConstraints.weighty = 0;
5311313 // oe.aConstraints.gridwidth = 1;
....@@ -537,47 +1319,34 @@
5371319 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
5381320 // gcButton.addActionListener(this);
5391321
540
- oe.aConstraints.gridx = 0;
541
- oe.aConstraints.gridy += 1;
542
-
543
- //ctrlPanel.add(objList = new List(5, true));
544
- oe.aConstraints.gridwidth = 100;
545
- // oe.aConstraints.gridheight = 100;
546
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547
- oe.aConstraints.gridheight = 1;
548
- oe.aConstraints.weighty = 0.5;
549
- oe.aConstraints.gridx = 0;
550
- JScrollPane jSP;
1322
+ cGridBag jSPPanel = new cGridBag();
1323
+
1324
+ jSPPanel.preferredHeight = 20;
1325
+
1326
+ JScrollPane jSP;
5511327 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
1328
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
5531329 ResetModel();
554
- oe.aConstraints.weighty = 0.5;
555
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556
- oe.aConstraints.gridy += 1;
557
- oe.aConstraints.gridwidth = 1;
558
-
559
- oe.aConstraints.weighty = 0;
560
- oe.aConstraints.gridwidth = 2;
561
-
562
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
563
- colorCB.addItemListener(this);
564
- oe.aConstraints.gridx += 2;
565
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
566
- materialCB.addItemListener(this);
567
- oe.aConstraints.gridx += 2;
568
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
569
- textureCB.addItemListener(this);
570
-
571
- oe.aConstraints.gridx = 0;
572
- oe.aConstraints.gridy += 1;
5731330
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
+
5741343 //jList.addListSelectionListener(this);
5751344 oe.jTree.addTreeSelectionListener(this);
5761345 //jTree.setRootVisible(false);
5771346 //jTree.setEditable(true);
5781347 oe.jTree.setDragEnabled(true);
5791348 //jTree.setPreferredSize(new Dimension(10,10));
580
- jSP.setPreferredSize(new Dimension(100,200));
1349
+ //jSP.setPreferredSize(new Dimension(100,200));
5811350
5821351 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
5831352
....@@ -589,53 +1358,70 @@
5891358 dgr.addDragGestureListener(this);
5901359 }catch(Exception e) {}
5911360 */
592
- radio.layout = sevenButton;
1361
+ radio.layout = threeButton; // sixButton;
5931362 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5941363 }
5951364
5961365 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
5971366 {
598
- //constraints.gridx = 0;
599
- //constraints.gridy = 0;
600
- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601
- fastCB.setToolTipText("Fast mode");
602
- fastCB.addItemListener(this);
603
- //constraints.gridy += 1;
604
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605
- supportCB.setToolTipText("Enabled rigging");
606
- supportCB.addItemListener(this);
1367
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1368
+ colorCB.setToolTipText("Copy color when dropped");
1369
+ colorCB.addItemListener(this);
6071370
608
- // constraints.gridy += 1;
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
+
6091399 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
6101400 // localCB.addItemListener(this);
6111401
612
- //constraints.gridy += 1;
1402
+ panel.Return();
1403
+
6131404 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
6141405 crowdCB.setToolTipText("Used for crowds");
6151406 crowdCB.addItemListener(this);
6161407
617
- //constraints.gridy += 1;
6181408 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
6191409 smoothCB.setToolTipText("Snapping delay");
6201410 smoothCB.addItemListener(this);
6211411
622
- //constraints.gridy += 1;
623
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624
- slowCB.setToolTipText("Smooth interpolation");
625
- slowCB.addItemListener(this);
626
- //constraints.gridy += 1;
627
- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628
- boxCB.setToolTipText("Display bounding boxes");
629
- boxCB.addItemListener(this);
630
- //constraints.gridy += 1;
631
- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633
- zoomBoxCB.addItemListener(this);
634
-
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
+
6351419 // constraints.gridy += 1;
6361420 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
6371421 // speakerMocapCB.addItemListener(this);
6381422
1423
+ panel.Return();
1424
+
6391425 if (false)
6401426 {
6411427 // handled in scripts
....@@ -650,61 +1436,126 @@
6501436 //constraints.gridy += 1;
6511437 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
6521438 smoothfocusCB.addItemListener(this);
1439
+ panel.Return();
6531440 }
6541441
6551442 //constraints.gridx += 1;
6561443 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
6571444 // debugCB.addItemListener(this);
6581445
659
- //constraints.gridy += 1;
1446
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1447
+ trackCB.setToolTipText("Enable tracking target");
1448
+ trackCB.addItemListener(this);
1449
+
6601450 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1451
+ oeilCB.setToolTipText("Move camera when tracking");
6611452 oeilCB.addItemListener(this);
6621453
663
- //constraints.gridy += 1;
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
+ {
6641474 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
6651475 lookAtCB.setToolTipText("Look-at target");
6661476 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);
6671491
6681492 }
6691493
6701494 void EditObject(Object3D obj)
6711495 {
1496
+ assert(obj instanceof Composite);
1497
+
1498
+// if (obj.versionlist == null)
1499
+// {
1500
+// obj.versionlist = new Object3D[100];
1501
+// obj.versionindex = -1;
1502
+// }
1503
+
6721504 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
+
6731513 radioButton.SetObject(obj);
674
- radioButton.layout = sevenButton;
1514
+ radioButton.layout = threeButton; // sixButton;
6751515 radioButton.SetCamera(cameraView.renderCamera, false);
6761516 radioButton.addActionListener(this);
6771517 radioPanel.add(radioButton);
6781518 buttonGroup.add(radioButton);
6791519 radioButton.doClick();
6801520 }
1521
+
6811522 void SetupViews(ObjEditor oe)
6821523 {
1524
+ theFrame = this;
1525
+
6831526 oe.SetupViews();
6841527
1528
+ if (Globals.DEBUG)
6851529 System.out.println("SetupViews");
6861530 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
6871531 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
6881532 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
6891533 }
6901534
691
- JCheckBox liveCB;
692
- JCheckBox supportCB;
693
- JCheckBox localCB;
694
- JCheckBox crowdCB;
695
- JCheckBox smoothCB;
696
- JCheckBox fastCB;
697
- JCheckBox slowCB;
698
- JCheckBox boxCB;
699
- JCheckBox zoomBoxCB;
700
- JCheckBox trackCB;
701
- 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;
7021550 // JCheckBox speakerMocapCB;
703
- JCheckBox speakerCameraCB;
704
- JCheckBox speakerFocusCB;
705
- JCheckBox debugCB;
706
- JCheckBox oeilCB;
707
- JCheckBox lookAtCB;
1551
+ cCheckBox speakerCameraCB;
1552
+ cCheckBox speakerFocusCB;
1553
+ cCheckBox debugCB;
1554
+
1555
+ cCheckBox oeilCB;
1556
+ cCheckBox shadowCB;
1557
+ cCheckBox autokeepCB;
1558
+ cCheckBox lookAtCB;
7081559
7091560 // static int COLOR = 1;
7101561 // static int MATERIAL = 2;
....@@ -712,9 +1563,9 @@
7121563
7131564 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7141565
715
- JCheckBox colorCB;
716
- JCheckBox materialCB;
717
- JCheckBox textureCB;
1566
+ cCheckBox colorCB;
1567
+ cCheckBox materialCB;
1568
+ cCheckBox textureCB;
7181569
7191570 public void itemStateChanged(ItemEvent e)
7201571 {
....@@ -742,6 +1593,7 @@
7421593 } else if(e.getSource() == liveCB)
7431594 {
7441595 cameraView.ToggleLive();
1596
+ refreshContents(false);
7451597 }
7461598 else if(e.getSource() == supportCB)
7471599 {
....@@ -757,6 +1609,12 @@
7571609 {
7581610 cameraView.ToggleInertia();
7591611 cameraView.repaint();
1612
+ }
1613
+ else if(e.getSource() == minshaderCB)
1614
+ {
1615
+ Globals.MINSHADER ^= true;
1616
+ cameraView.programInitialized = false;
1617
+ cameraView.repaint();
7601618 }
7611619 else if(e.getSource() == localCB)
7621620 {
....@@ -806,6 +1664,18 @@
8061664 {
8071665 cameraView.ToggleOeil();
8081666 }
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
+ }
8091679 else if(e.getSource() == lookAtCB)
8101680 {
8111681 cameraView.ToggleLookAt();
....@@ -822,7 +1692,8 @@
8221692
8231693 /**/
8241694 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
825
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1695
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1696
+ TreePath path = objEditor.jTree.getSelectionPath();
8261697 if ((path == null) || (path.getPathCount() <= 1)) {
8271698 // We can't move the root node or an empty selection
8281699 return;
....@@ -885,8 +1756,6 @@
8851756 }
8861757 }
8871758
888
- String string = (String) object;
889
-
8901759 System.out.println("Transfer = " + object + "; drop : " + target);
8911760 // if( object instanceof java.io.File[])
8921761 // {
....@@ -894,7 +1763,11 @@
8941763 // objEditor.DropFile((java.io.File[]) object, true);
8951764 // return;
8961765 // }
897
- 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) == ':')
8981771 {
8991772 // file(s)
9001773 String[] names = string.split("\n");
....@@ -921,7 +1794,7 @@
9211794
9221795 flashIt = false;
9231796 CameraPane pane = (CameraPane) target;
924
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1797
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
9251798 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
9261799
9271800 if (group.selection.size() == 1)
....@@ -937,23 +1810,33 @@
9371810
9381811 assert target == objEditor.jTree;
9391812 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1813
+ Object3D destinationLeaf;
9401814 try {
941
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1815
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9421816 } catch (Exception e) {
9431817 System.out.println("destinationPath : " + destinationPath);
9441818 return;
9451819 }
9461820
947
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1821
+ for (int i=group.selection.size(); --i>=0;)
9481822 {
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
+// {
9491832 loadClipboard(true);
9501833 objEditor.jTree.setSelectionPath(destinationPath);
951
- pasteInto(false);
952
- } else {
953
- loadClipboard(false);
954
- objEditor.jTree.setSelectionPath(destinationPath);
955
- pasteInto(false); // true); // ???
956
- }
1834
+ pasteInto(false, false);
1835
+// } else {
1836
+// loadClipboard(false);
1837
+// objEditor.jTree.setSelectionPath(destinationPath);
1838
+// pasteInto(false, false); // true); // ???
1839
+// }
9571840 }
9581841 public void dropActionChanged(DropTargetDragEvent dtde)
9591842 // Called if the user has modified the current drop gesture
....@@ -1009,7 +1892,12 @@
10091892 TreePath path;
10101893
10111894 public TransferableTreePath(TreePath tp) {
1012
- 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);
10131901 }
10141902
10151903 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1058,85 +1946,107 @@
10581946 {
10591947 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10601948 //heightFieldItem.addActionListener(this);
1061
- gridItem = menu.add(new MenuItem("Grid"));
1062
- gridItem.addActionListener(this);
1063
- rectoidItem = menu.add(new MenuItem("Box"));
1064
- rectoidItem.addActionListener(this);
1065
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1066
- ellipsoidItem.addActionListener(this);
1067
- coneItem = menu.add(new MenuItem("Cone"));
1068
- coneItem.addActionListener(this);
1069
- torusItem = menu.add(new MenuItem("Torus"));
1070
- torusItem.addActionListener(this);
1071
- superItem = menu.add(new MenuItem("Superellipsoid"));
1072
- 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
+ {
10731967 kleinItem = menu.add(new MenuItem("Klein Bottle"));
10741968 kleinItem.addActionListener(this);
1075
- particleItem = menu.add(new MenuItem("Particle system"));
1076
- particleItem.addActionListener(this);
1969
+ }
1970
+
1971
+// particleItem = menu.add(new MenuItem("Particle system"));
1972
+// particleItem.addActionListener(this);
1973
+ if (Globals.ADVANCED)
1974
+ {
10771975 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10781976 ragdollItem.addActionListener(this);
10791977 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10801978 ragdoll2Item.addActionListener(this);
1979
+ }
10811980 menu.add("-");
1082
- meshItem = menu.add(new MenuItem("Mesh"));
1981
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10831982 meshItem.addActionListener(this);
10841983 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10851984 // meshGroupItem.addActionListener(this);
1985
+ if (Globals.ADVANCED)
1986
+ {
10861987 springItem = menu.add(new MenuItem("Spring"));
10871988 springItem.addActionListener(this);
10881989 flagItem = menu.add(new MenuItem("Flag"));
10891990 flagItem.addActionListener(this);
1090
- bezierItem = menu.add(new MenuItem("Patch"));
1091
- bezierItem.addActionListener(this);
1092
- checkerItem = menu.add(new MenuItem("Checker"));
1093
- checkerItem.addActionListener(this);
10941991 blobItem = menu.add(new MenuItem("Blob"));
10951992 blobItem.addActionListener(this);
10961993 latheItem = menu.add(new MenuItem("Lathe"));
10971994 latheItem.addActionListener(this);
1098
- lightItem = menu.add(new MenuItem("Light"));
1099
- 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);
11002002 menu.add("-");
11012003 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11022004 //superLoopItem.addActionListener(this);
1103
- loopItem = menu.add(new MenuItem("Loop"));
1104
- loopItem.addActionListener(this);
2005
+// loopItem = menu.add(new MenuItem("Loop"));
2006
+// loopItem.addActionListener(this);
11052007 doubleItem = menu.add(new MenuItem("Fork"));
11062008 doubleItem.addActionListener(this);
2009
+ if (Globals.ADVANCED)
2010
+ {
11072011 tripleItem = menu.add(new MenuItem("Trident"));
11082012 tripleItem.addActionListener(this);
2013
+ }
11092014 }
11102015
11112016 void buildToolsMenu(Menu menu)
11122017 {
11132018 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11142019 animationItem.addItemListener(this);
1115
- animationItem.setState(CameraPane.ANIMATION);
2020
+ animationItem.setState(Globals.ANIMATION);
2021
+
2022
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2023
+ archiveItem.addActionListener(this);
11162024
11172025 menu.add("-");
11182026 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11192027 parseverticesItem.addActionListener(this);
11202028 textureFieldItem = menu.add(new MenuItem("Texture Field"));
11212029 textureFieldItem.addActionListener(this);
1122
- alignItem = menu.add(new MenuItem("Align"));
2030
+ alignItem = menu.add(new MenuItem("Align Objects"));
11232031 alignItem.addActionListener(this);
1124
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125
- mirrorItem.addActionListener(this);
11262032 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11272033 reduceMorphItem.addActionListener(this);
11282034 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11292035 reduce34MorphItem.addActionListener(this);
1130
-
1131
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1132
- computeAOItem.addActionListener(this);
11332036 menu.add("-");
1134
-
11352037 menu.add(memoryItem = new MenuItem("Memory Usage"));
11362038 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("-");
11372047 menu.add(analyzeItem = new MenuItem("Analyze"));
11382048 analyzeItem.addActionListener(this);
1139
- menu.add(dumpItem = new MenuItem("Dump"));
2049
+ menu.add(dumpItem = new MenuItem("Print"));
11402050 dumpItem.addActionListener(this);
11412051 // menu.add(pathItem = new MenuItem("From-to path"));
11422052 // pathItem.addActionListener(this);
....@@ -1154,6 +2064,7 @@
11542064 menu.add("-");
11552065 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11562066 editScriptItem.addActionListener(this);
2067
+ }
11572068 }
11582069
11592070 void ScreenFit()
....@@ -1218,24 +2129,24 @@
12182129 switch(axis)
12192130 {
12202131 case 0 :
1221
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1222
- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1223
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1224
- 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;
12252136 norm = cVector.X;
12262137 break;
12272138 case 1 :
1228
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1229
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1230
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1231
- 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;
12322143 norm = cVector.Y;
12332144 break;
12342145 case 2 :
1235
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1236
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1237
- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1238
- 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;
12392150 norm = cVector.Z;
12402151 break;
12412152 }
....@@ -1276,9 +2187,38 @@
12762187 shadow.material = new cMaterial(obj.material);
12772188 shadow.material.diffuse = 0.0001f;
12782189 shadow.material.specular = 0.0001f;
2190
+ shadow.material.opacity = 0.75f;
2191
+
2192
+ AllocProjectedVertices(shadow);
2193
+
2194
+ shadow.projectedVertices[1].x = 300;
12792195
12802196 makeSomething(shadow);
12812197 }
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
+ }
12822222
12832223 /**
12842224 * applyExample
....@@ -1482,9 +2422,9 @@
14822422
14832423 void Overwrite(int mask)
14842424 {
1485
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2425
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14862426 {
1487
- Object3D content = GrafreeD.clipboard.get(0);
2427
+ Object3D content = Grafreed.clipboard.get(0);
14882428
14892429 if (content instanceof cGroup && ((cGroup)content).transientlink )
14902430 content = ((cGroup)content).get(0);
....@@ -1523,7 +2463,7 @@
15232463 {
15242464 ScreenFit();
15252465 } else
1526
- if (source == switchItem)
2466
+ if (source == switchViewItem)
15272467 {
15282468 cVector v1 = new cVector();
15292469 cVector v2 = new cVector();
....@@ -1532,11 +2472,11 @@
15322472 objEditor.cameraView.renderCamera.setAim(v2, v1);
15332473 objEditor.cameraView.repaint();
15342474 } else
1535
- if (source == rectoidItem)
2475
+ if (source == rectoidItem || source == boxButton)
15362476 {
15372477 makeSomething(new Box());
15382478 } else
1539
- if (source == particleItem)
2479
+ if (source == particleItem || source == particlesButton)
15402480 {
15412481 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15422482 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1615,27 +2555,27 @@
16152555
16162556 makeSomething(obj);
16172557 } else
1618
- if (source == gridItem)
2558
+ if (source == gridItem || source == gridButton)
16192559 {
16202560 makeSomething(new Grid());
16212561 } else
1622
- if (source == ellipsoidItem)
2562
+ if (source == ellipsoidItem || source == sphereButton)
16232563 {
16242564 makeSomething(new Sphere());
16252565 } else
1626
- if (source == coneItem)
2566
+ if (source == coneItem || source == coneButton)
16272567 {
16282568 makeSomething(new Cone());
16292569 } else
1630
- if (source == torusItem)
2570
+ if (source == torusItem || source == torusButton)
16312571 {
16322572 makeSomething(new Torus());
16332573 } else
1634
- if (source == superItem)
2574
+ if (source == superItem || source == superButton)
16352575 {
16362576 makeSomething(new Superellipsoid());
16372577 } else
1638
- if (source == kleinItem)
2578
+ if (source == kleinItem || source == kleinButton)
16392579 {
16402580 makeSomething(new Klein());
16412581 } else
....@@ -1655,7 +2595,7 @@
16552595 {
16562596 makeSomething(new BezierSurface());
16572597 } else
1658
- if (source == checkerItem)
2598
+ if (source == overlayItem || source == overlayButton)
16592599 {
16602600 /*
16612601 Object3D obj = new BezierSurface(5,8);
....@@ -1703,10 +2643,27 @@
17032643 s.setup();
17042644 makeSomething(s);
17052645 } else
1706
- if (source == lightItem)
2646
+ if (source == lightItem || source == lightButton)
17072647 {
17082648 makeSomething(new Light());
17092649 } else
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
17102667 if (source == csgItem)
17112668 {
17122669 group(new CSG());
....@@ -1753,30 +2710,38 @@
17532710
17542711 group(g);
17552712 } else
1756
- if (source == loopItem)
2713
+ if (source == loopItem || source == loopButton)
17572714 {
2715
+ if (!group.selection.isEmpty())
2716
+ {
17582717 Composite csg = new GroupLeaf();
17592718 csg.count = 5;
1760
- group(csg);
1761
- Composite child = new cGroup();
2719
+ Composite child = new cGroup("Branch");
17622720 csg.addChild(child);
17632721 child.addChild(csg);
2722
+ group(csg);
2723
+ }
17642724 } else
17652725 if (source == doubleItem)
17662726 {
1767
- Composite csg = new GroupLeaf();
2727
+ if (!group.selection.isEmpty())
2728
+ {
2729
+ Composite csg = new GroupLeaf("Fork");
17682730 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);
17692737 group(csg);
1770
- Composite child = new cGroup();
1771
- csg.addChild(child);
1772
- child.addChild(csg);
1773
- child = new cGroup();
1774
- csg.addChild(child);
1775
- child.addChild(csg);
2738
+ }
17762739 } else
17772740 if (source == tripleItem)
17782741 {
1779
- Composite csg = new GroupLeaf();
2742
+ if (!group.selection.isEmpty())
2743
+ {
2744
+ Composite csg = new GroupLeaf("Trident");
17802745 csg.count = 4;
17812746 group(csg);
17822747 Composite child = new cGroup();
....@@ -1788,28 +2753,12 @@
17882753 child = new cGroup();
17892754 csg.addChild(child);
17902755 child.addChild(csg);
1791
- } else
1792
-
1793
- if (source == importGFDItem)
1794
- {
1795
- ImportGFD();
1796
- } else
1797
- if (source == importVRMLX3DItem)
1798
- {
1799
- ImportVRMLX3D();
1800
- } else
1801
- if (source == import3DSItem)
1802
- {
1803
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804
- } else
1805
- if (source == importOBJItem)
1806
- {
1807
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
2756
+ }
18082757 } else
18092758 if (source == computeAOItem)
18102759 {
18112760 Globals.drawMode = CameraPane.OCCLUSION;
1812
- Globals.theRenderer.repaint();
2761
+ cameraView.repaint();
18132762 } else
18142763 if (source == recompileItem)
18152764 {
....@@ -1824,7 +2773,7 @@
18242773 if (source == invariantsItem)
18252774 {
18262775 System.out.println("Invariants:");
1827
- GrafreeD.grafreeD.universe.invariants();
2776
+ Grafreed.grafreed.universe.invariants();
18282777 } else
18292778 if (source == memoryItem)
18302779 {
....@@ -1843,19 +2792,80 @@
18432792 {
18442793 DumpObject();
18452794 } else
2795
+ if (source == minButton)
2796
+ {
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
18462859 if (source == screenfitButton)
18472860 {
1848
- //Reload(lastConverter, lastFilename, true);
18492861 ScreenFit();
18502862 } else
18512863 if (source == screenfitpointButton)
18522864 {
1853
- //Reload(lastConverter, lastFilename, true);
18542865 ScreenFitPoint();
18552866 } else
18562867 if (source == snapobjectButton)
18572868 {
1858
- //Reload(lastConverter, lastFilename, true);
18592869 SnapObject();
18602870 } else
18612871 // if (event.getSource() == recompileButton)
....@@ -1892,12 +2902,20 @@
18922902 {
18932903 loadClipboard(true);
18942904 } else
2905
+ if (source == undoItem)
2906
+ {
2907
+ PreviousVersion();
2908
+ } else
2909
+ if (source == redoItem)
2910
+ {
2911
+ NextVersion();
2912
+ } else
18952913 if (source == duplicateItem)
18962914 {
1897
- Object3D keep = GrafreeD.clipboard;
2915
+ Object3D keep = Grafreed.clipboard;
18982916 loadClipboard(false);
18992917 paste(false);
1900
- GrafreeD.clipboard = keep;
2918
+ Grafreed.clipboard = keep;
19012919 } else
19022920 if (source == cloneItem)
19032921 {
....@@ -1915,13 +2933,17 @@
19152933 {
19162934 paste(false);
19172935 } else
2936
+ if (source == pasteIntoItem)
2937
+ {
2938
+ pasteInto(true, false);
2939
+ } else
19182940 if (source == pasteLinkItem)
19192941 {
1920
- pasteInto(false);
2942
+ pasteInto(false, false);
19212943 } else
19222944 if (source == pasteCloneItem)
19232945 {
1924
- pasteInto(true);
2946
+ pasteInto(true, true);
19252947 } else
19262948 if (source == pasteExpandItem)
19272949 {
....@@ -2113,9 +3135,9 @@
21133135 // group.selection.get(0).setMasterThis(content); // should be identity
21143136 // refreshContents();
21153137 // }
2116
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3138
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
21173139 {
2118
- Object3D content = GrafreeD.clipboard.get(0);
3140
+ Object3D content = Grafreed.clipboard.get(0);
21193141
21203142 if (content instanceof cGroup && ((cGroup)content).transientlink )
21213143 content = ((cGroup)content).get(0);
....@@ -2123,11 +3145,11 @@
21233145 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21243146 for (int i=0; i<group.selection.size(); i++)
21253147 {
2126
- boolean random = CameraPane.RANDOM;
2127
- CameraPane.RANDOM = false; // parse all random nodes
3148
+ boolean random = CameraPane.SWITCH;
3149
+ CameraPane.SWITCH = false; // parse all random nodes
21283150 group.selection.get(i).linkVerticesThis(content);
21293151 // group.selection.get(i).setMasterThis(content); // should be identity
2130
- CameraPane.RANDOM = random;
3152
+ CameraPane.SWITCH = random;
21313153 }
21323154 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21333155 refreshContents();
....@@ -2137,20 +3159,20 @@
21373159 {
21383160 for (int i=0; i<group.selection.size(); i++)
21393161 {
2140
- boolean random = CameraPane.RANDOM;
2141
- CameraPane.RANDOM = false; // parse all random nodes
3162
+ boolean random = CameraPane.SWITCH;
3163
+ CameraPane.SWITCH = false; // parse all random nodes
21423164 group.selection.get(i).linkVerticesThis(null);
2143
- CameraPane.RANDOM = random;
3165
+ CameraPane.SWITCH = random;
21443166 }
21453167
21463168 refreshContents();
21473169 } else
21483170 if (source == relinkverticesItem)
21493171 {
2150
- boolean random = CameraPane.RANDOM;
2151
- CameraPane.RANDOM = false; // parse all random nodes
3172
+ boolean random = CameraPane.SWITCH;
3173
+ CameraPane.SWITCH = false; // parse all random nodes
21523174 group.selection.RelinkToSupport();
2153
- CameraPane.RANDOM = random;
3175
+ CameraPane.SWITCH = random;
21543176
21553177 refreshContents();
21563178 } else
....@@ -2165,9 +3187,9 @@
21653187 } else
21663188 if (source == setMasterItem)
21673189 {
2168
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
3190
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21693191 {
2170
- Object3D content = GrafreeD.clipboard.get(0);
3192
+ Object3D content = Grafreed.clipboard.get(0);
21713193
21723194 if (content instanceof cGroup && ((cGroup)content).transientlink )
21733195 content = ((cGroup)content).get(0);
....@@ -2180,9 +3202,9 @@
21803202 {
21813203 if (group.selection.size() == 1)
21823204 {
2183
- if (GrafreeD.clipboard.size() == 1)
3205
+ if (Grafreed.clipboard.size() == 1)
21843206 {
2185
- Object3D content = GrafreeD.clipboard.get(0);
3207
+ Object3D content = Grafreed.clipboard.get(0);
21863208
21873209 if (content instanceof cGroup && ((cGroup)content).transientlink )
21883210 content = ((cGroup)content).get(0);
....@@ -2199,7 +3221,7 @@
21993221 {
22003222 RevertMeshes();
22013223 } else
2202
- if (source == resetMeshItem)
3224
+ if (source == resetAllItem)
22033225 {
22043226 ResetAll();
22053227 } else
....@@ -2207,7 +3229,7 @@
22073229 {
22083230 StepAll();
22093231 } else
2210
- if (source == clearItem) // || event.getSource() == clearButton)
3232
+ if (source == deleteItem) // || event.getSource() == clearButton)
22113233 {
22123234 //int indices[] = jList.getSelectedIndices();
22133235 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2219,9 +3241,9 @@
22193241 {
22203242 ClearSelection(true);
22213243 } else
2222
- if (source == grabItem)
3244
+ if (source == grabItem || source == groupButton)
22233245 {
2224
- group(new cGroup(), true);
3246
+ group(new cGroup(), false); // true);
22253247 } else
22263248 if (source == hideItem)
22273249 {
....@@ -2239,16 +3261,16 @@
22393261 {
22403262 makeSomething(new Camera());
22413263 } else
2242
- if (source == compositeItem)
3264
+ if (source == compositeItem || source == compositeButton)
22433265 {
22443266 group(new Composite());
22453267 } else
2246
- if (source == randomItem)
3268
+ if (source == switchItem || source == switchButton)
22473269 {
22483270 RandomNode random = new RandomNode();
22493271 group(random);
22503272 if (random.size() > 0)
2251
- random.name = random.get(0).name + "Rnd";
3273
+ random.name = random.get(0).name + "Switch";
22523274 } else
22533275 if (source == physicsItem)
22543276 {
....@@ -2345,7 +3367,7 @@
23453367 {
23463368 group(new cLinker());
23473369 } else
2348
- if (source == textureItem)
3370
+ if (source == textureItem || source == textureButton)
23493371 {
23503372 group(new TextureNode());
23513373 } else
....@@ -2365,17 +3387,42 @@
23653387 {
23663388 CastShadow(2);
23673389 } else
2368
- if (source == ungroupItem)
3390
+ if (source == ungroupItem || source == ungroupButton)
23693391 {
2370
- //ungroup();
3392
+ boolean canUngroup = true;
3393
+
23713394 for (int i=0; i<group.selection.size(); i++)
23723395 {
2373
- 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
+ }
23743411 }
23753412
2376
- ClearSelection(false);
2377
-
2378
- 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
+ }
23793426 } else
23803427 if (source == genUVItem)
23813428 {
....@@ -2387,7 +3434,7 @@
23873434 } else
23883435 if (source == genNormalsMESHItem)
23893436 {
2390
- GenNormals(true); // TODO
3437
+ GenNormalsMESH();
23913438 } else
23923439 if (source == genNormalsORGANItem)
23933440 {
....@@ -2421,6 +3468,10 @@
24213468 {
24223469 ClearMaterials();
24233470 } else
3471
+ if (source == clearVersionsItem)
3472
+ {
3473
+ ClearVersions();
3474
+ } else
24243475 if (source == liveleavesItem)
24253476 {
24263477 LiveLeaves(true);
....@@ -2452,6 +3503,22 @@
24523503 if (source == unmarkleavesItem)
24533504 {
24543505 MarkLeaves(false);
3506
+ } else
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);
24553522 } else
24563523 if (source == flipVItem)
24573524 {
....@@ -2537,9 +3604,13 @@
25373604 {
25383605 SmoothMesh();
25393606 } else
2540
- if (source == transformgeometryItem)
3607
+ if (source == transformGeometryItem)
25413608 {
25423609 TransformGeometry();
3610
+ } else
3611
+ if (source == transformChildrenItem)
3612
+ {
3613
+ TransformChildren();
25433614 } else
25443615 if (source == resetTransformItem)
25453616 {
....@@ -2547,7 +3618,11 @@
25473618 } else
25483619 if (source == resetCentroidItem)
25493620 {
2550
- ResetCentroid();
3621
+ ResetCentroid(true);
3622
+ } else
3623
+ if (source == resetCentroidXZItem)
3624
+ {
3625
+ ResetCentroid(false);
25513626 } else
25523627 if (source == resetParentItem)
25533628 {
....@@ -2652,7 +3727,7 @@
26523727 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
26533728 {
26543729 obj = (Object3D)e.nextElement();
2655
- obj.SetBumpTexture(null);
3730
+ obj.ResetBumpTexture();
26563731 }
26573732
26583733 refreshContents();
....@@ -2668,6 +3743,31 @@
26683743
26693744 refreshContents();
26703745 } else
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
26713771 if (source == flashSelectionButton)
26723772 {
26733773 CameraPane.flash = true;
....@@ -2679,42 +3779,36 @@
26793779 if (source == twoButton)
26803780 {
26813781 radio.layout = twoButton;
2682
- // bug
2683
- //gridPanel.setDividerLocation(1.0);
2684
- //bigPanel.setDividerLocation(0.0);
2685
-// bigThree.remove(scenePanel);
2686
-// bigThree.remove(centralPanel);
2687
-// bigThree.remove(XYZPanel);
2688
-// aWindowConstraints.gridx = 0;
2689
-// aWindowConstraints.gridy = 0;
2690
-// aWindowConstraints.gridwidth = 1;
2691
-// // aConstraints.gridheight = 3;
2692
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693
-// aWindowConstraints.weightx = 0;
2694
-// aWindowConstraints.weighty = 1;
2695
-// //bigThree.add(jtp, aWindowConstraints);
2696
-// aWindowConstraints.weightx = 1;
2697
-// aWindowConstraints.gridwidth = 3;
2698
-// // aConstraints.gridheight = 3;
2699
-// aWindowConstraints.gridx = 1;
2700
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2701
-// bigThree.add(centralPanel, aWindowConstraints);
2702
-// aWindowConstraints.weightx = 0;
2703
-// aWindowConstraints.gridx = 4;
2704
-// aWindowConstraints.gridwidth = 1;
2705
-// // aConstraints.gridheight = 3;
2706
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707
-// //bigThree.add(XYZPanel, aWindowConstraints);
2708
-// scenePanel.setVisible(false);
2709
-// centralPanel.setVisible(true);
2710
-// XYZPanel.setVisible(false);
2711
- bigThree.ClearUI();
2712
- bigThree.add(centralPanel);
2713
- bigThree.FlushUI();
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
+
27143805 } else
27153806 if (source == threeButton)
27163807 {
27173808 radio.layout = threeButton;
3809
+
3810
+ if (CameraPane.FULLSCREEN)
3811
+ fullscreenLayout = radio.layout;
27183812
27193813 // bigThree.remove(scenePanel);
27203814 // bigThree.remove(centralPanel);
....@@ -2744,13 +3838,18 @@
27443838 // centralPanel.setVisible(true);
27453839 // XYZPanel.setVisible(true);
27463840 bigThree.ClearUI();
3841
+ bigThree.add(scenePanel);
27473842 bigThree.add(centralPanel);
2748
- bigThree.add(XYZPanel);
27493843 bigThree.FlushUI();
3844
+
3845
+ cameraView.requestFocusInWindow();
27503846 } else
27513847 if (source == fourButton)
27523848 {
27533849 radio.layout = fourButton;
3850
+
3851
+ if (CameraPane.FULLSCREEN)
3852
+ fullscreenLayout = radio.layout;
27543853
27553854 // bigThree.remove(scenePanel);
27563855 // bigThree.remove(centralPanel);
....@@ -2782,10 +3881,15 @@
27823881 bigThree.ClearUI();
27833882 bigThree.add(scenePanel);
27843883 bigThree.FlushUI();
3884
+
3885
+ cameraView.requestFocusInWindow();
27853886 } else
27863887 if (source == sixButton)
27873888 {
27883889 radio.layout = sixButton;
3890
+
3891
+ if (CameraPane.FULLSCREEN)
3892
+ fullscreenLayout = radio.layout;
27893893
27903894 // bigThree.remove(scenePanel);
27913895 // bigThree.remove(centralPanel);
....@@ -2815,13 +3919,18 @@
28153919 // centralPanel.setVisible(true);
28163920 // XYZPanel.setVisible(false);
28173921 bigThree.ClearUI();
2818
- bigThree.add(scenePanel);
28193922 bigThree.add(centralPanel);
3923
+ bigThree.add(scenePanel);
28203924 bigThree.FlushUI();
3925
+
3926
+ cameraView.requestFocusInWindow();
28213927 } else
28223928 if (source == sevenButton)
28233929 {
28243930 radio.layout = sevenButton;
3931
+
3932
+ if (CameraPane.FULLSCREEN)
3933
+ fullscreenLayout = radio.layout;
28253934
28263935 // bigThree.remove(scenePanel);
28273936 // bigThree.remove(centralPanel);
....@@ -2855,9 +3964,12 @@
28553964 bigThree.add(centralPanel);
28563965 bigThree.add(XYZPanel);
28573966 bigThree.FlushUI();
3967
+
3968
+ cameraView.requestFocusInWindow();
28583969 } else
28593970 if (source == rootButton)
28603971 {
3972
+ Replace();
28613973 Object3D obj;
28623974 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28633975 {
....@@ -2866,31 +3978,49 @@
28663978 EditObject(obj);
28673979 }
28683980
3981
+ cameraView.requestFocusInWindow();
28693982 refreshContents(true);
28703983 } else
28713984 if (source == closeButton)
28723985 {
28733986 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3987
+ Replace();
3988
+
28743989 cRadio ab;
28753990 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
28763991 {
28773992 ab = (cRadio)e.nextElement();
2878
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3993
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
28793994 {
3995
+ // Patch to avoid bug with transparency.
3996
+ if (!ab.hadMaterial)
3997
+ {
3998
+ ab.object.material = null;
3999
+ }
4000
+
28804001 buttonGroup.remove(ab);
28814002 radioPanel.remove(ab);
28824003
2883
- ab.GetObject().editWindow = null;
4004
+ //ab.GetObject().editWindow = null;
4005
+ ab.GetObject().manipWindow = null;
28844006 // ab.GetObject().objectUI = null; // ?????????
28854007
28864008 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
28874009 break;
28884010 }
28894011 }
4012
+
4013
+ cameraView.requestFocusInWindow();
28904014 refreshContents(true);
28914015 } else
28924016 if (source == editItem || source == editButton)
28934017 {
4018
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4019
+ {
4020
+ Object3D child = (Object3D)e.nextElement();
4021
+ child.pinned = true;
4022
+ }
4023
+
28944024 EditSelection(false);
28954025 } else
28964026 if (source == uneditButton)
....@@ -2899,13 +4029,14 @@
28994029 {
29004030 Object3D child = (Object3D)e.nextElement();
29014031 if(child.editWindow != null)
2902
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4032
+ child.pinned = false;
29034033 child.CloseUI();
29044034 listUI.remove(child);
4035
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29054036
2906
- child.editWindow = null; // ???????????
4037
+ //child.editWindow = null; // ???????????
29074038 }
2908
- objEditor.ctrlPanel.validate();
4039
+ objEditor.ctrlPanel.FlushUI();
29094040 //objEditor.jTree.clearSelection();
29104041 //objEditor.ResetSliders();
29114042 refreshContents(true);
....@@ -2916,16 +4047,18 @@
29164047 //copy.ClearUI();
29174048 for (Object3D obj : listUI)
29184049 {
4050
+ obj.pinned = false;
29194051 obj.CloseUI();
29204052 }
29214053 listUI.clear();
4054
+ SetPinStates(group.selection.size() > 0);
29224055 refreshContents(true);
29234056 } else
29244057 if (source == allParamsButton)
29254058 {
29264059 assert(copy == group);
29274060
2928
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4061
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29294062
29304063 for (Object3D obj : listUI)
29314064 {
....@@ -2951,6 +4084,8 @@
29514084 } else
29524085 if(source instanceof cRadio)
29534086 {
4087
+ Replace();
4088
+
29544089 group.parent = keepparent;
29554090 group.attributes = 0;
29564091 //group.editWindow = null;
....@@ -2974,6 +4109,7 @@
29744109 }
29754110
29764111 copy = group;
4112
+
29774113 //Globals.theRenderer.object = group;
29784114 if(!useclient)
29794115 {
....@@ -2989,20 +4125,74 @@
29894125 frontView.object = group;
29904126 sideView.object = group;
29914127 }
2992
- group.editWindow = this;
4128
+
4129
+// fix "+" issue
4130
+ //group.editWindow = this;
4131
+ group.manipWindow = this;
4132
+
29934133 /*
29944134 currentLayout = radio.layout;
29954135 if (currentLayout == null)
29964136 currentLayout = sevenButton;
29974137 */
29984138 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);
29994172 keepparent = group.parent;
30004173 // PARENT = NULL or not???
30014174 //group.parent = null; // ROOT
30024175 //group.attributes = -1;
30034176 ResetModel();
4177
+
4178
+ cameraView.requestFocusInWindow();
30044179 refreshContents(true);
3005
- }
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
+ }
30064196 else
30074197 {
30084198 //return super.action(event, arg);
....@@ -3011,7 +4201,6 @@
30114201 }
30124202
30134203 boolean useclient = false;
3014
- cRadio radio;
30154204
30164205 void ToggleRoot()
30174206 {
....@@ -3063,6 +4252,28 @@
30634252 refreshContents();
30644253 }
30654254
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
+ }
30664277
30674278 void ResetTransform()
30684279 {
....@@ -3094,7 +4305,7 @@
30944305 TouchTransform(obj);
30954306 continue;
30964307 }
3097
- if ((mask&2) != 0) // Scale
4308
+ if ((mask&2) != 0) // Scale/rotation
30984309 {
30994310 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
31004311 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -3102,10 +4313,6 @@
31024313 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
31034314 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
31044315 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3105
- }
3106
- if ((mask&4) != 0) // Rotation
3107
- {
3108
- // ?
31094316 }
31104317 if ((mask&1) != 0) // Translation
31114318 {
....@@ -3175,7 +4382,7 @@
31754382 refreshContents();
31764383 }
31774384
3178
- void ResetCentroid()
4385
+ void ResetCentroid(boolean full)
31794386 {
31804387 Object3D obj;
31814388 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3190,12 +4397,16 @@
31904397 LA.matIdentity(Object3D.mat);
31914398 obj.getBounds(minima, maxima, false);
31924399 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4400
+ if (full)
4401
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
31944402 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
31954403 obj.TransformMesh(Object3D.mat);
4404
+
31964405 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4406
+ if (full)
4407
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
31984408 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4409
+
31994410 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
32004411 //Object3D.mat[3][0] = -Object3D.mat[3][0];
32014412 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3224,7 +4435,8 @@
32244435
32254436 int size = obj.MemorySize();
32264437
3227
- 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)");
32284440 }
32294441 }
32304442 catch (Exception e)
....@@ -3261,9 +4473,9 @@
32614473 obj = (Object3D)e.nextElement();
32624474
32634475 System.out.println("Object is: " + obj);
3264
- GrafreeD.AnalyzeObject(obj);
4476
+ Grafreed.AnalyzeObject(obj);
32654477 System.out.println("Boundary rep: " + obj.bRep);
3266
- GrafreeD.AnalyzeObject(obj.bRep);
4478
+ Grafreed.AnalyzeObject(obj.bRep);
32674479
32684480 // System.err.println((size/1024) + " KB is the size of " + obj);
32694481 }
....@@ -3305,6 +4517,13 @@
33054517 void GenNormals(boolean crease)
33064518 {
33074519 group.GenNormalsS(crease);
4520
+
4521
+ refreshContents();
4522
+ }
4523
+
4524
+ void GenNormalsMESH()
4525
+ {
4526
+ group.GenNormalsMeshS();
33084527
33094528 refreshContents();
33104529 }
....@@ -3477,8 +4696,8 @@
34774696
34784697 void ParseVertices()
34794698 {
3480
- boolean epsequal = GrafreeD.epsequal;
3481
- GrafreeD.epsequal = true;
4699
+ boolean epsequal = Grafreed.epsequal;
4700
+ Grafreed.epsequal = true;
34824701
34834702 for (int i=0; i<group.selection.size(); i++)
34844703 {
....@@ -3503,7 +4722,7 @@
35034722 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
35044723 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
35054724
3506
- g.add(GrafreeD.clipboard);
4725
+ g.add(Grafreed.clipboard);
35074726
35084727 buffer.add(g);
35094728 }
....@@ -3518,7 +4737,7 @@
35184737 makeSomething(buffer, i==group.selection.size()-1);
35194738 }
35204739
3521
- GrafreeD.epsequal = epsequal;
4740
+ Grafreed.epsequal = epsequal;
35224741
35234742 refreshContents();
35244743 }
....@@ -3536,7 +4755,16 @@
35364755 String pigment = Object3D.GetPigment(tex);
35374756 //String bump = Object3D.GetBump(tex);
35384757
3539
- com.sun.opengl.util.texture.TextureData texturedata = Globals.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
+ }
35404768
35414769 double s = v.s;
35424770
....@@ -3624,11 +4852,11 @@
36244852
36254853 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36264854
3627
- boolean random = CameraPane.RANDOM;
3628
- CameraPane.RANDOM = false; // parse all random nodes
4855
+ boolean random = CameraPane.SWITCH;
4856
+ CameraPane.SWITCH = false; // parse all random nodes
36294857 lowres.linkVerticesThis(null);
36304858 lowres.linkVerticesThis(sn);
3631
- CameraPane.RANDOM = random;
4859
+ CameraPane.SWITCH = random;
36324860
36334861 System.err.flush();
36344862
....@@ -3668,7 +4896,7 @@
36684896 return;
36694897
36704898 Object3D poses = group.selection.get(0);
3671
- Object3D ref = GrafreeD.clipboard.get(0);
4899
+ Object3D ref = Grafreed.clipboard.get(0);
36724900
36734901 Object3D newgroup = new Object3D("Po:" + poses.name);
36744902
....@@ -3862,9 +5090,9 @@
38625090
38635091 void ClipMesh()
38645092 {
3865
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
5093
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
38665094 {
3867
- Object3D content = GrafreeD.clipboard.get(0);
5095
+ Object3D content = Grafreed.clipboard.get(0);
38685096
38695097 if (content instanceof cGroup && ((cGroup)content).transientlink )
38705098 content = ((cGroup)content).get(0);
....@@ -3873,7 +5101,7 @@
38735101 // {
38745102 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
38755103 // }
3876
- group.selection.ClipMesh(GrafreeD.clipboard);
5104
+ group.selection.ClipMesh(Grafreed.clipboard);
38775105 }
38785106 // group.selection.ClipMesh(GrafreeD.clipboard);
38795107 System.out.println("DONE.");
....@@ -3890,6 +5118,12 @@
38905118 void ClearMaterials()
38915119 {
38925120 group.selection.ClearMaterials();
5121
+ refreshContents();
5122
+ }
5123
+
5124
+ void ClearVersions()
5125
+ {
5126
+ group.selection.ClearVersions();
38935127 refreshContents();
38945128 }
38955129
....@@ -3920,6 +5154,18 @@
39205154 void MarkLeaves(boolean hide)
39215155 {
39225156 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);
39235169 refreshContents();
39245170 }
39255171
....@@ -3994,28 +5240,25 @@
39945240 // }
39955241 // }
39965242
3997
- static boolean allparams = true;
3998
-
3999
- static Vector<Object3D> listUI = new Vector<Object3D>();
4000
-
40015243 void EditSelection(boolean newWindow)
40025244 {
5245
+ if (group.selection == null)
5246
+ {
5247
+ EditElement(group, newWindow); // ? new
5248
+ return;
5249
+ }
5250
+
40035251 // aConstraints.gridy = 0;
40045252 for (int i=0; i<group.selection.size(); i++)
40055253 {
40065254 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
40075255 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4008
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5256
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
40095257
40105258 Object3D elem = (Object3D)group.selection.elementAt(i);
4011
- if(elem != group)
5259
+ if(elem != group || !newWindow)
40125260 {
4013
- // if (!(elem instanceof Composite))
4014
- // newWindow = false;
4015
- listUI.add(elem);
4016
- elem.openEditWindow(this, newWindow); //, false);
4017
- System.out.println("edit : " + elem);
4018
- elem.editWindow.refreshContents(true); // ? new
5261
+ EditElement(elem, newWindow); // ? new
40195262 }
40205263 }
40215264 }
....@@ -4078,9 +5321,7 @@
40785321
40795322 freezemodel = false;
40805323 }
4081
-
4082
- boolean flashIt = true;
4083
-
5324
+
40845325 public void valueChanged(TreeSelectionEvent e)
40855326 //public boolean handleEvent(Event event)
40865327 {
....@@ -4090,7 +5331,8 @@
40905331 //new Exception().printStackTrace();
40915332
40925333 freezemodel = true;
4093
-
5334
+ ClearUnpinned();
5335
+
40945336 /**/
40955337 //switch (event.id)
40965338 {
....@@ -4098,7 +5340,6 @@
40985340 //case 702: // Event.LIST_DESELECT
40995341 group.deselectAll();
41005342 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4101
- objEditor.ClearInfo(); // .GetMaterial());
41025343 if (tps != null)
41035344 {
41045345 for (int i=0; i < tps.length; i++)
....@@ -4107,33 +5348,39 @@
41075348
41085349 //if (child.parent != null)
41095350 //child.parent.addSelectee(child);
5351
+ objEditor.SetMaterial(child);
41105352 group.addSelectee(child);
4111
- objEditor.SetMaterial(child); // .GetMaterial());
4112
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4113
- System.err.println("info : " + child.GetPath());
41145353 }
41155354 }
4116
- else
4117
- {
4118
- objEditor.SetMaterial(group); // .GetMaterial());
4119
- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120
- System.err.println("info : " + group.GetPath());
4121
- }
5355
+// else
5356
+// {
5357
+// objEditor.SetMaterial(group); // .GetMaterial());
5358
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
5359
+// System.err.println("info : " + group.GetPath());
5360
+// }
41225361
4123
- objEditor.SetText(); // jan 2014
4124
-
4125
- if (flashIt && !Globals.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))
41265363 CameraPane.flash = true;
41275364
4128
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5365
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
41295366 // a camera
41305367 {
4131
- CameraPane.camerachangeframe = 0; // don't refuse it
4132
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
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
+ }
41335373 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
41345374 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
41355375 }
41365376
5377
+ if (tps != null && tps.length == 1)
5378
+ {
5379
+ EditSelection(false);
5380
+ }
5381
+
5382
+ SetPinStates(tps != null && tps.length > 0);
5383
+
41375384 refreshContents();
41385385 //return true;
41395386 }
....@@ -4142,6 +5389,53 @@
41425389
41435390 freezemodel = false;
41445391 }
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
+ }
41455439
41465440 void linkSomething(Object3D thing)
41475441 {
....@@ -4213,16 +5507,19 @@
42135507 {
42145508 if (group.selection.isEmpty())
42155509 return;
4216
- GrafreeD.clipboardIsTempGroup = false;
5510
+
5511
+ Grafreed.clipboardIsTempGroup = false;
42175512 Composite tGroup = null;
42185513 if (group.selection.size() > 0) // 1)
42195514 {
42205515 tGroup = new cGroup();
4221
- GrafreeD.clipboardIsTempGroup = true;
5516
+ Grafreed.clipboardIsTempGroup = true;
42225517 }
42235518
42245519 if (cut)
42255520 {
5521
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5522
+// Save();
42265523 //int indices[] = jList.getSelectedIndices();
42275524 //for (int i = indices.length - 1; i >= 0; i--)
42285525 //jList.remove(indices[i]);
....@@ -4258,16 +5555,16 @@
42585555 //System.out.println("cut " + child);
42595556 //System.out.println("parent = " + child.parent);
42605557 // tmp.addChild(child);
4261
- if (GrafreeD.clipboardIsTempGroup)
5558
+ if (Grafreed.clipboardIsTempGroup)
42625559 tGroup.add/*Child*/(tmp);
42635560 else
4264
- GrafreeD.clipboard = tmp;
5561
+ Grafreed.clipboard = tmp;
42655562 }
42665563 else
4267
- if (GrafreeD.clipboardIsTempGroup)
5564
+ if (Grafreed.clipboardIsTempGroup)
42685565 tGroup.add/*Child*/(child);
42695566 else
4270
- GrafreeD.clipboard = child;
5567
+ Grafreed.clipboard = child;
42715568 }
42725569
42735570 //ResetModel();
....@@ -4299,21 +5596,23 @@
42995596 //System.out.println("cut " + elem);
43005597 //System.out.println("parent = " + elem.parent);
43015598 // tmp.addChild(elem);
4302
- if (GrafreeD.clipboardIsTempGroup)
5599
+ if (Grafreed.clipboardIsTempGroup)
43035600 tGroup.add/*Child*/(tmp);
43045601 else
4305
- GrafreeD.clipboard = tmp;
5602
+ Grafreed.clipboard = tmp;
43065603 }
43075604 else
4308
- if (GrafreeD.clipboardIsTempGroup)
5605
+ if (Grafreed.clipboardIsTempGroup)
43095606 tGroup.add/*Child*/(child);
43105607 else
4311
- GrafreeD.clipboard = child;
5608
+ Grafreed.clipboard = child;
43125609 }
43135610
43145611 }
4315
- if (GrafreeD.clipboardIsTempGroup)
4316
- GrafreeD.clipboard = tGroup;
5612
+
5613
+ if (Grafreed.clipboardIsTempGroup)
5614
+ Grafreed.clipboard = tGroup;
5615
+
43175616 if (cut)
43185617 {
43195618 ResetModel();
....@@ -4323,11 +5622,15 @@
43235622
43245623 void paste(boolean expand)
43255624 {
5625
+ if (Globals.REPLACEONMAKE)
5626
+ Save();
5627
+ boolean keep = Globals.REPLACEONMAKE;
5628
+ Globals.REPLACEONMAKE = false;
43265629 // if (GrafreeD.clipboard == null)
43275630 // return;
43285631 boolean first = true;
43295632
4330
- if (GrafreeD.clipboardIsTempGroup)
5633
+ if (Grafreed.clipboardIsTempGroup)
43315634 {
43325635 Composite temp;
43335636
....@@ -4338,7 +5641,7 @@
43385641 temp = (Composite)Applet3D.clipboard.deepCopy();
43395642 */
43405643 Object3D elem;
4341
- 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))
43425645 {
43435646 Object3D child = (Object3D)e.nextElement();
43445647
....@@ -4372,21 +5675,22 @@
43725675 //Object3D cb = Applet3D.clipboard;
43735676 //temp.addChild(cb);
43745677 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375
- assert(GrafreeD.clipboard.parent == null);
4376
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4377
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379
- 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());
43805683 else
4381
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382
- GrafreeD.clipboard.get(0).parent = keepparent;
5684
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5685
+ Grafreed.clipboard.get(0).parent = keepparent;
43835686 }
43845687
5688
+ Globals.REPLACEONMAKE = keep;
43855689 ResetModel();
43865690 refreshContents();
43875691 }
43885692
4389
- void pasteInto(boolean copyit)
5693
+ void pasteInto(boolean copyit, boolean clone)
43905694 {
43915695 // if (GrafreeD.clipboard == null)
43925696 // return;
....@@ -4415,15 +5719,22 @@
44155719 if (copyit)
44165720 {
44175721 // paste(false);
4418
- CloneClipboard(false); // sept 2014
5722
+ if (clone)
5723
+ {
5724
+ CloneClipboard(false); // sept 2014
5725
+ }
5726
+ else
5727
+ {
5728
+ paste(false);
5729
+ }
44195730 }
44205731 else
44215732 {
44225733 boolean first = true;
44235734
4424
- if (GrafreeD.clipboardIsTempGroup)
5735
+ if (Grafreed.clipboardIsTempGroup)
44255736 {
4426
- Composite temp = (Composite)GrafreeD.clipboard;
5737
+ Composite temp = (Composite)Grafreed.clipboard;
44275738 Object3D copy;
44285739 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
44295740 {
....@@ -4433,7 +5744,7 @@
44335744 }
44345745 } else
44355746 {
4436
- linkSomething(GrafreeD.clipboard); //.get(0));
5747
+ linkSomething(Grafreed.clipboard); //.get(0));
44375748 }
44385749 }
44395750 }
....@@ -4510,6 +5821,10 @@
45105821
45115822 void group(Object3D csg, boolean grab)
45125823 {
5824
+ if (Globals.REPLACEONMAKE)
5825
+ Save();
5826
+ boolean keep = Globals.REPLACEONMAKE;
5827
+ Globals.REPLACEONMAKE = false;
45135828 if (//false) // why??
45145829 !group.selection.isEmpty())
45155830 {
....@@ -4623,10 +5938,15 @@
46235938 //node.add(csg);
46245939 //makeSomething(node);
46255940 makeSomething(csg);
5941
+ Globals.REPLACEONMAKE = keep;
46265942 }
46275943
46285944 void Ungroup(Object3D g)
46295945 {
5946
+ if (Globals.REPLACEONMAKE)
5947
+ Save();
5948
+ boolean keep = Globals.REPLACEONMAKE;
5949
+ Globals.REPLACEONMAKE = false;
46305950 if (g instanceof HiddenObject)
46315951 {
46325952 HiddenObject h = (HiddenObject) g;
....@@ -4643,6 +5963,7 @@
46435963 objEditor.makeSomething(g.get(i), false);
46445964 }
46455965 }
5966
+ Globals.REPLACEONMAKE = keep;
46465967 }
46475968
46485969 void ungroup()
....@@ -4838,21 +6159,6 @@
48386159 }
48396160 */
48406161
4841
- void ImportGFD()
4842
- {
4843
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844
- browser.show();
4845
- String filename = browser.getFile();
4846
- if (filename != null && filename.length() > 0)
4847
- {
4848
- String fullname = browser.getDirectory() + filename;
4849
-
4850
- //Object3D readobj =
4851
- objEditor.ReadGFD(fullname, objEditor);
4852
- //makeSomething(readobj);
4853
- }
4854
- }
4855
-
48566162 /*
48576163 public void Callback(Object obj)
48586164 {
....@@ -4876,26 +6182,9 @@
48766182 }
48776183 */
48786184
4879
- void ImportVRMLX3D()
4880
- {
4881
- if (GrafreeD.standAlone)
4882
- {
4883
- /**/
4884
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885
- browser.show();
4886
- String filename = browser.getFile();
4887
- if (filename != null && filename.length() > 0)
4888
- {
4889
- String fullname = browser.getDirectory() + filename;
4890
- LoadVRMLX3D(fullname);
4891
- }
4892
- /**/
4893
- }
4894
- }
4895
-
48966185 String GetFile(String dialogName)
48976186 {
4898
- if (GrafreeD.standAlone)
6187
+ if (Grafreed.standAlone)
48996188 {
49006189 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
49016190 browser.show();
....@@ -4959,10 +6248,48 @@
49596248 cButton flashSelectionButton;
49606249 cButton editButton;
49616250 cButton uneditButton;
6251
+ JCheckBox allParamsButton;
49626252 cButton clearpanelButton;
4963
- cButton allParamsButton;
49646253 cButton unselectButton;
49656254
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
+
49666293 cButton screenfitButton;
49676294 cButton screenfitpointButton;
49686295 cButton snapobjectButton;
....@@ -4974,14 +6301,6 @@
49746301
49756302 cButton setsupportButton;
49766303
4977
- cButton twoButton;
4978
- cButton sixButton;
4979
- cButton threeButton;
4980
- cButton sevenButton;
4981
- cButton fourButton; // full panel
4982
- cButton oneButton; // full XYZ
4983
- //cButton currentLayout;
4984
-
49856304 //
49866305 //Composite
49876306 Object3D // to do !!
....@@ -4991,10 +6310,12 @@
49916310 //JTree jTree;
49926311 private MenuItem lookAtItem;
49936312 private MenuItem lookFromItem;
4994
- private MenuItem switchItem;
4995
- private MenuItem cutItem;
4996
- private MenuItem duplicateItem;
4997
- 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;
49986319 private MenuItem cloneSupportItem;
49996320 private MenuItem overwriteGeoItem;
50006321 private MenuItem overwriteMatItem;
....@@ -5006,7 +6327,7 @@
50066327 private MenuItem linkverticesItem;
50076328 private MenuItem relinkverticesItem;
50086329 private MenuItem setMasterItem;
5009
- private MenuItem resetMeshItem;
6330
+ private MenuItem resetAllItem;
50106331 private MenuItem stepAllItem;
50116332 private MenuItem revertMeshItem;
50126333 private MenuItem poseMeshItem;
....@@ -5015,12 +6336,13 @@
50156336 private MenuItem cloneGeometriesItem;
50166337 private MenuItem shareGeometriesItem;
50176338 private MenuItem mergeGeometriesItem;
5018
- private MenuItem copyItem;
6339
+ private JMenuItem copyItem;
50196340 private MenuItem pasteItem;
5020
- private MenuItem pasteLinkItem;
5021
- private MenuItem pasteCloneItem;
5022
- private MenuItem pasteExpandItem;
5023
- private MenuItem clearItem;
6341
+ private JMenuItem pasteIntoItem;
6342
+ private JMenuItem pasteLinkItem;
6343
+ private JMenuItem pasteCloneItem;
6344
+ private JMenuItem pasteExpandItem;
6345
+ private JMenuItem deleteItem;
50246346 private MenuItem clearAllItem;
50256347 private MenuItem genUVItem;
50266348 private MenuItem genNormalsMESHItem;
....@@ -5046,6 +6368,7 @@
50466368 private MenuItem clipMeshItem;
50476369 private MenuItem smoothMeshItem;
50486370 private MenuItem clearMaterialsItem;
6371
+ private MenuItem clearVersionsItem;
50496372
50506373 private MenuItem liveleavesItem;
50516374 private MenuItem unliveleavesItem;
....@@ -5055,6 +6378,10 @@
50556378 private MenuItem showleavesItem;
50566379 private MenuItem markleavesItem;
50576380 private MenuItem unmarkleavesItem;
6381
+ private MenuItem rewindleavesItem;
6382
+ private MenuItem unrewindleavesItem;
6383
+ private MenuItem randomleavesItem;
6384
+ private MenuItem unrandomleavesItem;
50586385
50596386 private MenuItem flipVItem;
50606387 private MenuItem unflipVItem;
....@@ -5066,15 +6393,17 @@
50666393 private MenuItem panoTexturesItem;
50676394
50686395 private MenuItem resetCentroidItem;
5069
- private MenuItem transformgeometryItem;
6396
+ private MenuItem resetCentroidXZItem;
50706397 private MenuItem resetTransformItem;
6398
+ private MenuItem transformGeometryItem;
6399
+ private MenuItem transformChildrenItem;
50716400 private MenuItem hideItem;
5072
- private MenuItem grabItem;
6401
+ private JMenuItem grabItem;
50736402 private MenuItem backItem;
50746403 private MenuItem frontItem;
50756404 private MenuItem cameraItem;
50766405 private MenuItem compositeItem;
5077
- private MenuItem randomItem;
6406
+ private MenuItem switchItem;
50786407 private MenuItem physicsItem;
50796408 private MenuItem frameselectorItem;
50806409 private MenuItem scriptNodeItem;
....@@ -5082,7 +6411,7 @@
50826411 private MenuItem switchTransfoItem;
50836412 private MenuItem morphItem;
50846413 private MenuItem linkerItem;
5085
- private MenuItem ungroupItem;
6414
+ private JMenuItem ungroupItem;
50866415 private MenuItem editItem;
50876416 private MenuItem openWindowItem;
50886417 private MenuItem editLeafItem;
....@@ -5098,6 +6427,8 @@
50986427 private MenuItem attachBumpItem;
50996428 private MenuItem detachBumpItem;
51006429 private MenuItem pigmentBumpItem;
6430
+ private MenuItem embedTexturesItem;
6431
+ private MenuItem deEmbedTexturesItem;
51016432
51026433 private MenuItem particleItem;
51036434 private MenuItem ragdollItem;
....@@ -5114,7 +6445,7 @@
51146445 private MenuItem blobItem;
51156446 private MenuItem latheItem;
51166447 private MenuItem bezierItem;
5117
- private MenuItem checkerItem;
6448
+ private MenuItem overlayItem;
51186449 private MenuItem meshItem;
51196450 // private MenuItem meshGroupItem;
51206451 private MenuItem springItem;
....@@ -5136,11 +6467,6 @@
51366467 private MenuItem doubleItem;
51376468 private MenuItem tripleItem;
51386469
5139
- private MenuItem importGFDItem;
5140
- private MenuItem importVRMLX3DItem;
5141
- private MenuItem import3DSItem;
5142
- private MenuItem importOBJItem;
5143
-
51446470 private MenuItem computeAOItem;
51456471 private MenuItem recompileItem;
51466472 private MenuItem editScriptItem;
....@@ -5150,4 +6476,8 @@
51506476 private MenuItem analyzeItem;
51516477 private MenuItem dumpItem;
51526478 //boolean freezemodel = false;
6479
+
6480
+ Menu cameraMenu;
6481
+ MenuItem editCameraItem;
6482
+ MenuItem restoreCameraItem;
51536483 }