Normand Briere
2019-08-20 537f4ac57ae2b34f0a04fa63874c8ca6534c9a6d
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 }
....@@ -80,10 +445,22 @@
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,6 +471,7 @@
94471
95472 makeSomething(clone, i==group.selection.size()-1);
96473 }
474
+ Globals.REPLACEONMAKE = keep;
97475 }
98476
99477 void CloneClipboard(boolean supports)
....@@ -150,6 +528,8 @@
150528
151529 void SetupMenu2(GroupEditor oe)
152530 {
531
+ oe.jTree = new cTree();
532
+
153533 Menu menu;
154534 oe.menuBar.add(menu = new Menu("Edit"));
155535 //editItem = menu.add(new MenuItem("Edit"));
....@@ -160,35 +540,37 @@
160540 // redoItem = menu.add(new MenuItem("Redo"));
161541 // redoItem.addActionListener(this);
162542 // menu.add("-");
163
- duplicateItem = menu.add(new MenuItem("Duplicate"));
543
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164544 duplicateItem.addActionListener(this);
165
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166547 cloneItem.addActionListener(this);
167
- if (Globals.ADVANCED)
548
+ //if (Globals.ADVANCED)
168549 {
169550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170551 cloneSupportItem.addActionListener(this);
171552 }
553
+ oe.jTree.popup.addSeparator();
172554 menu.add("-");
173
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174556 cutItem.addActionListener(this);
175
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176558 copyItem.addActionListener(this);
177559 pasteItem = menu.add(new MenuItem("Paste"));
178560 pasteItem.addActionListener(this);
179561
180
- menu.add("-");
181
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
562
+ oe.jTree.popup.addSeparator();
563
+ //menu.add("-");
564
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
182565 pasteIntoItem.addActionListener(this);
183
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
184567 pasteLinkItem.addActionListener(this);
185
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
186569 pasteCloneItem.addActionListener(this);
187
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
188571 // pasteExpandItem.addActionListener(this);
189
- menu.add("-");
190
- clearItem = menu.add(new MenuItem("Clear"));
191
- clearItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
192574
193575 if (Globals.ADVANCED)
194576 {
....@@ -202,23 +584,23 @@
202584 //zBufferItem.addActionListener(this);
203585 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204586 //normalLensItem.addActionListener(this);
205
- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206
- revertCameraItem.addActionListener(this);
587
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
588
+ restoreCameraItem.addActionListener(this);
207589
208
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209
- toggleFullScreenItem.addItemListener(this);
210
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211
- cameraMenu.add("-");
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);
212602
213
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214
- toggleTextureItem.addItemListener(this);
215
- toggleTextureItem.setState(CameraPane.textureon);
216
-
217
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218
- toggleSwitchItem.addItemListener(this);
219
- toggleSwitchItem.setState(CameraPane.SWITCH);
220
-
221
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
603
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222604 toggleHandleItem.addItemListener(this);
223605 toggleHandleItem.setState(CameraPane.HANDLES);
224606
....@@ -273,15 +655,13 @@
273655 {
274656 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275657 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
658
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278659 oe.cameraMenu.add("-");
279660 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280661 openWindowItem.addActionListener(this);
281
- editLeafItem.addActionListener(this);
282662 lookAtItem.addActionListener(this);
283663 //lookFromItem.addActinoListener(this);
284
- //switchItem.addActionListener(this);
664
+ //switchViewItem.addActionListener(this);
285665 }
286666
287667 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -325,22 +705,37 @@
325705 setMasterItem.addActionListener(this);
326706 }
327707
328
- oe.menuBar.add(menu = new Menu("Group"));
329
- grabItem = menu.add(new MenuItem("Grab"));
330
- grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
331710 backItem = menu.add(new MenuItem("Back"));
332711 backItem.addActionListener(this);
333712 frontItem = menu.add(new MenuItem("Front"));
334713 frontItem.addActionListener(this);
335
- compositeItem = menu.add(new MenuItem("Composite"));
336
- compositeItem.addActionListener(this);
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
+ {
337722 hideItem = menu.add(new MenuItem("Hidden Group"));
338723 hideItem.addActionListener(this);
339
- ungroupItem = menu.add(new MenuItem("Ungroup"));
724
+ }
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
340726 ungroupItem.addActionListener(this);
341
- menu.add("-");
342
- randomItem = menu.add(new MenuItem("Switch node"));
343
- randomItem.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
+ {
344739 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345740 switchGeoItem.addActionListener(this);
346741 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -348,8 +743,6 @@
348743 morphItem = menu.add(new MenuItem("Morph Group"));
349744 morphItem.addActionListener(this);
350745
351
- if (Globals.ADVANCED)
352
- {
353746 menu.add("-");
354747 physicsItem = menu.add(new MenuItem("Physics"));
355748 physicsItem.addActionListener(this);
....@@ -357,13 +750,11 @@
357750 frameselectorItem.addActionListener(this);
358751 scriptNodeItem = menu.add(new MenuItem("Script Node"));
359752 scriptNodeItem.addActionListener(this);
360
- cameraItem = menu.add(new MenuItem("Camera"));
361
- cameraItem.addActionListener(this);
362753 }
363754
364755 oe.menuBar.add(menu = new Menu("Object"));
365
- textureItem = menu.add(new MenuItem("Texture"));
366
- textureItem.addActionListener(this);
756
+// textureItem = menu.add(new MenuItem("Texture"));
757
+// textureItem.addActionListener(this);
367758 billboardItem = menu.add(new MenuItem("Billboard"));
368759 billboardItem.addActionListener(this);
369760 csgItem = menu.add(new MenuItem("CSG"));
....@@ -374,13 +765,14 @@
374765 shadowYItem.addActionListener(this);
375766 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376767 shadowZItem.addActionListener(this);
768
+ attributeItem = menu.add(new MenuItem("Attribute"));
769
+ attributeItem.addActionListener(this);
770
+
377771 if (Globals.ADVANCED)
378772 {
379773 menu.add("-");
380774 linkerItem = menu.add(new MenuItem("Linker"));
381775 linkerItem.addActionListener(this);
382
- attributeItem = menu.add(new MenuItem("Attribute"));
383
- attributeItem.addActionListener(this);
384776 templateItem = menu.add(new MenuItem("Template"));
385777 templateItem.addActionListener(this);
386778 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -409,7 +801,7 @@
409801 genNormalsMESHItem.addActionListener(this);
410802 if (Globals.ADVANCED)
411803 {
412
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
804
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413805 genNormalsMINEItem.addActionListener(this);
414806 }
415807 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -465,9 +857,9 @@
465857 hideleavesItem.addActionListener(this);
466858 showleavesItem = menu.add(new MenuItem("Show Leaves"));
467859 showleavesItem.addActionListener(this);
468
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
469861 markleavesItem.addActionListener(this);
470
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
471863 unmarkleavesItem.addActionListener(this);
472864 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473865 rewindleavesItem.addActionListener(this);
....@@ -502,10 +894,15 @@
502894 attachBumpItem.addActionListener(this);
503895 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504896 pigmentBumpItem.addActionListener(this);
897
+ //embedTexturesItem
505898 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506899 detachPigmentItem.addActionListener(this);
507900 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508901 detachBumpItem.addActionListener(this);
902
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
903
+ embedTexturesItem.addActionListener(this);
904
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
905
+ deEmbedTexturesItem.addActionListener(this);
509906 menu.add("-");
510907 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511908 sortbysizeItem.addActionListener(this);
....@@ -516,6 +913,9 @@
516913 shareGeometriesItem.addActionListener(this);
517914 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518915 mergeGeometriesItem.addActionListener(this);
916
+ menu.add("-");
917
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+ editLeafItem.addActionListener(this);
519919 if (Globals.ADVANCED)
520920 {
521921 // Pretty much the same as duplicate and clone.
....@@ -532,6 +932,75 @@
532932 buildToolsMenu(menu);
533933 }
534934
935
+ JTabbedPane resourcecontainer;
936
+ cGridBag currenttab;
937
+ //boolean added; // patch for jar
938
+
939
+ int tabcount = 0;
940
+ int colcount = 0;
941
+ int rowcount = 0;
942
+ int texturecount = 0;
943
+
944
+ int columns = 5;
945
+ int rows = 7;
946
+
947
+ public void ResourceCallBack(String[] path)
948
+ {
949
+// for (int i = 0; i < path.length; i++)
950
+// System.out.print(path[i] + "/");
951
+// System.out.println();
952
+
953
+ if (//rowcount == 0 ||
954
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
955
+ {
956
+ currenttab = new cGridBag();
957
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
958
+ currenttab.setName(tabname);
959
+ //added = false;
960
+ resourcecontainer.add(currenttab);
961
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
962
+ rowcount = 1;
963
+ colcount = 0;
964
+ texturecount = 0;
965
+ }
966
+
967
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
968
+ {
969
+ //if (!added)
970
+ {
971
+ //added = true;
972
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
973
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
974
+ }
975
+
976
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
977
+
978
+ if (++colcount >= columns)
979
+ {
980
+ colcount = 0;
981
+ currenttab.Return();
982
+
983
+ if (rowcount++ >= rows)
984
+ {
985
+ rowcount = 0;
986
+ }
987
+ }
988
+ }
989
+ else
990
+ {
991
+// if (!path[path.length-1].equals("icons"))
992
+// resourcecontainer.Return();
993
+ }
994
+ }
995
+
996
+ void CreateTexturePanel(cGridBag container)
997
+ {
998
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
999
+ container.add(resourcecontainer);
1000
+
1001
+ Grafreed.ParseResources("textures", this);
1002
+ }
1003
+
5351004 void SetupUI2(ObjEditor oe)
5361005 {
5371006 // June 2019
....@@ -549,11 +1018,6 @@
5491018 //new Exception().printStackTrace();
5501019
5511020 oe.radioPanel = new JPanel(new GridBagLayout());
552
- oe.aConstraints.weightx = 1;
553
- oe.aConstraints.weighty = 0;
554
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
555
- oe.aConstraints.gridwidth = 100;
556
- oe.aConstraints.gridheight = 1;
5571021 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5581022
5591023 oe.buttonGroup = new ButtonGroup();
....@@ -574,117 +1038,266 @@
5741038 oe.radioPanel.add(dummyButton);
5751039 oe.buttonGroup.add(dummyButton);
5761040 */
1041
+ cGridBag versionManagerPanel = new cGridBag();
1042
+
1043
+ versionManagerPanel.preferredHeight = 4;
1044
+
5771045 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
5781046
5791047 //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5801048 //minButton.setToolTipText("Minimize window");
5811049 //minButton.addActionListener(this);
5821050
583
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584
- maxButton.setToolTipText("Maximize window");
585
- maxButton.addActionListener(this);
1051
+ if (Globals.ADVANCED)
1052
+ {
1053
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
+// maxButton.setToolTipText("Maximize window");
1055
+// maxButton.addActionListener(this);
1056
+ }
5861057
587
- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
+ cButton gcButton;
1059
+
1060
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// gcButton.setToolTipText("Garbage collect");
1062
+// gcButton.addActionListener(new ActionListener()
1063
+// {
1064
+// public void actionPerformed(ActionEvent e)
1065
+// {
1066
+// System.gc();
1067
+// }
1068
+// });
1069
+
1070
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1071
+ collapseButton.setToolTipText("Collapse toolbar");
1072
+ collapseButton.addActionListener(this);
1073
+
1074
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1075
+ maximize3DButton.setToolTipText("Maximize 3D view");
1076
+ maximize3DButton.addActionListener(this);
1077
+
1078
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1079
+ twoButton.setToolTipText("Show 3D view only");
1080
+ twoButton.addActionListener(this);
1081
+ this.fullscreenLayout = twoButton;
1082
+
1083
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084
+ threeButton.setToolTipText("Show controls and 3D view");
1085
+ threeButton.addActionListener(this);
1086
+ if (Globals.ADVANCED)
1087
+ {
1088
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
+ sixButton.setToolTipText("Show 3D view and controls");
1090
+ sixButton.addActionListener(this);
1091
+ }
1092
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093
+// sevenButton.setToolTipText("3-column layout");
1094
+// sevenButton.addActionListener(this);
1095
+ //
1096
+
1097
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
5881098 fullButton.setToolTipText("Full-screen window");
5891099 fullButton.addActionListener(this);
5901100
591
- oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592
- undoButton.setToolTipText("Undo changes");
593
- undoButton.addActionListener(this);
594
-
595
- oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
- redoButton.setToolTipText("Redo changes");
597
- redoButton.addActionListener(this);
598
-
599
- oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
- saveButton.setToolTipText("Save changes");
601
- saveButton.addActionListener(this);
602
-
603
- oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604
- liveCB.setToolTipText("Enable animation");
605
- liveCB.addItemListener(this);
1101
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1102
+ screenfitButton.setToolTipText("Screen fit");
1103
+ screenfitButton.addActionListener(this);
6061104
607
- oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
608
- fastCB.setToolTipText("Fast mode");
609
- fastCB.addItemListener(this);
610
-
611
- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1106
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1107
+ restoreCameraButton.addActionListener(this);
1108
+
1109
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1110
+ saveVersionButton.setToolTipText("Duplicate current version");
1111
+ saveVersionButton.addActionListener(this);
1112
+
1113
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1114
+ deleteVersionButton.setToolTipText("Delete current version");
1115
+ deleteVersionButton.addActionListener(this);
1116
+ deleteVersionButton.setEnabled(false);
1117
+
1118
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1119
+ previousVersionButton.setToolTipText("Previous version");
1120
+ previousVersionButton.addActionListener(this);
1121
+ previousVersionButton.setEnabled(false);
1122
+
1123
+ cGridBag updown = new cGridBag().setVertical(true);
1124
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1125
+ restoreButton.setToolTipText("Undo (restore current version)");
1126
+ restoreButton.addActionListener(this);
1127
+ restoreButton.setEnabled(false);
1128
+
1129
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
+ replaceButton.setToolTipText("Save (replace current version)");
1131
+ replaceButton.addActionListener(this);
1132
+ replaceButton.setEnabled(false);
1133
+
1134
+ versionManagerPanel.add(updown);
1135
+
1136
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1137
+ nextVersionButton.setToolTipText("Next version");
1138
+ nextVersionButton.addActionListener(this);
1139
+ nextVersionButton.setEnabled(false);
1140
+
1141
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6121142 oneStepButton.setToolTipText("Animate one step forward");
6131143 oneStepButton.addActionListener(this);
6141144
615
- oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
616
- trackCB.setToolTipText("Enable tracking");
617
- trackCB.addItemListener(this);
1145
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1146
+ liveCB.setToolTipText("Enable animation");
1147
+ liveCB.addItemListener(this);
6181148
619
- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
- screenfitButton.setToolTipText("Screen fit");
621
- screenfitButton.addActionListener(this);
1149
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1150
+ fastCB.setToolTipText("Fast mode");
1151
+ fastCB.addItemListener(this);
1152
+
1153
+ //oe.toolboxPanel.Return();
1154
+
1155
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1156
+// trackCB.setToolTipText("Enable tracking");
1157
+// trackCB.addItemListener(this);
6221158
6231159 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
6241160 // screenfitpointButton.addActionListener(this);
6251161
6261162 if (Globals.ADVANCED)
6271163 {
628
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6291165 snapobjectButton.addActionListener(this);
6301166 snapobjectButton.setToolTipText("Snap Object");
1167
+
1168
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1169
+ fourButton.addActionListener(this);
1170
+ fourButton.setToolTipText("Show control panel only");
6311171 }
6321172
633
- oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
- flashSelectionButton.setToolTipText("Highlight selection");
635
- flashSelectionButton.addActionListener(this);
1173
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6361174
637
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638
-
639
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640
- twoButton.setToolTipText("Show center view only");
641
- twoButton.addActionListener(this);
642
- oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643
- fourButton.addActionListener(this);
644
- fourButton.setToolTipText("Show left panel only");
645
- oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646
- sixButton.setToolTipText("2-column layout left");
647
- sixButton.addActionListener(this);
648
- oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649
- threeButton.setToolTipText("2-column layout right");
650
- threeButton.addActionListener(this);
651
- oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652
- sevenButton.setToolTipText("3-column layout");
653
- sevenButton.addActionListener(this);
654
- //
6551175
656
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657
- rootButton.setToolTipText("Edit selection in new tab");
1176
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1177
+ rootButton.setToolTipText("Open selection in new tab");
6581178 rootButton.addActionListener(this);
6591179
660
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6611181 closeButton.setToolTipText("Close tab");
6621182 closeButton.addActionListener(this);
6631183 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
6641184 //clearButton.addActionListener(this);
665
-
666
- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667
- editButton.setToolTipText("Edit selection");
1185
+
1186
+ cGridBag row1 = new cGridBag();
1187
+
1188
+ // INSERT
1189
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1190
+ gridButton.setToolTipText("Create ground");
1191
+ gridButton.addActionListener(this);
1192
+
1193
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1194
+ boxButton.setToolTipText("Create box");
1195
+ boxButton.addActionListener(this);
1196
+
1197
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1198
+ superButton.setToolTipText("Create superellipsoid");
1199
+ superButton.addActionListener(this);
1200
+
1201
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1202
+ sphereButton.setToolTipText("Create sphere");
1203
+ sphereButton.addActionListener(this);
1204
+
1205
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1206
+ coneButton.setToolTipText("Create cone");
1207
+ coneButton.addActionListener(this);
1208
+
1209
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1210
+ torusButton.setToolTipText("Create torus");
1211
+ torusButton.addActionListener(this);
1212
+
1213
+ if (Globals.ADVANCED)
1214
+ {
1215
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
+ kleinButton.setToolTipText("Create Klein bottle");
1217
+ kleinButton.addActionListener(this);
1218
+ }
1219
+
1220
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1221
+ particlesButton.setToolTipText("Create particle system");
1222
+ particlesButton.addActionListener(this);
1223
+
1224
+ oe.toolboxPanel.add(row1);
1225
+
1226
+ cGridBag row2 = new cGridBag();
1227
+
1228
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1229
+ groupButton.setToolTipText("Create group");
1230
+ groupButton.addActionListener(this);
1231
+
1232
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1233
+ compositeButton.setToolTipText("Create composite");
1234
+ compositeButton.addActionListener(this);
1235
+
1236
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1237
+ switchButton.setToolTipText("Create item switcher");
1238
+ switchButton.addActionListener(this);
1239
+
1240
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1241
+ loopButton.setToolTipText("Create loop");
1242
+ loopButton.addActionListener(this);
1243
+
1244
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1245
+ textureButton.setToolTipText("Create texture");
1246
+ textureButton.addActionListener(this);
1247
+
1248
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1249
+ overlayButton.setToolTipText("Create overlay");
1250
+ overlayButton.addActionListener(this);
1251
+
1252
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1253
+ lightButton.setToolTipText("Create light");
1254
+ lightButton.addActionListener(this);
1255
+
1256
+ oe.toolboxPanel.add(row2);
1257
+
1258
+ cGridBag textures = new cGridBag();
1259
+
1260
+ CreateTexturePanel(textures);
1261
+
1262
+ int tabCount = resourcecontainer.getTabCount();
1263
+
1264
+ if (tabCount > 0)
1265
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1266
+
1267
+ oe.toolboxPanel.add(textures);
1268
+
1269
+ textures.preferredHeight = 100;
1270
+
1271
+ CreateSkyboxPanel(oe.skyboxPanel);
1272
+
1273
+ // EDIT panel
1274
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1275
+ editButton.setToolTipText("Pin selection controls");
6681276 editButton.addActionListener(this);
6691277
670
- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671
- uneditButton.setToolTipText("Unedit selection");
1278
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1279
+ uneditButton.setToolTipText("Unpin and remove selection controls");
6721280 uneditButton.addActionListener(this);
6731281
6741282 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675
- allParamsButton.setToolTipText("Edit all params");
1283
+ allParamsButton.setToolTipText("Show all controls");
6761284 allParamsButton.addActionListener(this);
6771285
678
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679
- clearPanelButton.setToolTipText("Clear edit panel");
1286
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1287
+ clearPanelButton.setToolTipText("Clear all controls");
6801288 clearPanelButton.addActionListener(this);
6811289
682
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683
- unselectButton.setToolTipText("Unselect");
684
- unselectButton.addActionListener(this);
1290
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1291
+ //unselectButton.setToolTipText("Unselect");
1292
+ //unselectButton.addActionListener(this);
6851293
1294
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1295
+ flashSelectionButton.setToolTipText("Highlight selection");
1296
+ flashSelectionButton.addActionListener(this);
1297
+
6861298 editCommandsPanel.preferredHeight = 1;
6871299
1300
+ SetPinStates(false);
6881301 // oe.treePanel.add(commandsPanel);
6891302 // oe.treePanel.Return();
6901303
....@@ -701,34 +1314,24 @@
7011314
7021315 cGridBag jSPPanel = new cGridBag();
7031316
1317
+ jSPPanel.preferredHeight = 20;
1318
+
7041319 JScrollPane jSP;
7051320 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1321
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
7071322 ResetModel();
7081323
7091324 oe.treePanel.add(jSPPanel);
7101325 oe.treePanel.Return();
7111326
712
- cGridBag copyOptionsPanel = new cGridBag();
713
-
714
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715
- colorCB.setToolTipText("Copy color when dropped");
716
- colorCB.addItemListener(this);
717
-
718
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719
- materialCB.setToolTipText("Copy material when dropped");
720
- materialCB.addItemListener(this);
721
-
722
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723
- textureCB.setToolTipText("Copy texture when dropped");
724
- textureCB.addItemListener(this);
725
-
726
- copyOptionsPanel.preferredHeight = 1;
727
- oe.treePanel.add(copyOptionsPanel);
1327
+ oe.treePanel.add(versionManagerPanel);
7281328 oe.treePanel.Return();
1329
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1330
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1331
+ versionSliderPane.preferredHeight = 3;
7291332
730
-// mainPanel.setDividerLocation(0.5); //1.0);
731
-// mainPanel.setResizeWeight(0.5);
1333
+// mainPanel.setDividerLocation(0.1); //1.0);
1334
+ mainPanel.setResizeWeight(0.4);
7321335
7331336 //jList.addListSelectionListener(this);
7341337 oe.jTree.addTreeSelectionListener(this);
....@@ -736,7 +1339,7 @@
7361339 //jTree.setEditable(true);
7371340 oe.jTree.setDragEnabled(true);
7381341 //jTree.setPreferredSize(new Dimension(10,10));
739
- jSP.setPreferredSize(new Dimension(100,200));
1342
+ //jSP.setPreferredSize(new Dimension(100,200));
7401343
7411344 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
7421345
....@@ -748,29 +1351,49 @@
7481351 dgr.addDragGestureListener(this);
7491352 }catch(Exception e) {}
7501353 */
751
- radio.layout = sevenButton;
1354
+ radio.layout = threeButton; // sixButton;
7521355 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
7531356 }
7541357
7551358 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
7561359 {
1360
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1361
+ colorCB.setToolTipText("Copy color when dropped");
1362
+ colorCB.addItemListener(this);
1363
+
1364
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1365
+ materialCB.setToolTipText("Copy material when dropped");
1366
+ materialCB.addItemListener(this);
1367
+
1368
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1369
+ textureCB.setToolTipText("Copy texture when dropped");
1370
+ textureCB.addItemListener(this);
1371
+
1372
+ panel.Return();
1373
+
7571374 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
7581375 boxCB.setToolTipText("Display bounding boxes");
7591376 boxCB.addItemListener(this);
7601377
7611378 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1379
+ zoomBoxCB.setToolTipText("Display only for wheel");
7631380 zoomBoxCB.addItemListener(this);
7641381
7651382 if (true) // Globals.ADVANCED)
7661383 {
767
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768
- supportCB.setToolTipText("Enable rigging");
769
- supportCB.addItemListener(this);
1384
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1385
+// supportCB.setToolTipText("Enable rigging");
1386
+// supportCB.addItemListener(this);
1387
+
1388
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1389
+ freezeCB.setToolTipText("Fast moving camera");
1390
+ freezeCB.addItemListener(this);
7701391
7711392 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
7721393 // localCB.addItemListener(this);
7731394
1395
+ panel.Return();
1396
+
7741397 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
7751398 crowdCB.setToolTipText("Used for crowds");
7761399 crowdCB.addItemListener(this);
....@@ -779,14 +1402,19 @@
7791402 smoothCB.setToolTipText("Snapping delay");
7801403 smoothCB.addItemListener(this);
7811404
782
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783
- slowCB.setToolTipText("Smooth interpolation");
784
- slowCB.addItemListener(this);
1405
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1406
+// slowCB.setToolTipText("Smooth interpolation");
1407
+// slowCB.addItemListener(this);
1408
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1409
+ minshaderCB.setToolTipText("Minimal fast shader");
1410
+ minshaderCB.addItemListener(this);
7851411
7861412 // constraints.gridy += 1;
7871413 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
7881414 // speakerMocapCB.addItemListener(this);
7891415
1416
+ panel.Return();
1417
+
7901418 if (false)
7911419 {
7921420 // handled in scripts
....@@ -801,24 +1429,39 @@
8011429 //constraints.gridy += 1;
8021430 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
8031431 smoothfocusCB.addItemListener(this);
1432
+ panel.Return();
8041433 }
8051434
8061435 //constraints.gridx += 1;
8071436 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
8081437 // debugCB.addItemListener(this);
8091438
1439
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1440
+ trackCB.setToolTipText("Enable tracking target");
1441
+ trackCB.addItemListener(this);
1442
+
8101443 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811
- oeilCB.setToolTipText("Move camera when tracking target");
1444
+ oeilCB.setToolTipText("Move camera when tracking");
8121445 oeilCB.addItemListener(this);
8131446
8141447 panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815
- shadowCB.setToolTipText("Compute shadows when live");
1448
+ shadowCB.setToolTipText("When live compute shadows");
8161449 shadowCB.addItemListener(this);
8171450
818
- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
819
- autosaveCB.setToolTipText("Auto-save on structure change");
820
- autosaveCB.addItemListener(this);
1451
+ panel.Return();
1452
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1453
+ toggleTextureCB.setToolTipText("Load textures");
1454
+ toggleTextureCB.addItemListener(this);
1455
+
1456
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1457
+ toggleSwitchCB.setToolTipText("Choose a single item");
1458
+ toggleSwitchCB.addItemListener(this);
1459
+
1460
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1461
+ autokeepCB.setToolTipText("On structure change");
1462
+ autokeepCB.addItemListener(this);
8211463
1464
+ panel.Return();
8221465 if (Globals.ADVANCED)
8231466 {
8241467 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
....@@ -829,18 +1472,31 @@
8291472 }
8301473
8311474 cGridBag fill = new cGridBag();
832
-
8331475 fill.preferredHeight = 200;
1476
+ cGridBag fill2 = new cGridBag();
1477
+ fill2.preferredHeight = 200;
1478
+ cGridBag fill3 = new cGridBag();
1479
+ fill3.preferredHeight = 200;
8341480
8351481 panel.add(fill);
1482
+ panel.add(fill2);
1483
+ panel.add(fill3);
8361484
8371485 }
8381486
8391487 void EditObject(Object3D obj)
8401488 {
1489
+ assert(obj instanceof Composite);
1490
+
1491
+// if (obj.versionlist == null)
1492
+// {
1493
+// obj.versionlist = new Object3D[100];
1494
+// obj.versionindex = -1;
1495
+// }
1496
+
8411497 cRadio radioButton = new cRadio(obj.name);
8421498
843
- // Patch to avoid bug with transparency.
1499
+ // June 2019. Patch to avoid bug with transparency.
8441500 radioButton.hadMaterial = obj.material != null;
8451501 if (!radioButton.hadMaterial)
8461502 {
....@@ -848,7 +1504,7 @@
8481504 }
8491505
8501506 radioButton.SetObject(obj);
851
- radioButton.layout = sevenButton;
1507
+ radioButton.layout = threeButton; // sixButton;
8521508 radioButton.SetCamera(cameraView.renderCamera, false);
8531509 radioButton.addActionListener(this);
8541510 radioPanel.add(radioButton);
....@@ -862,21 +1518,26 @@
8621518
8631519 oe.SetupViews();
8641520
1521
+ if (Globals.DEBUG)
8651522 System.out.println("SetupViews");
8661523 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
8671524 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
8681525 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
8691526 }
8701527
871
- cCheckBox liveCB;
1528
+ cToggleButton liveCB;
8721529 cCheckBox supportCB;
8731530 cCheckBox localCB;
8741531 cCheckBox crowdCB;
8751532 cCheckBox smoothCB;
876
- cCheckBox fastCB;
1533
+ cCheckBox minshaderCB;
1534
+
1535
+ cToggleButton fastCB;
8771536 cCheckBox slowCB;
8781537 cCheckBox boxCB;
8791538 cCheckBox zoomBoxCB;
1539
+ cCheckBox freezeCB;
1540
+ //cToggleButton trackCB;
8801541 cCheckBox trackCB;
8811542 cCheckBox smoothfocusCB;
8821543 // JCheckBox speakerMocapCB;
....@@ -886,7 +1547,7 @@
8861547
8871548 cCheckBox oeilCB;
8881549 cCheckBox shadowCB;
889
- cCheckBox autosaveCB;
1550
+ cCheckBox autokeepCB;
8901551 cCheckBox lookAtCB;
8911552
8921553 // static int COLOR = 1;
....@@ -942,6 +1603,12 @@
9421603 cameraView.ToggleInertia();
9431604 cameraView.repaint();
9441605 }
1606
+ else if(e.getSource() == minshaderCB)
1607
+ {
1608
+ Globals.MINSHADER ^= true;
1609
+ cameraView.programInitialized = false;
1610
+ cameraView.repaint();
1611
+ }
9451612 else if(e.getSource() == localCB)
9461613 {
9471614 cameraView.ToggleLocal();
....@@ -994,9 +1661,13 @@
9941661 {
9951662 Globals.COMPUTESHADOWWHENLIVE ^= true;
9961663 }
997
- else if(e.getSource() == autosaveCB)
1664
+ else if(e.getSource() == freezeCB)
9981665 {
999
- Globals.SAVEONMAKE ^= true;
1666
+ Globals.FREEZEONMOVE ^= true;
1667
+ }
1668
+ else if(e.getSource() == autokeepCB)
1669
+ {
1670
+ Globals.REPLACEONMAKE ^= true;
10001671 }
10011672 else if(e.getSource() == lookAtCB)
10021673 {
....@@ -1014,7 +1685,8 @@
10141685
10151686 /**/
10161687 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1017
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1688
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1689
+ TreePath path = objEditor.jTree.getSelectionPath();
10181690 if ((path == null) || (path.getPathCount() <= 1)) {
10191691 // We can't move the root node or an empty selection
10201692 return;
....@@ -1077,8 +1749,6 @@
10771749 }
10781750 }
10791751
1080
- String string = (String) object;
1081
-
10821752 System.out.println("Transfer = " + object + "; drop : " + target);
10831753 // if( object instanceof java.io.File[])
10841754 // {
....@@ -1086,6 +1756,8 @@
10861756 // objEditor.DropFile((java.io.File[]) object, true);
10871757 // return;
10881758 // }
1759
+
1760
+ String string = object.toString();
10891761
10901762 // File path for Mac and Windows
10911763 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1131,23 +1803,33 @@
11311803
11321804 assert target == objEditor.jTree;
11331805 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1806
+ Object3D destinationLeaf;
11341807 try {
1135
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1808
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
11361809 } catch (Exception e) {
11371810 System.out.println("destinationPath : " + destinationPath);
11381811 return;
11391812 }
11401813
1141
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1814
+ for (int i=group.selection.size(); --i>=0;)
11421815 {
1816
+ Object3D child = (Object3D)group.selection.elementAt(i);
1817
+
1818
+ // Cannot move into itself
1819
+ if (child == destinationLeaf)
1820
+ return;
1821
+ }
1822
+
1823
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1824
+// {
11431825 loadClipboard(true);
11441826 objEditor.jTree.setSelectionPath(destinationPath);
11451827 pasteInto(false, false);
1146
- } else {
1147
- loadClipboard(false);
1148
- objEditor.jTree.setSelectionPath(destinationPath);
1149
- pasteInto(false, false); // true); // ???
1150
- }
1828
+// } else {
1829
+// loadClipboard(false);
1830
+// objEditor.jTree.setSelectionPath(destinationPath);
1831
+// pasteInto(false, false); // true); // ???
1832
+// }
11511833 }
11521834 public void dropActionChanged(DropTargetDragEvent dtde)
11531835 // Called if the user has modified the current drop gesture
....@@ -1203,7 +1885,12 @@
12031885 TreePath path;
12041886
12051887 public TransferableTreePath(TreePath tp) {
1206
- path = tp;
1888
+ Object[] objs = new Object[tp.getPathCount()];
1889
+ for (int i=0; i<objs.length; i++)
1890
+ {
1891
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1892
+ }
1893
+ path = new TreePath(objs);
12071894 }
12081895
12091896 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1252,22 +1939,30 @@
12521939 {
12531940 //heightFieldItem = menu.add(new MenuItem("Height Field"));
12541941 //heightFieldItem.addActionListener(this);
1255
- gridItem = menu.add(new MenuItem("Grid"));
1256
- gridItem.addActionListener(this);
1257
- rectoidItem = menu.add(new MenuItem("Box"));
1258
- rectoidItem.addActionListener(this);
1259
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1260
- ellipsoidItem.addActionListener(this);
1261
- coneItem = menu.add(new MenuItem("Cone"));
1262
- coneItem.addActionListener(this);
1263
- torusItem = menu.add(new MenuItem("Torus"));
1264
- torusItem.addActionListener(this);
1265
- superItem = menu.add(new MenuItem("Superellipsoid"));
1266
- superItem.addActionListener(this);
1942
+// gridItem = menu.add(new MenuItem("Grid"));
1943
+// gridItem.addActionListener(this);
1944
+// rectoidItem = menu.add(new MenuItem("Box"));
1945
+// rectoidItem.addActionListener(this);
1946
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1947
+// ellipsoidItem.addActionListener(this);
1948
+// coneItem = menu.add(new MenuItem("Cone"));
1949
+// coneItem.addActionListener(this);
1950
+// torusItem = menu.add(new MenuItem("Torus"));
1951
+// torusItem.addActionListener(this);
1952
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1953
+// superItem.addActionListener(this);
1954
+
1955
+ cameraItem = menu.add(new MenuItem("Camera"));
1956
+ cameraItem.addActionListener(this);
1957
+
1958
+ if (!Globals.ADVANCED)
1959
+ {
12671960 kleinItem = menu.add(new MenuItem("Klein Bottle"));
12681961 kleinItem.addActionListener(this);
1269
- particleItem = menu.add(new MenuItem("Particle system"));
1270
- particleItem.addActionListener(this);
1962
+ }
1963
+
1964
+// particleItem = menu.add(new MenuItem("Particle system"));
1965
+// particleItem.addActionListener(this);
12711966 if (Globals.ADVANCED)
12721967 {
12731968 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1293,15 +1988,15 @@
12931988 }
12941989 bezierItem = menu.add(new MenuItem("Bezier Patch"));
12951990 bezierItem.addActionListener(this);
1296
- overlayItem = menu.add(new MenuItem("Overlay"));
1297
- overlayItem.addActionListener(this);
1298
- lightItem = menu.add(new MenuItem("Light"));
1299
- lightItem.addActionListener(this);
1991
+// overlayItem = menu.add(new MenuItem("Overlay"));
1992
+// overlayItem.addActionListener(this);
1993
+// lightItem = menu.add(new MenuItem("Light"));
1994
+// lightItem.addActionListener(this);
13001995 menu.add("-");
13011996 //superLoopItem = menu.add(new MenuItem("Super Loop"));
13021997 //superLoopItem.addActionListener(this);
1303
- loopItem = menu.add(new MenuItem("Loop"));
1304
- loopItem.addActionListener(this);
1998
+// loopItem = menu.add(new MenuItem("Loop"));
1999
+// loopItem.addActionListener(this);
13052000 doubleItem = menu.add(new MenuItem("Fork"));
13062001 doubleItem.addActionListener(this);
13072002 if (Globals.ADVANCED)
....@@ -1317,6 +2012,9 @@
13172012 animationItem.addItemListener(this);
13182013 animationItem.setState(Globals.ANIMATION);
13192014
2015
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2016
+ archiveItem.addActionListener(this);
2017
+
13202018 menu.add("-");
13212019 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
13222020 parseverticesItem.addActionListener(this);
....@@ -1329,6 +2027,8 @@
13292027 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
13302028 reduce34MorphItem.addActionListener(this);
13312029 menu.add("-");
2030
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2031
+ memoryItem.addActionListener(this);
13322032 menu.add(computeAOItem = new MenuItem("Compute AO"));
13332033 computeAOItem.addActionListener(this);
13342034
....@@ -1337,8 +2037,6 @@
13372037 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
13382038 mirrorItem.addActionListener(this);
13392039 menu.add("-");
1340
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1341
- memoryItem.addActionListener(this);
13422040 menu.add(analyzeItem = new MenuItem("Analyze"));
13432041 analyzeItem.addActionListener(this);
13442042 menu.add(dumpItem = new MenuItem("Print"));
....@@ -1482,10 +2180,38 @@
14822180 shadow.material = new cMaterial(obj.material);
14832181 shadow.material.diffuse = 0.0001f;
14842182 shadow.material.specular = 0.0001f;
1485
- //shadow.projectedVertices[1].x = 300;
2183
+ shadow.material.opacity = 0.75f;
2184
+
2185
+ AllocProjectedVertices(shadow);
2186
+
2187
+ shadow.projectedVertices[1].x = 300;
14862188
14872189 makeSomething(shadow);
14882190 }
2191
+
2192
+ private void ClearUnpinned()
2193
+ {
2194
+ //for (Object3D obj : listUI)
2195
+ for (int i=listUI.size(); --i>=0;)
2196
+ {
2197
+ Object3D obj = listUI.elementAt(i);
2198
+ if (!obj.pinned)
2199
+ {
2200
+ obj.CloseUI();
2201
+ listUI.remove(i);
2202
+ }
2203
+ }
2204
+ }
2205
+
2206
+ private void EditElement(Object3D elem, boolean newWindow)
2207
+ {
2208
+ // if (!(elem instanceof Composite))
2209
+ // newWindow = false;
2210
+ listUI.add(elem);
2211
+ elem.openEditWindow(this, newWindow); //, false);
2212
+ System.out.println("edit : " + elem);
2213
+ elem.editWindow.refreshContents(true); // ? new
2214
+ }
14892215
14902216 /**
14912217 * applyExample
....@@ -1730,7 +2456,7 @@
17302456 {
17312457 ScreenFit();
17322458 } else
1733
- if (source == switchItem)
2459
+ if (source == switchViewItem)
17342460 {
17352461 cVector v1 = new cVector();
17362462 cVector v2 = new cVector();
....@@ -1739,11 +2465,11 @@
17392465 objEditor.cameraView.renderCamera.setAim(v2, v1);
17402466 objEditor.cameraView.repaint();
17412467 } else
1742
- if (source == rectoidItem)
2468
+ if (source == rectoidItem || source == boxButton)
17432469 {
17442470 makeSomething(new Box());
17452471 } else
1746
- if (source == particleItem)
2472
+ if (source == particleItem || source == particlesButton)
17472473 {
17482474 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
17492475 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1822,27 +2548,27 @@
18222548
18232549 makeSomething(obj);
18242550 } else
1825
- if (source == gridItem)
2551
+ if (source == gridItem || source == gridButton)
18262552 {
18272553 makeSomething(new Grid());
18282554 } else
1829
- if (source == ellipsoidItem)
2555
+ if (source == ellipsoidItem || source == sphereButton)
18302556 {
18312557 makeSomething(new Sphere());
18322558 } else
1833
- if (source == coneItem)
2559
+ if (source == coneItem || source == coneButton)
18342560 {
18352561 makeSomething(new Cone());
18362562 } else
1837
- if (source == torusItem)
2563
+ if (source == torusItem || source == torusButton)
18382564 {
18392565 makeSomething(new Torus());
18402566 } else
1841
- if (source == superItem)
2567
+ if (source == superItem || source == superButton)
18422568 {
18432569 makeSomething(new Superellipsoid());
18442570 } else
1845
- if (source == kleinItem)
2571
+ if (source == kleinItem || source == kleinButton)
18462572 {
18472573 makeSomething(new Klein());
18482574 } else
....@@ -1862,7 +2588,7 @@
18622588 {
18632589 makeSomething(new BezierSurface());
18642590 } else
1865
- if (source == overlayItem)
2591
+ if (source == overlayItem || source == overlayButton)
18662592 {
18672593 /*
18682594 Object3D obj = new BezierSurface(5,8);
....@@ -1910,10 +2636,27 @@
19102636 s.setup();
19112637 makeSomething(s);
19122638 } else
1913
- if (source == lightItem)
2639
+ if (source == lightItem || source == lightButton)
19142640 {
19152641 makeSomething(new Light());
19162642 } else
2643
+// if (source == skybox1Button ||
2644
+// source == skybox2Button ||
2645
+// source == skybox3Button ||
2646
+// source == skybox4Button ||
2647
+// source == skybox5Button ||
2648
+// source == skybox6Button ||
2649
+// source == skybox7Button ||
2650
+// source == skybox11Button ||
2651
+// source == skybox12Button ||
2652
+// source == skybox13Button ||
2653
+// source == skybox14Button ||
2654
+// source == skybox15Button ||
2655
+// source == skybox16Button ||
2656
+// source == skybox17Button)
2657
+// {
2658
+// ChangeSkybox(source);
2659
+// } else
19172660 if (source == csgItem)
19182661 {
19192662 group(new CSG());
....@@ -1960,30 +2703,38 @@
19602703
19612704 group(g);
19622705 } else
1963
- if (source == loopItem)
2706
+ if (source == loopItem || source == loopButton)
19642707 {
2708
+ if (!group.selection.isEmpty())
2709
+ {
19652710 Composite csg = new GroupLeaf();
19662711 csg.count = 5;
1967
- group(csg);
1968
- Composite child = new cGroup();
2712
+ Composite child = new cGroup("Branch");
19692713 csg.addChild(child);
19702714 child.addChild(csg);
2715
+ group(csg);
2716
+ }
19712717 } else
19722718 if (source == doubleItem)
19732719 {
1974
- Composite csg = new GroupLeaf();
2720
+ if (!group.selection.isEmpty())
2721
+ {
2722
+ Composite csg = new GroupLeaf("Fork");
19752723 csg.count = 5;
2724
+ Composite child = new cGroup("Branch A");
2725
+ csg.addChild(child);
2726
+ child.addChild(csg);
2727
+ child = new cGroup("Branch B");
2728
+ csg.addChild(child);
2729
+ child.addChild(csg);
19762730 group(csg);
1977
- Composite child = new cGroup();
1978
- csg.addChild(child);
1979
- child.addChild(csg);
1980
- child = new cGroup();
1981
- csg.addChild(child);
1982
- child.addChild(csg);
2731
+ }
19832732 } else
19842733 if (source == tripleItem)
19852734 {
1986
- Composite csg = new GroupLeaf();
2735
+ if (!group.selection.isEmpty())
2736
+ {
2737
+ Composite csg = new GroupLeaf("Trident");
19872738 csg.count = 4;
19882739 group(csg);
19892740 Composite child = new cGroup();
....@@ -1995,11 +2746,12 @@
19952746 child = new cGroup();
19962747 csg.addChild(child);
19972748 child.addChild(csg);
2749
+ }
19982750 } else
19992751 if (source == computeAOItem)
20002752 {
20012753 Globals.drawMode = CameraPane.OCCLUSION;
2002
- Globals.theRenderer.repaint();
2754
+ cameraView.repaint();
20032755 } else
20042756 if (source == recompileItem)
20052757 {
....@@ -2014,7 +2766,7 @@
20142766 if (source == invariantsItem)
20152767 {
20162768 System.out.println("Invariants:");
2017
- Grafreed.grafreeD.universe.invariants();
2769
+ Grafreed.grafreed.universe.invariants();
20182770 } else
20192771 if (source == memoryItem)
20202772 {
....@@ -2045,17 +2797,52 @@
20452797 {
20462798 ToggleFullScreen();
20472799 } else
2048
- if (source == undoButton)
2800
+ if (source == collapseButton)
20492801 {
2050
- Undo();
2802
+ this.expandedLayout = radio.layout;
2803
+ CollapseToolbar();
20512804 } else
2052
- if (source == redoButton)
2805
+ if (source == maximize3DButton)
20532806 {
2054
- Redo();
2807
+ this.expandedLayout = radio.layout;
2808
+ radio.layout = twoButton;
2809
+ Show3DView();
2810
+ CollapseToolbar();
20552811 } else
2056
- if (source == saveButton)
2812
+ if (source == previousVersionButton)
20572813 {
2058
- Save();
2814
+ // Go to previous version
2815
+ //if (!Undo())
2816
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2817
+ PreviousVersion();
2818
+ } else
2819
+ if (source == restoreButton)
2820
+ {
2821
+ // Restore current version
2822
+ Restore();
2823
+ //restoreButton.setEnabled(false);
2824
+ } else
2825
+ if (source == replaceButton)
2826
+ {
2827
+ // Overwrite current version
2828
+ Replace();
2829
+ //replaceButton.setEnabled(false);
2830
+ } else
2831
+ if (source == nextVersionButton)
2832
+ {
2833
+ // Go to next version
2834
+ NextVersion();
2835
+ } else
2836
+ if (source == saveVersionButton)
2837
+ {
2838
+ // Save a new version
2839
+ if (!Save(true))
2840
+ java.awt.Toolkit.getDefaultToolkit().beep();
2841
+ } else
2842
+ if (source == deleteVersionButton)
2843
+ {
2844
+ // Delete a new version
2845
+ DeleteVersion();
20592846 } else
20602847 if (source == oneStepButton)
20612848 {
....@@ -2064,17 +2851,14 @@
20642851 } else
20652852 if (source == screenfitButton)
20662853 {
2067
- //Reload(lastConverter, lastFilename, true);
20682854 ScreenFit();
20692855 } else
20702856 if (source == screenfitpointButton)
20712857 {
2072
- //Reload(lastConverter, lastFilename, true);
20732858 ScreenFitPoint();
20742859 } else
20752860 if (source == snapobjectButton)
20762861 {
2077
- //Reload(lastConverter, lastFilename, true);
20782862 SnapObject();
20792863 } else
20802864 // if (event.getSource() == recompileButton)
....@@ -2113,11 +2897,11 @@
21132897 } else
21142898 if (source == undoItem)
21152899 {
2116
- Undo();
2900
+ PreviousVersion();
21172901 } else
21182902 if (source == redoItem)
21192903 {
2120
- Redo();
2904
+ NextVersion();
21212905 } else
21222906 if (source == duplicateItem)
21232907 {
....@@ -2438,7 +3222,7 @@
24383222 {
24393223 StepAll();
24403224 } else
2441
- if (source == clearItem) // || event.getSource() == clearButton)
3225
+ if (source == deleteItem) // || event.getSource() == clearButton)
24423226 {
24433227 //int indices[] = jList.getSelectedIndices();
24443228 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2450,9 +3234,9 @@
24503234 {
24513235 ClearSelection(true);
24523236 } else
2453
- if (source == grabItem)
3237
+ if (source == grabItem || source == groupButton)
24543238 {
2455
- group(new cGroup(), true);
3239
+ group(new cGroup(), false); // true);
24563240 } else
24573241 if (source == hideItem)
24583242 {
....@@ -2470,11 +3254,11 @@
24703254 {
24713255 makeSomething(new Camera());
24723256 } else
2473
- if (source == compositeItem)
3257
+ if (source == compositeItem || source == compositeButton)
24743258 {
24753259 group(new Composite());
24763260 } else
2477
- if (source == randomItem)
3261
+ if (source == switchItem || source == switchButton)
24783262 {
24793263 RandomNode random = new RandomNode();
24803264 group(random);
....@@ -2576,7 +3360,7 @@
25763360 {
25773361 group(new cLinker());
25783362 } else
2579
- if (source == textureItem)
3363
+ if (source == textureItem || source == textureButton)
25803364 {
25813365 group(new TextureNode());
25823366 } else
....@@ -2596,17 +3380,42 @@
25963380 {
25973381 CastShadow(2);
25983382 } else
2599
- if (source == ungroupItem)
3383
+ if (source == ungroupItem || source == ungroupButton)
26003384 {
2601
- //ungroup();
3385
+ boolean canUngroup = true;
3386
+
26023387 for (int i=0; i<group.selection.size(); i++)
26033388 {
2604
- Ungroup(group.selection.get(i));
3389
+ Object3D selectedItem = group.selection.get(i);
3390
+
3391
+ if (selectedItem.Size() == 0)
3392
+ {
3393
+ // Cannot ungroup leaves
3394
+ canUngroup = false;
3395
+ break;
3396
+ }
3397
+
3398
+ if (selectedItem == group)
3399
+ {
3400
+ // Cannot ungroup root
3401
+ canUngroup = false;
3402
+ break;
3403
+ }
26053404 }
26063405
2607
- ClearSelection(false);
2608
-
2609
- refreshContents();
3406
+ if (canUngroup)
3407
+ {
3408
+ for (int i=0; i<group.selection.size(); i++)
3409
+ {
3410
+ Object3D selectedItem = group.selection.get(i);
3411
+
3412
+ Ungroup(selectedItem);
3413
+ }
3414
+
3415
+ ClearSelection(false);
3416
+
3417
+ refreshContents();
3418
+ }
26103419 } else
26113420 if (source == genUVItem)
26123421 {
....@@ -2907,7 +3716,7 @@
29073716 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
29083717 {
29093718 obj = (Object3D)e.nextElement();
2910
- obj.SetBumpTexture(null);
3719
+ obj.ResetBumpTexture();
29113720 }
29123721
29133722 refreshContents();
....@@ -2923,6 +3732,31 @@
29233732
29243733 refreshContents();
29253734 } else
3735
+ if (source == embedTexturesItem)
3736
+ {
3737
+ Object3D obj;
3738
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3739
+ {
3740
+ obj = (Object3D)e.nextElement();
3741
+ obj.EmbedTextures(true);
3742
+ }
3743
+
3744
+ refreshContents();
3745
+ } else
3746
+ if (source == deEmbedTexturesItem)
3747
+ {
3748
+ Object3D obj;
3749
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3750
+ {
3751
+ obj = (Object3D)e.nextElement();
3752
+ obj.EmbedTextures(false);
3753
+ }
3754
+
3755
+ CameraPane.texturepigment.clear();
3756
+ CameraPane.texturebump.clear();
3757
+
3758
+ refreshContents();
3759
+ } else
29263760 if (source == flashSelectionButton)
29273761 {
29283762 CameraPane.flash = true;
....@@ -2934,38 +3768,11 @@
29343768 if (source == twoButton)
29353769 {
29363770 radio.layout = twoButton;
2937
- // bug
2938
- //gridPanel.setDividerLocation(1.0);
2939
- //bigPanel.setDividerLocation(0.0);
2940
-// bigThree.remove(scenePanel);
2941
-// bigThree.remove(centralPanel);
2942
-// bigThree.remove(XYZPanel);
2943
-// aWindowConstraints.gridx = 0;
2944
-// aWindowConstraints.gridy = 0;
2945
-// aWindowConstraints.gridwidth = 1;
2946
-// // aConstraints.gridheight = 3;
2947
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2948
-// aWindowConstraints.weightx = 0;
2949
-// aWindowConstraints.weighty = 1;
2950
-// //bigThree.add(jtp, aWindowConstraints);
2951
-// aWindowConstraints.weightx = 1;
2952
-// aWindowConstraints.gridwidth = 3;
2953
-// // aConstraints.gridheight = 3;
2954
-// aWindowConstraints.gridx = 1;
2955
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2956
-// bigThree.add(centralPanel, aWindowConstraints);
2957
-// aWindowConstraints.weightx = 0;
2958
-// aWindowConstraints.gridx = 4;
2959
-// aWindowConstraints.gridwidth = 1;
2960
-// // aConstraints.gridheight = 3;
2961
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2962
-// //bigThree.add(XYZPanel, aWindowConstraints);
2963
-// scenePanel.setVisible(false);
2964
-// centralPanel.setVisible(true);
2965
-// XYZPanel.setVisible(false);
2966
- bigThree.ClearUI();
2967
- bigThree.add(centralPanel);
2968
- bigThree.FlushUI();
3771
+
3772
+ if (CameraPane.FULLSCREEN)
3773
+ fullscreenLayout = radio.layout;
3774
+
3775
+ Show3DView();
29693776
29703777 cameraView.requestFocusInWindow();
29713778
....@@ -2988,6 +3795,9 @@
29883795 if (source == threeButton)
29893796 {
29903797 radio.layout = threeButton;
3798
+
3799
+ if (CameraPane.FULLSCREEN)
3800
+ fullscreenLayout = radio.layout;
29913801
29923802 // bigThree.remove(scenePanel);
29933803 // bigThree.remove(centralPanel);
....@@ -3017,8 +3827,8 @@
30173827 // centralPanel.setVisible(true);
30183828 // XYZPanel.setVisible(true);
30193829 bigThree.ClearUI();
3830
+ bigThree.add(scenePanel);
30203831 bigThree.add(centralPanel);
3021
- bigThree.add(XYZPanel);
30223832 bigThree.FlushUI();
30233833
30243834 cameraView.requestFocusInWindow();
....@@ -3026,6 +3836,9 @@
30263836 if (source == fourButton)
30273837 {
30283838 radio.layout = fourButton;
3839
+
3840
+ if (CameraPane.FULLSCREEN)
3841
+ fullscreenLayout = radio.layout;
30293842
30303843 // bigThree.remove(scenePanel);
30313844 // bigThree.remove(centralPanel);
....@@ -3064,6 +3877,9 @@
30643877 {
30653878 radio.layout = sixButton;
30663879
3880
+ if (CameraPane.FULLSCREEN)
3881
+ fullscreenLayout = radio.layout;
3882
+
30673883 // bigThree.remove(scenePanel);
30683884 // bigThree.remove(centralPanel);
30693885 // bigThree.remove(XYZPanel);
....@@ -3092,8 +3908,8 @@
30923908 // centralPanel.setVisible(true);
30933909 // XYZPanel.setVisible(false);
30943910 bigThree.ClearUI();
3095
- bigThree.add(scenePanel);
30963911 bigThree.add(centralPanel);
3912
+ bigThree.add(scenePanel);
30973913 bigThree.FlushUI();
30983914
30993915 cameraView.requestFocusInWindow();
....@@ -3101,6 +3917,9 @@
31013917 if (source == sevenButton)
31023918 {
31033919 radio.layout = sevenButton;
3920
+
3921
+ if (CameraPane.FULLSCREEN)
3922
+ fullscreenLayout = radio.layout;
31043923
31053924 // bigThree.remove(scenePanel);
31063925 // bigThree.remove(centralPanel);
....@@ -3139,6 +3958,7 @@
31393958 } else
31403959 if (source == rootButton)
31413960 {
3961
+ Replace();
31423962 Object3D obj;
31433963 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31443964 {
....@@ -3153,6 +3973,8 @@
31533973 if (source == closeButton)
31543974 {
31553975 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3976
+ Replace();
3977
+
31563978 cRadio ab;
31573979 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
31583980 {
....@@ -3182,6 +4004,12 @@
31824004 } else
31834005 if (source == editItem || source == editButton)
31844006 {
4007
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4008
+ {
4009
+ Object3D child = (Object3D)e.nextElement();
4010
+ child.pinned = true;
4011
+ }
4012
+
31854013 EditSelection(false);
31864014 } else
31874015 if (source == uneditButton)
....@@ -3190,9 +4018,10 @@
31904018 {
31914019 Object3D child = (Object3D)e.nextElement();
31924020 if(child.editWindow != null)
3193
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021
+ child.pinned = false;
31944022 child.CloseUI();
31954023 listUI.remove(child);
4024
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
31964025
31974026 //child.editWindow = null; // ???????????
31984027 }
....@@ -3207,16 +4036,18 @@
32074036 //copy.ClearUI();
32084037 for (Object3D obj : listUI)
32094038 {
4039
+ obj.pinned = false;
32104040 obj.CloseUI();
32114041 }
32124042 listUI.clear();
4043
+ SetPinStates(group.selection.size() > 0);
32134044 refreshContents(true);
32144045 } else
32154046 if (source == allParamsButton)
32164047 {
32174048 assert(copy == group);
32184049
3219
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4050
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
32204051
32214052 for (Object3D obj : listUI)
32224053 {
....@@ -3242,6 +4073,8 @@
32424073 } else
32434074 if(source instanceof cRadio)
32444075 {
4076
+ Replace();
4077
+
32454078 group.parent = keepparent;
32464079 group.attributes = 0;
32474080 //group.editWindow = null;
....@@ -3265,6 +4098,7 @@
32654098 }
32664099
32674100 copy = group;
4101
+
32684102 //Globals.theRenderer.object = group;
32694103 if(!useclient)
32704104 {
....@@ -3291,6 +4125,37 @@
32914125 currentLayout = sevenButton;
32924126 */
32934127 radio.layout.doClick();
4128
+
4129
+ assert(copy instanceof Composite);
4130
+
4131
+ if (copy.versionlist == null)
4132
+ {
4133
+ copy.versionindex = -1;
4134
+
4135
+ // Cannot work with loops
4136
+ // To fix this issue, we first mark all nodes above the root,
4137
+ // and check if any of these nodes are reachable below the root.
4138
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4139
+
4140
+ if (!copy.HasTags())
4141
+ {
4142
+ copy.versionlist = new Object3D[100];
4143
+
4144
+ Save(true);
4145
+ }
4146
+
4147
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4148
+ }
4149
+
4150
+ SetVersionStates();
4151
+
4152
+ ClearUnpinned();
4153
+
4154
+ //Grafreed.Assert(group != null);
4155
+ //Grafreed.Assert(group.selection != null);
4156
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4157
+ if (group.selection == null || group.selection.size() == 1)
4158
+ EditSelection(false);
32944159 keepparent = group.parent;
32954160 // PARENT = NULL or not???
32964161 //group.parent = null; // ROOT
....@@ -3302,11 +4167,13 @@
33024167 } else if (event.getSource() == editCameraItem)
33034168 {
33044169 cameraView.ProtectCamera();
4170
+ cameraView.requestFocusInWindow();
33054171 cameraView.repaint();
33064172 return;
3307
- } else if (event.getSource() == revertCameraItem)
4173
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
33084174 {
33094175 cameraView.RevertCamera();
4176
+ cameraView.requestFocusInWindow();
33104177 cameraView.repaint();
33114178 return;
33124179 // } else if (event.getSource() == textureButton)
....@@ -3425,7 +4292,7 @@
34254292 TouchTransform(obj);
34264293 continue;
34274294 }
3428
- if ((mask&2) != 0) // Scale
4295
+ if ((mask&2) != 0) // Scale/rotation
34294296 {
34304297 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
34314298 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -3433,10 +4300,6 @@
34334300 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
34344301 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
34354302 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3436
- }
3437
- if ((mask&4) != 0) // Rotation
3438
- {
3439
- // ?
34404303 }
34414304 if ((mask&1) != 0) // Translation
34424305 {
....@@ -3883,7 +4746,7 @@
38834746
38844747 try
38854748 {
3886
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4749
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
38874750 }
38884751 catch (Exception e)
38894752 {
....@@ -4358,28 +5221,25 @@
43585221 // }
43595222 // }
43605223
4361
- static boolean allparams = true;
4362
-
4363
- static Vector<Object3D> listUI = new Vector<Object3D>();
4364
-
43655224 void EditSelection(boolean newWindow)
43665225 {
5226
+ if (group.selection == null)
5227
+ {
5228
+ EditElement(group, newWindow); // ? new
5229
+ return;
5230
+ }
5231
+
43675232 // aConstraints.gridy = 0;
43685233 for (int i=0; i<group.selection.size(); i++)
43695234 {
43705235 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
43715236 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4372
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5237
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
43735238
43745239 Object3D elem = (Object3D)group.selection.elementAt(i);
43755240 if(elem != group || !newWindow)
43765241 {
4377
- // if (!(elem instanceof Composite))
4378
- // newWindow = false;
4379
- listUI.add(elem);
4380
- elem.openEditWindow(this, newWindow); //, false);
4381
- System.out.println("edit : " + elem);
4382
- elem.editWindow.refreshContents(true); // ? new
5242
+ EditElement(elem, newWindow); // ? new
43835243 }
43845244 }
43855245 }
....@@ -4442,9 +5302,7 @@
44425302
44435303 freezemodel = false;
44445304 }
4445
-
4446
- boolean flashIt = true;
4447
-
5305
+
44485306 public void valueChanged(TreeSelectionEvent e)
44495307 //public boolean handleEvent(Event event)
44505308 {
....@@ -4454,7 +5312,8 @@
44545312 //new Exception().printStackTrace();
44555313
44565314 freezemodel = true;
4457
-
5315
+ ClearUnpinned();
5316
+
44585317 /**/
44595318 //switch (event.id)
44605319 {
....@@ -4487,7 +5346,7 @@
44875346 if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
44885347 // a camera
44895348 {
4490
- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
5349
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
44915350 {
44925351 CameraPane.camerachangeframe = 0; // don't refuse it
44935352 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
....@@ -4496,6 +5355,13 @@
44965355 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
44975356 }
44985357
5358
+ if (tps != null && tps.length == 1)
5359
+ {
5360
+ EditSelection(false);
5361
+ }
5362
+
5363
+ SetPinStates(tps != null && tps.length > 0);
5364
+
44995365 refreshContents();
45005366 //return true;
45015367 }
....@@ -4505,9 +5371,36 @@
45055371 freezemodel = false;
45065372 }
45075373
5374
+ void SetPinStates(boolean enabled)
5375
+ {
5376
+ editButton.setEnabled(enabled);
5377
+ uneditButton.setEnabled(enabled);
5378
+ //unselectButton.setEnabled(enabled);
5379
+ flashSelectionButton.setEnabled(enabled);
5380
+
5381
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5382
+
5383
+ boolean allComposites = true;
5384
+
5385
+ if (group.selection != null)
5386
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5387
+ {
5388
+ Object next = e.nextElement();
5389
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5390
+ {
5391
+ allComposites = false;
5392
+ break;
5393
+ }
5394
+ }
5395
+
5396
+ rootButton.setEnabled(allComposites);
5397
+ }
5398
+
45085399 void refreshContents(boolean cp)
45095400 {
4510
- if (!Globals.MOUSEDRAGGED)
5401
+ if (Globals.ADVANCED)
5402
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5403
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
45115404 {
45125405 objEditor.ClearInfo(); // .GetMaterial());
45135406
....@@ -4516,7 +5409,7 @@
45165409 Object3D child = (Object3D) group.selection.get(i);
45175410
45185411 objEditor.AddInfo(child, this, true);
4519
- System.err.println("info : " + child.GetPath());
5412
+// System.err.println("info : " + child.GetPath());
45205413 }
45215414
45225415 objEditor.SetText(); // jan 2014
....@@ -4606,8 +5499,8 @@
46065499
46075500 if (cut)
46085501 {
4609
- if (Globals.SAVEONMAKE)
4610
- Save();
5502
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5503
+// Save();
46115504 //int indices[] = jList.getSelectedIndices();
46125505 //for (int i = indices.length - 1; i >= 0; i--)
46135506 //jList.remove(indices[i]);
....@@ -4710,6 +5603,10 @@
47105603
47115604 void paste(boolean expand)
47125605 {
5606
+ if (Globals.REPLACEONMAKE)
5607
+ Save();
5608
+ boolean keep = Globals.REPLACEONMAKE;
5609
+ Globals.REPLACEONMAKE = false;
47135610 // if (GrafreeD.clipboard == null)
47145611 // return;
47155612 boolean first = true;
....@@ -4769,6 +5666,7 @@
47695666 Grafreed.clipboard.get(0).parent = keepparent;
47705667 }
47715668
5669
+ Globals.REPLACEONMAKE = keep;
47725670 ResetModel();
47735671 refreshContents();
47745672 }
....@@ -4904,6 +5802,10 @@
49045802
49055803 void group(Object3D csg, boolean grab)
49065804 {
5805
+ if (Globals.REPLACEONMAKE)
5806
+ Save();
5807
+ boolean keep = Globals.REPLACEONMAKE;
5808
+ Globals.REPLACEONMAKE = false;
49075809 if (//false) // why??
49085810 !group.selection.isEmpty())
49095811 {
....@@ -5017,10 +5919,15 @@
50175919 //node.add(csg);
50185920 //makeSomething(node);
50195921 makeSomething(csg);
5922
+ Globals.REPLACEONMAKE = keep;
50205923 }
50215924
50225925 void Ungroup(Object3D g)
50235926 {
5927
+ if (Globals.REPLACEONMAKE)
5928
+ Save();
5929
+ boolean keep = Globals.REPLACEONMAKE;
5930
+ Globals.REPLACEONMAKE = false;
50245931 if (g instanceof HiddenObject)
50255932 {
50265933 HiddenObject h = (HiddenObject) g;
....@@ -5037,6 +5944,7 @@
50375944 objEditor.makeSomething(g.get(i), false);
50385945 }
50395946 }
5947
+ Globals.REPLACEONMAKE = keep;
50405948 }
50415949
50425950 void ungroup()
....@@ -5325,13 +6233,43 @@
53256233 cButton clearpanelButton;
53266234 cButton unselectButton;
53276235
5328
- cButton minButton;
5329
- cButton maxButton;
5330
- cButton fullButton;
5331
- cButton undoButton;
5332
- cButton redoButton;
5333
- cButton saveButton;
6236
+ cButton restoreCameraButton;
6237
+
53346238 cButton oneStepButton;
6239
+
6240
+ cButton groupButton;
6241
+ cButton ungroupButton;
6242
+ cButton compositeButton;
6243
+ cButton switchButton;
6244
+ cButton loopButton;
6245
+ cButton textureButton;
6246
+
6247
+ cButton skybox1Button;
6248
+ cButton skybox2Button;
6249
+ cButton skybox3Button;
6250
+ cButton skybox4Button;
6251
+ cButton skybox5Button;
6252
+ cButton skybox6Button;
6253
+ cButton skybox7Button;
6254
+
6255
+ cButton skybox11Button;
6256
+ cButton skybox12Button;
6257
+ cButton skybox13Button;
6258
+ cButton skybox14Button;
6259
+ cButton skybox15Button;
6260
+ cButton skybox16Button;
6261
+ cButton skybox17Button;
6262
+
6263
+ cButton gridButton;
6264
+ cButton boxButton;
6265
+ cButton sphereButton;
6266
+ cButton coneButton;
6267
+ cButton torusButton;
6268
+ cButton superButton;
6269
+ cButton kleinButton;
6270
+ cButton particlesButton;
6271
+ cButton overlayButton;
6272
+ cButton lightButton;
53356273
53366274 cButton screenfitButton;
53376275 cButton screenfitpointButton;
....@@ -5353,12 +6291,12 @@
53536291 //JTree jTree;
53546292 private MenuItem lookAtItem;
53556293 private MenuItem lookFromItem;
5356
- private MenuItem switchItem;
5357
- private MenuItem cutItem;
6294
+ private MenuItem switchViewItem;
6295
+ private JMenuItem cutItem;
53586296 private MenuItem undoItem;
53596297 private MenuItem redoItem;
5360
- private MenuItem duplicateItem;
5361
- private MenuItem cloneItem;
6298
+ private JMenuItem duplicateItem;
6299
+ private JMenuItem cloneItem;
53626300 private MenuItem cloneSupportItem;
53636301 private MenuItem overwriteGeoItem;
53646302 private MenuItem overwriteMatItem;
....@@ -5379,13 +6317,13 @@
53796317 private MenuItem cloneGeometriesItem;
53806318 private MenuItem shareGeometriesItem;
53816319 private MenuItem mergeGeometriesItem;
5382
- private MenuItem copyItem;
6320
+ private JMenuItem copyItem;
53836321 private MenuItem pasteItem;
5384
- private MenuItem pasteIntoItem;
5385
- private MenuItem pasteLinkItem;
5386
- private MenuItem pasteCloneItem;
5387
- private MenuItem pasteExpandItem;
5388
- private MenuItem clearItem;
6322
+ private JMenuItem pasteIntoItem;
6323
+ private JMenuItem pasteLinkItem;
6324
+ private JMenuItem pasteCloneItem;
6325
+ private JMenuItem pasteExpandItem;
6326
+ private JMenuItem deleteItem;
53896327 private MenuItem clearAllItem;
53906328 private MenuItem genUVItem;
53916329 private MenuItem genNormalsMESHItem;
....@@ -5440,12 +6378,12 @@
54406378 private MenuItem transformGeometryItem;
54416379 private MenuItem transformChildrenItem;
54426380 private MenuItem hideItem;
5443
- private MenuItem grabItem;
6381
+ private JMenuItem grabItem;
54446382 private MenuItem backItem;
54456383 private MenuItem frontItem;
54466384 private MenuItem cameraItem;
54476385 private MenuItem compositeItem;
5448
- private MenuItem randomItem;
6386
+ private MenuItem switchItem;
54496387 private MenuItem physicsItem;
54506388 private MenuItem frameselectorItem;
54516389 private MenuItem scriptNodeItem;
....@@ -5453,7 +6391,7 @@
54536391 private MenuItem switchTransfoItem;
54546392 private MenuItem morphItem;
54556393 private MenuItem linkerItem;
5456
- private MenuItem ungroupItem;
6394
+ private JMenuItem ungroupItem;
54576395 private MenuItem editItem;
54586396 private MenuItem openWindowItem;
54596397 private MenuItem editLeafItem;
....@@ -5469,6 +6407,8 @@
54696407 private MenuItem attachBumpItem;
54706408 private MenuItem detachBumpItem;
54716409 private MenuItem pigmentBumpItem;
6410
+ private MenuItem embedTexturesItem;
6411
+ private MenuItem deEmbedTexturesItem;
54726412
54736413 private MenuItem particleItem;
54746414 private MenuItem ragdollItem;
....@@ -5519,5 +6459,5 @@
55196459
55206460 Menu cameraMenu;
55216461 MenuItem editCameraItem;
5522
- MenuItem revertCameraItem;
6462
+ MenuItem restoreCameraItem;
55236463 }