Normand Briere
2019-08-15 7f97054d681518416a4ee1c1548ad42cfb489a8f
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)
....@@ -150,6 +526,8 @@
150526
151527 void SetupMenu2(GroupEditor oe)
152528 {
529
+ oe.jTree = new cTree();
530
+
153531 Menu menu;
154532 oe.menuBar.add(menu = new Menu("Edit"));
155533 //editItem = menu.add(new MenuItem("Edit"));
....@@ -160,35 +538,40 @@
160538 // redoItem = menu.add(new MenuItem("Redo"));
161539 // redoItem.addActionListener(this);
162540 // menu.add("-");
163
- duplicateItem = menu.add(new MenuItem("Duplicate"));
541
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164542 duplicateItem.addActionListener(this);
165
- cloneItem = menu.add(new MenuItem("Clone"));
543
+
544
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166545 cloneItem.addActionListener(this);
167
- if (Globals.ADVANCED)
546
+ //if (Globals.ADVANCED)
168547 {
169548 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170549 cloneSupportItem.addActionListener(this);
171550 }
551
+ oe.jTree.popup.addSeparator();
172552 menu.add("-");
173
- cutItem = menu.add(new MenuItem("Cut"));
553
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174554 cutItem.addActionListener(this);
175
- copyItem = menu.add(new MenuItem("Copy"));
555
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176556 copyItem.addActionListener(this);
177557 pasteItem = menu.add(new MenuItem("Paste"));
178558 pasteItem.addActionListener(this);
179559
180
- menu.add("-");
181
- 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"));
182563 pasteIntoItem.addActionListener(this);
183
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
564
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
184565 pasteLinkItem.addActionListener(this);
185
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
566
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
186567 pasteCloneItem.addActionListener(this);
187
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
568
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
188569 // pasteExpandItem.addActionListener(this);
189
- menu.add("-");
190
- clearItem = menu.add(new MenuItem("Clear"));
191
- clearItem.addActionListener(this);
570
+ //menu.add("-");
571
+ oe.jTree.popup.addSeparator();
572
+
573
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
574
+ deleteItem.addActionListener(this);
192575
193576 if (Globals.ADVANCED)
194577 {
....@@ -202,23 +585,23 @@
202585 //zBufferItem.addActionListener(this);
203586 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204587 //normalLensItem.addActionListener(this);
205
- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206
- revertCameraItem.addActionListener(this);
588
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
589
+ restoreCameraItem.addActionListener(this);
207590
208
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209
- toggleFullScreenItem.addItemListener(this);
210
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211
- cameraMenu.add("-");
591
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
592
+// toggleFullScreenItem.addItemListener(this);
593
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
594
+// cameraMenu.add("-");
595
+//
596
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
597
+// toggleTextureItem.addItemListener(this);
598
+// toggleTextureItem.setState(CameraPane.textureon);
599
+//
600
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
601
+// toggleSwitchItem.addItemListener(this);
602
+// toggleSwitchItem.setState(CameraPane.SWITCH);
212603
213
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214
- toggleTextureItem.addItemListener(this);
215
- toggleTextureItem.setState(CameraPane.textureon);
216
-
217
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218
- toggleSwitchItem.addItemListener(this);
219
- toggleSwitchItem.setState(CameraPane.SWITCH);
220
-
221
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
604
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222605 toggleHandleItem.addItemListener(this);
223606 toggleHandleItem.setState(CameraPane.HANDLES);
224607
....@@ -273,15 +656,13 @@
273656 {
274657 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275658 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
659
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278660 oe.cameraMenu.add("-");
279661 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280662 openWindowItem.addActionListener(this);
281
- editLeafItem.addActionListener(this);
282663 lookAtItem.addActionListener(this);
283664 //lookFromItem.addActinoListener(this);
284
- //switchItem.addActionListener(this);
665
+ //switchViewItem.addActionListener(this);
285666 }
286667
287668 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -326,21 +707,29 @@
326707 }
327708
328709 oe.menuBar.add(menu = new Menu("Group"));
329
- grabItem = menu.add(new MenuItem("Grab"));
330
- grabItem.addActionListener(this);
710
+// grabItem = menu.add(new MenuItem("Grab"));
711
+// grabItem.addActionListener(this);
331712 backItem = menu.add(new MenuItem("Back"));
332713 backItem.addActionListener(this);
333714 frontItem = menu.add(new MenuItem("Front"));
334715 frontItem.addActionListener(this);
335
- compositeItem = menu.add(new MenuItem("Composite"));
336
- compositeItem.addActionListener(this);
716
+// compositeItem = menu.add(new MenuItem("Composite"));
717
+// compositeItem.addActionListener(this);
718
+
719
+ if (Globals.ADVANCED)
720
+ {
337721 hideItem = menu.add(new MenuItem("Hidden Group"));
338722 hideItem.addActionListener(this);
339
- ungroupItem = menu.add(new MenuItem("Ungroup"));
723
+ }
724
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
340725 ungroupItem.addActionListener(this);
341
- menu.add("-");
342
- randomItem = menu.add(new MenuItem("Switch node"));
343
- randomItem.addActionListener(this);
726
+
727
+// menu.add("-");
728
+//
729
+// switchItem = menu.add(new MenuItem("Switch node"));
730
+// switchItem.addActionListener(this);
731
+ if (Globals.ADVANCED)
732
+ {
344733 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345734 switchGeoItem.addActionListener(this);
346735 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -348,8 +737,6 @@
348737 morphItem = menu.add(new MenuItem("Morph Group"));
349738 morphItem.addActionListener(this);
350739
351
- if (Globals.ADVANCED)
352
- {
353740 menu.add("-");
354741 physicsItem = menu.add(new MenuItem("Physics"));
355742 physicsItem.addActionListener(this);
....@@ -357,13 +744,11 @@
357744 frameselectorItem.addActionListener(this);
358745 scriptNodeItem = menu.add(new MenuItem("Script Node"));
359746 scriptNodeItem.addActionListener(this);
360
- cameraItem = menu.add(new MenuItem("Camera"));
361
- cameraItem.addActionListener(this);
362747 }
363748
364749 oe.menuBar.add(menu = new Menu("Object"));
365
- textureItem = menu.add(new MenuItem("Texture"));
366
- textureItem.addActionListener(this);
750
+// textureItem = menu.add(new MenuItem("Texture"));
751
+// textureItem.addActionListener(this);
367752 billboardItem = menu.add(new MenuItem("Billboard"));
368753 billboardItem.addActionListener(this);
369754 csgItem = menu.add(new MenuItem("CSG"));
....@@ -374,13 +759,14 @@
374759 shadowYItem.addActionListener(this);
375760 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376761 shadowZItem.addActionListener(this);
762
+ attributeItem = menu.add(new MenuItem("Attribute"));
763
+ attributeItem.addActionListener(this);
764
+
377765 if (Globals.ADVANCED)
378766 {
379767 menu.add("-");
380768 linkerItem = menu.add(new MenuItem("Linker"));
381769 linkerItem.addActionListener(this);
382
- attributeItem = menu.add(new MenuItem("Attribute"));
383
- attributeItem.addActionListener(this);
384770 templateItem = menu.add(new MenuItem("Template"));
385771 templateItem.addActionListener(this);
386772 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -409,7 +795,7 @@
409795 genNormalsMESHItem.addActionListener(this);
410796 if (Globals.ADVANCED)
411797 {
412
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
798
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413799 genNormalsMINEItem.addActionListener(this);
414800 }
415801 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -502,10 +888,15 @@
502888 attachBumpItem.addActionListener(this);
503889 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504890 pigmentBumpItem.addActionListener(this);
891
+ //embedTexturesItem
505892 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506893 detachPigmentItem.addActionListener(this);
507894 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508895 detachBumpItem.addActionListener(this);
896
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
897
+ embedTexturesItem.addActionListener(this);
898
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
899
+ deEmbedTexturesItem.addActionListener(this);
509900 menu.add("-");
510901 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511902 sortbysizeItem.addActionListener(this);
....@@ -516,6 +907,9 @@
516907 shareGeometriesItem.addActionListener(this);
517908 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518909 mergeGeometriesItem.addActionListener(this);
910
+ menu.add("-");
911
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
912
+ editLeafItem.addActionListener(this);
519913 if (Globals.ADVANCED)
520914 {
521915 // Pretty much the same as duplicate and clone.
....@@ -532,6 +926,74 @@
532926 buildToolsMenu(menu);
533927 }
534928
929
+ JTabbedPane resourcecontainer;
930
+ cGridBag currenttab;
931
+ boolean added; // patch for jar
932
+
933
+ int tabcount = 0;
934
+ int colcount = 0;
935
+ int rowcount = 0;
936
+ int texturecount = 0;
937
+
938
+ int columns = 5;
939
+ int rows = 7;
940
+
941
+ public void ResourceCallBack(String[] path)
942
+ {
943
+ for (int i = 0; i < path.length; i++)
944
+ System.out.print(path[i] + "/");
945
+ System.out.println();
946
+
947
+ if (//rowcount == 0 ||
948
+ path.length == 1)
949
+ {
950
+ currenttab = new cGridBag();
951
+ added = false;
952
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
953
+ currenttab.setName(tabname);
954
+ rowcount = 1;
955
+ colcount = 0;
956
+ texturecount = 0;
957
+ }
958
+
959
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
960
+ {
961
+ if (!added)
962
+ {
963
+ added = true;
964
+ resourcecontainer.add(currenttab);
965
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
966
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
967
+ }
968
+
969
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
970
+
971
+ if (++colcount >= columns)
972
+ {
973
+ colcount = 0;
974
+ currenttab.Return();
975
+
976
+ if (rowcount++ >= rows)
977
+ {
978
+ rowcount = 0;
979
+ }
980
+ }
981
+ }
982
+ else
983
+ {
984
+// if (!path[path.length-1].equals("icons"))
985
+// resourcecontainer.Return();
986
+ }
987
+ }
988
+
989
+ void CreateTexturePanel(cGridBag container)
990
+ {
991
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
992
+ container.add(resourcecontainer);
993
+
994
+ Grafreed.ParseResources("textures", this);
995
+ }
996
+
535997 void SetupUI2(ObjEditor oe)
536998 {
537999 // June 2019
....@@ -549,11 +1011,6 @@
5491011 //new Exception().printStackTrace();
5501012
5511013 oe.radioPanel = new JPanel(new GridBagLayout());
552
- oe.aConstraints.weightx = 1;
553
- oe.aConstraints.weighty = 0;
554
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
555
- oe.aConstraints.gridwidth = 100;
556
- oe.aConstraints.gridheight = 1;
5571014 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5581015
5591016 oe.buttonGroup = new ButtonGroup();
....@@ -574,51 +1031,122 @@
5741031 oe.radioPanel.add(dummyButton);
5751032 oe.buttonGroup.add(dummyButton);
5761033 */
1034
+ cGridBag copyOptionsPanel = new cGridBag();
1035
+
1036
+ copyOptionsPanel.preferredHeight = 2;
1037
+
5771038 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
5781039
5791040 //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5801041 //minButton.setToolTipText("Minimize window");
5811042 //minButton.addActionListener(this);
5821043
583
- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584
- maxButton.setToolTipText("Maximize window");
585
- maxButton.addActionListener(this);
1044
+ if (Globals.ADVANCED)
1045
+ {
1046
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
+// maxButton.setToolTipText("Maximize window");
1048
+// maxButton.addActionListener(this);
1049
+ }
5861050
587
- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1051
+ cButton gcButton;
1052
+
1053
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
+// gcButton.setToolTipText("Garbage collect");
1055
+// gcButton.addActionListener(new ActionListener()
1056
+// {
1057
+// public void actionPerformed(ActionEvent e)
1058
+// {
1059
+// System.gc();
1060
+// }
1061
+// });
1062
+
1063
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1064
+ collapseButton.setToolTipText("Collapse toolbar");
1065
+ collapseButton.addActionListener(this);
1066
+
1067
+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+ maximize3DButton.setToolTipText("Maximize 3D view");
1069
+ maximize3DButton.addActionListener(this);
1070
+
1071
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1072
+ twoButton.setToolTipText("Show 3D view only");
1073
+ twoButton.addActionListener(this);
1074
+ this.fullscreenLayout = twoButton;
1075
+
1076
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
+ threeButton.setToolTipText("Show controls and 3D view");
1078
+ threeButton.addActionListener(this);
1079
+ if (Globals.ADVANCED)
1080
+ {
1081
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1082
+ sixButton.setToolTipText("Show 3D view and controls");
1083
+ sixButton.addActionListener(this);
1084
+ }
1085
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1086
+// sevenButton.setToolTipText("3-column layout");
1087
+// sevenButton.addActionListener(this);
1088
+ //
1089
+
1090
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5881091 fullButton.setToolTipText("Full-screen window");
5891092 fullButton.addActionListener(this);
5901093
591
- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592
- undoButton.setToolTipText("Undo changes");
593
- undoButton.addActionListener(this);
594
-
595
- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
- redoButton.setToolTipText("Redo changes");
597
- redoButton.addActionListener(this);
598
-
599
- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
- saveButton.setToolTipText("Save changes");
601
- saveButton.addActionListener(this);
602
-
603
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
604
- liveCB.setToolTipText("Enable animation");
605
- liveCB.addItemListener(this);
1094
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095
+ screenfitButton.setToolTipText("Screen fit");
1096
+ screenfitButton.addActionListener(this);
6061097
607
- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1098
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1099
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1100
+ restoreCameraButton.addActionListener(this);
1101
+
1102
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103
+ saveVersionButton.setToolTipText("Duplicate current version");
1104
+ saveVersionButton.addActionListener(this);
1105
+
1106
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1107
+ deleteVersionButton.setToolTipText("Delete current version");
1108
+ deleteVersionButton.addActionListener(this);
1109
+
1110
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1111
+ previousVersionButton.setToolTipText("Previous version");
1112
+ previousVersionButton.addActionListener(this);
1113
+ previousVersionButton.setEnabled(false);
1114
+
1115
+ cGridBag updown = new cGridBag().setVertical(true);
1116
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1117
+ restoreButton.setToolTipText("Undo (restore current version)");
1118
+ restoreButton.addActionListener(this);
1119
+ //restoreButton.setEnabled(false);
1120
+
1121
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1122
+ replaceButton.setToolTipText("Save (replace current version)");
1123
+ replaceButton.addActionListener(this);
1124
+ //replaceButton.setEnabled(false);
1125
+
1126
+ copyOptionsPanel.add(updown);
1127
+
1128
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+ nextVersionButton.setToolTipText("Next version");
1130
+ nextVersionButton.addActionListener(this);
1131
+ nextVersionButton.setEnabled(false);
1132
+
1133
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6081134 oneStepButton.setToolTipText("Animate one step forward");
6091135 oneStepButton.addActionListener(this);
6101136
611
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
1137
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1138
+ liveCB.setToolTipText("Enable animation");
1139
+ liveCB.addItemListener(this);
1140
+
1141
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
6121142 fastCB.setToolTipText("Fast mode");
6131143 fastCB.addItemListener(this);
6141144
615
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616
- trackCB.setToolTipText("Enable tracking");
617
- trackCB.addItemListener(this);
618
-
619
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
- screenfitButton.setToolTipText("Screen fit");
621
- screenfitButton.addActionListener(this);
1145
+ //oe.toolboxPanel.Return();
1146
+
1147
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1148
+// trackCB.setToolTipText("Enable tracking");
1149
+// trackCB.addItemListener(this);
6221150
6231151 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
6241152 // screenfitpointButton.addActionListener(this);
....@@ -628,63 +1156,135 @@
6281156 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6291157 snapobjectButton.addActionListener(this);
6301158 snapobjectButton.setToolTipText("Snap Object");
1159
+
1160
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1161
+ fourButton.addActionListener(this);
1162
+ fourButton.setToolTipText("Show control panel only");
6311163 }
6321164
633
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
- flashSelectionButton.setToolTipText("Show selection");
635
- flashSelectionButton.addActionListener(this);
1165
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6361166
637
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638
-
639
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640
- twoButton.setToolTipText("Show center view only");
641
- twoButton.addActionListener(this);
642
- oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643
- fourButton.addActionListener(this);
644
- fourButton.setToolTipText("Show left panel only");
645
- oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646
- sixButton.setToolTipText("2-column layout left");
647
- sixButton.addActionListener(this);
648
- oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649
- threeButton.setToolTipText("2-column layout right");
650
- threeButton.addActionListener(this);
651
- oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652
- sevenButton.setToolTipText("3-column layout");
653
- sevenButton.addActionListener(this);
654
- //
6551167
656
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657
- rootButton.setToolTipText("Edit selection in new tab");
1168
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+ rootButton.setToolTipText("Open selection in new tab");
6581170 rootButton.addActionListener(this);
6591171
660
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1172
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6611173 closeButton.setToolTipText("Close tab");
6621174 closeButton.addActionListener(this);
6631175 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
6641176 //clearButton.addActionListener(this);
665
-
666
- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667
- editButton.setToolTipText("Edit selection");
1177
+
1178
+ cGridBag row1 = new cGridBag();
1179
+
1180
+ // INSERT
1181
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1182
+ gridButton.setToolTipText("Create ground");
1183
+ gridButton.addActionListener(this);
1184
+
1185
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1186
+ boxButton.setToolTipText("Create box");
1187
+ boxButton.addActionListener(this);
1188
+
1189
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1190
+ sphereButton.setToolTipText("Create sphere");
1191
+ sphereButton.addActionListener(this);
1192
+
1193
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+ coneButton.setToolTipText("Create cone");
1195
+ coneButton.addActionListener(this);
1196
+
1197
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+ torusButton.setToolTipText("Create torus");
1199
+ torusButton.addActionListener(this);
1200
+
1201
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+ superButton.setToolTipText("Create superellipsoid");
1203
+ superButton.addActionListener(this);
1204
+
1205
+ if (Globals.ADVANCED)
1206
+ {
1207
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1208
+ kleinButton.setToolTipText("Create Klein bottle");
1209
+ kleinButton.addActionListener(this);
1210
+ }
1211
+
1212
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1213
+ particlesButton.setToolTipText("Create particle system");
1214
+ particlesButton.addActionListener(this);
1215
+
1216
+ oe.toolboxPanel.add(row1);
1217
+
1218
+ cGridBag row2 = new cGridBag();
1219
+
1220
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1221
+ groupButton.setToolTipText("Create group");
1222
+ groupButton.addActionListener(this);
1223
+
1224
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1225
+ compositeButton.setToolTipText("Create composite");
1226
+ compositeButton.addActionListener(this);
1227
+
1228
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1229
+ switchButton.setToolTipText("Create item switcher");
1230
+ switchButton.addActionListener(this);
1231
+
1232
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+ loopButton.setToolTipText("Create loop");
1234
+ loopButton.addActionListener(this);
1235
+
1236
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+ textureButton.setToolTipText("Create texture");
1238
+ textureButton.addActionListener(this);
1239
+
1240
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+ overlayButton.setToolTipText("Create overlay");
1242
+ overlayButton.addActionListener(this);
1243
+
1244
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+ lightButton.setToolTipText("Create light");
1246
+ lightButton.addActionListener(this);
1247
+
1248
+ oe.toolboxPanel.add(row2);
1249
+
1250
+ cGridBag textures = new cGridBag();
1251
+
1252
+ CreateTexturePanel(textures);
1253
+
1254
+ oe.toolboxPanel.add(textures);
1255
+
1256
+ textures.preferredHeight = 100;
1257
+
1258
+ CreateSkyboxPanel(oe.skyboxPanel);
1259
+
1260
+ // EDIT panel
1261
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1262
+ editButton.setToolTipText("Pin selection controls");
6681263 editButton.addActionListener(this);
6691264
670
- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671
- uneditButton.setToolTipText("Unedit selection");
1265
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1266
+ uneditButton.setToolTipText("Unpin and remove selection controls");
6721267 uneditButton.addActionListener(this);
6731268
6741269 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675
- allParamsButton.setToolTipText("Edit all params");
1270
+ allParamsButton.setToolTipText("Show all controls");
6761271 allParamsButton.addActionListener(this);
6771272
678
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679
- clearPanelButton.setToolTipText("Clear edit panel");
1273
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1274
+ clearPanelButton.setToolTipText("Clear all controls");
6801275 clearPanelButton.addActionListener(this);
6811276
682
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683
- unselectButton.setToolTipText("Unselect");
684
- unselectButton.addActionListener(this);
1277
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1278
+ //unselectButton.setToolTipText("Unselect");
1279
+ //unselectButton.addActionListener(this);
6851280
1281
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1282
+ flashSelectionButton.setToolTipText("Highlight selection");
1283
+ flashSelectionButton.addActionListener(this);
1284
+
6861285 editCommandsPanel.preferredHeight = 1;
6871286
1287
+ SetPinStates(false);
6881288 // oe.treePanel.add(commandsPanel);
6891289 // oe.treePanel.Return();
6901290
....@@ -703,32 +1303,20 @@
7031303
7041304 JScrollPane jSP;
7051305 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1306
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
7071307 ResetModel();
7081308
7091309 oe.treePanel.add(jSPPanel);
7101310 oe.treePanel.Return();
7111311
712
- cGridBag copyOptionsPanel = new cGridBag();
713
-
714
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715
- colorCB.setToolTipText("Copy color when dropped");
716
- colorCB.addItemListener(this);
717
-
718
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719
- materialCB.setToolTipText("Copy material when dropped");
720
- materialCB.addItemListener(this);
721
-
722
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723
- textureCB.setToolTipText("Copy texture when dropped");
724
- textureCB.addItemListener(this);
725
-
726
- copyOptionsPanel.preferredHeight = 1;
7271312 oe.treePanel.add(copyOptionsPanel);
7281313 oe.treePanel.Return();
1314
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1315
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1316
+ sliderPane.preferredHeight = 1;
7291317
730
-// mainPanel.setDividerLocation(0.5); //1.0);
731
-// mainPanel.setResizeWeight(0.5);
1318
+// mainPanel.setDividerLocation(0.1); //1.0);
1319
+ mainPanel.setResizeWeight(0.4);
7321320
7331321 //jList.addListSelectionListener(this);
7341322 oe.jTree.addTreeSelectionListener(this);
....@@ -736,7 +1324,7 @@
7361324 //jTree.setEditable(true);
7371325 oe.jTree.setDragEnabled(true);
7381326 //jTree.setPreferredSize(new Dimension(10,10));
739
- jSP.setPreferredSize(new Dimension(100,200));
1327
+ //jSP.setPreferredSize(new Dimension(100,200));
7401328
7411329 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
7421330
....@@ -748,29 +1336,49 @@
7481336 dgr.addDragGestureListener(this);
7491337 }catch(Exception e) {}
7501338 */
751
- radio.layout = sevenButton;
1339
+ radio.layout = threeButton; // sixButton;
7521340 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
7531341 }
7541342
7551343 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
7561344 {
1345
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1346
+ colorCB.setToolTipText("Copy color when dropped");
1347
+ colorCB.addItemListener(this);
1348
+
1349
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1350
+ materialCB.setToolTipText("Copy material when dropped");
1351
+ materialCB.addItemListener(this);
1352
+
1353
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1354
+ textureCB.setToolTipText("Copy texture when dropped");
1355
+ textureCB.addItemListener(this);
1356
+
1357
+ panel.Return();
1358
+
7571359 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
7581360 boxCB.setToolTipText("Display bounding boxes");
7591361 boxCB.addItemListener(this);
7601362
7611363 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1364
+ zoomBoxCB.setToolTipText("Display only for wheel");
7631365 zoomBoxCB.addItemListener(this);
7641366
7651367 if (true) // Globals.ADVANCED)
7661368 {
767
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768
- supportCB.setToolTipText("Enable rigging");
769
- supportCB.addItemListener(this);
1369
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1370
+// supportCB.setToolTipText("Enable rigging");
1371
+// supportCB.addItemListener(this);
1372
+
1373
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1374
+ freezeCB.setToolTipText("Fast moving camera");
1375
+ freezeCB.addItemListener(this);
7701376
7711377 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
7721378 // localCB.addItemListener(this);
7731379
1380
+ panel.Return();
1381
+
7741382 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
7751383 crowdCB.setToolTipText("Used for crowds");
7761384 crowdCB.addItemListener(this);
....@@ -779,14 +1387,19 @@
7791387 smoothCB.setToolTipText("Snapping delay");
7801388 smoothCB.addItemListener(this);
7811389
782
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783
- slowCB.setToolTipText("Smooth interpolation");
784
- slowCB.addItemListener(this);
1390
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1391
+// slowCB.setToolTipText("Smooth interpolation");
1392
+// slowCB.addItemListener(this);
1393
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1394
+ minshaderCB.setToolTipText("Minimal fast shader");
1395
+ minshaderCB.addItemListener(this);
7851396
7861397 // constraints.gridy += 1;
7871398 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
7881399 // speakerMocapCB.addItemListener(this);
7891400
1401
+ panel.Return();
1402
+
7901403 if (false)
7911404 {
7921405 // handled in scripts
....@@ -801,34 +1414,82 @@
8011414 //constraints.gridy += 1;
8021415 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
8031416 smoothfocusCB.addItemListener(this);
1417
+ panel.Return();
8041418 }
8051419
8061420 //constraints.gridx += 1;
8071421 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
8081422 // debugCB.addItemListener(this);
8091423
1424
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1425
+ trackCB.setToolTipText("Enable tracking target");
1426
+ trackCB.addItemListener(this);
1427
+
8101428 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1429
+ oeilCB.setToolTipText("Move camera when tracking");
8111430 oeilCB.addItemListener(this);
8121431
1432
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1433
+ shadowCB.setToolTipText("When live compute shadows");
1434
+ shadowCB.addItemListener(this);
1435
+
1436
+ panel.Return();
1437
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1438
+ toggleTextureCB.setToolTipText("Load textures");
1439
+ toggleTextureCB.addItemListener(this);
1440
+
1441
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1442
+ toggleSwitchCB.setToolTipText("Choose a single item");
1443
+ toggleSwitchCB.addItemListener(this);
1444
+
1445
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1446
+ autokeepCB.setToolTipText("On structure change");
1447
+ autokeepCB.addItemListener(this);
1448
+
1449
+ panel.Return();
1450
+ if (Globals.ADVANCED)
1451
+ {
8131452 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
8141453 lookAtCB.setToolTipText("Look-at target");
8151454 lookAtCB.addItemListener(this);
1455
+ }
8161456
8171457 }
8181458
8191459 cGridBag fill = new cGridBag();
820
-
8211460 fill.preferredHeight = 200;
1461
+ cGridBag fill2 = new cGridBag();
1462
+ fill2.preferredHeight = 200;
1463
+ cGridBag fill3 = new cGridBag();
1464
+ fill3.preferredHeight = 200;
8221465
8231466 panel.add(fill);
1467
+ panel.add(fill2);
1468
+ panel.add(fill3);
8241469
8251470 }
8261471
8271472 void EditObject(Object3D obj)
8281473 {
1474
+ assert(obj instanceof Composite);
1475
+
1476
+// if (obj.versionlist == null)
1477
+// {
1478
+// obj.versionlist = new Object3D[100];
1479
+// obj.versionindex = -1;
1480
+// }
1481
+
8291482 cRadio radioButton = new cRadio(obj.name);
1483
+
1484
+ // June 2019. Patch to avoid bug with transparency.
1485
+ radioButton.hadMaterial = obj.material != null;
1486
+ if (!radioButton.hadMaterial)
1487
+ {
1488
+ obj.material = new cMaterial();
1489
+ }
1490
+
8301491 radioButton.SetObject(obj);
831
- radioButton.layout = sevenButton;
1492
+ radioButton.layout = threeButton; // sixButton;
8321493 radioButton.SetCamera(cameraView.renderCamera, false);
8331494 radioButton.addActionListener(this);
8341495 radioPanel.add(radioButton);
....@@ -848,23 +1509,30 @@
8481509 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
8491510 }
8501511
851
- JCheckBox liveCB;
852
- JCheckBox supportCB;
853
- JCheckBox localCB;
854
- JCheckBox crowdCB;
855
- JCheckBox smoothCB;
856
- JCheckBox fastCB;
857
- JCheckBox slowCB;
858
- JCheckBox boxCB;
859
- JCheckBox zoomBoxCB;
860
- JCheckBox trackCB;
861
- JCheckBox smoothfocusCB;
1512
+ cToggleButton liveCB;
1513
+ cCheckBox supportCB;
1514
+ cCheckBox localCB;
1515
+ cCheckBox crowdCB;
1516
+ cCheckBox smoothCB;
1517
+ cCheckBox minshaderCB;
1518
+
1519
+ cToggleButton fastCB;
1520
+ cCheckBox slowCB;
1521
+ cCheckBox boxCB;
1522
+ cCheckBox zoomBoxCB;
1523
+ cCheckBox freezeCB;
1524
+ //cToggleButton trackCB;
1525
+ cCheckBox trackCB;
1526
+ cCheckBox smoothfocusCB;
8621527 // JCheckBox speakerMocapCB;
863
- JCheckBox speakerCameraCB;
864
- JCheckBox speakerFocusCB;
865
- JCheckBox debugCB;
866
- JCheckBox oeilCB;
867
- JCheckBox lookAtCB;
1528
+ cCheckBox speakerCameraCB;
1529
+ cCheckBox speakerFocusCB;
1530
+ cCheckBox debugCB;
1531
+
1532
+ cCheckBox oeilCB;
1533
+ cCheckBox shadowCB;
1534
+ cCheckBox autokeepCB;
1535
+ cCheckBox lookAtCB;
8681536
8691537 // static int COLOR = 1;
8701538 // static int MATERIAL = 2;
....@@ -872,9 +1540,9 @@
8721540
8731541 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
8741542
875
- JCheckBox colorCB;
876
- JCheckBox materialCB;
877
- JCheckBox textureCB;
1543
+ cCheckBox colorCB;
1544
+ cCheckBox materialCB;
1545
+ cCheckBox textureCB;
8781546
8791547 public void itemStateChanged(ItemEvent e)
8801548 {
....@@ -918,6 +1586,12 @@
9181586 {
9191587 cameraView.ToggleInertia();
9201588 cameraView.repaint();
1589
+ }
1590
+ else if(e.getSource() == minshaderCB)
1591
+ {
1592
+ Globals.MINSHADER ^= true;
1593
+ cameraView.programInitialized = false;
1594
+ cameraView.repaint();
9211595 }
9221596 else if(e.getSource() == localCB)
9231597 {
....@@ -967,6 +1641,18 @@
9671641 {
9681642 cameraView.ToggleOeil();
9691643 }
1644
+ else if(e.getSource() == shadowCB)
1645
+ {
1646
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1647
+ }
1648
+ else if(e.getSource() == freezeCB)
1649
+ {
1650
+ Globals.FREEZEONMOVE ^= true;
1651
+ }
1652
+ else if(e.getSource() == autokeepCB)
1653
+ {
1654
+ Globals.REPLACEONMAKE ^= true;
1655
+ }
9701656 else if(e.getSource() == lookAtCB)
9711657 {
9721658 cameraView.ToggleLookAt();
....@@ -983,7 +1669,8 @@
9831669
9841670 /**/
9851671 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1672
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1673
+ TreePath path = objEditor.jTree.getSelectionPath();
9871674 if ((path == null) || (path.getPathCount() <= 1)) {
9881675 // We can't move the root node or an empty selection
9891676 return;
....@@ -1046,8 +1733,6 @@
10461733 }
10471734 }
10481735
1049
- String string = (String) object;
1050
-
10511736 System.out.println("Transfer = " + object + "; drop : " + target);
10521737 // if( object instanceof java.io.File[])
10531738 // {
....@@ -1055,6 +1740,8 @@
10551740 // objEditor.DropFile((java.io.File[]) object, true);
10561741 // return;
10571742 // }
1743
+
1744
+ String string = object.toString();
10581745
10591746 // File path for Mac and Windows
10601747 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1100,23 +1787,33 @@
11001787
11011788 assert target == objEditor.jTree;
11021789 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1790
+ Object3D destinationLeaf;
11031791 try {
1104
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1792
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
11051793 } catch (Exception e) {
11061794 System.out.println("destinationPath : " + destinationPath);
11071795 return;
11081796 }
11091797
1110
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1798
+ for (int i=group.selection.size(); --i>=0;)
11111799 {
1800
+ Object3D child = (Object3D)group.selection.elementAt(i);
1801
+
1802
+ // Cannot move into itself
1803
+ if (child == destinationLeaf)
1804
+ return;
1805
+ }
1806
+
1807
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1808
+// {
11121809 loadClipboard(true);
11131810 objEditor.jTree.setSelectionPath(destinationPath);
11141811 pasteInto(false, false);
1115
- } else {
1116
- loadClipboard(false);
1117
- objEditor.jTree.setSelectionPath(destinationPath);
1118
- pasteInto(false, false); // true); // ???
1119
- }
1812
+// } else {
1813
+// loadClipboard(false);
1814
+// objEditor.jTree.setSelectionPath(destinationPath);
1815
+// pasteInto(false, false); // true); // ???
1816
+// }
11201817 }
11211818 public void dropActionChanged(DropTargetDragEvent dtde)
11221819 // Called if the user has modified the current drop gesture
....@@ -1172,7 +1869,12 @@
11721869 TreePath path;
11731870
11741871 public TransferableTreePath(TreePath tp) {
1175
- path = tp;
1872
+ Object[] objs = new Object[tp.getPathCount()];
1873
+ for (int i=0; i<objs.length; i++)
1874
+ {
1875
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1876
+ }
1877
+ path = new TreePath(objs);
11761878 }
11771879
11781880 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1221,22 +1923,30 @@
12211923 {
12221924 //heightFieldItem = menu.add(new MenuItem("Height Field"));
12231925 //heightFieldItem.addActionListener(this);
1224
- gridItem = menu.add(new MenuItem("Grid"));
1225
- gridItem.addActionListener(this);
1226
- rectoidItem = menu.add(new MenuItem("Box"));
1227
- rectoidItem.addActionListener(this);
1228
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229
- ellipsoidItem.addActionListener(this);
1230
- coneItem = menu.add(new MenuItem("Cone"));
1231
- coneItem.addActionListener(this);
1232
- torusItem = menu.add(new MenuItem("Torus"));
1233
- torusItem.addActionListener(this);
1234
- superItem = menu.add(new MenuItem("Superellipsoid"));
1235
- superItem.addActionListener(this);
1926
+// gridItem = menu.add(new MenuItem("Grid"));
1927
+// gridItem.addActionListener(this);
1928
+// rectoidItem = menu.add(new MenuItem("Box"));
1929
+// rectoidItem.addActionListener(this);
1930
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1931
+// ellipsoidItem.addActionListener(this);
1932
+// coneItem = menu.add(new MenuItem("Cone"));
1933
+// coneItem.addActionListener(this);
1934
+// torusItem = menu.add(new MenuItem("Torus"));
1935
+// torusItem.addActionListener(this);
1936
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1937
+// superItem.addActionListener(this);
1938
+
1939
+ cameraItem = menu.add(new MenuItem("Camera"));
1940
+ cameraItem.addActionListener(this);
1941
+
1942
+ if (!Globals.ADVANCED)
1943
+ {
12361944 kleinItem = menu.add(new MenuItem("Klein Bottle"));
12371945 kleinItem.addActionListener(this);
1238
- particleItem = menu.add(new MenuItem("Particle system"));
1239
- particleItem.addActionListener(this);
1946
+ }
1947
+
1948
+// particleItem = menu.add(new MenuItem("Particle system"));
1949
+// particleItem.addActionListener(this);
12401950 if (Globals.ADVANCED)
12411951 {
12421952 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1262,15 +1972,15 @@
12621972 }
12631973 bezierItem = menu.add(new MenuItem("Bezier Patch"));
12641974 bezierItem.addActionListener(this);
1265
- overlayItem = menu.add(new MenuItem("Overlay"));
1266
- overlayItem.addActionListener(this);
1267
- lightItem = menu.add(new MenuItem("Light"));
1268
- lightItem.addActionListener(this);
1975
+// overlayItem = menu.add(new MenuItem("Overlay"));
1976
+// overlayItem.addActionListener(this);
1977
+// lightItem = menu.add(new MenuItem("Light"));
1978
+// lightItem.addActionListener(this);
12691979 menu.add("-");
12701980 //superLoopItem = menu.add(new MenuItem("Super Loop"));
12711981 //superLoopItem.addActionListener(this);
1272
- loopItem = menu.add(new MenuItem("Loop"));
1273
- loopItem.addActionListener(this);
1982
+// loopItem = menu.add(new MenuItem("Loop"));
1983
+// loopItem.addActionListener(this);
12741984 doubleItem = menu.add(new MenuItem("Fork"));
12751985 doubleItem.addActionListener(this);
12761986 if (Globals.ADVANCED)
....@@ -1286,6 +1996,9 @@
12861996 animationItem.addItemListener(this);
12871997 animationItem.setState(Globals.ANIMATION);
12881998
1999
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2000
+ archiveItem.addActionListener(this);
2001
+
12892002 menu.add("-");
12902003 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
12912004 parseverticesItem.addActionListener(this);
....@@ -1298,6 +2011,8 @@
12982011 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
12992012 reduce34MorphItem.addActionListener(this);
13002013 menu.add("-");
2014
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2015
+ memoryItem.addActionListener(this);
13012016 menu.add(computeAOItem = new MenuItem("Compute AO"));
13022017 computeAOItem.addActionListener(this);
13032018
....@@ -1306,8 +2021,6 @@
13062021 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
13072022 mirrorItem.addActionListener(this);
13082023 menu.add("-");
1309
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310
- memoryItem.addActionListener(this);
13112024 menu.add(analyzeItem = new MenuItem("Analyze"));
13122025 analyzeItem.addActionListener(this);
13132026 menu.add(dumpItem = new MenuItem("Print"));
....@@ -1455,6 +2168,30 @@
14552168
14562169 makeSomething(shadow);
14572170 }
2171
+
2172
+ private void ClearUnpinned()
2173
+ {
2174
+ //for (Object3D obj : listUI)
2175
+ for (int i=listUI.size(); --i>=0;)
2176
+ {
2177
+ Object3D obj = listUI.elementAt(i);
2178
+ if (!obj.pinned)
2179
+ {
2180
+ obj.CloseUI();
2181
+ listUI.remove(i);
2182
+ }
2183
+ }
2184
+ }
2185
+
2186
+ private void EditElement(Object3D elem, boolean newWindow)
2187
+ {
2188
+ // if (!(elem instanceof Composite))
2189
+ // newWindow = false;
2190
+ listUI.add(elem);
2191
+ elem.openEditWindow(this, newWindow); //, false);
2192
+ System.out.println("edit : " + elem);
2193
+ elem.editWindow.refreshContents(true); // ? new
2194
+ }
14582195
14592196 /**
14602197 * applyExample
....@@ -1699,7 +2436,7 @@
16992436 {
17002437 ScreenFit();
17012438 } else
1702
- if (source == switchItem)
2439
+ if (source == switchViewItem)
17032440 {
17042441 cVector v1 = new cVector();
17052442 cVector v2 = new cVector();
....@@ -1708,11 +2445,11 @@
17082445 objEditor.cameraView.renderCamera.setAim(v2, v1);
17092446 objEditor.cameraView.repaint();
17102447 } else
1711
- if (source == rectoidItem)
2448
+ if (source == rectoidItem || source == boxButton)
17122449 {
17132450 makeSomething(new Box());
17142451 } else
1715
- if (source == particleItem)
2452
+ if (source == particleItem || source == particlesButton)
17162453 {
17172454 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
17182455 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1791,27 +2528,27 @@
17912528
17922529 makeSomething(obj);
17932530 } else
1794
- if (source == gridItem)
2531
+ if (source == gridItem || source == gridButton)
17952532 {
17962533 makeSomething(new Grid());
17972534 } else
1798
- if (source == ellipsoidItem)
2535
+ if (source == ellipsoidItem || source == sphereButton)
17992536 {
18002537 makeSomething(new Sphere());
18012538 } else
1802
- if (source == coneItem)
2539
+ if (source == coneItem || source == coneButton)
18032540 {
18042541 makeSomething(new Cone());
18052542 } else
1806
- if (source == torusItem)
2543
+ if (source == torusItem || source == torusButton)
18072544 {
18082545 makeSomething(new Torus());
18092546 } else
1810
- if (source == superItem)
2547
+ if (source == superItem || source == superButton)
18112548 {
18122549 makeSomething(new Superellipsoid());
18132550 } else
1814
- if (source == kleinItem)
2551
+ if (source == kleinItem || source == kleinButton)
18152552 {
18162553 makeSomething(new Klein());
18172554 } else
....@@ -1831,7 +2568,7 @@
18312568 {
18322569 makeSomething(new BezierSurface());
18332570 } else
1834
- if (source == overlayItem)
2571
+ if (source == overlayItem || source == overlayButton)
18352572 {
18362573 /*
18372574 Object3D obj = new BezierSurface(5,8);
....@@ -1879,10 +2616,27 @@
18792616 s.setup();
18802617 makeSomething(s);
18812618 } else
1882
- if (source == lightItem)
2619
+ if (source == lightItem || source == lightButton)
18832620 {
18842621 makeSomething(new Light());
18852622 } else
2623
+// if (source == skybox1Button ||
2624
+// source == skybox2Button ||
2625
+// source == skybox3Button ||
2626
+// source == skybox4Button ||
2627
+// source == skybox5Button ||
2628
+// source == skybox6Button ||
2629
+// source == skybox7Button ||
2630
+// source == skybox11Button ||
2631
+// source == skybox12Button ||
2632
+// source == skybox13Button ||
2633
+// source == skybox14Button ||
2634
+// source == skybox15Button ||
2635
+// source == skybox16Button ||
2636
+// source == skybox17Button)
2637
+// {
2638
+// ChangeSkybox(source);
2639
+// } else
18862640 if (source == csgItem)
18872641 {
18882642 group(new CSG());
....@@ -1929,30 +2683,38 @@
19292683
19302684 group(g);
19312685 } else
1932
- if (source == loopItem)
2686
+ if (source == loopItem || source == loopButton)
19332687 {
2688
+ if (!group.selection.isEmpty())
2689
+ {
19342690 Composite csg = new GroupLeaf();
19352691 csg.count = 5;
1936
- group(csg);
1937
- Composite child = new cGroup();
2692
+ Composite child = new cGroup("Branch");
19382693 csg.addChild(child);
19392694 child.addChild(csg);
2695
+ group(csg);
2696
+ }
19402697 } else
19412698 if (source == doubleItem)
19422699 {
1943
- Composite csg = new GroupLeaf();
2700
+ if (!group.selection.isEmpty())
2701
+ {
2702
+ Composite csg = new GroupLeaf("Fork");
19442703 csg.count = 5;
2704
+ Composite child = new cGroup("Branch A");
2705
+ csg.addChild(child);
2706
+ child.addChild(csg);
2707
+ child = new cGroup("Branch B");
2708
+ csg.addChild(child);
2709
+ child.addChild(csg);
19452710 group(csg);
1946
- Composite child = new cGroup();
1947
- csg.addChild(child);
1948
- child.addChild(csg);
1949
- child = new cGroup();
1950
- csg.addChild(child);
1951
- child.addChild(csg);
2711
+ }
19522712 } else
19532713 if (source == tripleItem)
19542714 {
1955
- Composite csg = new GroupLeaf();
2715
+ if (!group.selection.isEmpty())
2716
+ {
2717
+ Composite csg = new GroupLeaf("Trident");
19562718 csg.count = 4;
19572719 group(csg);
19582720 Composite child = new cGroup();
....@@ -1964,11 +2726,12 @@
19642726 child = new cGroup();
19652727 csg.addChild(child);
19662728 child.addChild(csg);
2729
+ }
19672730 } else
19682731 if (source == computeAOItem)
19692732 {
19702733 Globals.drawMode = CameraPane.OCCLUSION;
1971
- Globals.theRenderer.repaint();
2734
+ cameraView.repaint();
19722735 } else
19732736 if (source == recompileItem)
19742737 {
....@@ -1983,7 +2746,7 @@
19832746 if (source == invariantsItem)
19842747 {
19852748 System.out.println("Invariants:");
1986
- Grafreed.grafreeD.universe.invariants();
2749
+ Grafreed.grafreed.universe.invariants();
19872750 } else
19882751 if (source == memoryItem)
19892752 {
....@@ -2014,17 +2777,52 @@
20142777 {
20152778 ToggleFullScreen();
20162779 } else
2017
- if (source == undoButton)
2780
+ if (source == collapseButton)
20182781 {
2019
- Undo();
2782
+ this.expandedLayout = radio.layout;
2783
+ CollapseToolbar();
20202784 } else
2021
- if (source == redoButton)
2785
+ if (source == maximize3DButton)
20222786 {
2023
- Redo();
2787
+ this.expandedLayout = radio.layout;
2788
+ radio.layout = twoButton;
2789
+ Show3DView();
2790
+ CollapseToolbar();
20242791 } else
2025
- if (source == saveButton)
2792
+ if (source == previousVersionButton)
20262793 {
2027
- Save();
2794
+ // Go to previous version
2795
+ //if (!Undo())
2796
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2797
+ PreviousVersion();
2798
+ } else
2799
+ if (source == restoreButton)
2800
+ {
2801
+ // Restore current version
2802
+ Restore();
2803
+ //restoreButton.setEnabled(false);
2804
+ } else
2805
+ if (source == replaceButton)
2806
+ {
2807
+ // Overwrite current version
2808
+ Replace();
2809
+ //replaceButton.setEnabled(false);
2810
+ } else
2811
+ if (source == nextVersionButton)
2812
+ {
2813
+ // Go to next version
2814
+ NextVersion();
2815
+ } else
2816
+ if (source == saveVersionButton)
2817
+ {
2818
+ // Save a new version
2819
+ if (!Save(true))
2820
+ java.awt.Toolkit.getDefaultToolkit().beep();
2821
+ } else
2822
+ if (source == deleteVersionButton)
2823
+ {
2824
+ // Delete a new version
2825
+ DeleteVersion();
20282826 } else
20292827 if (source == oneStepButton)
20302828 {
....@@ -2033,17 +2831,14 @@
20332831 } else
20342832 if (source == screenfitButton)
20352833 {
2036
- //Reload(lastConverter, lastFilename, true);
20372834 ScreenFit();
20382835 } else
20392836 if (source == screenfitpointButton)
20402837 {
2041
- //Reload(lastConverter, lastFilename, true);
20422838 ScreenFitPoint();
20432839 } else
20442840 if (source == snapobjectButton)
20452841 {
2046
- //Reload(lastConverter, lastFilename, true);
20472842 SnapObject();
20482843 } else
20492844 // if (event.getSource() == recompileButton)
....@@ -2082,11 +2877,11 @@
20822877 } else
20832878 if (source == undoItem)
20842879 {
2085
- Undo();
2880
+ PreviousVersion();
20862881 } else
20872882 if (source == redoItem)
20882883 {
2089
- Redo();
2884
+ NextVersion();
20902885 } else
20912886 if (source == duplicateItem)
20922887 {
....@@ -2407,7 +3202,7 @@
24073202 {
24083203 StepAll();
24093204 } else
2410
- if (source == clearItem) // || event.getSource() == clearButton)
3205
+ if (source == deleteItem) // || event.getSource() == clearButton)
24113206 {
24123207 //int indices[] = jList.getSelectedIndices();
24133208 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2419,9 +3214,9 @@
24193214 {
24203215 ClearSelection(true);
24213216 } else
2422
- if (source == grabItem)
3217
+ if (source == grabItem || source == groupButton)
24233218 {
2424
- group(new cGroup(), true);
3219
+ group(new cGroup(), false); // true);
24253220 } else
24263221 if (source == hideItem)
24273222 {
....@@ -2439,11 +3234,11 @@
24393234 {
24403235 makeSomething(new Camera());
24413236 } else
2442
- if (source == compositeItem)
3237
+ if (source == compositeItem || source == compositeButton)
24433238 {
24443239 group(new Composite());
24453240 } else
2446
- if (source == randomItem)
3241
+ if (source == switchItem || source == switchButton)
24473242 {
24483243 RandomNode random = new RandomNode();
24493244 group(random);
....@@ -2545,7 +3340,7 @@
25453340 {
25463341 group(new cLinker());
25473342 } else
2548
- if (source == textureItem)
3343
+ if (source == textureItem || source == textureButton)
25493344 {
25503345 group(new TextureNode());
25513346 } else
....@@ -2565,17 +3360,42 @@
25653360 {
25663361 CastShadow(2);
25673362 } else
2568
- if (source == ungroupItem)
3363
+ if (source == ungroupItem || source == ungroupButton)
25693364 {
2570
- //ungroup();
3365
+ boolean canUngroup = true;
3366
+
25713367 for (int i=0; i<group.selection.size(); i++)
25723368 {
2573
- Ungroup(group.selection.get(i));
3369
+ Object3D selectedItem = group.selection.get(i);
3370
+
3371
+ if (selectedItem.Size() == 0)
3372
+ {
3373
+ // Cannot ungroup leaves
3374
+ canUngroup = false;
3375
+ break;
3376
+ }
3377
+
3378
+ if (selectedItem == group)
3379
+ {
3380
+ // Cannot ungroup root
3381
+ canUngroup = false;
3382
+ break;
3383
+ }
25743384 }
25753385
2576
- ClearSelection(false);
2577
-
2578
- refreshContents();
3386
+ if (canUngroup)
3387
+ {
3388
+ for (int i=0; i<group.selection.size(); i++)
3389
+ {
3390
+ Object3D selectedItem = group.selection.get(i);
3391
+
3392
+ Ungroup(selectedItem);
3393
+ }
3394
+
3395
+ ClearSelection(false);
3396
+
3397
+ refreshContents();
3398
+ }
25793399 } else
25803400 if (source == genUVItem)
25813401 {
....@@ -2876,7 +3696,7 @@
28763696 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28773697 {
28783698 obj = (Object3D)e.nextElement();
2879
- obj.SetBumpTexture(null);
3699
+ obj.ResetBumpTexture();
28803700 }
28813701
28823702 refreshContents();
....@@ -2892,6 +3712,31 @@
28923712
28933713 refreshContents();
28943714 } else
3715
+ if (source == embedTexturesItem)
3716
+ {
3717
+ Object3D obj;
3718
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3719
+ {
3720
+ obj = (Object3D)e.nextElement();
3721
+ obj.EmbedTextures(true);
3722
+ }
3723
+
3724
+ refreshContents();
3725
+ } else
3726
+ if (source == deEmbedTexturesItem)
3727
+ {
3728
+ Object3D obj;
3729
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3730
+ {
3731
+ obj = (Object3D)e.nextElement();
3732
+ obj.EmbedTextures(false);
3733
+ }
3734
+
3735
+ CameraPane.texturepigment.clear();
3736
+ CameraPane.texturebump.clear();
3737
+
3738
+ refreshContents();
3739
+ } else
28953740 if (source == flashSelectionButton)
28963741 {
28973742 CameraPane.flash = true;
....@@ -2903,38 +3748,11 @@
29033748 if (source == twoButton)
29043749 {
29053750 radio.layout = twoButton;
2906
- // bug
2907
- //gridPanel.setDividerLocation(1.0);
2908
- //bigPanel.setDividerLocation(0.0);
2909
-// bigThree.remove(scenePanel);
2910
-// bigThree.remove(centralPanel);
2911
-// bigThree.remove(XYZPanel);
2912
-// aWindowConstraints.gridx = 0;
2913
-// aWindowConstraints.gridy = 0;
2914
-// aWindowConstraints.gridwidth = 1;
2915
-// // aConstraints.gridheight = 3;
2916
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2917
-// aWindowConstraints.weightx = 0;
2918
-// aWindowConstraints.weighty = 1;
2919
-// //bigThree.add(jtp, aWindowConstraints);
2920
-// aWindowConstraints.weightx = 1;
2921
-// aWindowConstraints.gridwidth = 3;
2922
-// // aConstraints.gridheight = 3;
2923
-// aWindowConstraints.gridx = 1;
2924
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2925
-// bigThree.add(centralPanel, aWindowConstraints);
2926
-// aWindowConstraints.weightx = 0;
2927
-// aWindowConstraints.gridx = 4;
2928
-// aWindowConstraints.gridwidth = 1;
2929
-// // aConstraints.gridheight = 3;
2930
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2931
-// //bigThree.add(XYZPanel, aWindowConstraints);
2932
-// scenePanel.setVisible(false);
2933
-// centralPanel.setVisible(true);
2934
-// XYZPanel.setVisible(false);
2935
- bigThree.ClearUI();
2936
- bigThree.add(centralPanel);
2937
- bigThree.FlushUI();
3751
+
3752
+ if (CameraPane.FULLSCREEN)
3753
+ fullscreenLayout = radio.layout;
3754
+
3755
+ Show3DView();
29383756
29393757 cameraView.requestFocusInWindow();
29403758
....@@ -2957,6 +3775,9 @@
29573775 if (source == threeButton)
29583776 {
29593777 radio.layout = threeButton;
3778
+
3779
+ if (CameraPane.FULLSCREEN)
3780
+ fullscreenLayout = radio.layout;
29603781
29613782 // bigThree.remove(scenePanel);
29623783 // bigThree.remove(centralPanel);
....@@ -2986,8 +3807,8 @@
29863807 // centralPanel.setVisible(true);
29873808 // XYZPanel.setVisible(true);
29883809 bigThree.ClearUI();
3810
+ bigThree.add(scenePanel);
29893811 bigThree.add(centralPanel);
2990
- bigThree.add(XYZPanel);
29913812 bigThree.FlushUI();
29923813
29933814 cameraView.requestFocusInWindow();
....@@ -2995,6 +3816,9 @@
29953816 if (source == fourButton)
29963817 {
29973818 radio.layout = fourButton;
3819
+
3820
+ if (CameraPane.FULLSCREEN)
3821
+ fullscreenLayout = radio.layout;
29983822
29993823 // bigThree.remove(scenePanel);
30003824 // bigThree.remove(centralPanel);
....@@ -3033,6 +3857,9 @@
30333857 {
30343858 radio.layout = sixButton;
30353859
3860
+ if (CameraPane.FULLSCREEN)
3861
+ fullscreenLayout = radio.layout;
3862
+
30363863 // bigThree.remove(scenePanel);
30373864 // bigThree.remove(centralPanel);
30383865 // bigThree.remove(XYZPanel);
....@@ -3061,8 +3888,8 @@
30613888 // centralPanel.setVisible(true);
30623889 // XYZPanel.setVisible(false);
30633890 bigThree.ClearUI();
3064
- bigThree.add(scenePanel);
30653891 bigThree.add(centralPanel);
3892
+ bigThree.add(scenePanel);
30663893 bigThree.FlushUI();
30673894
30683895 cameraView.requestFocusInWindow();
....@@ -3070,6 +3897,9 @@
30703897 if (source == sevenButton)
30713898 {
30723899 radio.layout = sevenButton;
3900
+
3901
+ if (CameraPane.FULLSCREEN)
3902
+ fullscreenLayout = radio.layout;
30733903
30743904 // bigThree.remove(scenePanel);
30753905 // bigThree.remove(centralPanel);
....@@ -3108,6 +3938,7 @@
31083938 } else
31093939 if (source == rootButton)
31103940 {
3941
+ Replace();
31113942 Object3D obj;
31123943 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31133944 {
....@@ -3126,12 +3957,19 @@
31263957 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
31273958 {
31283959 ab = (cRadio)e.nextElement();
3129
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3960
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
31303961 {
3962
+ // Patch to avoid bug with transparency.
3963
+ if (!ab.hadMaterial)
3964
+ {
3965
+ ab.object.material = null;
3966
+ }
3967
+
31313968 buttonGroup.remove(ab);
31323969 radioPanel.remove(ab);
31333970
3134
- ab.GetObject().editWindow = null;
3971
+ //ab.GetObject().editWindow = null;
3972
+ ab.GetObject().manipWindow = null;
31353973 // ab.GetObject().objectUI = null; // ?????????
31363974
31373975 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
....@@ -3144,6 +3982,12 @@
31443982 } else
31453983 if (source == editItem || source == editButton)
31463984 {
3985
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3986
+ {
3987
+ Object3D child = (Object3D)e.nextElement();
3988
+ child.pinned = true;
3989
+ }
3990
+
31473991 EditSelection(false);
31483992 } else
31493993 if (source == uneditButton)
....@@ -3152,9 +3996,10 @@
31523996 {
31533997 Object3D child = (Object3D)e.nextElement();
31543998 if(child.editWindow != null)
3155
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999
+ child.pinned = false;
31564000 child.CloseUI();
31574001 listUI.remove(child);
4002
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
31584003
31594004 //child.editWindow = null; // ???????????
31604005 }
....@@ -3169,16 +4014,18 @@
31694014 //copy.ClearUI();
31704015 for (Object3D obj : listUI)
31714016 {
4017
+ obj.pinned = false;
31724018 obj.CloseUI();
31734019 }
31744020 listUI.clear();
4021
+ SetPinStates(group.selection.size() > 0);
31754022 refreshContents(true);
31764023 } else
31774024 if (source == allParamsButton)
31784025 {
31794026 assert(copy == group);
31804027
3181
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4028
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
31824029
31834030 for (Object3D obj : listUI)
31844031 {
....@@ -3227,6 +4074,7 @@
32274074 }
32284075
32294076 copy = group;
4077
+
32304078 //Globals.theRenderer.object = group;
32314079 if(!useclient)
32324080 {
....@@ -3245,6 +4093,7 @@
32454093
32464094 // fix "+" issue
32474095 //group.editWindow = this;
4096
+ group.manipWindow = this;
32484097
32494098 /*
32504099 currentLayout = radio.layout;
....@@ -3252,6 +4101,26 @@
32524101 currentLayout = sevenButton;
32534102 */
32544103 radio.layout.doClick();
4104
+
4105
+ assert(copy instanceof Composite);
4106
+
4107
+ if (copy.versionlist == null)
4108
+ {
4109
+ copy.versionlist = new Object3D[100];
4110
+ copy.versionindex = -1;
4111
+
4112
+ Save(true);
4113
+ }
4114
+
4115
+ SetVersionStates();
4116
+
4117
+ ClearUnpinned();
4118
+
4119
+ //Grafreed.Assert(group != null);
4120
+ //Grafreed.Assert(group.selection != null);
4121
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4122
+ if (group.selection == null || group.selection.size() == 1)
4123
+ EditSelection(false);
32554124 keepparent = group.parent;
32564125 // PARENT = NULL or not???
32574126 //group.parent = null; // ROOT
....@@ -3263,11 +4132,13 @@
32634132 } else if (event.getSource() == editCameraItem)
32644133 {
32654134 cameraView.ProtectCamera();
4135
+ cameraView.requestFocusInWindow();
32664136 cameraView.repaint();
32674137 return;
3268
- } else if (event.getSource() == revertCameraItem)
4138
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
32694139 {
32704140 cameraView.RevertCamera();
4141
+ cameraView.requestFocusInWindow();
32714142 cameraView.repaint();
32724143 return;
32734144 // } else if (event.getSource() == textureButton)
....@@ -3844,7 +4715,7 @@
38444715
38454716 try
38464717 {
3847
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4718
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
38484719 }
38494720 catch (Exception e)
38504721 {
....@@ -4319,28 +5190,25 @@
43195190 // }
43205191 // }
43215192
4322
- static boolean allparams = true;
4323
-
4324
- static Vector<Object3D> listUI = new Vector<Object3D>();
4325
-
43265193 void EditSelection(boolean newWindow)
43275194 {
5195
+ if (group.selection == null)
5196
+ {
5197
+ EditElement(group, newWindow); // ? new
5198
+ return;
5199
+ }
5200
+
43285201 // aConstraints.gridy = 0;
43295202 for (int i=0; i<group.selection.size(); i++)
43305203 {
43315204 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
43325205 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5206
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
43345207
43355208 Object3D elem = (Object3D)group.selection.elementAt(i);
43365209 if(elem != group || !newWindow)
43375210 {
4338
- // if (!(elem instanceof Composite))
4339
- // newWindow = false;
4340
- listUI.add(elem);
4341
- elem.openEditWindow(this, newWindow); //, false);
4342
- System.out.println("edit : " + elem);
4343
- elem.editWindow.refreshContents(true); // ? new
5211
+ EditElement(elem, newWindow); // ? new
43445212 }
43455213 }
43465214 }
....@@ -4403,9 +5271,7 @@
44035271
44045272 freezemodel = false;
44055273 }
4406
-
4407
- boolean flashIt = true;
4408
-
5274
+
44095275 public void valueChanged(TreeSelectionEvent e)
44105276 //public boolean handleEvent(Event event)
44115277 {
....@@ -4415,7 +5281,8 @@
44155281 //new Exception().printStackTrace();
44165282
44175283 freezemodel = true;
4418
-
5284
+ ClearUnpinned();
5285
+
44195286 /**/
44205287 //switch (event.id)
44215288 {
....@@ -4448,7 +5315,7 @@
44485315 if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
44495316 // a camera
44505317 {
4451
- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
5318
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
44525319 {
44535320 CameraPane.camerachangeframe = 0; // don't refuse it
44545321 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
....@@ -4457,6 +5324,13 @@
44575324 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
44585325 }
44595326
5327
+ if (tps != null && tps.length == 1)
5328
+ {
5329
+ EditSelection(false);
5330
+ }
5331
+
5332
+ SetPinStates(tps != null && tps.length > 0);
5333
+
44605334 refreshContents();
44615335 //return true;
44625336 }
....@@ -4466,9 +5340,34 @@
44665340 freezemodel = false;
44675341 }
44685342
5343
+ void SetPinStates(boolean enabled)
5344
+ {
5345
+ editButton.setEnabled(enabled);
5346
+ uneditButton.setEnabled(enabled);
5347
+ //unselectButton.setEnabled(enabled);
5348
+ flashSelectionButton.setEnabled(enabled);
5349
+
5350
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5351
+
5352
+ boolean allComposites = true;
5353
+
5354
+ if (group.selection != null)
5355
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5356
+ {
5357
+ if (!(e.nextElement() instanceof Composite))
5358
+ {
5359
+ allComposites = false;
5360
+ break;
5361
+ }
5362
+ }
5363
+
5364
+ rootButton.setEnabled(allComposites);
5365
+ }
5366
+
44695367 void refreshContents(boolean cp)
44705368 {
4471
- if (!Globals.MOUSEDRAGGED)
5369
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5370
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
44725371 {
44735372 objEditor.ClearInfo(); // .GetMaterial());
44745373
....@@ -4477,7 +5376,7 @@
44775376 Object3D child = (Object3D) group.selection.get(i);
44785377
44795378 objEditor.AddInfo(child, this, true);
4480
- System.err.println("info : " + child.GetPath());
5379
+// System.err.println("info : " + child.GetPath());
44815380 }
44825381
44835382 objEditor.SetText(); // jan 2014
....@@ -4567,7 +5466,8 @@
45675466
45685467 if (cut)
45695468 {
4570
- Save();
5469
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5470
+// Save();
45715471 //int indices[] = jList.getSelectedIndices();
45725472 //for (int i = indices.length - 1; i >= 0; i--)
45735473 //jList.remove(indices[i]);
....@@ -4670,6 +5570,10 @@
46705570
46715571 void paste(boolean expand)
46725572 {
5573
+ if (Globals.REPLACEONMAKE)
5574
+ Save();
5575
+ boolean keep = Globals.REPLACEONMAKE;
5576
+ Globals.REPLACEONMAKE = false;
46735577 // if (GrafreeD.clipboard == null)
46745578 // return;
46755579 boolean first = true;
....@@ -4729,6 +5633,7 @@
47295633 Grafreed.clipboard.get(0).parent = keepparent;
47305634 }
47315635
5636
+ Globals.REPLACEONMAKE = keep;
47325637 ResetModel();
47335638 refreshContents();
47345639 }
....@@ -4864,6 +5769,10 @@
48645769
48655770 void group(Object3D csg, boolean grab)
48665771 {
5772
+ if (Globals.REPLACEONMAKE)
5773
+ Save();
5774
+ boolean keep = Globals.REPLACEONMAKE;
5775
+ Globals.REPLACEONMAKE = false;
48675776 if (//false) // why??
48685777 !group.selection.isEmpty())
48695778 {
....@@ -4977,10 +5886,15 @@
49775886 //node.add(csg);
49785887 //makeSomething(node);
49795888 makeSomething(csg);
5889
+ Globals.REPLACEONMAKE = keep;
49805890 }
49815891
49825892 void Ungroup(Object3D g)
49835893 {
5894
+ if (Globals.REPLACEONMAKE)
5895
+ Save();
5896
+ boolean keep = Globals.REPLACEONMAKE;
5897
+ Globals.REPLACEONMAKE = false;
49845898 if (g instanceof HiddenObject)
49855899 {
49865900 HiddenObject h = (HiddenObject) g;
....@@ -4997,6 +5911,7 @@
49975911 objEditor.makeSomething(g.get(i), false);
49985912 }
49995913 }
5914
+ Globals.REPLACEONMAKE = keep;
50005915 }
50015916
50025917 void ungroup()
....@@ -5285,13 +6200,43 @@
52856200 cButton clearpanelButton;
52866201 cButton unselectButton;
52876202
5288
- cButton minButton;
5289
- cButton maxButton;
5290
- cButton fullButton;
5291
- cButton undoButton;
5292
- cButton redoButton;
5293
- cButton saveButton;
6203
+ cButton restoreCameraButton;
6204
+
52946205 cButton oneStepButton;
6206
+
6207
+ cButton groupButton;
6208
+ cButton ungroupButton;
6209
+ cButton compositeButton;
6210
+ cButton switchButton;
6211
+ cButton loopButton;
6212
+ cButton textureButton;
6213
+
6214
+ cButton skybox1Button;
6215
+ cButton skybox2Button;
6216
+ cButton skybox3Button;
6217
+ cButton skybox4Button;
6218
+ cButton skybox5Button;
6219
+ cButton skybox6Button;
6220
+ cButton skybox7Button;
6221
+
6222
+ cButton skybox11Button;
6223
+ cButton skybox12Button;
6224
+ cButton skybox13Button;
6225
+ cButton skybox14Button;
6226
+ cButton skybox15Button;
6227
+ cButton skybox16Button;
6228
+ cButton skybox17Button;
6229
+
6230
+ cButton gridButton;
6231
+ cButton boxButton;
6232
+ cButton sphereButton;
6233
+ cButton coneButton;
6234
+ cButton torusButton;
6235
+ cButton superButton;
6236
+ cButton kleinButton;
6237
+ cButton particlesButton;
6238
+ cButton overlayButton;
6239
+ cButton lightButton;
52956240
52966241 cButton screenfitButton;
52976242 cButton screenfitpointButton;
....@@ -5313,12 +6258,12 @@
53136258 //JTree jTree;
53146259 private MenuItem lookAtItem;
53156260 private MenuItem lookFromItem;
5316
- private MenuItem switchItem;
5317
- private MenuItem cutItem;
6261
+ private MenuItem switchViewItem;
6262
+ private JMenuItem cutItem;
53186263 private MenuItem undoItem;
53196264 private MenuItem redoItem;
5320
- private MenuItem duplicateItem;
5321
- private MenuItem cloneItem;
6265
+ private JMenuItem duplicateItem;
6266
+ private JMenuItem cloneItem;
53226267 private MenuItem cloneSupportItem;
53236268 private MenuItem overwriteGeoItem;
53246269 private MenuItem overwriteMatItem;
....@@ -5339,13 +6284,13 @@
53396284 private MenuItem cloneGeometriesItem;
53406285 private MenuItem shareGeometriesItem;
53416286 private MenuItem mergeGeometriesItem;
5342
- private MenuItem copyItem;
6287
+ private JMenuItem copyItem;
53436288 private MenuItem pasteItem;
5344
- private MenuItem pasteIntoItem;
5345
- private MenuItem pasteLinkItem;
5346
- private MenuItem pasteCloneItem;
5347
- private MenuItem pasteExpandItem;
5348
- private MenuItem clearItem;
6289
+ private JMenuItem pasteIntoItem;
6290
+ private JMenuItem pasteLinkItem;
6291
+ private JMenuItem pasteCloneItem;
6292
+ private JMenuItem pasteExpandItem;
6293
+ private JMenuItem deleteItem;
53496294 private MenuItem clearAllItem;
53506295 private MenuItem genUVItem;
53516296 private MenuItem genNormalsMESHItem;
....@@ -5405,7 +6350,7 @@
54056350 private MenuItem frontItem;
54066351 private MenuItem cameraItem;
54076352 private MenuItem compositeItem;
5408
- private MenuItem randomItem;
6353
+ private MenuItem switchItem;
54096354 private MenuItem physicsItem;
54106355 private MenuItem frameselectorItem;
54116356 private MenuItem scriptNodeItem;
....@@ -5413,7 +6358,7 @@
54136358 private MenuItem switchTransfoItem;
54146359 private MenuItem morphItem;
54156360 private MenuItem linkerItem;
5416
- private MenuItem ungroupItem;
6361
+ private JMenuItem ungroupItem;
54176362 private MenuItem editItem;
54186363 private MenuItem openWindowItem;
54196364 private MenuItem editLeafItem;
....@@ -5429,6 +6374,8 @@
54296374 private MenuItem attachBumpItem;
54306375 private MenuItem detachBumpItem;
54316376 private MenuItem pigmentBumpItem;
6377
+ private MenuItem embedTexturesItem;
6378
+ private MenuItem deEmbedTexturesItem;
54326379
54336380 private MenuItem particleItem;
54346381 private MenuItem ragdollItem;
....@@ -5479,5 +6426,5 @@
54796426
54806427 Menu cameraMenu;
54816428 MenuItem editCameraItem;
5482
- MenuItem revertCameraItem;
6429
+ MenuItem restoreCameraItem;
54836430 }