Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5
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", !Grafreed.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, !Grafreed.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();
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,14 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
418
+ if (copy.versionlist == null)
419
+ {
420
+ copy.versionlist = new Object3D[100];
421
+ copy.versionindex = -1;
422
+
423
+ Save(true);
424
+ }
425
+
63426 if(ui)
64427 SetupUI(objEditor);
65428 }
....@@ -80,10 +443,22 @@
80443 SetupViews(objEditor);
81444
82445 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446
+
447
+ if (copy.versionlist == null)
448
+ {
449
+ copy.versionlist = new Object3D[100];
450
+ copy.versionindex = -1;
451
+
452
+ Save(true);
453
+ }
83454 }
84455
85456 void CloneSelection(boolean supports)
86457 {
458
+ if (Globals.REPLACEONMAKE)
459
+ Save();
460
+ boolean keep = Globals.REPLACEONMAKE;
461
+ Globals.REPLACEONMAKE = false;
87462 // Object3D keep = GrafreeD.clipboard;
88463 //Object3D obj;
89464 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,6 +469,7 @@
94469
95470 makeSomething(clone, i==group.selection.size()-1);
96471 }
472
+ Globals.REPLACEONMAKE = keep;
97473 }
98474
99475 void CloneClipboard(boolean supports)
....@@ -164,33 +540,35 @@
164540 // menu.add("-");
165541 duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
166542 duplicateItem.addActionListener(this);
167
- cloneItem = menu.add(new MenuItem("Clone"));
543
+
544
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
168545 cloneItem.addActionListener(this);
169
- if (Globals.ADVANCED)
546
+ //if (Globals.ADVANCED)
170547 {
171548 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
172549 cloneSupportItem.addActionListener(this);
173550 }
551
+ oe.jTree.popup.addSeparator();
174552 menu.add("-");
175
- cutItem = menu.add(new MenuItem("Cut"));
553
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176554 cutItem.addActionListener(this);
177
- copyItem = menu.add(new MenuItem("Copy"));
555
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178556 copyItem.addActionListener(this);
179557 pasteItem = menu.add(new MenuItem("Paste"));
180558 pasteItem.addActionListener(this);
181559
182
- menu.add("-");
183
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
560
+ oe.jTree.popup.addSeparator();
561
+ //menu.add("-");
562
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
184563 pasteIntoItem.addActionListener(this);
185
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
564
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
186565 pasteLinkItem.addActionListener(this);
187
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
566
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
188567 pasteCloneItem.addActionListener(this);
189
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
568
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
190569 // pasteExpandItem.addActionListener(this);
191
- menu.add("-");
192
- clearItem = menu.add(new MenuItem("Clear"));
193
- clearItem.addActionListener(this);
570
+ //menu.add("-");
571
+ oe.jTree.popup.addSeparator();
194572
195573 if (Globals.ADVANCED)
196574 {
....@@ -204,23 +582,23 @@
204582 //zBufferItem.addActionListener(this);
205583 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206584 //normalLensItem.addActionListener(this);
207
- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208
- revertCameraItem.addActionListener(this);
585
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
586
+ restoreCameraItem.addActionListener(this);
209587
210
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211
- toggleFullScreenItem.addItemListener(this);
212
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213
- cameraMenu.add("-");
588
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
589
+// toggleFullScreenItem.addItemListener(this);
590
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
591
+// cameraMenu.add("-");
592
+//
593
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
594
+// toggleTextureItem.addItemListener(this);
595
+// toggleTextureItem.setState(CameraPane.textureon);
596
+//
597
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
598
+// toggleSwitchItem.addItemListener(this);
599
+// toggleSwitchItem.setState(CameraPane.SWITCH);
214600
215
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
216
- toggleTextureItem.addItemListener(this);
217
- toggleTextureItem.setState(CameraPane.textureon);
218
-
219
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
220
- toggleSwitchItem.addItemListener(this);
221
- toggleSwitchItem.setState(CameraPane.SWITCH);
222
-
223
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
601
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224602 toggleHandleItem.addItemListener(this);
225603 toggleHandleItem.setState(CameraPane.HANDLES);
226604
....@@ -275,15 +653,13 @@
275653 {
276654 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277655 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
279
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
656
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
280657 oe.cameraMenu.add("-");
281658 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282659 openWindowItem.addActionListener(this);
283
- editLeafItem.addActionListener(this);
284660 lookAtItem.addActionListener(this);
285661 //lookFromItem.addActinoListener(this);
286
- //switchItem.addActionListener(this);
662
+ //switchViewItem.addActionListener(this);
287663 }
288664
289665 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -327,28 +703,35 @@
327703 setMasterItem.addActionListener(this);
328704 }
329705
330
- oe.menuBar.add(menu = new Menu("Group"));
331
- grabItem = menu.add(new MenuItem("Grab"));
332
- grabItem.addActionListener(this);
706
+ oe.menuBar.add(menu = new Menu("Order"));
707
+
333708 backItem = menu.add(new MenuItem("Back"));
334709 backItem.addActionListener(this);
335710 frontItem = menu.add(new MenuItem("Front"));
336711 frontItem.addActionListener(this);
337
- compositeItem = menu.add(new MenuItem("Composite"));
338
- compositeItem.addActionListener(this);
712
+// compositeItem = menu.add(new MenuItem("Composite"));
713
+// compositeItem.addActionListener(this);
714
+
715
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
716
+ grabItem.addActionListener(this);
339717
340718 if (Globals.ADVANCED)
341719 {
342720 hideItem = menu.add(new MenuItem("Hidden Group"));
343721 hideItem.addActionListener(this);
344722 }
345
- ungroupItem = menu.add(new MenuItem("Ungroup"));
723
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346724 ungroupItem.addActionListener(this);
347725
348
- menu.add("-");
726
+ oe.jTree.popup.addSeparator();
349727
350
- randomItem = menu.add(new MenuItem("Switch node"));
351
- randomItem.addActionListener(this);
728
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
729
+ deleteItem.addActionListener(this);
730
+
731
+// menu.add("-");
732
+//
733
+// switchItem = menu.add(new MenuItem("Switch node"));
734
+// switchItem.addActionListener(this);
352735 if (Globals.ADVANCED)
353736 {
354737 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
....@@ -365,13 +748,11 @@
365748 frameselectorItem.addActionListener(this);
366749 scriptNodeItem = menu.add(new MenuItem("Script Node"));
367750 scriptNodeItem.addActionListener(this);
368
- cameraItem = menu.add(new MenuItem("Camera"));
369
- cameraItem.addActionListener(this);
370751 }
371752
372753 oe.menuBar.add(menu = new Menu("Object"));
373
- textureItem = menu.add(new MenuItem("Texture"));
374
- textureItem.addActionListener(this);
754
+// textureItem = menu.add(new MenuItem("Texture"));
755
+// textureItem.addActionListener(this);
375756 billboardItem = menu.add(new MenuItem("Billboard"));
376757 billboardItem.addActionListener(this);
377758 csgItem = menu.add(new MenuItem("CSG"));
....@@ -382,13 +763,14 @@
382763 shadowYItem.addActionListener(this);
383764 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384765 shadowZItem.addActionListener(this);
766
+ attributeItem = menu.add(new MenuItem("Attribute"));
767
+ attributeItem.addActionListener(this);
768
+
385769 if (Globals.ADVANCED)
386770 {
387771 menu.add("-");
388772 linkerItem = menu.add(new MenuItem("Linker"));
389773 linkerItem.addActionListener(this);
390
- attributeItem = menu.add(new MenuItem("Attribute"));
391
- attributeItem.addActionListener(this);
392774 templateItem = menu.add(new MenuItem("Template"));
393775 templateItem.addActionListener(this);
394776 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -417,7 +799,7 @@
417799 genNormalsMESHItem.addActionListener(this);
418800 if (Globals.ADVANCED)
419801 {
420
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
802
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
421803 genNormalsMINEItem.addActionListener(this);
422804 }
423805 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -510,10 +892,15 @@
510892 attachBumpItem.addActionListener(this);
511893 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
512894 pigmentBumpItem.addActionListener(this);
895
+ //embedTexturesItem
513896 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
514897 detachPigmentItem.addActionListener(this);
515898 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
516899 detachBumpItem.addActionListener(this);
900
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
901
+ embedTexturesItem.addActionListener(this);
902
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
903
+ deEmbedTexturesItem.addActionListener(this);
517904 menu.add("-");
518905 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
519906 sortbysizeItem.addActionListener(this);
....@@ -524,6 +911,9 @@
524911 shareGeometriesItem.addActionListener(this);
525912 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
526913 mergeGeometriesItem.addActionListener(this);
914
+ menu.add("-");
915
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
916
+ editLeafItem.addActionListener(this);
527917 if (Globals.ADVANCED)
528918 {
529919 // Pretty much the same as duplicate and clone.
....@@ -540,6 +930,75 @@
540930 buildToolsMenu(menu);
541931 }
542932
933
+ JTabbedPane resourcecontainer;
934
+ cGridBag currenttab;
935
+ //boolean added; // patch for jar
936
+
937
+ int tabcount = 0;
938
+ int colcount = 0;
939
+ int rowcount = 0;
940
+ int texturecount = 0;
941
+
942
+ int columns = 5;
943
+ int rows = 7;
944
+
945
+ public void ResourceCallBack(String[] path)
946
+ {
947
+// for (int i = 0; i < path.length; i++)
948
+// System.out.print(path[i] + "/");
949
+// System.out.println();
950
+
951
+ if (//rowcount == 0 ||
952
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
953
+ {
954
+ currenttab = new cGridBag();
955
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
956
+ currenttab.setName(tabname);
957
+ //added = false;
958
+ resourcecontainer.add(currenttab);
959
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
960
+ rowcount = 1;
961
+ colcount = 0;
962
+ texturecount = 0;
963
+ }
964
+
965
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
966
+ {
967
+ //if (!added)
968
+ {
969
+ //added = true;
970
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
971
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
972
+ }
973
+
974
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
975
+
976
+ if (++colcount >= columns)
977
+ {
978
+ colcount = 0;
979
+ currenttab.Return();
980
+
981
+ if (rowcount++ >= rows)
982
+ {
983
+ rowcount = 0;
984
+ }
985
+ }
986
+ }
987
+ else
988
+ {
989
+// if (!path[path.length-1].equals("icons"))
990
+// resourcecontainer.Return();
991
+ }
992
+ }
993
+
994
+ void CreateTexturePanel(cGridBag container)
995
+ {
996
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
997
+ container.add(resourcecontainer);
998
+
999
+ Grafreed.ParseResources("textures", this);
1000
+ }
1001
+
5431002 void SetupUI2(ObjEditor oe)
5441003 {
5451004 // June 2019
....@@ -557,11 +1016,6 @@
5571016 //new Exception().printStackTrace();
5581017
5591018 oe.radioPanel = new JPanel(new GridBagLayout());
560
- oe.aConstraints.weightx = 1;
561
- oe.aConstraints.weighty = 0;
562
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
563
- oe.aConstraints.gridwidth = 100;
564
- oe.aConstraints.gridheight = 1;
5651019 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5661020
5671021 oe.buttonGroup = new ButtonGroup();
....@@ -582,53 +1036,122 @@
5821036 oe.radioPanel.add(dummyButton);
5831037 oe.buttonGroup.add(dummyButton);
5841038 */
1039
+ cGridBag copyOptionsPanel = new cGridBag();
1040
+
1041
+ copyOptionsPanel.preferredHeight = 2;
1042
+
5851043 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
5861044
5871045 //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5881046 //minButton.setToolTipText("Minimize window");
5891047 //minButton.addActionListener(this);
5901048
591
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592
- maxButton.setToolTipText("Maximize window");
593
- maxButton.addActionListener(this);
1049
+ if (Globals.ADVANCED)
1050
+ {
1051
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1052
+// maxButton.setToolTipText("Maximize window");
1053
+// maxButton.addActionListener(this);
1054
+ }
1055
+
1056
+ cButton gcButton;
1057
+
1058
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+// gcButton.setToolTipText("Garbage collect");
1060
+// gcButton.addActionListener(new ActionListener()
1061
+// {
1062
+// public void actionPerformed(ActionEvent e)
1063
+// {
1064
+// System.gc();
1065
+// }
1066
+// });
1067
+
1068
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1069
+ collapseButton.setToolTipText("Collapse toolbar");
1070
+ collapseButton.addActionListener(this);
1071
+
1072
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1073
+ maximize3DButton.setToolTipText("Maximize 3D view");
1074
+ maximize3DButton.addActionListener(this);
1075
+
1076
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
+ twoButton.setToolTipText("Show 3D view only");
1078
+ twoButton.addActionListener(this);
1079
+ this.fullscreenLayout = twoButton;
1080
+
1081
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1082
+ threeButton.setToolTipText("Show controls and 3D view");
1083
+ threeButton.addActionListener(this);
1084
+ if (Globals.ADVANCED)
1085
+ {
1086
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1087
+ sixButton.setToolTipText("Show 3D view and controls");
1088
+ sixButton.addActionListener(this);
1089
+ }
1090
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1091
+// sevenButton.setToolTipText("3-column layout");
1092
+// sevenButton.addActionListener(this);
1093
+ //
5941094
5951095 oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5961096 fullButton.setToolTipText("Full-screen window");
5971097 fullButton.addActionListener(this);
5981098
599
- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
- undoButton.setToolTipText("Undo changes");
601
- undoButton.addActionListener(this);
602
-
603
- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604
- redoButton.setToolTipText("Redo changes");
605
- redoButton.addActionListener(this);
606
-
607
- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608
- saveButton.setToolTipText("Save changes");
609
- saveButton.addActionListener(this);
610
-
611
- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612
- liveCB.setToolTipText("Enable animation");
613
- liveCB.addItemListener(this);
1099
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+ screenfitButton.setToolTipText("Screen fit");
1101
+ screenfitButton.addActionListener(this);
6141102
615
- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1104
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1105
+ restoreCameraButton.addActionListener(this);
1106
+
1107
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+ saveVersionButton.setToolTipText("Duplicate current version");
1109
+ saveVersionButton.addActionListener(this);
1110
+
1111
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+ deleteVersionButton.setToolTipText("Delete current version");
1113
+ deleteVersionButton.addActionListener(this);
1114
+
1115
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1116
+ previousVersionButton.setToolTipText("Previous version");
1117
+ previousVersionButton.addActionListener(this);
1118
+ previousVersionButton.setEnabled(false);
1119
+
1120
+ cGridBag updown = new cGridBag().setVertical(true);
1121
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1122
+ restoreButton.setToolTipText("Undo (restore current version)");
1123
+ restoreButton.addActionListener(this);
1124
+ //restoreButton.setEnabled(false);
1125
+
1126
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1127
+ replaceButton.setToolTipText("Save (replace current version)");
1128
+ replaceButton.addActionListener(this);
1129
+ //replaceButton.setEnabled(false);
1130
+
1131
+ copyOptionsPanel.add(updown);
1132
+
1133
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+ nextVersionButton.setToolTipText("Next version");
1135
+ nextVersionButton.addActionListener(this);
1136
+ nextVersionButton.setEnabled(false);
1137
+
1138
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6161139 oneStepButton.setToolTipText("Animate one step forward");
6171140 oneStepButton.addActionListener(this);
6181141
619
- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1142
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1143
+ liveCB.setToolTipText("Enable animation");
1144
+ liveCB.addItemListener(this);
1145
+
1146
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
6201147 fastCB.setToolTipText("Fast mode");
6211148 fastCB.addItemListener(this);
6221149
623
- oe.toolboxPanel.Return();
1150
+ //oe.toolboxPanel.Return();
6241151
625
- oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
626
- trackCB.setToolTipText("Enable tracking");
627
- trackCB.addItemListener(this);
628
-
629
- oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630
- screenfitButton.setToolTipText("Screen fit");
631
- screenfitButton.addActionListener(this);
1152
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1153
+// trackCB.setToolTipText("Enable tracking");
1154
+// trackCB.addItemListener(this);
6321155
6331156 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
6341157 // screenfitpointButton.addActionListener(this);
....@@ -638,35 +1161,17 @@
6381161 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6391162 snapobjectButton.addActionListener(this);
6401163 snapobjectButton.setToolTipText("Snap Object");
1164
+
1165
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1166
+ fourButton.addActionListener(this);
1167
+ fourButton.setToolTipText("Show control panel only");
6411168 }
6421169
643
- oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644
- flashSelectionButton.setToolTipText("Highlight selection");
645
- flashSelectionButton.addActionListener(this);
646
-
6471170 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6481171
649
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650
- twoButton.setToolTipText("Show center view only");
651
- twoButton.addActionListener(this);
652
- this.fullscreenLayout = twoButton;
653
-
654
- oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
655
- fourButton.addActionListener(this);
656
- fourButton.setToolTipText("Show left panel only");
657
- oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658
- sixButton.setToolTipText("2-column layout left");
659
- sixButton.addActionListener(this);
660
- oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661
- threeButton.setToolTipText("2-column layout right");
662
- threeButton.addActionListener(this);
663
- oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664
- sevenButton.setToolTipText("3-column layout");
665
- sevenButton.addActionListener(this);
666
- //
6671172
668
- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669
- rootButton.setToolTipText("Edit selection in new tab");
1173
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1174
+ rootButton.setToolTipText("Open selection in new tab");
6701175 rootButton.addActionListener(this);
6711176
6721177 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -675,32 +1180,32 @@
6751180 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
6761181 //clearButton.addActionListener(this);
6771182
1183
+ cGridBag row1 = new cGridBag();
1184
+
6781185 // INSERT
679
- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680
- gridButton.setToolTipText("Create grid");
1186
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1187
+ gridButton.setToolTipText("Create ground");
6811188 gridButton.addActionListener(this);
6821189
683
- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1190
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6841191 boxButton.setToolTipText("Create box");
6851192 boxButton.addActionListener(this);
6861193
687
- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1195
+ superButton.setToolTipText("Create superellipsoid");
1196
+ superButton.addActionListener(this);
1197
+
1198
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6881199 sphereButton.setToolTipText("Create sphere");
6891200 sphereButton.addActionListener(this);
6901201
691
- oe.toolboxPanel.Return();
692
-
693
- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6941203 coneButton.setToolTipText("Create cone");
6951204 coneButton.addActionListener(this);
6961205
697
- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1206
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6981207 torusButton.setToolTipText("Create torus");
6991208 torusButton.addActionListener(this);
700
-
701
- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702
- superButton.setToolTipText("Create superellipsoid");
703
- superButton.addActionListener(this);
7041209
7051210 if (Globals.ADVANCED)
7061211 {
....@@ -709,41 +1214,82 @@
7091214 kleinButton.addActionListener(this);
7101215 }
7111216
712
- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1217
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7131218 particlesButton.setToolTipText("Create particle system");
7141219 particlesButton.addActionListener(this);
7151220
716
- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1221
+ oe.toolboxPanel.add(row1);
1222
+
1223
+ cGridBag row2 = new cGridBag();
1224
+
1225
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1226
+ groupButton.setToolTipText("Create group");
1227
+ groupButton.addActionListener(this);
1228
+
1229
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1230
+ compositeButton.setToolTipText("Create composite");
1231
+ compositeButton.addActionListener(this);
1232
+
1233
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1234
+ switchButton.setToolTipText("Create item switcher");
1235
+ switchButton.addActionListener(this);
1236
+
1237
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1238
+ loopButton.setToolTipText("Create loop");
1239
+ loopButton.addActionListener(this);
1240
+
1241
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1242
+ textureButton.setToolTipText("Create texture");
1243
+ textureButton.addActionListener(this);
1244
+
1245
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7171246 overlayButton.setToolTipText("Create overlay");
7181247 overlayButton.addActionListener(this);
7191248
720
- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7211250 lightButton.setToolTipText("Create light");
7221251 lightButton.addActionListener(this);
7231252
1253
+ oe.toolboxPanel.add(row2);
1254
+
1255
+ cGridBag textures = new cGridBag();
1256
+
1257
+ CreateTexturePanel(textures);
1258
+
1259
+ oe.toolboxPanel.add(textures);
1260
+
1261
+ textures.preferredHeight = 100;
1262
+
1263
+ CreateSkyboxPanel(oe.skyboxPanel);
1264
+
7241265 // EDIT panel
725
- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726
- editButton.setToolTipText("Edit selection");
1266
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1267
+ editButton.setToolTipText("Pin selection controls");
7271268 editButton.addActionListener(this);
7281269
729
- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730
- uneditButton.setToolTipText("Unedit selection");
1270
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1271
+ uneditButton.setToolTipText("Unpin and remove selection controls");
7311272 uneditButton.addActionListener(this);
7321273
7331274 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734
- allParamsButton.setToolTipText("Edit all params");
1275
+ allParamsButton.setToolTipText("Show all controls");
7351276 allParamsButton.addActionListener(this);
7361277
737
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738
- clearPanelButton.setToolTipText("Clear edit panel");
1278
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+ clearPanelButton.setToolTipText("Clear all controls");
7391280 clearPanelButton.addActionListener(this);
7401281
741
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742
- unselectButton.setToolTipText("Unselect");
743
- unselectButton.addActionListener(this);
1282
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+ //unselectButton.setToolTipText("Unselect");
1284
+ //unselectButton.addActionListener(this);
7441285
1286
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1287
+ flashSelectionButton.setToolTipText("Highlight selection");
1288
+ flashSelectionButton.addActionListener(this);
1289
+
7451290 editCommandsPanel.preferredHeight = 1;
7461291
1292
+ SetPinStates(false);
7471293 // oe.treePanel.add(commandsPanel);
7481294 // oe.treePanel.Return();
7491295
....@@ -768,26 +1314,14 @@
7681314 oe.treePanel.add(jSPPanel);
7691315 oe.treePanel.Return();
7701316
771
- cGridBag copyOptionsPanel = new cGridBag();
772
-
773
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
774
- colorCB.setToolTipText("Copy color when dropped");
775
- colorCB.addItemListener(this);
776
-
777
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
778
- materialCB.setToolTipText("Copy material when dropped");
779
- materialCB.addItemListener(this);
780
-
781
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
782
- textureCB.setToolTipText("Copy texture when dropped");
783
- textureCB.addItemListener(this);
784
-
785
- copyOptionsPanel.preferredHeight = 1;
7861317 oe.treePanel.add(copyOptionsPanel);
7871318 oe.treePanel.Return();
1319
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1320
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1321
+ sliderPane.preferredHeight = 1;
7881322
789
-// mainPanel.setDividerLocation(0.5); //1.0);
790
-// mainPanel.setResizeWeight(0.5);
1323
+// mainPanel.setDividerLocation(0.1); //1.0);
1324
+ mainPanel.setResizeWeight(0.4);
7911325
7921326 //jList.addListSelectionListener(this);
7931327 oe.jTree.addTreeSelectionListener(this);
....@@ -795,7 +1329,7 @@
7951329 //jTree.setEditable(true);
7961330 oe.jTree.setDragEnabled(true);
7971331 //jTree.setPreferredSize(new Dimension(10,10));
798
- jSP.setPreferredSize(new Dimension(100,200));
1332
+ //jSP.setPreferredSize(new Dimension(100,200));
7991333
8001334 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
8011335
....@@ -807,29 +1341,49 @@
8071341 dgr.addDragGestureListener(this);
8081342 }catch(Exception e) {}
8091343 */
810
- radio.layout = sevenButton;
1344
+ radio.layout = threeButton; // sixButton;
8111345 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8121346 }
8131347
8141348 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
8151349 {
1350
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1351
+ colorCB.setToolTipText("Copy color when dropped");
1352
+ colorCB.addItemListener(this);
1353
+
1354
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1355
+ materialCB.setToolTipText("Copy material when dropped");
1356
+ materialCB.addItemListener(this);
1357
+
1358
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1359
+ textureCB.setToolTipText("Copy texture when dropped");
1360
+ textureCB.addItemListener(this);
1361
+
1362
+ panel.Return();
1363
+
8161364 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
8171365 boxCB.setToolTipText("Display bounding boxes");
8181366 boxCB.addItemListener(this);
8191367
8201368 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1369
+ zoomBoxCB.setToolTipText("Display only for wheel");
8221370 zoomBoxCB.addItemListener(this);
8231371
8241372 if (true) // Globals.ADVANCED)
8251373 {
826
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827
- supportCB.setToolTipText("Enable rigging");
828
- supportCB.addItemListener(this);
1374
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1375
+// supportCB.setToolTipText("Enable rigging");
1376
+// supportCB.addItemListener(this);
1377
+
1378
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1379
+ freezeCB.setToolTipText("Fast moving camera");
1380
+ freezeCB.addItemListener(this);
8291381
8301382 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
8311383 // localCB.addItemListener(this);
8321384
1385
+ panel.Return();
1386
+
8331387 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
8341388 crowdCB.setToolTipText("Used for crowds");
8351389 crowdCB.addItemListener(this);
....@@ -838,14 +1392,19 @@
8381392 smoothCB.setToolTipText("Snapping delay");
8391393 smoothCB.addItemListener(this);
8401394
841
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
842
- slowCB.setToolTipText("Smooth interpolation");
843
- slowCB.addItemListener(this);
1395
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1396
+// slowCB.setToolTipText("Smooth interpolation");
1397
+// slowCB.addItemListener(this);
1398
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1399
+ minshaderCB.setToolTipText("Minimal fast shader");
1400
+ minshaderCB.addItemListener(this);
8441401
8451402 // constraints.gridy += 1;
8461403 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
8471404 // speakerMocapCB.addItemListener(this);
8481405
1406
+ panel.Return();
1407
+
8491408 if (false)
8501409 {
8511410 // handled in scripts
....@@ -860,24 +1419,39 @@
8601419 //constraints.gridy += 1;
8611420 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
8621421 smoothfocusCB.addItemListener(this);
1422
+ panel.Return();
8631423 }
8641424
8651425 //constraints.gridx += 1;
8661426 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
8671427 // debugCB.addItemListener(this);
8681428
1429
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1430
+ trackCB.setToolTipText("Enable tracking target");
1431
+ trackCB.addItemListener(this);
1432
+
8691433 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870
- oeilCB.setToolTipText("Move camera when tracking target");
1434
+ oeilCB.setToolTipText("Move camera when tracking");
8711435 oeilCB.addItemListener(this);
8721436
8731437 panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874
- shadowCB.setToolTipText("Compute shadows when live");
1438
+ shadowCB.setToolTipText("When live compute shadows");
8751439 shadowCB.addItemListener(this);
8761440
877
- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878
- autosaveCB.setToolTipText("Auto-save on structure change");
879
- autosaveCB.addItemListener(this);
1441
+ panel.Return();
1442
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1443
+ toggleTextureCB.setToolTipText("Load textures");
1444
+ toggleTextureCB.addItemListener(this);
1445
+
1446
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1447
+ toggleSwitchCB.setToolTipText("Choose a single item");
1448
+ toggleSwitchCB.addItemListener(this);
1449
+
1450
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1451
+ autokeepCB.setToolTipText("On structure change");
1452
+ autokeepCB.addItemListener(this);
8801453
1454
+ panel.Return();
8811455 if (Globals.ADVANCED)
8821456 {
8831457 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
....@@ -888,18 +1462,31 @@
8881462 }
8891463
8901464 cGridBag fill = new cGridBag();
891
-
8921465 fill.preferredHeight = 200;
1466
+ cGridBag fill2 = new cGridBag();
1467
+ fill2.preferredHeight = 200;
1468
+ cGridBag fill3 = new cGridBag();
1469
+ fill3.preferredHeight = 200;
8931470
8941471 panel.add(fill);
1472
+ panel.add(fill2);
1473
+ panel.add(fill3);
8951474
8961475 }
8971476
8981477 void EditObject(Object3D obj)
8991478 {
1479
+ assert(obj instanceof Composite);
1480
+
1481
+// if (obj.versionlist == null)
1482
+// {
1483
+// obj.versionlist = new Object3D[100];
1484
+// obj.versionindex = -1;
1485
+// }
1486
+
9001487 cRadio radioButton = new cRadio(obj.name);
9011488
902
- // Patch to avoid bug with transparency.
1489
+ // June 2019. Patch to avoid bug with transparency.
9031490 radioButton.hadMaterial = obj.material != null;
9041491 if (!radioButton.hadMaterial)
9051492 {
....@@ -907,7 +1494,7 @@
9071494 }
9081495
9091496 radioButton.SetObject(obj);
910
- radioButton.layout = sevenButton;
1497
+ radioButton.layout = threeButton; // sixButton;
9111498 radioButton.SetCamera(cameraView.renderCamera, false);
9121499 radioButton.addActionListener(this);
9131500 radioPanel.add(radioButton);
....@@ -921,6 +1508,7 @@
9211508
9221509 oe.SetupViews();
9231510
1511
+ if (Globals.DEBUG)
9241512 System.out.println("SetupViews");
9251513 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
9261514 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -932,11 +1520,15 @@
9321520 cCheckBox localCB;
9331521 cCheckBox crowdCB;
9341522 cCheckBox smoothCB;
1523
+ cCheckBox minshaderCB;
1524
+
9351525 cToggleButton fastCB;
9361526 cCheckBox slowCB;
9371527 cCheckBox boxCB;
9381528 cCheckBox zoomBoxCB;
939
- cToggleButton trackCB;
1529
+ cCheckBox freezeCB;
1530
+ //cToggleButton trackCB;
1531
+ cCheckBox trackCB;
9401532 cCheckBox smoothfocusCB;
9411533 // JCheckBox speakerMocapCB;
9421534 cCheckBox speakerCameraCB;
....@@ -945,7 +1537,7 @@
9451537
9461538 cCheckBox oeilCB;
9471539 cCheckBox shadowCB;
948
- cCheckBox autosaveCB;
1540
+ cCheckBox autokeepCB;
9491541 cCheckBox lookAtCB;
9501542
9511543 // static int COLOR = 1;
....@@ -1001,6 +1593,12 @@
10011593 cameraView.ToggleInertia();
10021594 cameraView.repaint();
10031595 }
1596
+ else if(e.getSource() == minshaderCB)
1597
+ {
1598
+ Globals.MINSHADER ^= true;
1599
+ cameraView.programInitialized = false;
1600
+ cameraView.repaint();
1601
+ }
10041602 else if(e.getSource() == localCB)
10051603 {
10061604 cameraView.ToggleLocal();
....@@ -1053,9 +1651,13 @@
10531651 {
10541652 Globals.COMPUTESHADOWWHENLIVE ^= true;
10551653 }
1056
- else if(e.getSource() == autosaveCB)
1654
+ else if(e.getSource() == freezeCB)
10571655 {
1058
- Globals.SAVEONMAKE ^= true;
1656
+ Globals.FREEZEONMOVE ^= true;
1657
+ }
1658
+ else if(e.getSource() == autokeepCB)
1659
+ {
1660
+ Globals.REPLACEONMAKE ^= true;
10591661 }
10601662 else if(e.getSource() == lookAtCB)
10611663 {
....@@ -1137,8 +1739,6 @@
11371739 }
11381740 }
11391741
1140
- String string = (String) object;
1141
-
11421742 System.out.println("Transfer = " + object + "; drop : " + target);
11431743 // if( object instanceof java.io.File[])
11441744 // {
....@@ -1146,6 +1746,8 @@
11461746 // objEditor.DropFile((java.io.File[]) object, true);
11471747 // return;
11481748 // }
1749
+
1750
+ String string = object.toString();
11491751
11501752 // File path for Mac and Windows
11511753 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1191,13 +1793,23 @@
11911793
11921794 assert target == objEditor.jTree;
11931795 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1796
+ Object3D destinationLeaf;
11941797 try {
1195
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1798
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
11961799 } catch (Exception e) {
11971800 System.out.println("destinationPath : " + destinationPath);
11981801 return;
11991802 }
12001803
1804
+ for (int i=group.selection.size(); --i>=0;)
1805
+ {
1806
+ Object3D child = (Object3D)group.selection.elementAt(i);
1807
+
1808
+ // Cannot move into itself
1809
+ if (child == destinationLeaf)
1810
+ return;
1811
+ }
1812
+
12011813 // june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
12021814 // {
12031815 loadClipboard(true);
....@@ -1263,7 +1875,12 @@
12631875 TreePath path;
12641876
12651877 public TransferableTreePath(TreePath tp) {
1266
- path = tp;
1878
+ Object[] objs = new Object[tp.getPathCount()];
1879
+ for (int i=0; i<objs.length; i++)
1880
+ {
1881
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1882
+ }
1883
+ path = new TreePath(objs);
12671884 }
12681885
12691886 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1312,22 +1929,30 @@
13121929 {
13131930 //heightFieldItem = menu.add(new MenuItem("Height Field"));
13141931 //heightFieldItem.addActionListener(this);
1315
- gridItem = menu.add(new MenuItem("Grid"));
1316
- gridItem.addActionListener(this);
1317
- rectoidItem = menu.add(new MenuItem("Box"));
1318
- rectoidItem.addActionListener(this);
1319
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1320
- ellipsoidItem.addActionListener(this);
1321
- coneItem = menu.add(new MenuItem("Cone"));
1322
- coneItem.addActionListener(this);
1323
- torusItem = menu.add(new MenuItem("Torus"));
1324
- torusItem.addActionListener(this);
1325
- superItem = menu.add(new MenuItem("Superellipsoid"));
1326
- superItem.addActionListener(this);
1932
+// gridItem = menu.add(new MenuItem("Grid"));
1933
+// gridItem.addActionListener(this);
1934
+// rectoidItem = menu.add(new MenuItem("Box"));
1935
+// rectoidItem.addActionListener(this);
1936
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1937
+// ellipsoidItem.addActionListener(this);
1938
+// coneItem = menu.add(new MenuItem("Cone"));
1939
+// coneItem.addActionListener(this);
1940
+// torusItem = menu.add(new MenuItem("Torus"));
1941
+// torusItem.addActionListener(this);
1942
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1943
+// superItem.addActionListener(this);
1944
+
1945
+ cameraItem = menu.add(new MenuItem("Camera"));
1946
+ cameraItem.addActionListener(this);
1947
+
1948
+ if (!Globals.ADVANCED)
1949
+ {
13271950 kleinItem = menu.add(new MenuItem("Klein Bottle"));
13281951 kleinItem.addActionListener(this);
1329
- particleItem = menu.add(new MenuItem("Particle system"));
1330
- particleItem.addActionListener(this);
1952
+ }
1953
+
1954
+// particleItem = menu.add(new MenuItem("Particle system"));
1955
+// particleItem.addActionListener(this);
13311956 if (Globals.ADVANCED)
13321957 {
13331958 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1353,15 +1978,15 @@
13531978 }
13541979 bezierItem = menu.add(new MenuItem("Bezier Patch"));
13551980 bezierItem.addActionListener(this);
1356
- overlayItem = menu.add(new MenuItem("Overlay"));
1357
- overlayItem.addActionListener(this);
1358
- lightItem = menu.add(new MenuItem("Light"));
1359
- lightItem.addActionListener(this);
1981
+// overlayItem = menu.add(new MenuItem("Overlay"));
1982
+// overlayItem.addActionListener(this);
1983
+// lightItem = menu.add(new MenuItem("Light"));
1984
+// lightItem.addActionListener(this);
13601985 menu.add("-");
13611986 //superLoopItem = menu.add(new MenuItem("Super Loop"));
13621987 //superLoopItem.addActionListener(this);
1363
- loopItem = menu.add(new MenuItem("Loop"));
1364
- loopItem.addActionListener(this);
1988
+// loopItem = menu.add(new MenuItem("Loop"));
1989
+// loopItem.addActionListener(this);
13651990 doubleItem = menu.add(new MenuItem("Fork"));
13661991 doubleItem.addActionListener(this);
13671992 if (Globals.ADVANCED)
....@@ -1377,6 +2002,9 @@
13772002 animationItem.addItemListener(this);
13782003 animationItem.setState(Globals.ANIMATION);
13792004
2005
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2006
+ archiveItem.addActionListener(this);
2007
+
13802008 menu.add("-");
13812009 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
13822010 parseverticesItem.addActionListener(this);
....@@ -1389,6 +2017,8 @@
13892017 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
13902018 reduce34MorphItem.addActionListener(this);
13912019 menu.add("-");
2020
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2021
+ memoryItem.addActionListener(this);
13922022 menu.add(computeAOItem = new MenuItem("Compute AO"));
13932023 computeAOItem.addActionListener(this);
13942024
....@@ -1397,8 +2027,6 @@
13972027 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
13982028 mirrorItem.addActionListener(this);
13992029 menu.add("-");
1400
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401
- memoryItem.addActionListener(this);
14022030 menu.add(analyzeItem = new MenuItem("Analyze"));
14032031 analyzeItem.addActionListener(this);
14042032 menu.add(dumpItem = new MenuItem("Print"));
....@@ -1542,10 +2170,38 @@
15422170 shadow.material = new cMaterial(obj.material);
15432171 shadow.material.diffuse = 0.0001f;
15442172 shadow.material.specular = 0.0001f;
1545
- //shadow.projectedVertices[1].x = 300;
2173
+ shadow.material.opacity = 0.75f;
2174
+
2175
+ AllocProjectedVertices(shadow);
2176
+
2177
+ shadow.projectedVertices[1].x = 300;
15462178
15472179 makeSomething(shadow);
15482180 }
2181
+
2182
+ private void ClearUnpinned()
2183
+ {
2184
+ //for (Object3D obj : listUI)
2185
+ for (int i=listUI.size(); --i>=0;)
2186
+ {
2187
+ Object3D obj = listUI.elementAt(i);
2188
+ if (!obj.pinned)
2189
+ {
2190
+ obj.CloseUI();
2191
+ listUI.remove(i);
2192
+ }
2193
+ }
2194
+ }
2195
+
2196
+ private void EditElement(Object3D elem, boolean newWindow)
2197
+ {
2198
+ // if (!(elem instanceof Composite))
2199
+ // newWindow = false;
2200
+ listUI.add(elem);
2201
+ elem.openEditWindow(this, newWindow); //, false);
2202
+ System.out.println("edit : " + elem);
2203
+ elem.editWindow.refreshContents(true); // ? new
2204
+ }
15492205
15502206 /**
15512207 * applyExample
....@@ -1790,7 +2446,7 @@
17902446 {
17912447 ScreenFit();
17922448 } else
1793
- if (source == switchItem)
2449
+ if (source == switchViewItem)
17942450 {
17952451 cVector v1 = new cVector();
17962452 cVector v2 = new cVector();
....@@ -1974,6 +2630,23 @@
19742630 {
19752631 makeSomething(new Light());
19762632 } else
2633
+// if (source == skybox1Button ||
2634
+// source == skybox2Button ||
2635
+// source == skybox3Button ||
2636
+// source == skybox4Button ||
2637
+// source == skybox5Button ||
2638
+// source == skybox6Button ||
2639
+// source == skybox7Button ||
2640
+// source == skybox11Button ||
2641
+// source == skybox12Button ||
2642
+// source == skybox13Button ||
2643
+// source == skybox14Button ||
2644
+// source == skybox15Button ||
2645
+// source == skybox16Button ||
2646
+// source == skybox17Button)
2647
+// {
2648
+// ChangeSkybox(source);
2649
+// } else
19772650 if (source == csgItem)
19782651 {
19792652 group(new CSG());
....@@ -2020,30 +2693,38 @@
20202693
20212694 group(g);
20222695 } else
2023
- if (source == loopItem)
2696
+ if (source == loopItem || source == loopButton)
20242697 {
2698
+ if (!group.selection.isEmpty())
2699
+ {
20252700 Composite csg = new GroupLeaf();
20262701 csg.count = 5;
2027
- group(csg);
2028
- Composite child = new cGroup();
2702
+ Composite child = new cGroup("Branch");
20292703 csg.addChild(child);
20302704 child.addChild(csg);
2705
+ group(csg);
2706
+ }
20312707 } else
20322708 if (source == doubleItem)
20332709 {
2034
- Composite csg = new GroupLeaf();
2710
+ if (!group.selection.isEmpty())
2711
+ {
2712
+ Composite csg = new GroupLeaf("Fork");
20352713 csg.count = 5;
2714
+ Composite child = new cGroup("Branch A");
2715
+ csg.addChild(child);
2716
+ child.addChild(csg);
2717
+ child = new cGroup("Branch B");
2718
+ csg.addChild(child);
2719
+ child.addChild(csg);
20362720 group(csg);
2037
- Composite child = new cGroup();
2038
- csg.addChild(child);
2039
- child.addChild(csg);
2040
- child = new cGroup();
2041
- csg.addChild(child);
2042
- child.addChild(csg);
2721
+ }
20432722 } else
20442723 if (source == tripleItem)
20452724 {
2046
- Composite csg = new GroupLeaf();
2725
+ if (!group.selection.isEmpty())
2726
+ {
2727
+ Composite csg = new GroupLeaf("Trident");
20472728 csg.count = 4;
20482729 group(csg);
20492730 Composite child = new cGroup();
....@@ -2055,11 +2736,12 @@
20552736 child = new cGroup();
20562737 csg.addChild(child);
20572738 child.addChild(csg);
2739
+ }
20582740 } else
20592741 if (source == computeAOItem)
20602742 {
20612743 Globals.drawMode = CameraPane.OCCLUSION;
2062
- Globals.theRenderer.repaint();
2744
+ cameraView.repaint();
20632745 } else
20642746 if (source == recompileItem)
20652747 {
....@@ -2074,7 +2756,7 @@
20742756 if (source == invariantsItem)
20752757 {
20762758 System.out.println("Invariants:");
2077
- Grafreed.grafreeD.universe.invariants();
2759
+ Grafreed.grafreed.universe.invariants();
20782760 } else
20792761 if (source == memoryItem)
20802762 {
....@@ -2105,17 +2787,52 @@
21052787 {
21062788 ToggleFullScreen();
21072789 } else
2108
- if (source == undoButton)
2790
+ if (source == collapseButton)
21092791 {
2110
- Undo();
2792
+ this.expandedLayout = radio.layout;
2793
+ CollapseToolbar();
21112794 } else
2112
- if (source == redoButton)
2795
+ if (source == maximize3DButton)
21132796 {
2114
- Redo();
2797
+ this.expandedLayout = radio.layout;
2798
+ radio.layout = twoButton;
2799
+ Show3DView();
2800
+ CollapseToolbar();
21152801 } else
2116
- if (source == saveButton)
2802
+ if (source == previousVersionButton)
21172803 {
2118
- Save();
2804
+ // Go to previous version
2805
+ //if (!Undo())
2806
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2807
+ PreviousVersion();
2808
+ } else
2809
+ if (source == restoreButton)
2810
+ {
2811
+ // Restore current version
2812
+ Restore();
2813
+ //restoreButton.setEnabled(false);
2814
+ } else
2815
+ if (source == replaceButton)
2816
+ {
2817
+ // Overwrite current version
2818
+ Replace();
2819
+ //replaceButton.setEnabled(false);
2820
+ } else
2821
+ if (source == nextVersionButton)
2822
+ {
2823
+ // Go to next version
2824
+ NextVersion();
2825
+ } else
2826
+ if (source == saveVersionButton)
2827
+ {
2828
+ // Save a new version
2829
+ if (!Save(true))
2830
+ java.awt.Toolkit.getDefaultToolkit().beep();
2831
+ } else
2832
+ if (source == deleteVersionButton)
2833
+ {
2834
+ // Delete a new version
2835
+ DeleteVersion();
21192836 } else
21202837 if (source == oneStepButton)
21212838 {
....@@ -2124,17 +2841,14 @@
21242841 } else
21252842 if (source == screenfitButton)
21262843 {
2127
- //Reload(lastConverter, lastFilename, true);
21282844 ScreenFit();
21292845 } else
21302846 if (source == screenfitpointButton)
21312847 {
2132
- //Reload(lastConverter, lastFilename, true);
21332848 ScreenFitPoint();
21342849 } else
21352850 if (source == snapobjectButton)
21362851 {
2137
- //Reload(lastConverter, lastFilename, true);
21382852 SnapObject();
21392853 } else
21402854 // if (event.getSource() == recompileButton)
....@@ -2173,11 +2887,11 @@
21732887 } else
21742888 if (source == undoItem)
21752889 {
2176
- Undo();
2890
+ PreviousVersion();
21772891 } else
21782892 if (source == redoItem)
21792893 {
2180
- Redo();
2894
+ NextVersion();
21812895 } else
21822896 if (source == duplicateItem)
21832897 {
....@@ -2498,7 +3212,7 @@
24983212 {
24993213 StepAll();
25003214 } else
2501
- if (source == clearItem) // || event.getSource() == clearButton)
3215
+ if (source == deleteItem) // || event.getSource() == clearButton)
25023216 {
25033217 //int indices[] = jList.getSelectedIndices();
25043218 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2510,9 +3224,9 @@
25103224 {
25113225 ClearSelection(true);
25123226 } else
2513
- if (source == grabItem)
3227
+ if (source == grabItem || source == groupButton)
25143228 {
2515
- group(new cGroup(), true);
3229
+ group(new cGroup(), false); // true);
25163230 } else
25173231 if (source == hideItem)
25183232 {
....@@ -2530,11 +3244,11 @@
25303244 {
25313245 makeSomething(new Camera());
25323246 } else
2533
- if (source == compositeItem)
3247
+ if (source == compositeItem || source == compositeButton)
25343248 {
25353249 group(new Composite());
25363250 } else
2537
- if (source == randomItem)
3251
+ if (source == switchItem || source == switchButton)
25383252 {
25393253 RandomNode random = new RandomNode();
25403254 group(random);
....@@ -2636,7 +3350,7 @@
26363350 {
26373351 group(new cLinker());
26383352 } else
2639
- if (source == textureItem)
3353
+ if (source == textureItem || source == textureButton)
26403354 {
26413355 group(new TextureNode());
26423356 } else
....@@ -2658,15 +3372,40 @@
26583372 } else
26593373 if (source == ungroupItem || source == ungroupButton)
26603374 {
2661
- //ungroup();
3375
+ boolean canUngroup = true;
3376
+
26623377 for (int i=0; i<group.selection.size(); i++)
26633378 {
2664
- Ungroup(group.selection.get(i));
3379
+ Object3D selectedItem = group.selection.get(i);
3380
+
3381
+ if (selectedItem.Size() == 0)
3382
+ {
3383
+ // Cannot ungroup leaves
3384
+ canUngroup = false;
3385
+ break;
3386
+ }
3387
+
3388
+ if (selectedItem == group)
3389
+ {
3390
+ // Cannot ungroup root
3391
+ canUngroup = false;
3392
+ break;
3393
+ }
26653394 }
26663395
2667
- ClearSelection(false);
2668
-
2669
- refreshContents();
3396
+ if (canUngroup)
3397
+ {
3398
+ for (int i=0; i<group.selection.size(); i++)
3399
+ {
3400
+ Object3D selectedItem = group.selection.get(i);
3401
+
3402
+ Ungroup(selectedItem);
3403
+ }
3404
+
3405
+ ClearSelection(false);
3406
+
3407
+ refreshContents();
3408
+ }
26703409 } else
26713410 if (source == genUVItem)
26723411 {
....@@ -2967,7 +3706,7 @@
29673706 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
29683707 {
29693708 obj = (Object3D)e.nextElement();
2970
- obj.SetBumpTexture(null);
3709
+ obj.ResetBumpTexture();
29713710 }
29723711
29733712 refreshContents();
....@@ -2981,6 +3720,31 @@
29813720 obj.SetBumpTexture(obj.GetPigmentTexture());
29823721 }
29833722
3723
+ refreshContents();
3724
+ } else
3725
+ if (source == embedTexturesItem)
3726
+ {
3727
+ Object3D obj;
3728
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3729
+ {
3730
+ obj = (Object3D)e.nextElement();
3731
+ obj.EmbedTextures(true);
3732
+ }
3733
+
3734
+ refreshContents();
3735
+ } else
3736
+ if (source == deEmbedTexturesItem)
3737
+ {
3738
+ Object3D obj;
3739
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3740
+ {
3741
+ obj = (Object3D)e.nextElement();
3742
+ obj.EmbedTextures(false);
3743
+ }
3744
+
3745
+ CameraPane.texturepigment.clear();
3746
+ CameraPane.texturebump.clear();
3747
+
29843748 refreshContents();
29853749 } else
29863750 if (source == flashSelectionButton)
....@@ -2998,38 +3762,7 @@
29983762 if (CameraPane.FULLSCREEN)
29993763 fullscreenLayout = radio.layout;
30003764
3001
- // bug
3002
- //gridPanel.setDividerLocation(1.0);
3003
- //bigPanel.setDividerLocation(0.0);
3004
-// bigThree.remove(scenePanel);
3005
-// bigThree.remove(centralPanel);
3006
-// bigThree.remove(XYZPanel);
3007
-// aWindowConstraints.gridx = 0;
3008
-// aWindowConstraints.gridy = 0;
3009
-// aWindowConstraints.gridwidth = 1;
3010
-// // aConstraints.gridheight = 3;
3011
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3012
-// aWindowConstraints.weightx = 0;
3013
-// aWindowConstraints.weighty = 1;
3014
-// //bigThree.add(jtp, aWindowConstraints);
3015
-// aWindowConstraints.weightx = 1;
3016
-// aWindowConstraints.gridwidth = 3;
3017
-// // aConstraints.gridheight = 3;
3018
-// aWindowConstraints.gridx = 1;
3019
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3020
-// bigThree.add(centralPanel, aWindowConstraints);
3021
-// aWindowConstraints.weightx = 0;
3022
-// aWindowConstraints.gridx = 4;
3023
-// aWindowConstraints.gridwidth = 1;
3024
-// // aConstraints.gridheight = 3;
3025
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3026
-// //bigThree.add(XYZPanel, aWindowConstraints);
3027
-// scenePanel.setVisible(false);
3028
-// centralPanel.setVisible(true);
3029
-// XYZPanel.setVisible(false);
3030
- bigThree.ClearUI();
3031
- bigThree.add(centralPanel);
3032
- bigThree.FlushUI();
3765
+ Show3DView();
30333766
30343767 cameraView.requestFocusInWindow();
30353768
....@@ -3084,8 +3817,8 @@
30843817 // centralPanel.setVisible(true);
30853818 // XYZPanel.setVisible(true);
30863819 bigThree.ClearUI();
3820
+ bigThree.add(scenePanel);
30873821 bigThree.add(centralPanel);
3088
- bigThree.add(XYZPanel);
30893822 bigThree.FlushUI();
30903823
30913824 cameraView.requestFocusInWindow();
....@@ -3165,8 +3898,8 @@
31653898 // centralPanel.setVisible(true);
31663899 // XYZPanel.setVisible(false);
31673900 bigThree.ClearUI();
3168
- bigThree.add(scenePanel);
31693901 bigThree.add(centralPanel);
3902
+ bigThree.add(scenePanel);
31703903 bigThree.FlushUI();
31713904
31723905 cameraView.requestFocusInWindow();
....@@ -3215,6 +3948,7 @@
32153948 } else
32163949 if (source == rootButton)
32173950 {
3951
+ Replace();
32183952 Object3D obj;
32193953 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
32203954 {
....@@ -3258,6 +3992,12 @@
32583992 } else
32593993 if (source == editItem || source == editButton)
32603994 {
3995
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3996
+ {
3997
+ Object3D child = (Object3D)e.nextElement();
3998
+ child.pinned = true;
3999
+ }
4000
+
32614001 EditSelection(false);
32624002 } else
32634003 if (source == uneditButton)
....@@ -3266,9 +4006,10 @@
32664006 {
32674007 Object3D child = (Object3D)e.nextElement();
32684008 if(child.editWindow != null)
3269
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009
+ child.pinned = false;
32704010 child.CloseUI();
32714011 listUI.remove(child);
4012
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
32724013
32734014 //child.editWindow = null; // ???????????
32744015 }
....@@ -3283,16 +4024,18 @@
32834024 //copy.ClearUI();
32844025 for (Object3D obj : listUI)
32854026 {
4027
+ obj.pinned = false;
32864028 obj.CloseUI();
32874029 }
32884030 listUI.clear();
4031
+ SetPinStates(group.selection.size() > 0);
32894032 refreshContents(true);
32904033 } else
32914034 if (source == allParamsButton)
32924035 {
32934036 assert(copy == group);
32944037
3295
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4038
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
32964039
32974040 for (Object3D obj : listUI)
32984041 {
....@@ -3341,6 +4084,7 @@
33414084 }
33424085
33434086 copy = group;
4087
+
33444088 //Globals.theRenderer.object = group;
33454089 if(!useclient)
33464090 {
....@@ -3367,6 +4111,29 @@
33674111 currentLayout = sevenButton;
33684112 */
33694113 radio.layout.doClick();
4114
+
4115
+ assert(copy instanceof Composite);
4116
+
4117
+ if (copy.versionlist == null)
4118
+ {
4119
+ copy.versionlist = new Object3D[100];
4120
+ copy.versionindex = -1;
4121
+
4122
+ // Cannot work with loops
4123
+ // To fix this issue, first mark all nodes above the root,
4124
+ // and check if any of these nodes are reachable below the root.
4125
+ //Save(true);
4126
+ }
4127
+
4128
+ SetVersionStates();
4129
+
4130
+ ClearUnpinned();
4131
+
4132
+ //Grafreed.Assert(group != null);
4133
+ //Grafreed.Assert(group.selection != null);
4134
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4135
+ if (group.selection == null || group.selection.size() == 1)
4136
+ EditSelection(false);
33704137 keepparent = group.parent;
33714138 // PARENT = NULL or not???
33724139 //group.parent = null; // ROOT
....@@ -3378,11 +4145,13 @@
33784145 } else if (event.getSource() == editCameraItem)
33794146 {
33804147 cameraView.ProtectCamera();
4148
+ cameraView.requestFocusInWindow();
33814149 cameraView.repaint();
33824150 return;
3383
- } else if (event.getSource() == revertCameraItem)
4151
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
33844152 {
33854153 cameraView.RevertCamera();
4154
+ cameraView.requestFocusInWindow();
33864155 cameraView.repaint();
33874156 return;
33884157 // } else if (event.getSource() == textureButton)
....@@ -3959,7 +4728,7 @@
39594728
39604729 try
39614730 {
3962
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4731
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
39634732 }
39644733 catch (Exception e)
39654734 {
....@@ -4434,12 +5203,14 @@
44345203 // }
44355204 // }
44365205
4437
- static boolean allparams = true;
4438
-
4439
- static Vector<Object3D> listUI = new Vector<Object3D>();
4440
-
44415206 void EditSelection(boolean newWindow)
44425207 {
5208
+ if (group.selection == null)
5209
+ {
5210
+ EditElement(group, newWindow); // ? new
5211
+ return;
5212
+ }
5213
+
44435214 // aConstraints.gridy = 0;
44445215 for (int i=0; i<group.selection.size(); i++)
44455216 {
....@@ -4450,12 +5221,7 @@
44505221 Object3D elem = (Object3D)group.selection.elementAt(i);
44515222 if(elem != group || !newWindow)
44525223 {
4453
- // if (!(elem instanceof Composite))
4454
- // newWindow = false;
4455
- listUI.add(elem);
4456
- elem.openEditWindow(this, newWindow); //, false);
4457
- System.out.println("edit : " + elem);
4458
- elem.editWindow.refreshContents(true); // ? new
5224
+ EditElement(elem, newWindow); // ? new
44595225 }
44605226 }
44615227 }
....@@ -4518,9 +5284,7 @@
45185284
45195285 freezemodel = false;
45205286 }
4521
-
4522
- boolean flashIt = true;
4523
-
5287
+
45245288 public void valueChanged(TreeSelectionEvent e)
45255289 //public boolean handleEvent(Event event)
45265290 {
....@@ -4530,7 +5294,8 @@
45305294 //new Exception().printStackTrace();
45315295
45325296 freezemodel = true;
4533
-
5297
+ ClearUnpinned();
5298
+
45345299 /**/
45355300 //switch (event.id)
45365301 {
....@@ -4563,7 +5328,7 @@
45635328 if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
45645329 // a camera
45655330 {
4566
- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
5331
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
45675332 {
45685333 CameraPane.camerachangeframe = 0; // don't refuse it
45695334 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
....@@ -4572,6 +5337,13 @@
45725337 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
45735338 }
45745339
5340
+ if (tps != null && tps.length == 1)
5341
+ {
5342
+ EditSelection(false);
5343
+ }
5344
+
5345
+ SetPinStates(tps != null && tps.length > 0);
5346
+
45755347 refreshContents();
45765348 //return true;
45775349 }
....@@ -4581,9 +5353,35 @@
45815353 freezemodel = false;
45825354 }
45835355
5356
+ void SetPinStates(boolean enabled)
5357
+ {
5358
+ editButton.setEnabled(enabled);
5359
+ uneditButton.setEnabled(enabled);
5360
+ //unselectButton.setEnabled(enabled);
5361
+ flashSelectionButton.setEnabled(enabled);
5362
+
5363
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5364
+
5365
+ boolean allComposites = true;
5366
+
5367
+ if (group.selection != null)
5368
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5369
+ {
5370
+ Object next = e.nextElement();
5371
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5372
+ {
5373
+ allComposites = false;
5374
+ break;
5375
+ }
5376
+ }
5377
+
5378
+ rootButton.setEnabled(allComposites);
5379
+ }
5380
+
45845381 void refreshContents(boolean cp)
45855382 {
4586
- if (!Globals.MOUSEDRAGGED)
5383
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5384
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
45875385 {
45885386 objEditor.ClearInfo(); // .GetMaterial());
45895387
....@@ -4592,7 +5390,7 @@
45925390 Object3D child = (Object3D) group.selection.get(i);
45935391
45945392 objEditor.AddInfo(child, this, true);
4595
- System.err.println("info : " + child.GetPath());
5393
+// System.err.println("info : " + child.GetPath());
45965394 }
45975395
45985396 objEditor.SetText(); // jan 2014
....@@ -4682,8 +5480,8 @@
46825480
46835481 if (cut)
46845482 {
4685
- if (Globals.SAVEONMAKE)
4686
- Save();
5483
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5484
+// Save();
46875485 //int indices[] = jList.getSelectedIndices();
46885486 //for (int i = indices.length - 1; i >= 0; i--)
46895487 //jList.remove(indices[i]);
....@@ -4786,6 +5584,10 @@
47865584
47875585 void paste(boolean expand)
47885586 {
5587
+ if (Globals.REPLACEONMAKE)
5588
+ Save();
5589
+ boolean keep = Globals.REPLACEONMAKE;
5590
+ Globals.REPLACEONMAKE = false;
47895591 // if (GrafreeD.clipboard == null)
47905592 // return;
47915593 boolean first = true;
....@@ -4845,6 +5647,7 @@
48455647 Grafreed.clipboard.get(0).parent = keepparent;
48465648 }
48475649
5650
+ Globals.REPLACEONMAKE = keep;
48485651 ResetModel();
48495652 refreshContents();
48505653 }
....@@ -4980,6 +5783,10 @@
49805783
49815784 void group(Object3D csg, boolean grab)
49825785 {
5786
+ if (Globals.REPLACEONMAKE)
5787
+ Save();
5788
+ boolean keep = Globals.REPLACEONMAKE;
5789
+ Globals.REPLACEONMAKE = false;
49835790 if (//false) // why??
49845791 !group.selection.isEmpty())
49855792 {
....@@ -5093,10 +5900,15 @@
50935900 //node.add(csg);
50945901 //makeSomething(node);
50955902 makeSomething(csg);
5903
+ Globals.REPLACEONMAKE = keep;
50965904 }
50975905
50985906 void Ungroup(Object3D g)
50995907 {
5908
+ if (Globals.REPLACEONMAKE)
5909
+ Save();
5910
+ boolean keep = Globals.REPLACEONMAKE;
5911
+ Globals.REPLACEONMAKE = false;
51005912 if (g instanceof HiddenObject)
51015913 {
51025914 HiddenObject h = (HiddenObject) g;
....@@ -5113,6 +5925,7 @@
51135925 objEditor.makeSomething(g.get(i), false);
51145926 }
51155927 }
5928
+ Globals.REPLACEONMAKE = keep;
51165929 }
51175930
51185931 void ungroup()
....@@ -5401,17 +6214,32 @@
54016214 cButton clearpanelButton;
54026215 cButton unselectButton;
54036216
5404
- cButton minButton;
5405
- cButton maxButton;
5406
- cButton fullButton;
5407
- cButton undoButton;
5408
- cButton redoButton;
5409
- cButton saveButton;
6217
+ cButton restoreCameraButton;
6218
+
54106219 cButton oneStepButton;
54116220
54126221 cButton groupButton;
54136222 cButton ungroupButton;
54146223 cButton compositeButton;
6224
+ cButton switchButton;
6225
+ cButton loopButton;
6226
+ cButton textureButton;
6227
+
6228
+ cButton skybox1Button;
6229
+ cButton skybox2Button;
6230
+ cButton skybox3Button;
6231
+ cButton skybox4Button;
6232
+ cButton skybox5Button;
6233
+ cButton skybox6Button;
6234
+ cButton skybox7Button;
6235
+
6236
+ cButton skybox11Button;
6237
+ cButton skybox12Button;
6238
+ cButton skybox13Button;
6239
+ cButton skybox14Button;
6240
+ cButton skybox15Button;
6241
+ cButton skybox16Button;
6242
+ cButton skybox17Button;
54156243
54166244 cButton gridButton;
54176245 cButton boxButton;
....@@ -5444,12 +6272,12 @@
54446272 //JTree jTree;
54456273 private MenuItem lookAtItem;
54466274 private MenuItem lookFromItem;
5447
- private MenuItem switchItem;
5448
- private MenuItem cutItem;
6275
+ private MenuItem switchViewItem;
6276
+ private JMenuItem cutItem;
54496277 private MenuItem undoItem;
54506278 private MenuItem redoItem;
54516279 private JMenuItem duplicateItem;
5452
- private MenuItem cloneItem;
6280
+ private JMenuItem cloneItem;
54536281 private MenuItem cloneSupportItem;
54546282 private MenuItem overwriteGeoItem;
54556283 private MenuItem overwriteMatItem;
....@@ -5470,13 +6298,13 @@
54706298 private MenuItem cloneGeometriesItem;
54716299 private MenuItem shareGeometriesItem;
54726300 private MenuItem mergeGeometriesItem;
5473
- private MenuItem copyItem;
6301
+ private JMenuItem copyItem;
54746302 private MenuItem pasteItem;
5475
- private MenuItem pasteIntoItem;
5476
- private MenuItem pasteLinkItem;
5477
- private MenuItem pasteCloneItem;
5478
- private MenuItem pasteExpandItem;
5479
- private MenuItem clearItem;
6303
+ private JMenuItem pasteIntoItem;
6304
+ private JMenuItem pasteLinkItem;
6305
+ private JMenuItem pasteCloneItem;
6306
+ private JMenuItem pasteExpandItem;
6307
+ private JMenuItem deleteItem;
54806308 private MenuItem clearAllItem;
54816309 private MenuItem genUVItem;
54826310 private MenuItem genNormalsMESHItem;
....@@ -5531,12 +6359,12 @@
55316359 private MenuItem transformGeometryItem;
55326360 private MenuItem transformChildrenItem;
55336361 private MenuItem hideItem;
5534
- private MenuItem grabItem;
6362
+ private JMenuItem grabItem;
55356363 private MenuItem backItem;
55366364 private MenuItem frontItem;
55376365 private MenuItem cameraItem;
55386366 private MenuItem compositeItem;
5539
- private MenuItem randomItem;
6367
+ private MenuItem switchItem;
55406368 private MenuItem physicsItem;
55416369 private MenuItem frameselectorItem;
55426370 private MenuItem scriptNodeItem;
....@@ -5544,7 +6372,7 @@
55446372 private MenuItem switchTransfoItem;
55456373 private MenuItem morphItem;
55466374 private MenuItem linkerItem;
5547
- private MenuItem ungroupItem;
6375
+ private JMenuItem ungroupItem;
55486376 private MenuItem editItem;
55496377 private MenuItem openWindowItem;
55506378 private MenuItem editLeafItem;
....@@ -5560,6 +6388,8 @@
55606388 private MenuItem attachBumpItem;
55616389 private MenuItem detachBumpItem;
55626390 private MenuItem pigmentBumpItem;
6391
+ private MenuItem embedTexturesItem;
6392
+ private MenuItem deEmbedTexturesItem;
55636393
55646394 private MenuItem particleItem;
55656395 private MenuItem ragdollItem;
....@@ -5610,5 +6440,5 @@
56106440
56116441 Menu cameraMenu;
56126442 MenuItem editCameraItem;
5613
- MenuItem revertCameraItem;
6443
+ MenuItem restoreCameraItem;
56146444 }