Normand Briere
2019-08-22 6a823ffbfcda4c843f46e02e83c869d5bc323e25
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,36 +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);
179
- menu.add("-");
180561
181
- menu.add("-");
182
- 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"));
183565 pasteIntoItem.addActionListener(this);
184
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185567 pasteLinkItem.addActionListener(this);
186
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187569 pasteCloneItem.addActionListener(this);
188
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189571 // pasteExpandItem.addActionListener(this);
190
- menu.add("-");
191
- clearItem = menu.add(new MenuItem("Clear"));
192
- clearItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
193574
194575 if (Globals.ADVANCED)
195576 {
....@@ -203,23 +584,23 @@
203584 //zBufferItem.addActionListener(this);
204585 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205586 //normalLensItem.addActionListener(this);
206
- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207
- revertCameraItem.addActionListener(this);
587
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
588
+ restoreCameraItem.addActionListener(this);
208589
209
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210
- toggleFullScreenItem.addItemListener(this);
211
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212
- 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);
213602
214
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215
- toggleTextureItem.addItemListener(this);
216
- toggleTextureItem.setState(CameraPane.textureon);
217
-
218
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219
- toggleSwitchItem.addItemListener(this);
220
- toggleSwitchItem.setState(CameraPane.SWITCH);
221
-
222
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
603
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223604 toggleHandleItem.addItemListener(this);
224605 toggleHandleItem.setState(CameraPane.HANDLES);
225606
....@@ -274,15 +655,13 @@
274655 {
275656 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276657 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
658
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279659 oe.cameraMenu.add("-");
280660 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281661 openWindowItem.addActionListener(this);
282
- editLeafItem.addActionListener(this);
283662 lookAtItem.addActionListener(this);
284663 //lookFromItem.addActinoListener(this);
285
- //switchItem.addActionListener(this);
664
+ //switchViewItem.addActionListener(this);
286665 }
287666
288667 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -326,22 +705,37 @@
326705 setMasterItem.addActionListener(this);
327706 }
328707
329
- oe.menuBar.add(menu = new Menu("Group"));
330
- grabItem = menu.add(new MenuItem("Grab"));
331
- grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
332710 backItem = menu.add(new MenuItem("Back"));
333711 backItem.addActionListener(this);
334712 frontItem = menu.add(new MenuItem("Front"));
335713 frontItem.addActionListener(this);
336
- compositeItem = menu.add(new MenuItem("Composite"));
337
- 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
+ {
338722 hideItem = menu.add(new MenuItem("Hidden Group"));
339723 hideItem.addActionListener(this);
340
- ungroupItem = menu.add(new MenuItem("Ungroup"));
724
+ }
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341726 ungroupItem.addActionListener(this);
342
- menu.add("-");
343
- randomItem = menu.add(new MenuItem("Switch node"));
344
- 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
+ {
345739 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346740 switchGeoItem.addActionListener(this);
347741 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -349,8 +743,6 @@
349743 morphItem = menu.add(new MenuItem("Morph Group"));
350744 morphItem.addActionListener(this);
351745
352
- if (Globals.ADVANCED)
353
- {
354746 menu.add("-");
355747 physicsItem = menu.add(new MenuItem("Physics"));
356748 physicsItem.addActionListener(this);
....@@ -358,30 +750,29 @@
358750 frameselectorItem.addActionListener(this);
359751 scriptNodeItem = menu.add(new MenuItem("Script Node"));
360752 scriptNodeItem.addActionListener(this);
361
- cameraItem = menu.add(new MenuItem("Camera"));
362
- cameraItem.addActionListener(this);
363753 }
364754
365755 oe.menuBar.add(menu = new Menu("Object"));
366
- textureItem = menu.add(new MenuItem("Texture"));
367
- textureItem.addActionListener(this);
756
+// textureItem = menu.add(new MenuItem("Texture"));
757
+// textureItem.addActionListener(this);
368758 billboardItem = menu.add(new MenuItem("Billboard"));
369759 billboardItem.addActionListener(this);
370760 csgItem = menu.add(new MenuItem("CSG"));
371761 csgItem.addActionListener(this);
372
- shadowXItem = menu.add(new MenuItem("Shadow X"));
762
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373763 shadowXItem.addActionListener(this);
374
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
764
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375765 shadowYItem.addActionListener(this);
376
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
766
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377767 shadowZItem.addActionListener(this);
768
+ attributeItem = menu.add(new MenuItem("Attribute"));
769
+ attributeItem.addActionListener(this);
770
+
378771 if (Globals.ADVANCED)
379772 {
380773 menu.add("-");
381774 linkerItem = menu.add(new MenuItem("Linker"));
382775 linkerItem.addActionListener(this);
383
- attributeItem = menu.add(new MenuItem("Attribute"));
384
- attributeItem.addActionListener(this);
385776 templateItem = menu.add(new MenuItem("Template"));
386777 templateItem.addActionListener(this);
387778 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -410,7 +801,7 @@
410801 genNormalsMESHItem.addActionListener(this);
411802 if (Globals.ADVANCED)
412803 {
413
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
804
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414805 genNormalsMINEItem.addActionListener(this);
415806 }
416807 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -466,9 +857,9 @@
466857 hideleavesItem.addActionListener(this);
467858 showleavesItem = menu.add(new MenuItem("Show Leaves"));
468859 showleavesItem.addActionListener(this);
469
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
470861 markleavesItem.addActionListener(this);
471
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
472863 unmarkleavesItem.addActionListener(this);
473864 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
474865 rewindleavesItem.addActionListener(this);
....@@ -503,10 +894,15 @@
503894 attachBumpItem.addActionListener(this);
504895 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505896 pigmentBumpItem.addActionListener(this);
897
+ //embedTexturesItem
506898 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507899 detachPigmentItem.addActionListener(this);
508900 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509901 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);
510906 menu.add("-");
511907 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512908 sortbysizeItem.addActionListener(this);
....@@ -517,6 +913,9 @@
517913 shareGeometriesItem.addActionListener(this);
518914 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
519915 mergeGeometriesItem.addActionListener(this);
916
+ menu.add("-");
917
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+ editLeafItem.addActionListener(this);
520919 if (Globals.ADVANCED)
521920 {
522921 // Pretty much the same as duplicate and clone.
....@@ -533,6 +932,80 @@
533932 buildToolsMenu(menu);
534933 }
535934
935
+ JTabbedPane resourcecontainer;
936
+ cGridBag currenttab;
937
+ //boolean added; // patch for jar
938
+
939
+ int totalcount = 0;
940
+
941
+ int tabcount = 0;
942
+ int colcount = 0;
943
+ int rowcount = 0;
944
+ int texturecount = 0;
945
+
946
+ int columns = 5;
947
+ int rows = 7;
948
+
949
+ public void ResourceCallBack(String[] path)
950
+ {
951
+// for (int i = 0; i < path.length; i++)
952
+// System.out.print(path[i] + "/");
953
+// System.out.println();
954
+
955
+ if (//rowcount == 0 ||
956
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
957
+ {
958
+ currenttab = new cGridBag();
959
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
960
+ currenttab.setName(tabname);
961
+ //added = false;
962
+ resourcecontainer.add(currenttab);
963
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
964
+ rowcount = 1;
965
+ colcount = 0;
966
+ texturecount = 0;
967
+ }
968
+
969
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
970
+ {
971
+ //if (!added)
972
+ {
973
+ //added = true;
974
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
975
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
976
+ }
977
+
978
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
979
+ totalcount++;
980
+
981
+ if (++colcount >= columns)
982
+ {
983
+ colcount = 0;
984
+ currenttab.Return();
985
+
986
+ if (rowcount++ >= rows)
987
+ {
988
+ rowcount = 0;
989
+ }
990
+ }
991
+ }
992
+ else
993
+ {
994
+// if (!path[path.length-1].equals("icons"))
995
+// resourcecontainer.Return();
996
+ }
997
+ }
998
+
999
+ void CreateTexturePanel(cGridBag container)
1000
+ {
1001
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1002
+ container.add(resourcecontainer);
1003
+
1004
+ Grafreed.ParseResources("textures", this);
1005
+
1006
+ // 935. System.out.println("Total = " + totalcount);
1007
+ }
1008
+
5361009 void SetupUI2(ObjEditor oe)
5371010 {
5381011 // June 2019
....@@ -550,11 +1023,6 @@
5501023 //new Exception().printStackTrace();
5511024
5521025 oe.radioPanel = new JPanel(new GridBagLayout());
553
- oe.aConstraints.weightx = 1;
554
- oe.aConstraints.weighty = 0;
555
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556
- oe.aConstraints.gridwidth = 100;
557
- oe.aConstraints.gridheight = 1;
5581026 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5591027
5601028 oe.buttonGroup = new ButtonGroup();
....@@ -575,121 +1043,268 @@
5751043 oe.radioPanel.add(dummyButton);
5761044 oe.buttonGroup.add(dummyButton);
5771045 */
1046
+ cGridBag versionManagerPanel = new cGridBag();
1047
+
1048
+ versionManagerPanel.preferredHeight = 4;
1049
+
5781050 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
5791051
5801052 //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5811053 //minButton.setToolTipText("Minimize window");
5821054 //minButton.addActionListener(this);
5831055
584
- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585
- maxButton.setToolTipText("Maximize window");
586
- maxButton.addActionListener(this);
1056
+ if (Globals.ADVANCED)
1057
+ {
1058
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+// maxButton.setToolTipText("Maximize window");
1060
+// maxButton.addActionListener(this);
1061
+ }
5871062
588
- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
+ cButton gcButton;
1064
+
1065
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1066
+// gcButton.setToolTipText("Garbage collect");
1067
+// gcButton.addActionListener(new ActionListener()
1068
+// {
1069
+// public void actionPerformed(ActionEvent e)
1070
+// {
1071
+// System.gc();
1072
+// }
1073
+// });
1074
+
1075
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1076
+ collapseButton.setToolTipText("Collapse toolbar");
1077
+ collapseButton.addActionListener(this);
1078
+
1079
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1080
+ maximize3DButton.setToolTipText("Maximize 3D view");
1081
+ maximize3DButton.addActionListener(this);
1082
+
1083
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084
+ twoButton.setToolTipText("Show 3D view only");
1085
+ twoButton.addActionListener(this);
1086
+ this.fullscreenLayout = twoButton;
1087
+
1088
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
+ threeButton.setToolTipText("Show controls and 3D view");
1090
+ threeButton.addActionListener(this);
1091
+ if (Globals.ADVANCED)
1092
+ {
1093
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1094
+ sixButton.setToolTipText("Show 3D view and controls");
1095
+ sixButton.addActionListener(this);
1096
+ }
1097
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1098
+// sevenButton.setToolTipText("3-column layout");
1099
+// sevenButton.addActionListener(this);
1100
+ //
1101
+
1102
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
5891103 fullButton.setToolTipText("Full-screen window");
5901104 fullButton.addActionListener(this);
5911105
592
- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593
- undoButton.setToolTipText("Undo changes");
594
- undoButton.addActionListener(this);
595
-
596
- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597
- redoButton.setToolTipText("Redo changes");
598
- redoButton.addActionListener(this);
599
-
600
- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601
- saveButton.setToolTipText("Save changes");
602
- saveButton.addActionListener(this);
603
-
604
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
605
- liveCB.setToolTipText("Enable animation");
606
- liveCB.addItemListener(this);
1106
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1107
+ screenfitButton.setToolTipText("Screen fit");
1108
+ screenfitButton.addActionListener(this);
6071109
608
- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1110
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1111
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1112
+ restoreCameraButton.addActionListener(this);
1113
+
1114
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1115
+ saveVersionButton.setToolTipText("Duplicate current version");
1116
+ saveVersionButton.addActionListener(this);
1117
+
1118
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1119
+ deleteVersionButton.setToolTipText("Delete current version");
1120
+ deleteVersionButton.addActionListener(this);
1121
+ deleteVersionButton.setEnabled(false);
1122
+
1123
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1124
+ previousVersionButton.setToolTipText("Previous version");
1125
+ previousVersionButton.addActionListener(this);
1126
+ previousVersionButton.setEnabled(false);
1127
+
1128
+ cGridBag updown = new cGridBag().setVertical(true);
1129
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
+ restoreButton.setToolTipText("Undo (restore current version)");
1131
+ restoreButton.addActionListener(this);
1132
+ restoreButton.setEnabled(false);
1133
+
1134
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1135
+ replaceButton.setToolTipText("Save (replace current version)");
1136
+ replaceButton.addActionListener(this);
1137
+ replaceButton.setEnabled(false);
1138
+
1139
+ versionManagerPanel.add(updown);
1140
+
1141
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1142
+ nextVersionButton.setToolTipText("Next version");
1143
+ nextVersionButton.addActionListener(this);
1144
+ nextVersionButton.setEnabled(false);
1145
+
1146
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6091147 oneStepButton.setToolTipText("Animate one step forward");
6101148 oneStepButton.addActionListener(this);
6111149
612
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
1150
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1151
+ liveCB.setToolTipText("Enable animation");
1152
+ liveCB.addItemListener(this);
1153
+
1154
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
6131155 fastCB.setToolTipText("Fast mode");
6141156 fastCB.addItemListener(this);
6151157
616
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617
- trackCB.setToolTipText("Enable tracking");
618
- trackCB.addItemListener(this);
619
-
620
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621
- screenfitButton.setToolTipText("Screen fit");
622
- screenfitButton.addActionListener(this);
1158
+ //oe.toolboxPanel.Return();
1159
+
1160
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1161
+// trackCB.setToolTipText("Enable tracking");
1162
+// trackCB.addItemListener(this);
6231163
6241164 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
6251165 // screenfitpointButton.addActionListener(this);
6261166
6271167 if (Globals.ADVANCED)
6281168 {
629
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6301170 snapobjectButton.addActionListener(this);
6311171 snapobjectButton.setToolTipText("Snap Object");
1172
+
1173
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1174
+ fourButton.addActionListener(this);
1175
+ fourButton.setToolTipText("Show control panel only");
6321176 }
6331177
634
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635
- flashSelectionButton.setToolTipText("Show selection");
636
- flashSelectionButton.addActionListener(this);
1178
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6371179
638
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639
-
640
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641
- twoButton.setToolTipText("Show center view only");
642
- twoButton.addActionListener(this);
643
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644
- fourButton.addActionListener(this);
645
- fourButton.setToolTipText("Show left panel only");
646
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647
- sixButton.setToolTipText("2-column layout left");
648
- sixButton.addActionListener(this);
649
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650
- threeButton.setToolTipText("2-column layout right");
651
- threeButton.addActionListener(this);
652
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653
- sevenButton.setToolTipText("3-column layout");
654
- sevenButton.addActionListener(this);
655
- //
6561180
657
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658
- rootButton.setToolTipText("Edit selection in new tab");
1181
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1182
+ rootButton.setToolTipText("Open selection in new tab");
6591183 rootButton.addActionListener(this);
6601184
661
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6621186 closeButton.setToolTipText("Close tab");
6631187 closeButton.addActionListener(this);
6641188 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
6651189 //clearButton.addActionListener(this);
666
-
667
- cGridBag commandsPanel = new cGridBag();
1190
+
1191
+ cGridBag row1 = new cGridBag();
6681192
669
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
- editButton.setToolTipText("Edit selection");
1193
+ // INSERT
1194
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195
+ gridButton.setToolTipText("Create ground");
1196
+ gridButton.addActionListener(this);
1197
+
1198
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1199
+ boxButton.setToolTipText("Create box");
1200
+ boxButton.addActionListener(this);
1201
+
1202
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1203
+ superButton.setToolTipText("Create superellipsoid");
1204
+ superButton.addActionListener(this);
1205
+
1206
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207
+ sphereButton.setToolTipText("Create sphere");
1208
+ sphereButton.addActionListener(this);
1209
+
1210
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1211
+ coneButton.setToolTipText("Create cone");
1212
+ coneButton.addActionListener(this);
1213
+
1214
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1215
+ torusButton.setToolTipText("Create torus");
1216
+ torusButton.addActionListener(this);
1217
+
1218
+ if (Globals.ADVANCED)
1219
+ {
1220
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1221
+ kleinButton.setToolTipText("Create Klein bottle");
1222
+ kleinButton.addActionListener(this);
1223
+ }
1224
+
1225
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1226
+ particlesButton.setToolTipText("Create particle system");
1227
+ particlesButton.addActionListener(this);
1228
+
1229
+ oe.toolboxPanel.add(row1);
1230
+
1231
+ cGridBag row2 = new cGridBag();
1232
+
1233
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1234
+ groupButton.setToolTipText("Create group");
1235
+ groupButton.addActionListener(this);
1236
+
1237
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1238
+ compositeButton.setToolTipText("Create composite");
1239
+ compositeButton.addActionListener(this);
1240
+
1241
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1242
+ switchButton.setToolTipText("Create item switcher");
1243
+ switchButton.addActionListener(this);
1244
+
1245
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1246
+ loopButton.setToolTipText("Create loop");
1247
+ loopButton.addActionListener(this);
1248
+
1249
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1250
+ textureButton.setToolTipText("Create texture");
1251
+ textureButton.addActionListener(this);
1252
+
1253
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1254
+ overlayButton.setToolTipText("Create overlay");
1255
+ overlayButton.addActionListener(this);
1256
+
1257
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1258
+ lightButton.setToolTipText("Create light");
1259
+ lightButton.addActionListener(this);
1260
+
1261
+ oe.toolboxPanel.add(row2);
1262
+
1263
+ cGridBag textures = new cGridBag();
1264
+
1265
+ CreateTexturePanel(textures);
1266
+
1267
+ int tabCount = resourcecontainer.getTabCount();
1268
+
1269
+ if (tabCount > 0)
1270
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1271
+
1272
+ oe.toolboxPanel.add(textures);
1273
+
1274
+ textures.preferredHeight = 100;
1275
+
1276
+ CreateSkyboxPanel(oe.skyboxPanel);
1277
+
1278
+ // EDIT panel
1279
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1280
+ editButton.setToolTipText("Pin selection controls");
6711281 editButton.addActionListener(this);
6721282
673
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674
- uneditButton.setToolTipText("Unedit selection");
1283
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1284
+ uneditButton.setToolTipText("Unpin and remove selection controls");
6751285 uneditButton.addActionListener(this);
6761286
677
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678
- allParamsButton.setToolTipText("Edit all params");
1287
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1288
+ allParamsButton.setToolTipText("Show all controls");
6791289 allParamsButton.addActionListener(this);
6801290
681
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
- clearPanelButton.setToolTipText("Clear edit panel");
1291
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1292
+ clearPanelButton.setToolTipText("Clear all controls");
6831293 clearPanelButton.addActionListener(this);
6841294
685
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686
- unselectButton.setToolTipText("Unselect");
687
- unselectButton.addActionListener(this);
1295
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1296
+ //unselectButton.setToolTipText("Unselect");
1297
+ //unselectButton.addActionListener(this);
6881298
689
- commandsPanel.preferredHeight = 1;
1299
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1300
+ flashSelectionButton.setToolTipText("Highlight selection");
1301
+ flashSelectionButton.addActionListener(this);
6901302
691
- oe.treePanel.add(commandsPanel);
692
- oe.treePanel.Return();
1303
+ editCommandsPanel.preferredHeight = 1;
1304
+
1305
+ SetPinStates(false);
1306
+// oe.treePanel.add(commandsPanel);
1307
+// oe.treePanel.Return();
6931308
6941309 // oe.aConstraints.gridx += 1;
6951310 // oe.aConstraints.weighty = 0;
....@@ -704,34 +1319,24 @@
7041319
7051320 cGridBag jSPPanel = new cGridBag();
7061321
1322
+ jSPPanel.preferredHeight = 20;
1323
+
7071324 JScrollPane jSP;
7081325 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1326
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
7101327 ResetModel();
7111328
7121329 oe.treePanel.add(jSPPanel);
7131330 oe.treePanel.Return();
7141331
715
- cGridBag copyOptionsPanel = new cGridBag();
716
-
717
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718
- colorCB.setToolTipText("Copy color when dropped");
719
- colorCB.addItemListener(this);
720
-
721
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722
- materialCB.setToolTipText("Copy material when dropped");
723
- materialCB.addItemListener(this);
724
-
725
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726
- textureCB.setToolTipText("Copy texture when dropped");
727
- textureCB.addItemListener(this);
728
-
729
- copyOptionsPanel.preferredHeight = 1;
730
- oe.treePanel.add(copyOptionsPanel);
1332
+ oe.treePanel.add(versionManagerPanel);
7311333 oe.treePanel.Return();
1334
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336
+ versionSliderPane.preferredHeight = 3;
7321337
733
-// mainPanel.setDividerLocation(0.5); //1.0);
734
-// mainPanel.setResizeWeight(0.5);
1338
+// mainPanel.setDividerLocation(0.1); //1.0);
1339
+ mainPanel.setResizeWeight(0.4);
7351340
7361341 //jList.addListSelectionListener(this);
7371342 oe.jTree.addTreeSelectionListener(this);
....@@ -739,7 +1344,7 @@
7391344 //jTree.setEditable(true);
7401345 oe.jTree.setDragEnabled(true);
7411346 //jTree.setPreferredSize(new Dimension(10,10));
742
- jSP.setPreferredSize(new Dimension(100,200));
1347
+ //jSP.setPreferredSize(new Dimension(100,200));
7431348
7441349 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
7451350
....@@ -751,29 +1356,49 @@
7511356 dgr.addDragGestureListener(this);
7521357 }catch(Exception e) {}
7531358 */
754
- radio.layout = sevenButton;
1359
+ radio.layout = threeButton; // sixButton;
7551360 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
7561361 }
7571362
7581363 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
7591364 {
1365
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1366
+ colorCB.setToolTipText("Copy color when dropped");
1367
+ colorCB.addItemListener(this);
1368
+
1369
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1370
+ materialCB.setToolTipText("Copy material when dropped");
1371
+ materialCB.addItemListener(this);
1372
+
1373
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1374
+ textureCB.setToolTipText("Copy texture when dropped");
1375
+ textureCB.addItemListener(this);
1376
+
1377
+ panel.Return();
1378
+
7601379 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
7611380 boxCB.setToolTipText("Display bounding boxes");
7621381 boxCB.addItemListener(this);
7631382
7641383 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1384
+ zoomBoxCB.setToolTipText("Display only for wheel");
7661385 zoomBoxCB.addItemListener(this);
7671386
7681387 if (true) // Globals.ADVANCED)
7691388 {
770
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771
- supportCB.setToolTipText("Enable rigging");
772
- supportCB.addItemListener(this);
1389
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1390
+// supportCB.setToolTipText("Enable rigging");
1391
+// supportCB.addItemListener(this);
1392
+
1393
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1394
+ freezeCB.setToolTipText("Fast moving camera");
1395
+ freezeCB.addItemListener(this);
7731396
7741397 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
7751398 // localCB.addItemListener(this);
7761399
1400
+ panel.Return();
1401
+
7771402 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
7781403 crowdCB.setToolTipText("Used for crowds");
7791404 crowdCB.addItemListener(this);
....@@ -782,14 +1407,19 @@
7821407 smoothCB.setToolTipText("Snapping delay");
7831408 smoothCB.addItemListener(this);
7841409
785
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
786
- slowCB.setToolTipText("Smooth interpolation");
787
- slowCB.addItemListener(this);
1410
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1411
+// slowCB.setToolTipText("Smooth interpolation");
1412
+// slowCB.addItemListener(this);
1413
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1414
+ minshaderCB.setToolTipText("Minimal fast shader");
1415
+ minshaderCB.addItemListener(this);
7881416
7891417 // constraints.gridy += 1;
7901418 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
7911419 // speakerMocapCB.addItemListener(this);
7921420
1421
+ panel.Return();
1422
+
7931423 if (false)
7941424 {
7951425 // handled in scripts
....@@ -804,34 +1434,82 @@
8041434 //constraints.gridy += 1;
8051435 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
8061436 smoothfocusCB.addItemListener(this);
1437
+ panel.Return();
8071438 }
8081439
8091440 //constraints.gridx += 1;
8101441 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
8111442 // debugCB.addItemListener(this);
8121443
1444
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1445
+ trackCB.setToolTipText("Enable tracking target");
1446
+ trackCB.addItemListener(this);
1447
+
8131448 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1449
+ oeilCB.setToolTipText("Move camera when tracking");
8141450 oeilCB.addItemListener(this);
8151451
1452
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1453
+ shadowCB.setToolTipText("When live compute shadows");
1454
+ shadowCB.addItemListener(this);
1455
+
1456
+ panel.Return();
1457
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1458
+ toggleTextureCB.setToolTipText("Load textures");
1459
+ toggleTextureCB.addItemListener(this);
1460
+
1461
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1462
+ toggleSwitchCB.setToolTipText("Choose a single item");
1463
+ toggleSwitchCB.addItemListener(this);
1464
+
1465
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1466
+ autokeepCB.setToolTipText("On structure change");
1467
+ autokeepCB.addItemListener(this);
1468
+
1469
+ panel.Return();
1470
+ if (Globals.ADVANCED)
1471
+ {
8161472 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
8171473 lookAtCB.setToolTipText("Look-at target");
8181474 lookAtCB.addItemListener(this);
1475
+ }
8191476
8201477 }
8211478
8221479 cGridBag fill = new cGridBag();
823
-
8241480 fill.preferredHeight = 200;
1481
+ cGridBag fill2 = new cGridBag();
1482
+ fill2.preferredHeight = 200;
1483
+ cGridBag fill3 = new cGridBag();
1484
+ fill3.preferredHeight = 200;
8251485
8261486 panel.add(fill);
1487
+ panel.add(fill2);
1488
+ panel.add(fill3);
8271489
8281490 }
8291491
8301492 void EditObject(Object3D obj)
8311493 {
1494
+ assert(obj instanceof Composite);
1495
+
1496
+// if (obj.versionlist == null)
1497
+// {
1498
+// obj.versionlist = new Object3D[100];
1499
+// obj.versionindex = -1;
1500
+// }
1501
+
8321502 cRadio radioButton = new cRadio(obj.name);
1503
+
1504
+ // June 2019. Patch to avoid bug with transparency.
1505
+ radioButton.hadMaterial = obj.material != null;
1506
+ if (!radioButton.hadMaterial)
1507
+ {
1508
+ obj.material = new cMaterial();
1509
+ }
1510
+
8331511 radioButton.SetObject(obj);
834
- radioButton.layout = sevenButton;
1512
+ radioButton.layout = threeButton; // sixButton;
8351513 radioButton.SetCamera(cameraView.renderCamera, false);
8361514 radioButton.addActionListener(this);
8371515 radioPanel.add(radioButton);
....@@ -845,29 +1523,37 @@
8451523
8461524 oe.SetupViews();
8471525
1526
+ if (Globals.DEBUG)
8481527 System.out.println("SetupViews");
8491528 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
8501529 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
8511530 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
8521531 }
8531532
854
- JCheckBox liveCB;
855
- JCheckBox supportCB;
856
- JCheckBox localCB;
857
- JCheckBox crowdCB;
858
- JCheckBox smoothCB;
859
- JCheckBox fastCB;
860
- JCheckBox slowCB;
861
- JCheckBox boxCB;
862
- JCheckBox zoomBoxCB;
863
- JCheckBox trackCB;
864
- JCheckBox smoothfocusCB;
1533
+ cToggleButton liveCB;
1534
+ cCheckBox supportCB;
1535
+ cCheckBox localCB;
1536
+ cCheckBox crowdCB;
1537
+ cCheckBox smoothCB;
1538
+ cCheckBox minshaderCB;
1539
+
1540
+ cToggleButton fastCB;
1541
+ cCheckBox slowCB;
1542
+ cCheckBox boxCB;
1543
+ cCheckBox zoomBoxCB;
1544
+ cCheckBox freezeCB;
1545
+ //cToggleButton trackCB;
1546
+ cCheckBox trackCB;
1547
+ cCheckBox smoothfocusCB;
8651548 // JCheckBox speakerMocapCB;
866
- JCheckBox speakerCameraCB;
867
- JCheckBox speakerFocusCB;
868
- JCheckBox debugCB;
869
- JCheckBox oeilCB;
870
- JCheckBox lookAtCB;
1549
+ cCheckBox speakerCameraCB;
1550
+ cCheckBox speakerFocusCB;
1551
+ cCheckBox debugCB;
1552
+
1553
+ cCheckBox oeilCB;
1554
+ cCheckBox shadowCB;
1555
+ cCheckBox autokeepCB;
1556
+ cCheckBox lookAtCB;
8711557
8721558 // static int COLOR = 1;
8731559 // static int MATERIAL = 2;
....@@ -875,9 +1561,9 @@
8751561
8761562 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
8771563
878
- JCheckBox colorCB;
879
- JCheckBox materialCB;
880
- JCheckBox textureCB;
1564
+ cCheckBox colorCB;
1565
+ cCheckBox materialCB;
1566
+ cCheckBox textureCB;
8811567
8821568 public void itemStateChanged(ItemEvent e)
8831569 {
....@@ -921,6 +1607,12 @@
9211607 {
9221608 cameraView.ToggleInertia();
9231609 cameraView.repaint();
1610
+ }
1611
+ else if(e.getSource() == minshaderCB)
1612
+ {
1613
+ Globals.MINSHADER ^= true;
1614
+ cameraView.programInitialized = false;
1615
+ cameraView.repaint();
9241616 }
9251617 else if(e.getSource() == localCB)
9261618 {
....@@ -970,6 +1662,18 @@
9701662 {
9711663 cameraView.ToggleOeil();
9721664 }
1665
+ else if(e.getSource() == shadowCB)
1666
+ {
1667
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1668
+ }
1669
+ else if(e.getSource() == freezeCB)
1670
+ {
1671
+ Globals.FREEZEONMOVE ^= true;
1672
+ }
1673
+ else if(e.getSource() == autokeepCB)
1674
+ {
1675
+ Globals.REPLACEONMAKE ^= true;
1676
+ }
9731677 else if(e.getSource() == lookAtCB)
9741678 {
9751679 cameraView.ToggleLookAt();
....@@ -986,7 +1690,8 @@
9861690
9871691 /**/
9881692 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1693
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1694
+ TreePath path = objEditor.jTree.getSelectionPath();
9901695 if ((path == null) || (path.getPathCount() <= 1)) {
9911696 // We can't move the root node or an empty selection
9921697 return;
....@@ -1049,8 +1754,6 @@
10491754 }
10501755 }
10511756
1052
- String string = (String) object;
1053
-
10541757 System.out.println("Transfer = " + object + "; drop : " + target);
10551758 // if( object instanceof java.io.File[])
10561759 // {
....@@ -1058,6 +1761,8 @@
10581761 // objEditor.DropFile((java.io.File[]) object, true);
10591762 // return;
10601763 // }
1764
+
1765
+ String string = object.toString();
10611766
10621767 // File path for Mac and Windows
10631768 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1103,23 +1808,33 @@
11031808
11041809 assert target == objEditor.jTree;
11051810 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1811
+ Object3D destinationLeaf;
11061812 try {
1107
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1813
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
11081814 } catch (Exception e) {
11091815 System.out.println("destinationPath : " + destinationPath);
11101816 return;
11111817 }
11121818
1113
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1819
+ for (int i=group.selection.size(); --i>=0;)
11141820 {
1821
+ Object3D child = (Object3D)group.selection.elementAt(i);
1822
+
1823
+ // Cannot move into itself
1824
+ if (child == destinationLeaf)
1825
+ return;
1826
+ }
1827
+
1828
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1829
+// {
11151830 loadClipboard(true);
11161831 objEditor.jTree.setSelectionPath(destinationPath);
11171832 pasteInto(false, false);
1118
- } else {
1119
- loadClipboard(false);
1120
- objEditor.jTree.setSelectionPath(destinationPath);
1121
- pasteInto(false, false); // true); // ???
1122
- }
1833
+// } else {
1834
+// loadClipboard(false);
1835
+// objEditor.jTree.setSelectionPath(destinationPath);
1836
+// pasteInto(false, false); // true); // ???
1837
+// }
11231838 }
11241839 public void dropActionChanged(DropTargetDragEvent dtde)
11251840 // Called if the user has modified the current drop gesture
....@@ -1175,7 +1890,12 @@
11751890 TreePath path;
11761891
11771892 public TransferableTreePath(TreePath tp) {
1178
- path = tp;
1893
+ Object[] objs = new Object[tp.getPathCount()];
1894
+ for (int i=0; i<objs.length; i++)
1895
+ {
1896
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1897
+ }
1898
+ path = new TreePath(objs);
11791899 }
11801900
11811901 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1224,22 +1944,30 @@
12241944 {
12251945 //heightFieldItem = menu.add(new MenuItem("Height Field"));
12261946 //heightFieldItem.addActionListener(this);
1227
- gridItem = menu.add(new MenuItem("Grid"));
1228
- gridItem.addActionListener(this);
1229
- rectoidItem = menu.add(new MenuItem("Box"));
1230
- rectoidItem.addActionListener(this);
1231
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232
- ellipsoidItem.addActionListener(this);
1233
- coneItem = menu.add(new MenuItem("Cone"));
1234
- coneItem.addActionListener(this);
1235
- torusItem = menu.add(new MenuItem("Torus"));
1236
- torusItem.addActionListener(this);
1237
- superItem = menu.add(new MenuItem("Superellipsoid"));
1238
- superItem.addActionListener(this);
1947
+// gridItem = menu.add(new MenuItem("Grid"));
1948
+// gridItem.addActionListener(this);
1949
+// rectoidItem = menu.add(new MenuItem("Box"));
1950
+// rectoidItem.addActionListener(this);
1951
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1952
+// ellipsoidItem.addActionListener(this);
1953
+// coneItem = menu.add(new MenuItem("Cone"));
1954
+// coneItem.addActionListener(this);
1955
+// torusItem = menu.add(new MenuItem("Torus"));
1956
+// torusItem.addActionListener(this);
1957
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1958
+// superItem.addActionListener(this);
1959
+
1960
+ cameraItem = menu.add(new MenuItem("Camera"));
1961
+ cameraItem.addActionListener(this);
1962
+
1963
+ if (!Globals.ADVANCED)
1964
+ {
12391965 kleinItem = menu.add(new MenuItem("Klein Bottle"));
12401966 kleinItem.addActionListener(this);
1241
- particleItem = menu.add(new MenuItem("Particle system"));
1242
- particleItem.addActionListener(this);
1967
+ }
1968
+
1969
+// particleItem = menu.add(new MenuItem("Particle system"));
1970
+// particleItem.addActionListener(this);
12431971 if (Globals.ADVANCED)
12441972 {
12451973 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1265,15 +1993,15 @@
12651993 }
12661994 bezierItem = menu.add(new MenuItem("Bezier Patch"));
12671995 bezierItem.addActionListener(this);
1268
- overlayItem = menu.add(new MenuItem("Overlay"));
1269
- overlayItem.addActionListener(this);
1270
- lightItem = menu.add(new MenuItem("Light"));
1271
- lightItem.addActionListener(this);
1996
+// overlayItem = menu.add(new MenuItem("Overlay"));
1997
+// overlayItem.addActionListener(this);
1998
+// lightItem = menu.add(new MenuItem("Light"));
1999
+// lightItem.addActionListener(this);
12722000 menu.add("-");
12732001 //superLoopItem = menu.add(new MenuItem("Super Loop"));
12742002 //superLoopItem.addActionListener(this);
1275
- loopItem = menu.add(new MenuItem("Loop"));
1276
- loopItem.addActionListener(this);
2003
+// loopItem = menu.add(new MenuItem("Loop"));
2004
+// loopItem.addActionListener(this);
12772005 doubleItem = menu.add(new MenuItem("Fork"));
12782006 doubleItem.addActionListener(this);
12792007 if (Globals.ADVANCED)
....@@ -1289,6 +2017,9 @@
12892017 animationItem.addItemListener(this);
12902018 animationItem.setState(Globals.ANIMATION);
12912019
2020
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2021
+ archiveItem.addActionListener(this);
2022
+
12922023 menu.add("-");
12932024 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
12942025 parseverticesItem.addActionListener(this);
....@@ -1301,6 +2032,8 @@
13012032 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
13022033 reduce34MorphItem.addActionListener(this);
13032034 menu.add("-");
2035
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2036
+ memoryItem.addActionListener(this);
13042037 menu.add(computeAOItem = new MenuItem("Compute AO"));
13052038 computeAOItem.addActionListener(this);
13062039
....@@ -1309,8 +2042,6 @@
13092042 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
13102043 mirrorItem.addActionListener(this);
13112044 menu.add("-");
1312
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313
- memoryItem.addActionListener(this);
13142045 menu.add(analyzeItem = new MenuItem("Analyze"));
13152046 analyzeItem.addActionListener(this);
13162047 menu.add(dumpItem = new MenuItem("Print"));
....@@ -1454,9 +2185,38 @@
14542185 shadow.material = new cMaterial(obj.material);
14552186 shadow.material.diffuse = 0.0001f;
14562187 shadow.material.specular = 0.0001f;
2188
+ shadow.material.opacity = 0.75f;
2189
+
2190
+ AllocProjectedVertices(shadow);
2191
+
2192
+ shadow.projectedVertices[1].x = 300;
14572193
14582194 makeSomething(shadow);
14592195 }
2196
+
2197
+ private void ClearUnpinned()
2198
+ {
2199
+ //for (Object3D obj : listUI)
2200
+ for (int i=listUI.size(); --i>=0;)
2201
+ {
2202
+ Object3D obj = listUI.elementAt(i);
2203
+ if (!obj.pinned)
2204
+ {
2205
+ obj.CloseUI();
2206
+ listUI.remove(i);
2207
+ }
2208
+ }
2209
+ }
2210
+
2211
+ private void EditElement(Object3D elem, boolean newWindow)
2212
+ {
2213
+ // if (!(elem instanceof Composite))
2214
+ // newWindow = false;
2215
+ listUI.add(elem);
2216
+ elem.openEditWindow(this, newWindow); //, false);
2217
+ System.out.println("edit : " + elem);
2218
+ elem.editWindow.refreshContents(true); // ? new
2219
+ }
14602220
14612221 /**
14622222 * applyExample
....@@ -1701,7 +2461,7 @@
17012461 {
17022462 ScreenFit();
17032463 } else
1704
- if (source == switchItem)
2464
+ if (source == switchViewItem)
17052465 {
17062466 cVector v1 = new cVector();
17072467 cVector v2 = new cVector();
....@@ -1710,11 +2470,11 @@
17102470 objEditor.cameraView.renderCamera.setAim(v2, v1);
17112471 objEditor.cameraView.repaint();
17122472 } else
1713
- if (source == rectoidItem)
2473
+ if (source == rectoidItem || source == boxButton)
17142474 {
17152475 makeSomething(new Box());
17162476 } else
1717
- if (source == particleItem)
2477
+ if (source == particleItem || source == particlesButton)
17182478 {
17192479 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
17202480 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1793,27 +2553,27 @@
17932553
17942554 makeSomething(obj);
17952555 } else
1796
- if (source == gridItem)
2556
+ if (source == gridItem || source == gridButton)
17972557 {
17982558 makeSomething(new Grid());
17992559 } else
1800
- if (source == ellipsoidItem)
2560
+ if (source == ellipsoidItem || source == sphereButton)
18012561 {
18022562 makeSomething(new Sphere());
18032563 } else
1804
- if (source == coneItem)
2564
+ if (source == coneItem || source == coneButton)
18052565 {
18062566 makeSomething(new Cone());
18072567 } else
1808
- if (source == torusItem)
2568
+ if (source == torusItem || source == torusButton)
18092569 {
18102570 makeSomething(new Torus());
18112571 } else
1812
- if (source == superItem)
2572
+ if (source == superItem || source == superButton)
18132573 {
18142574 makeSomething(new Superellipsoid());
18152575 } else
1816
- if (source == kleinItem)
2576
+ if (source == kleinItem || source == kleinButton)
18172577 {
18182578 makeSomething(new Klein());
18192579 } else
....@@ -1833,7 +2593,7 @@
18332593 {
18342594 makeSomething(new BezierSurface());
18352595 } else
1836
- if (source == overlayItem)
2596
+ if (source == overlayItem || source == overlayButton)
18372597 {
18382598 /*
18392599 Object3D obj = new BezierSurface(5,8);
....@@ -1881,10 +2641,27 @@
18812641 s.setup();
18822642 makeSomething(s);
18832643 } else
1884
- if (source == lightItem)
2644
+ if (source == lightItem || source == lightButton)
18852645 {
18862646 makeSomething(new Light());
18872647 } else
2648
+// if (source == skybox1Button ||
2649
+// source == skybox2Button ||
2650
+// source == skybox3Button ||
2651
+// source == skybox4Button ||
2652
+// source == skybox5Button ||
2653
+// source == skybox6Button ||
2654
+// source == skybox7Button ||
2655
+// source == skybox11Button ||
2656
+// source == skybox12Button ||
2657
+// source == skybox13Button ||
2658
+// source == skybox14Button ||
2659
+// source == skybox15Button ||
2660
+// source == skybox16Button ||
2661
+// source == skybox17Button)
2662
+// {
2663
+// ChangeSkybox(source);
2664
+// } else
18882665 if (source == csgItem)
18892666 {
18902667 group(new CSG());
....@@ -1931,30 +2708,38 @@
19312708
19322709 group(g);
19332710 } else
1934
- if (source == loopItem)
2711
+ if (source == loopItem || source == loopButton)
19352712 {
2713
+ if (!group.selection.isEmpty())
2714
+ {
19362715 Composite csg = new GroupLeaf();
19372716 csg.count = 5;
1938
- group(csg);
1939
- Composite child = new cGroup();
2717
+ Composite child = new cGroup("Branch");
19402718 csg.addChild(child);
19412719 child.addChild(csg);
2720
+ group(csg);
2721
+ }
19422722 } else
19432723 if (source == doubleItem)
19442724 {
1945
- Composite csg = new GroupLeaf();
2725
+ if (!group.selection.isEmpty())
2726
+ {
2727
+ Composite csg = new GroupLeaf("Fork");
19462728 csg.count = 5;
2729
+ Composite child = new cGroup("Branch A");
2730
+ csg.addChild(child);
2731
+ child.addChild(csg);
2732
+ child = new cGroup("Branch B");
2733
+ csg.addChild(child);
2734
+ child.addChild(csg);
19472735 group(csg);
1948
- Composite child = new cGroup();
1949
- csg.addChild(child);
1950
- child.addChild(csg);
1951
- child = new cGroup();
1952
- csg.addChild(child);
1953
- child.addChild(csg);
2736
+ }
19542737 } else
19552738 if (source == tripleItem)
19562739 {
1957
- Composite csg = new GroupLeaf();
2740
+ if (!group.selection.isEmpty())
2741
+ {
2742
+ Composite csg = new GroupLeaf("Trident");
19582743 csg.count = 4;
19592744 group(csg);
19602745 Composite child = new cGroup();
....@@ -1966,11 +2751,12 @@
19662751 child = new cGroup();
19672752 csg.addChild(child);
19682753 child.addChild(csg);
2754
+ }
19692755 } else
19702756 if (source == computeAOItem)
19712757 {
19722758 Globals.drawMode = CameraPane.OCCLUSION;
1973
- Globals.theRenderer.repaint();
2759
+ cameraView.repaint();
19742760 } else
19752761 if (source == recompileItem)
19762762 {
....@@ -1985,7 +2771,7 @@
19852771 if (source == invariantsItem)
19862772 {
19872773 System.out.println("Invariants:");
1988
- Grafreed.grafreeD.universe.invariants();
2774
+ Grafreed.grafreed.universe.invariants();
19892775 } else
19902776 if (source == memoryItem)
19912777 {
....@@ -2016,17 +2802,52 @@
20162802 {
20172803 ToggleFullScreen();
20182804 } else
2019
- if (source == undoButton)
2805
+ if (source == collapseButton)
20202806 {
2021
- Undo();
2807
+ this.expandedLayout = radio.layout;
2808
+ CollapseToolbar();
20222809 } else
2023
- if (source == redoButton)
2810
+ if (source == maximize3DButton)
20242811 {
2025
- Redo();
2812
+ this.expandedLayout = radio.layout;
2813
+ radio.layout = twoButton;
2814
+ Show3DView();
2815
+ CollapseToolbar();
20262816 } else
2027
- if (source == saveButton)
2817
+ if (source == previousVersionButton)
20282818 {
2029
- Save();
2819
+ // Go to previous version
2820
+ //if (!Undo())
2821
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2822
+ PreviousVersion();
2823
+ } else
2824
+ if (source == restoreButton)
2825
+ {
2826
+ // Restore current version
2827
+ Restore();
2828
+ //restoreButton.setEnabled(false);
2829
+ } else
2830
+ if (source == replaceButton)
2831
+ {
2832
+ // Overwrite current version
2833
+ Replace();
2834
+ //replaceButton.setEnabled(false);
2835
+ } else
2836
+ if (source == nextVersionButton)
2837
+ {
2838
+ // Go to next version
2839
+ NextVersion();
2840
+ } else
2841
+ if (source == saveVersionButton)
2842
+ {
2843
+ // Save a new version
2844
+ if (!Save(true))
2845
+ java.awt.Toolkit.getDefaultToolkit().beep();
2846
+ } else
2847
+ if (source == deleteVersionButton)
2848
+ {
2849
+ // Delete a new version
2850
+ DeleteVersion();
20302851 } else
20312852 if (source == oneStepButton)
20322853 {
....@@ -2035,17 +2856,14 @@
20352856 } else
20362857 if (source == screenfitButton)
20372858 {
2038
- //Reload(lastConverter, lastFilename, true);
20392859 ScreenFit();
20402860 } else
20412861 if (source == screenfitpointButton)
20422862 {
2043
- //Reload(lastConverter, lastFilename, true);
20442863 ScreenFitPoint();
20452864 } else
20462865 if (source == snapobjectButton)
20472866 {
2048
- //Reload(lastConverter, lastFilename, true);
20492867 SnapObject();
20502868 } else
20512869 // if (event.getSource() == recompileButton)
....@@ -2084,11 +2902,11 @@
20842902 } else
20852903 if (source == undoItem)
20862904 {
2087
- Undo();
2905
+ PreviousVersion();
20882906 } else
20892907 if (source == redoItem)
20902908 {
2091
- Redo();
2909
+ NextVersion();
20922910 } else
20932911 if (source == duplicateItem)
20942912 {
....@@ -2409,7 +3227,7 @@
24093227 {
24103228 StepAll();
24113229 } else
2412
- if (source == clearItem) // || event.getSource() == clearButton)
3230
+ if (source == deleteItem) // || event.getSource() == clearButton)
24133231 {
24143232 //int indices[] = jList.getSelectedIndices();
24153233 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2421,9 +3239,9 @@
24213239 {
24223240 ClearSelection(true);
24233241 } else
2424
- if (source == grabItem)
3242
+ if (source == grabItem || source == groupButton)
24253243 {
2426
- group(new cGroup(), true);
3244
+ group(new cGroup(), false); // true);
24273245 } else
24283246 if (source == hideItem)
24293247 {
....@@ -2441,11 +3259,11 @@
24413259 {
24423260 makeSomething(new Camera());
24433261 } else
2444
- if (source == compositeItem)
3262
+ if (source == compositeItem || source == compositeButton)
24453263 {
24463264 group(new Composite());
24473265 } else
2448
- if (source == randomItem)
3266
+ if (source == switchItem || source == switchButton)
24493267 {
24503268 RandomNode random = new RandomNode();
24513269 group(random);
....@@ -2547,7 +3365,7 @@
25473365 {
25483366 group(new cLinker());
25493367 } else
2550
- if (source == textureItem)
3368
+ if (source == textureItem || source == textureButton)
25513369 {
25523370 group(new TextureNode());
25533371 } else
....@@ -2567,17 +3385,42 @@
25673385 {
25683386 CastShadow(2);
25693387 } else
2570
- if (source == ungroupItem)
3388
+ if (source == ungroupItem || source == ungroupButton)
25713389 {
2572
- //ungroup();
3390
+ boolean canUngroup = true;
3391
+
25733392 for (int i=0; i<group.selection.size(); i++)
25743393 {
2575
- Ungroup(group.selection.get(i));
3394
+ Object3D selectedItem = group.selection.get(i);
3395
+
3396
+ if (selectedItem.Size() == 0)
3397
+ {
3398
+ // Cannot ungroup leaves
3399
+ canUngroup = false;
3400
+ break;
3401
+ }
3402
+
3403
+ if (selectedItem == group)
3404
+ {
3405
+ // Cannot ungroup root
3406
+ canUngroup = false;
3407
+ break;
3408
+ }
25763409 }
25773410
2578
- ClearSelection(false);
2579
-
2580
- refreshContents();
3411
+ if (canUngroup)
3412
+ {
3413
+ for (int i=0; i<group.selection.size(); i++)
3414
+ {
3415
+ Object3D selectedItem = group.selection.get(i);
3416
+
3417
+ Ungroup(selectedItem);
3418
+ }
3419
+
3420
+ ClearSelection(false);
3421
+
3422
+ refreshContents();
3423
+ }
25813424 } else
25823425 if (source == genUVItem)
25833426 {
....@@ -2878,7 +3721,7 @@
28783721 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28793722 {
28803723 obj = (Object3D)e.nextElement();
2881
- obj.SetBumpTexture(null);
3724
+ obj.ResetBumpTexture();
28823725 }
28833726
28843727 refreshContents();
....@@ -2894,6 +3737,31 @@
28943737
28953738 refreshContents();
28963739 } else
3740
+ if (source == embedTexturesItem)
3741
+ {
3742
+ Object3D obj;
3743
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3744
+ {
3745
+ obj = (Object3D)e.nextElement();
3746
+ obj.EmbedTextures(true);
3747
+ }
3748
+
3749
+ refreshContents();
3750
+ } else
3751
+ if (source == deEmbedTexturesItem)
3752
+ {
3753
+ Object3D obj;
3754
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3755
+ {
3756
+ obj = (Object3D)e.nextElement();
3757
+ obj.EmbedTextures(false);
3758
+ }
3759
+
3760
+ CameraPane.texturepigment.clear();
3761
+ CameraPane.texturebump.clear();
3762
+
3763
+ refreshContents();
3764
+ } else
28973765 if (source == flashSelectionButton)
28983766 {
28993767 CameraPane.flash = true;
....@@ -2905,38 +3773,11 @@
29053773 if (source == twoButton)
29063774 {
29073775 radio.layout = twoButton;
2908
- // bug
2909
- //gridPanel.setDividerLocation(1.0);
2910
- //bigPanel.setDividerLocation(0.0);
2911
-// bigThree.remove(scenePanel);
2912
-// bigThree.remove(centralPanel);
2913
-// bigThree.remove(XYZPanel);
2914
-// aWindowConstraints.gridx = 0;
2915
-// aWindowConstraints.gridy = 0;
2916
-// aWindowConstraints.gridwidth = 1;
2917
-// // aConstraints.gridheight = 3;
2918
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2919
-// aWindowConstraints.weightx = 0;
2920
-// aWindowConstraints.weighty = 1;
2921
-// //bigThree.add(jtp, aWindowConstraints);
2922
-// aWindowConstraints.weightx = 1;
2923
-// aWindowConstraints.gridwidth = 3;
2924
-// // aConstraints.gridheight = 3;
2925
-// aWindowConstraints.gridx = 1;
2926
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2927
-// bigThree.add(centralPanel, aWindowConstraints);
2928
-// aWindowConstraints.weightx = 0;
2929
-// aWindowConstraints.gridx = 4;
2930
-// aWindowConstraints.gridwidth = 1;
2931
-// // aConstraints.gridheight = 3;
2932
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2933
-// //bigThree.add(XYZPanel, aWindowConstraints);
2934
-// scenePanel.setVisible(false);
2935
-// centralPanel.setVisible(true);
2936
-// XYZPanel.setVisible(false);
2937
- bigThree.ClearUI();
2938
- bigThree.add(centralPanel);
2939
- bigThree.FlushUI();
3776
+
3777
+ if (CameraPane.FULLSCREEN)
3778
+ fullscreenLayout = radio.layout;
3779
+
3780
+ Show3DView();
29403781
29413782 cameraView.requestFocusInWindow();
29423783
....@@ -2959,6 +3800,9 @@
29593800 if (source == threeButton)
29603801 {
29613802 radio.layout = threeButton;
3803
+
3804
+ if (CameraPane.FULLSCREEN)
3805
+ fullscreenLayout = radio.layout;
29623806
29633807 // bigThree.remove(scenePanel);
29643808 // bigThree.remove(centralPanel);
....@@ -2988,8 +3832,8 @@
29883832 // centralPanel.setVisible(true);
29893833 // XYZPanel.setVisible(true);
29903834 bigThree.ClearUI();
3835
+ bigThree.add(scenePanel);
29913836 bigThree.add(centralPanel);
2992
- bigThree.add(XYZPanel);
29933837 bigThree.FlushUI();
29943838
29953839 cameraView.requestFocusInWindow();
....@@ -2997,6 +3841,9 @@
29973841 if (source == fourButton)
29983842 {
29993843 radio.layout = fourButton;
3844
+
3845
+ if (CameraPane.FULLSCREEN)
3846
+ fullscreenLayout = radio.layout;
30003847
30013848 // bigThree.remove(scenePanel);
30023849 // bigThree.remove(centralPanel);
....@@ -3035,6 +3882,9 @@
30353882 {
30363883 radio.layout = sixButton;
30373884
3885
+ if (CameraPane.FULLSCREEN)
3886
+ fullscreenLayout = radio.layout;
3887
+
30383888 // bigThree.remove(scenePanel);
30393889 // bigThree.remove(centralPanel);
30403890 // bigThree.remove(XYZPanel);
....@@ -3063,8 +3913,8 @@
30633913 // centralPanel.setVisible(true);
30643914 // XYZPanel.setVisible(false);
30653915 bigThree.ClearUI();
3066
- bigThree.add(scenePanel);
30673916 bigThree.add(centralPanel);
3917
+ bigThree.add(scenePanel);
30683918 bigThree.FlushUI();
30693919
30703920 cameraView.requestFocusInWindow();
....@@ -3072,6 +3922,9 @@
30723922 if (source == sevenButton)
30733923 {
30743924 radio.layout = sevenButton;
3925
+
3926
+ if (CameraPane.FULLSCREEN)
3927
+ fullscreenLayout = radio.layout;
30753928
30763929 // bigThree.remove(scenePanel);
30773930 // bigThree.remove(centralPanel);
....@@ -3110,6 +3963,7 @@
31103963 } else
31113964 if (source == rootButton)
31123965 {
3966
+ Replace();
31133967 Object3D obj;
31143968 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31153969 {
....@@ -3124,16 +3978,25 @@
31243978 if (source == closeButton)
31253979 {
31263980 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3981
+ Replace();
3982
+
31273983 cRadio ab;
31283984 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
31293985 {
31303986 ab = (cRadio)e.nextElement();
3131
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3987
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
31323988 {
3989
+ // Patch to avoid bug with transparency.
3990
+ if (!ab.hadMaterial)
3991
+ {
3992
+ ab.object.material = null;
3993
+ }
3994
+
31333995 buttonGroup.remove(ab);
31343996 radioPanel.remove(ab);
31353997
3136
- ab.GetObject().editWindow = null;
3998
+ //ab.GetObject().editWindow = null;
3999
+ ab.GetObject().manipWindow = null;
31374000 // ab.GetObject().objectUI = null; // ?????????
31384001
31394002 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
....@@ -3146,6 +4009,12 @@
31464009 } else
31474010 if (source == editItem || source == editButton)
31484011 {
4012
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4013
+ {
4014
+ Object3D child = (Object3D)e.nextElement();
4015
+ child.pinned = true;
4016
+ }
4017
+
31494018 EditSelection(false);
31504019 } else
31514020 if (source == uneditButton)
....@@ -3154,9 +4023,10 @@
31544023 {
31554024 Object3D child = (Object3D)e.nextElement();
31564025 if(child.editWindow != null)
3157
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4026
+ child.pinned = false;
31584027 child.CloseUI();
31594028 listUI.remove(child);
4029
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
31604030
31614031 //child.editWindow = null; // ???????????
31624032 }
....@@ -3171,16 +4041,18 @@
31714041 //copy.ClearUI();
31724042 for (Object3D obj : listUI)
31734043 {
4044
+ obj.pinned = false;
31744045 obj.CloseUI();
31754046 }
31764047 listUI.clear();
4048
+ SetPinStates(group.selection.size() > 0);
31774049 refreshContents(true);
31784050 } else
31794051 if (source == allParamsButton)
31804052 {
31814053 assert(copy == group);
31824054
3183
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4055
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
31844056
31854057 for (Object3D obj : listUI)
31864058 {
....@@ -3206,6 +4078,8 @@
32064078 } else
32074079 if(source instanceof cRadio)
32084080 {
4081
+ Replace();
4082
+
32094083 group.parent = keepparent;
32104084 group.attributes = 0;
32114085 //group.editWindow = null;
....@@ -3229,6 +4103,7 @@
32294103 }
32304104
32314105 copy = group;
4106
+
32324107 //Globals.theRenderer.object = group;
32334108 if(!useclient)
32344109 {
....@@ -3247,6 +4122,7 @@
32474122
32484123 // fix "+" issue
32494124 //group.editWindow = this;
4125
+ group.manipWindow = this;
32504126
32514127 /*
32524128 currentLayout = radio.layout;
....@@ -3254,6 +4130,37 @@
32544130 currentLayout = sevenButton;
32554131 */
32564132 radio.layout.doClick();
4133
+
4134
+ assert(copy instanceof Composite);
4135
+
4136
+ if (copy.versionlist == null)
4137
+ {
4138
+ copy.versionindex = -1;
4139
+
4140
+ // Cannot work with loops
4141
+ // To fix this issue, we first mark all nodes above the root,
4142
+ // and check if any of these nodes are reachable below the root.
4143
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4144
+
4145
+ if (!copy.HasTags())
4146
+ {
4147
+ copy.versionlist = new Object3D[100];
4148
+
4149
+ Save(true);
4150
+ }
4151
+
4152
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4153
+ }
4154
+
4155
+ SetVersionStates();
4156
+
4157
+ ClearUnpinned();
4158
+
4159
+ //Grafreed.Assert(group != null);
4160
+ //Grafreed.Assert(group.selection != null);
4161
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4162
+ if (group.selection == null || group.selection.size() == 1)
4163
+ EditSelection(false);
32574164 keepparent = group.parent;
32584165 // PARENT = NULL or not???
32594166 //group.parent = null; // ROOT
....@@ -3265,11 +4172,13 @@
32654172 } else if (event.getSource() == editCameraItem)
32664173 {
32674174 cameraView.ProtectCamera();
4175
+ cameraView.requestFocusInWindow();
32684176 cameraView.repaint();
32694177 return;
3270
- } else if (event.getSource() == revertCameraItem)
4178
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
32714179 {
32724180 cameraView.RevertCamera();
4181
+ cameraView.requestFocusInWindow();
32734182 cameraView.repaint();
32744183 return;
32754184 // } else if (event.getSource() == textureButton)
....@@ -3388,7 +4297,7 @@
33884297 TouchTransform(obj);
33894298 continue;
33904299 }
3391
- if ((mask&2) != 0) // Scale
4300
+ if ((mask&2) != 0) // Scale/rotation
33924301 {
33934302 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
33944303 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -3396,10 +4305,6 @@
33964305 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
33974306 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
33984307 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3399
- }
3400
- if ((mask&4) != 0) // Rotation
3401
- {
3402
- // ?
34034308 }
34044309 if ((mask&1) != 0) // Translation
34054310 {
....@@ -3846,7 +4751,7 @@
38464751
38474752 try
38484753 {
3849
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4754
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
38504755 }
38514756 catch (Exception e)
38524757 {
....@@ -4321,28 +5226,25 @@
43215226 // }
43225227 // }
43235228
4324
- static boolean allparams = true;
4325
-
4326
- static Vector<Object3D> listUI = new Vector<Object3D>();
4327
-
43285229 void EditSelection(boolean newWindow)
43295230 {
5231
+ if (group.selection == null)
5232
+ {
5233
+ EditElement(group, newWindow); // ? new
5234
+ return;
5235
+ }
5236
+
43305237 // aConstraints.gridy = 0;
43315238 for (int i=0; i<group.selection.size(); i++)
43325239 {
43335240 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
43345241 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5242
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
43365243
43375244 Object3D elem = (Object3D)group.selection.elementAt(i);
43385245 if(elem != group || !newWindow)
43395246 {
4340
- // if (!(elem instanceof Composite))
4341
- // newWindow = false;
4342
- listUI.add(elem);
4343
- elem.openEditWindow(this, newWindow); //, false);
4344
- System.out.println("edit : " + elem);
4345
- elem.editWindow.refreshContents(true); // ? new
5247
+ EditElement(elem, newWindow); // ? new
43465248 }
43475249 }
43485250 }
....@@ -4405,9 +5307,7 @@
44055307
44065308 freezemodel = false;
44075309 }
4408
-
4409
- boolean flashIt = true;
4410
-
5310
+
44115311 public void valueChanged(TreeSelectionEvent e)
44125312 //public boolean handleEvent(Event event)
44135313 {
....@@ -4417,7 +5317,8 @@
44175317 //new Exception().printStackTrace();
44185318
44195319 freezemodel = true;
4420
-
5320
+ ClearUnpinned();
5321
+
44215322 /**/
44225323 //switch (event.id)
44235324 {
....@@ -4450,7 +5351,7 @@
44505351 if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
44515352 // a camera
44525353 {
4453
- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
5354
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
44545355 {
44555356 CameraPane.camerachangeframe = 0; // don't refuse it
44565357 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
....@@ -4459,6 +5360,13 @@
44595360 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
44605361 }
44615362
5363
+ if (tps != null && tps.length == 1)
5364
+ {
5365
+ EditSelection(false);
5366
+ }
5367
+
5368
+ SetPinStates(tps != null && tps.length > 0);
5369
+
44625370 refreshContents();
44635371 //return true;
44645372 }
....@@ -4468,9 +5376,36 @@
44685376 freezemodel = false;
44695377 }
44705378
5379
+ void SetPinStates(boolean enabled)
5380
+ {
5381
+ editButton.setEnabled(enabled);
5382
+ uneditButton.setEnabled(enabled);
5383
+ //unselectButton.setEnabled(enabled);
5384
+ flashSelectionButton.setEnabled(enabled);
5385
+
5386
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5387
+
5388
+ boolean allComposites = true;
5389
+
5390
+ if (group.selection != null)
5391
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5392
+ {
5393
+ Object next = e.nextElement();
5394
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5395
+ {
5396
+ allComposites = false;
5397
+ break;
5398
+ }
5399
+ }
5400
+
5401
+ rootButton.setEnabled(allComposites);
5402
+ }
5403
+
44715404 void refreshContents(boolean cp)
44725405 {
4473
- if (!Globals.MOUSEDRAGGED)
5406
+ if (Globals.ADVANCED)
5407
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5408
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
44745409 {
44755410 objEditor.ClearInfo(); // .GetMaterial());
44765411
....@@ -4479,7 +5414,7 @@
44795414 Object3D child = (Object3D) group.selection.get(i);
44805415
44815416 objEditor.AddInfo(child, this, true);
4482
- System.err.println("info : " + child.GetPath());
5417
+// System.err.println("info : " + child.GetPath());
44835418 }
44845419
44855420 objEditor.SetText(); // jan 2014
....@@ -4569,7 +5504,8 @@
45695504
45705505 if (cut)
45715506 {
4572
- Save();
5507
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5508
+// Save();
45735509 //int indices[] = jList.getSelectedIndices();
45745510 //for (int i = indices.length - 1; i >= 0; i--)
45755511 //jList.remove(indices[i]);
....@@ -4672,6 +5608,10 @@
46725608
46735609 void paste(boolean expand)
46745610 {
5611
+ if (Globals.REPLACEONMAKE)
5612
+ Save();
5613
+ boolean keep = Globals.REPLACEONMAKE;
5614
+ Globals.REPLACEONMAKE = false;
46755615 // if (GrafreeD.clipboard == null)
46765616 // return;
46775617 boolean first = true;
....@@ -4731,6 +5671,7 @@
47315671 Grafreed.clipboard.get(0).parent = keepparent;
47325672 }
47335673
5674
+ Globals.REPLACEONMAKE = keep;
47345675 ResetModel();
47355676 refreshContents();
47365677 }
....@@ -4866,6 +5807,10 @@
48665807
48675808 void group(Object3D csg, boolean grab)
48685809 {
5810
+ if (Globals.REPLACEONMAKE)
5811
+ Save();
5812
+ boolean keep = Globals.REPLACEONMAKE;
5813
+ Globals.REPLACEONMAKE = false;
48695814 if (//false) // why??
48705815 !group.selection.isEmpty())
48715816 {
....@@ -4979,10 +5924,15 @@
49795924 //node.add(csg);
49805925 //makeSomething(node);
49815926 makeSomething(csg);
5927
+ Globals.REPLACEONMAKE = keep;
49825928 }
49835929
49845930 void Ungroup(Object3D g)
49855931 {
5932
+ if (Globals.REPLACEONMAKE)
5933
+ Save();
5934
+ boolean keep = Globals.REPLACEONMAKE;
5935
+ Globals.REPLACEONMAKE = false;
49865936 if (g instanceof HiddenObject)
49875937 {
49885938 HiddenObject h = (HiddenObject) g;
....@@ -4999,6 +5949,7 @@
49995949 objEditor.makeSomething(g.get(i), false);
50005950 }
50015951 }
5952
+ Globals.REPLACEONMAKE = keep;
50025953 }
50035954
50045955 void ungroup()
....@@ -5287,13 +6238,43 @@
52876238 cButton clearpanelButton;
52886239 cButton unselectButton;
52896240
5290
- cButton minButton;
5291
- cButton maxButton;
5292
- cButton fullButton;
5293
- cButton undoButton;
5294
- cButton redoButton;
5295
- cButton saveButton;
6241
+ cButton restoreCameraButton;
6242
+
52966243 cButton oneStepButton;
6244
+
6245
+ cButton groupButton;
6246
+ cButton ungroupButton;
6247
+ cButton compositeButton;
6248
+ cButton switchButton;
6249
+ cButton loopButton;
6250
+ cButton textureButton;
6251
+
6252
+ cButton skybox1Button;
6253
+ cButton skybox2Button;
6254
+ cButton skybox3Button;
6255
+ cButton skybox4Button;
6256
+ cButton skybox5Button;
6257
+ cButton skybox6Button;
6258
+ cButton skybox7Button;
6259
+
6260
+ cButton skybox11Button;
6261
+ cButton skybox12Button;
6262
+ cButton skybox13Button;
6263
+ cButton skybox14Button;
6264
+ cButton skybox15Button;
6265
+ cButton skybox16Button;
6266
+ cButton skybox17Button;
6267
+
6268
+ cButton gridButton;
6269
+ cButton boxButton;
6270
+ cButton sphereButton;
6271
+ cButton coneButton;
6272
+ cButton torusButton;
6273
+ cButton superButton;
6274
+ cButton kleinButton;
6275
+ cButton particlesButton;
6276
+ cButton overlayButton;
6277
+ cButton lightButton;
52976278
52986279 cButton screenfitButton;
52996280 cButton screenfitpointButton;
....@@ -5315,12 +6296,12 @@
53156296 //JTree jTree;
53166297 private MenuItem lookAtItem;
53176298 private MenuItem lookFromItem;
5318
- private MenuItem switchItem;
5319
- private MenuItem cutItem;
6299
+ private MenuItem switchViewItem;
6300
+ private JMenuItem cutItem;
53206301 private MenuItem undoItem;
53216302 private MenuItem redoItem;
5322
- private MenuItem duplicateItem;
5323
- private MenuItem cloneItem;
6303
+ private JMenuItem duplicateItem;
6304
+ private JMenuItem cloneItem;
53246305 private MenuItem cloneSupportItem;
53256306 private MenuItem overwriteGeoItem;
53266307 private MenuItem overwriteMatItem;
....@@ -5341,13 +6322,13 @@
53416322 private MenuItem cloneGeometriesItem;
53426323 private MenuItem shareGeometriesItem;
53436324 private MenuItem mergeGeometriesItem;
5344
- private MenuItem copyItem;
6325
+ private JMenuItem copyItem;
53456326 private MenuItem pasteItem;
5346
- private MenuItem pasteIntoItem;
5347
- private MenuItem pasteLinkItem;
5348
- private MenuItem pasteCloneItem;
5349
- private MenuItem pasteExpandItem;
5350
- private MenuItem clearItem;
6327
+ private JMenuItem pasteIntoItem;
6328
+ private JMenuItem pasteLinkItem;
6329
+ private JMenuItem pasteCloneItem;
6330
+ private JMenuItem pasteExpandItem;
6331
+ private JMenuItem deleteItem;
53516332 private MenuItem clearAllItem;
53526333 private MenuItem genUVItem;
53536334 private MenuItem genNormalsMESHItem;
....@@ -5402,12 +6383,12 @@
54026383 private MenuItem transformGeometryItem;
54036384 private MenuItem transformChildrenItem;
54046385 private MenuItem hideItem;
5405
- private MenuItem grabItem;
6386
+ private JMenuItem grabItem;
54066387 private MenuItem backItem;
54076388 private MenuItem frontItem;
54086389 private MenuItem cameraItem;
54096390 private MenuItem compositeItem;
5410
- private MenuItem randomItem;
6391
+ private MenuItem switchItem;
54116392 private MenuItem physicsItem;
54126393 private MenuItem frameselectorItem;
54136394 private MenuItem scriptNodeItem;
....@@ -5415,7 +6396,7 @@
54156396 private MenuItem switchTransfoItem;
54166397 private MenuItem morphItem;
54176398 private MenuItem linkerItem;
5418
- private MenuItem ungroupItem;
6399
+ private JMenuItem ungroupItem;
54196400 private MenuItem editItem;
54206401 private MenuItem openWindowItem;
54216402 private MenuItem editLeafItem;
....@@ -5431,6 +6412,8 @@
54316412 private MenuItem attachBumpItem;
54326413 private MenuItem detachBumpItem;
54336414 private MenuItem pigmentBumpItem;
6415
+ private MenuItem embedTexturesItem;
6416
+ private MenuItem deEmbedTexturesItem;
54346417
54356418 private MenuItem particleItem;
54366419 private MenuItem ragdollItem;
....@@ -5481,5 +6464,5 @@
54816464
54826465 Menu cameraMenu;
54836466 MenuItem editCameraItem;
5484
- MenuItem revertCameraItem;
6467
+ MenuItem restoreCameraItem;
54856468 }