Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314
GroupEditor.java
....@@ -16,6 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1920 ObjectUI,
2021 Runnable,
2122 ActionListener,
....@@ -23,6 +24,360 @@
2324 DragGestureListener, DragSourceListener, DropTargetListener,
2425 ItemListener // ListSelectionListener
2526 {
27
+
28
+ public void AddSkyboxButton(String f, String s, cGridBag row)
29
+ {
30
+ cButton skyboxButton;
31
+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
33
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
+ skyboxButton.addActionListener(new ActionListener()
36
+ {
37
+ @Override
38
+ public void actionPerformed(ActionEvent e)
39
+ {
40
+ ChangeSkybox(path);
41
+ }
42
+ });
43
+ }
44
+
45
+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46
+ {
47
+ cButton textureButton;
48
+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
+ textureButton.setToolTipText(c + count);
51
+ textureButton.addActionListener(new ActionListener()
52
+ {
53
+ @Override
54
+ public void actionPerformed(ActionEvent e)
55
+ {
56
+ ChangeTexture(path + t);
57
+ }
58
+ });
59
+ }
60
+
61
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
62
+ {
63
+ cGridBag tab0 = new cGridBag().setVertical(true);
64
+
65
+ tab0.setName("Urban");
66
+ skyboxpanel.add(tab0);
67
+
68
+ cGridBag row0 = new cGridBag();
69
+ cGridBag row1 = new cGridBag();
70
+ cGridBag row2 = new cGridBag();
71
+ cGridBag row3 = new cGridBag();
72
+ cGridBag row4 = new cGridBag();
73
+ cGridBag row5 = new cGridBag();
74
+ cGridBag row6 = new cGridBag();
75
+
76
+ AddSkyboxButton("default", "", row0);
77
+ //AddSkyboxButton("default", "cornell", row0);
78
+ AddSkyboxButton("penguins", "dust", row0);
79
+ AddSkyboxButton("penguins", "tropic", row0);
80
+ AddSkyboxButton("penguins", "yonder", row0);
81
+
82
+ AddSkyboxButton("default", "uffizi", row1);
83
+ AddSkyboxButton("bridge", "Bridge", row1);
84
+ AddSkyboxButton("bridge", "Bridge2", row1);
85
+ AddSkyboxButton("urban", "GamlaStan2", row1);
86
+
87
+ AddSkyboxButton("urban", "Parliament", row2);
88
+ AddSkyboxButton("urban", "Roundabout", row2);
89
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
90
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
91
+
92
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
93
+ AddSkyboxButton("urban", "UnionSquare", row3);
94
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
95
+ AddSkyboxButton("park", "BerzeliiPark", row3);
96
+
97
+ AddSkyboxButton("park", "Buddha", row4);
98
+ AddSkyboxButton("park", "CNTower2", row4);
99
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
100
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
101
+
102
+ AddSkyboxButton("park", "Park", row5);
103
+ AddSkyboxButton("park", "Pond", row5);
104
+ AddSkyboxButton("park", "Skansen", row5);
105
+ AddSkyboxButton("park", "Skansen2", row5);
106
+
107
+ AddSkyboxButton("park", "Skansen3", row6);
108
+ AddSkyboxButton("park", "Skansen4", row6);
109
+ AddSkyboxButton("park", "Skansen5", row6);
110
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
111
+
112
+ tab0.add(row0);
113
+ tab0.add(row1);
114
+ tab0.add(row2);
115
+ tab0.add(row3);
116
+ tab0.add(row4);
117
+ tab0.add(row5);
118
+ tab0.add(row6);
119
+
120
+ for (int i=5; --i>=0;)
121
+ {
122
+ //oe.toolboxPanel.Return();
123
+ //tab0.add(new cGridBag());
124
+ }
125
+ }
126
+
127
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
128
+ {
129
+ cGridBag tab0 = new cGridBag().setVertical(true);
130
+
131
+ tab0.setName("Nature");
132
+ skyboxpanel.add(tab0);
133
+
134
+ cGridBag row0 = new cGridBag();
135
+ cGridBag row1 = new cGridBag();
136
+ cGridBag row2 = new cGridBag();
137
+ cGridBag row3 = new cGridBag();
138
+ cGridBag row4 = new cGridBag();
139
+ cGridBag row5 = new cGridBag();
140
+ cGridBag row6 = new cGridBag();
141
+
142
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
143
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
144
+ AddSkyboxButton("beach", "PalmTrees", row0);
145
+ AddSkyboxButton("beach", "Tenerife", row0);
146
+
147
+ AddSkyboxButton("beach", "Tenerife2", row1);
148
+ AddSkyboxButton("beach", "Tenerife3", row1);
149
+ AddSkyboxButton("field", "FishPond", row1);
150
+ AddSkyboxButton("field", "Footballfield", row1);
151
+
152
+ AddSkyboxButton("field", "Meadow", row2);
153
+ AddSkyboxButton("field", "Sorsele", row2);
154
+ AddSkyboxButton("field", "Sorsele2", row2);
155
+ AddSkyboxButton("field", "Sorsele3", row2);
156
+
157
+ AddSkyboxButton("forest", "Brudslojan", row3);
158
+ AddSkyboxButton("forest", "Langholmen2", row3);
159
+ AddSkyboxButton("forest", "Plants", row3);
160
+ AddSkyboxButton("mountain", "Maskonaive", row3);
161
+
162
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
163
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
164
+ AddSkyboxButton("mountain", "Teide", row4);
165
+ AddSkyboxButton("park", "Tantolunden4", row4);
166
+
167
+ AddSkyboxButton("park", "Stairs", row5);
168
+ AddSkyboxButton("default", "skycube", row6);
169
+ AddSkyboxButton("rocky", "Langholmen", row5);
170
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
171
+
172
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
173
+ AddSkyboxButton("default", "CloudyHills", row6);
174
+ AddSkyboxButton("daz", "Autumn", row6);
175
+ AddSkyboxButton("daz", "MountainTrail", row6);
176
+ /*
177
+Autumn
178
+Greenlands
179
+MountainTrail
180
+Oasis
181
+TheRock
182
+TopOfTheWorld
183
+Winter
184
+ */
185
+
186
+ tab0.add(row0);
187
+ tab0.add(row1);
188
+ tab0.add(row2);
189
+ tab0.add(row3);
190
+ tab0.add(row4);
191
+ tab0.add(row5);
192
+ tab0.add(row6);
193
+
194
+ for (int i=5; --i>=0;)
195
+ {
196
+ //oe.toolboxPanel.Return();
197
+ //tab0.add(new cGridBag());
198
+ }
199
+ }
200
+
201
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
202
+ {
203
+ cGridBag tab0 = new cGridBag().setVertical(true);
204
+
205
+ tab0.setName("Night");
206
+ skyboxpanel.add(tab0);
207
+
208
+ cGridBag row0 = new cGridBag();
209
+ cGridBag row1 = new cGridBag();
210
+ cGridBag row2 = new cGridBag();
211
+ cGridBag row3 = new cGridBag();
212
+ cGridBag row4 = new cGridBag();
213
+ cGridBag row5 = new cGridBag();
214
+ cGridBag row6 = new cGridBag();
215
+
216
+ AddSkyboxButton("night", "NightPath", row0);
217
+ AddSkyboxButton("night", "PondNight", row0);
218
+ AddSkyboxButton("night", "Powerlines", row0);
219
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
220
+
221
+ AddSkyboxButton("urban", "CNTower", row1);
222
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
223
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
224
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
225
+
226
+ AddSkyboxButton("penguins", "kenon_star", row2);
227
+ AddSkyboxButton("persson", "corona", row2);
228
+ AddSkyboxButton("persson", "spaceskybox", row2);
229
+ AddSkyboxButton("indoors", "Vasa", row2);
230
+
231
+ AddSkyboxButton("winter", "Backyard", row3);
232
+ AddSkyboxButton("winter", "Creek", row3);
233
+ AddSkyboxButton("winter", "FootballField3", row3);
234
+ AddSkyboxButton("winter", "Forest", row3);
235
+
236
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
237
+ AddSkyboxButton("winter", "House", row4);
238
+ AddSkyboxButton("winter", "IceLake", row4);
239
+ AddSkyboxButton("winter", "IceRiver", row4);
240
+
241
+ AddSkyboxButton("winter", "Park3", row5);
242
+ AddSkyboxButton("winter", "PondWinter", row5);
243
+ AddSkyboxButton("winter", "Tantolunden5", row5);
244
+ AddSkyboxButton("winter", "Vindelalven", row5);
245
+
246
+ AddSkyboxButton("daz", "TheRock", row6);
247
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
248
+ AddSkyboxButton("daz", "Winter", row6);
249
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
250
+
251
+ tab0.add(row0);
252
+ tab0.add(row1);
253
+ tab0.add(row2);
254
+ tab0.add(row3);
255
+ tab0.add(row4);
256
+ tab0.add(row5);
257
+ tab0.add(row6);
258
+
259
+ for (int i=5; --i>=0;)
260
+ {
261
+ //oe.toolboxPanel.Return();
262
+ //tab0.add(new cGridBag());
263
+ }
264
+ }
265
+
266
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
267
+ {
268
+ cGridBag tab0 = new cGridBag().setVertical(true);
269
+
270
+ tab0.setName("Others");
271
+ skyboxpanel.add(tab0);
272
+
273
+ cGridBag row0 = new cGridBag();
274
+ cGridBag row1 = new cGridBag();
275
+ cGridBag row2 = new cGridBag();
276
+ cGridBag row3 = new cGridBag();
277
+ cGridBag row4 = new cGridBag();
278
+ cGridBag row5 = new cGridBag();
279
+ cGridBag row6 = new cGridBag();
280
+
281
+ AddSkyboxButton("mayhem", "afterrain", row0);
282
+ AddSkyboxButton("mayhem", "aqua4", row0);
283
+ AddSkyboxButton("mayhem", "aqua9", row0);
284
+ AddSkyboxButton("mayhem", "flame", row0);
285
+
286
+ AddSkyboxButton("mayhem", "h2s", row1);
287
+ AddSkyboxButton("mayhem", "prehistoric", row1);
288
+ AddSkyboxButton("mayhem", "scorched", row1);
289
+ AddSkyboxButton("penguins", "desertdawn", row1);
290
+
291
+ AddSkyboxButton("persson", "Citadella", row2);
292
+ AddSkyboxButton("persson", "Citadella2", row2);
293
+ AddSkyboxButton("persson", "clouds1", row2);
294
+ AddSkyboxButton("penguins", "wrath", row2);
295
+
296
+ AddSkyboxButton("persson", "FishermansBastion", row3);
297
+ AddSkyboxButton("persson", "HeroesSquare", row3);
298
+ AddSkyboxButton("indoors", "DallasW", row3);
299
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
300
+
301
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
302
+ AddSkyboxButton("persson", "PereaBeach1", row4);
303
+ AddSkyboxButton("persson", "PereaBeach2", row4);
304
+ AddSkyboxButton("persson", "redeclipse", row4);
305
+
306
+ AddSkyboxButton("daz", "Greenlands", row5);
307
+ AddSkyboxButton("daz", "Oasis", row5);
308
+ AddSkyboxButton("elyvisions", "arch3", row5);
309
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
310
+
311
+ AddSkyboxButton("elyvisions", "rainbow", row6);
312
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
313
+ AddSkyboxButton("elyvisions", "heaven", row6);
314
+ AddSkyboxButton("elyvisions", "hot", row6);
315
+
316
+ tab0.add(row0);
317
+ tab0.add(row1);
318
+ tab0.add(row2);
319
+ tab0.add(row3);
320
+ tab0.add(row4);
321
+ tab0.add(row5);
322
+ tab0.add(row6);
323
+
324
+ for (int i=5; --i>=0;)
325
+ {
326
+ //oe.toolboxPanel.Return();
327
+ //tab0.add(new cGridBag());
328
+ }
329
+ }
330
+
331
+ public void ChangeSkybox(String skybox)
332
+ {
333
+ if (skybox.endsWith("/"))
334
+ {
335
+ group.skyboxname = null;
336
+ group.skyboxext = null;
337
+ cameraView.repaint();
338
+ }
339
+ else
340
+ {
341
+ //cameraView.envyoff = false;
342
+ group.skyboxname = skybox;
343
+ group.skyboxext = "jpg";
344
+ cameraView.repaint();
345
+ }
346
+ }
347
+
348
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
+ {
350
+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
+
352
+ AddSkyboxTab0(skyboxpane);
353
+ AddSkyboxTab1(skyboxpane);
354
+ AddSkyboxTab2(skyboxpane);
355
+ AddSkyboxTab3(skyboxpane);
356
+
357
+ skyboxPanel.add(skyboxpane);
358
+ }
359
+
360
+ public void ChangeTexture(String texture)
361
+ {
362
+ for (int i=0; i<group.selection.size(); i++)
363
+ {
364
+ Object3D obj = group.selection.get(i);
365
+ obj.SetPigmentTexture("@" + texture);
366
+ }
367
+
368
+ refreshContents();
369
+ }
370
+
371
+ public void Show3DView()
372
+ {
373
+ // bug
374
+ //gridPanel.setDividerLocation(1.0);
375
+ //bigPanel.setDividerLocation(0.0);
376
+ bigThree.ClearUI();
377
+ bigThree.add(centralPanel);
378
+ bigThree.FlushUI();
379
+ }
380
+
26381 //ObjEditor objEditor;
27382 public void closeUI2()
28383 {
....@@ -60,6 +415,16 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
418
+ assert(false);
419
+
420
+// if (copy.versionlist == null)
421
+// {
422
+// copy.versionlist = new Object3D[100];
423
+// copy.versionindex = -1;
424
+//
425
+// //Save(true);
426
+// }
427
+
63428 if(ui)
64429 SetupUI(objEditor);
65430 }
....@@ -80,10 +445,22 @@
80445 SetupViews(objEditor);
81446
82447 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
448
+
449
+// if (copy.versionlist == null)
450
+// {
451
+// copy.versionlist = new Object3D[100];
452
+// copy.versionindex = -1;
453
+//
454
+// //Save(true);
455
+// }
83456 }
84457
85458 void CloneSelection(boolean supports)
86459 {
460
+ if (Globals.REPLACEONMAKE)
461
+ Save();
462
+ boolean keep = Globals.REPLACEONMAKE;
463
+ Globals.REPLACEONMAKE = false;
87464 // Object3D keep = GrafreeD.clipboard;
88465 //Object3D obj;
89466 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,6 +471,7 @@
94471
95472 makeSomething(clone, i==group.selection.size()-1);
96473 }
474
+ Globals.REPLACEONMAKE = keep;
97475 }
98476
99477 void CloneClipboard(boolean supports)
....@@ -150,40 +528,49 @@
150528
151529 void SetupMenu2(GroupEditor oe)
152530 {
531
+ oe.jTree = new cTree();
532
+
153533 Menu menu;
154534 oe.menuBar.add(menu = new Menu("Edit"));
155535 //editItem = menu.add(new MenuItem("Edit"));
156536 //editItem.addActionListener(this);
157
- duplicateItem = menu.add(new MenuItem("Duplicate"));
537
+
538
+// undoItem = menu.add(new MenuItem("Undo"));
539
+// undoItem.addActionListener(this);
540
+// redoItem = menu.add(new MenuItem("Redo"));
541
+// redoItem.addActionListener(this);
542
+// menu.add("-");
543
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158544 duplicateItem.addActionListener(this);
159
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
160547 cloneItem.addActionListener(this);
161
- if (Globals.ADVANCED)
548
+ //if (Globals.ADVANCED)
162549 {
163550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
164551 cloneSupportItem.addActionListener(this);
165552 }
553
+ oe.jTree.popup.addSeparator();
166554 menu.add("-");
167
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
168556 cutItem.addActionListener(this);
169
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
170558 copyItem.addActionListener(this);
171559 pasteItem = menu.add(new MenuItem("Paste"));
172560 pasteItem.addActionListener(this);
173
- menu.add("-");
174561
175
- menu.add("-");
176
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
562
+ oe.jTree.popup.addSeparator();
563
+ //menu.add("-");
564
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
177565 pasteIntoItem.addActionListener(this);
178
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
179567 pasteLinkItem.addActionListener(this);
180
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
181569 pasteCloneItem.addActionListener(this);
182
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
183571 // pasteExpandItem.addActionListener(this);
184
- menu.add("-");
185
- clearItem = menu.add(new MenuItem("Clear"));
186
- clearItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
187574
188575 if (Globals.ADVANCED)
189576 {
....@@ -197,23 +584,23 @@
197584 //zBufferItem.addActionListener(this);
198585 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199586 //normalLensItem.addActionListener(this);
200
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201
- revertCameraItem.addActionListener(this);
587
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
588
+ restoreCameraItem.addActionListener(this);
202589
203
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204
- toggleFullScreenItem.addItemListener(this);
205
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206
- cameraMenu.add("-");
590
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
591
+// toggleFullScreenItem.addItemListener(this);
592
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
593
+// cameraMenu.add("-");
594
+//
595
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
596
+// toggleTextureItem.addItemListener(this);
597
+// toggleTextureItem.setState(CameraPane.textureon);
598
+//
599
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
600
+// toggleSwitchItem.addItemListener(this);
601
+// toggleSwitchItem.setState(CameraPane.SWITCH);
207602
208
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209
- toggleTextureItem.addItemListener(this);
210
- toggleTextureItem.setState(CameraPane.textureon);
211
-
212
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213
- toggleSwitchItem.addItemListener(this);
214
- toggleSwitchItem.setState(CameraPane.SWITCH);
215
-
216
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
603
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217604 toggleHandleItem.addItemListener(this);
218605 toggleHandleItem.setState(CameraPane.HANDLES);
219606
....@@ -240,7 +627,7 @@
240627
241628 cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242629 toggleDebugItem.addItemListener(this);
243
- toggleDebugItem.setState(CameraPane.DEBUG);
630
+ toggleDebugItem.setState(Globals.DEBUG);
244631
245632 cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246633 toggleFrustumItem.addItemListener(this);
....@@ -261,22 +648,20 @@
261648 // animationItem.addItemListener(this);
262649 // animationItem.setState(CameraPane.ANIMATION);
263650 cameraMenu.add("-");
264
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
651
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265652 editCameraItem.addActionListener(this);
266653
267654 if (Globals.ADVANCED)
268655 {
269656 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270657 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
272
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
658
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
273659 oe.cameraMenu.add("-");
274660 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
275661 openWindowItem.addActionListener(this);
276
- editLeafItem.addActionListener(this);
277662 lookAtItem.addActionListener(this);
278663 //lookFromItem.addActinoListener(this);
279
- //switchItem.addActionListener(this);
664
+ //switchViewItem.addActionListener(this);
280665 }
281666
282667 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -320,22 +705,37 @@
320705 setMasterItem.addActionListener(this);
321706 }
322707
323
- oe.menuBar.add(menu = new Menu("Group"));
324
- grabItem = menu.add(new MenuItem("Grab"));
325
- grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
326710 backItem = menu.add(new MenuItem("Back"));
327711 backItem.addActionListener(this);
328712 frontItem = menu.add(new MenuItem("Front"));
329713 frontItem.addActionListener(this);
330
- compositeItem = menu.add(new MenuItem("Composite"));
331
- compositeItem.addActionListener(this);
714
+// compositeItem = menu.add(new MenuItem("Composite"));
715
+// compositeItem.addActionListener(this);
716
+
717
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+ grabItem.addActionListener(this);
719
+
720
+ if (Globals.ADVANCED)
721
+ {
332722 hideItem = menu.add(new MenuItem("Hidden Group"));
333723 hideItem.addActionListener(this);
334
- ungroupItem = menu.add(new MenuItem("Ungroup"));
724
+ }
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
335726 ungroupItem.addActionListener(this);
336
- menu.add("-");
337
- randomItem = menu.add(new MenuItem("Switch node"));
338
- randomItem.addActionListener(this);
727
+
728
+ oe.jTree.popup.addSeparator();
729
+
730
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+ deleteItem.addActionListener(this);
732
+
733
+// menu.add("-");
734
+//
735
+// switchItem = menu.add(new MenuItem("Switch node"));
736
+// switchItem.addActionListener(this);
737
+ if (Globals.ADVANCED)
738
+ {
339739 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340740 switchGeoItem.addActionListener(this);
341741 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -343,8 +743,6 @@
343743 morphItem = menu.add(new MenuItem("Morph Group"));
344744 morphItem.addActionListener(this);
345745
346
- if (Globals.ADVANCED)
347
- {
348746 menu.add("-");
349747 physicsItem = menu.add(new MenuItem("Physics"));
350748 physicsItem.addActionListener(this);
....@@ -352,30 +750,29 @@
352750 frameselectorItem.addActionListener(this);
353751 scriptNodeItem = menu.add(new MenuItem("Script Node"));
354752 scriptNodeItem.addActionListener(this);
355
- cameraItem = menu.add(new MenuItem("Camera"));
356
- cameraItem.addActionListener(this);
357753 }
358754
359755 oe.menuBar.add(menu = new Menu("Object"));
360
- textureItem = menu.add(new MenuItem("Texture"));
361
- textureItem.addActionListener(this);
756
+// textureItem = menu.add(new MenuItem("Texture"));
757
+// textureItem.addActionListener(this);
362758 billboardItem = menu.add(new MenuItem("Billboard"));
363759 billboardItem.addActionListener(this);
364760 csgItem = menu.add(new MenuItem("CSG"));
365761 csgItem.addActionListener(this);
366
- shadowXItem = menu.add(new MenuItem("Shadow X"));
762
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367763 shadowXItem.addActionListener(this);
368
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
764
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369765 shadowYItem.addActionListener(this);
370
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
766
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371767 shadowZItem.addActionListener(this);
768
+ attributeItem = menu.add(new MenuItem("Attribute"));
769
+ attributeItem.addActionListener(this);
770
+
372771 if (Globals.ADVANCED)
373772 {
374773 menu.add("-");
375774 linkerItem = menu.add(new MenuItem("Linker"));
376775 linkerItem.addActionListener(this);
377
- attributeItem = menu.add(new MenuItem("Attribute"));
378
- attributeItem.addActionListener(this);
379776 templateItem = menu.add(new MenuItem("Template"));
380777 templateItem.addActionListener(this);
381778 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -404,7 +801,7 @@
404801 genNormalsMESHItem.addActionListener(this);
405802 if (Globals.ADVANCED)
406803 {
407
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
804
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408805 genNormalsMINEItem.addActionListener(this);
409806 }
410807 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -438,6 +835,8 @@
438835 }
439836
440837 oe.menuBar.add(menu = new Menu("Attributes"));
838
+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
839
+ clearVersionsItem.addActionListener(this);
441840 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
442841 clearMaterialsItem.addActionListener(this);
443842 resetAllItem = menu.add(new MenuItem("Reset All"));
....@@ -460,10 +859,18 @@
460859 hideleavesItem.addActionListener(this);
461860 showleavesItem = menu.add(new MenuItem("Show Leaves"));
462861 showleavesItem.addActionListener(this);
463
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
862
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
464863 markleavesItem.addActionListener(this);
465
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
864
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
466865 unmarkleavesItem.addActionListener(this);
866
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
867
+ rewindleavesItem.addActionListener(this);
868
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
869
+ unrewindleavesItem.addActionListener(this);
870
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
871
+ randomleavesItem.addActionListener(this);
872
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
873
+ unrandomleavesItem.addActionListener(this);
467874 menu.add("-");
468875 flipVItem = menu.add(new MenuItem("Flip V"));
469876 flipVItem.addActionListener(this);
....@@ -489,10 +896,15 @@
489896 attachBumpItem.addActionListener(this);
490897 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491898 pigmentBumpItem.addActionListener(this);
899
+ //embedTexturesItem
492900 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493901 detachPigmentItem.addActionListener(this);
494902 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495903 detachBumpItem.addActionListener(this);
904
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
905
+ embedTexturesItem.addActionListener(this);
906
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
907
+ deEmbedTexturesItem.addActionListener(this);
496908 menu.add("-");
497909 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498910 sortbysizeItem.addActionListener(this);
....@@ -503,6 +915,9 @@
503915 shareGeometriesItem.addActionListener(this);
504916 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
505917 mergeGeometriesItem.addActionListener(this);
918
+ menu.add("-");
919
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
920
+ editLeafItem.addActionListener(this);
506921 if (Globals.ADVANCED)
507922 {
508923 // Pretty much the same as duplicate and clone.
....@@ -519,16 +934,97 @@
519934 buildToolsMenu(menu);
520935 }
521936
937
+ JTabbedPane resourcecontainer;
938
+ cGridBag currenttab;
939
+ //boolean added; // patch for jar
940
+
941
+ int totalcount = 0;
942
+
943
+ int tabcount = 0;
944
+ int colcount = 0;
945
+ int rowcount = 0;
946
+ int texturecount = 0;
947
+
948
+ int columns = 5;
949
+ int rows = 7;
950
+
951
+ public void ResourceCallBack(String[] path)
952
+ {
953
+// for (int i = 0; i < path.length; i++)
954
+// System.out.print(path[i] + "/");
955
+// System.out.println();
956
+
957
+ if (//rowcount == 0 ||
958
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
959
+ {
960
+ currenttab = new cGridBag();
961
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
962
+ currenttab.setName(tabname);
963
+ //added = false;
964
+ resourcecontainer.add(currenttab);
965
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
966
+ rowcount = 1;
967
+ colcount = 0;
968
+ texturecount = 0;
969
+ }
970
+
971
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
972
+ {
973
+ //if (!added)
974
+ {
975
+ //added = true;
976
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
977
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
978
+ }
979
+
980
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
981
+ totalcount++;
982
+
983
+ if (++colcount >= columns)
984
+ {
985
+ colcount = 0;
986
+ currenttab.Return();
987
+
988
+ if (rowcount++ >= rows)
989
+ {
990
+ rowcount = 0;
991
+ }
992
+ }
993
+ }
994
+ else
995
+ {
996
+// if (!path[path.length-1].equals("icons"))
997
+// resourcecontainer.Return();
998
+ }
999
+ }
1000
+
1001
+ void CreateTexturePanel(cGridBag container)
1002
+ {
1003
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1004
+ container.add(resourcecontainer);
1005
+
1006
+ Grafreed.ParseResources("textures", this);
1007
+
1008
+ // 935. System.out.println("Total = " + totalcount);
1009
+ }
1010
+
5221011 void SetupUI2(ObjEditor oe)
5231012 {
1013
+ // June 2019
1014
+ if (oe == null)
1015
+ {
1016
+ //super.SetupUI2(this);
1017
+ //return;
1018
+ }
1019
+
1020
+ if (copy != group)
1021
+ {
1022
+ //super.SetupUI2(this);
1023
+ }
1024
+
5241025 //new Exception().printStackTrace();
5251026
5261027 oe.radioPanel = new JPanel(new GridBagLayout());
527
- oe.aConstraints.weightx = 1;
528
- oe.aConstraints.weighty = 0;
529
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
530
- oe.aConstraints.gridwidth = 100;
531
- oe.aConstraints.gridheight = 1;
5321028 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5331029
5341030 oe.buttonGroup = new ButtonGroup();
....@@ -549,97 +1045,268 @@
5491045 oe.radioPanel.add(dummyButton);
5501046 oe.buttonGroup.add(dummyButton);
5511047 */
1048
+ cGridBag versionManagerPanel = new cGridBag();
1049
+
1050
+ versionManagerPanel.preferredHeight = 4;
1051
+
5521052 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
5531053
554
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
555
- liveCB.setToolTipText("Enable animation");
556
- liveCB.addItemListener(this);
1054
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
+ //minButton.setToolTipText("Minimize window");
1056
+ //minButton.addActionListener(this);
1057
+
1058
+ if (Globals.ADVANCED)
1059
+ {
1060
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// maxButton.setToolTipText("Maximize window");
1062
+// maxButton.addActionListener(this);
1063
+ }
1064
+
1065
+ cButton gcButton;
1066
+
1067
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+// gcButton.setToolTipText("Garbage collect");
1069
+// gcButton.addActionListener(new ActionListener()
1070
+// {
1071
+// public void actionPerformed(ActionEvent e)
1072
+// {
1073
+// System.gc();
1074
+// }
1075
+// });
1076
+
1077
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1078
+ collapseButton.setToolTipText("Collapse toolbar");
1079
+ collapseButton.addActionListener(this);
1080
+
1081
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
+ maximize3DButton.setToolTipText("Maximize 3D view");
1083
+ maximize3DButton.addActionListener(this);
1084
+
1085
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1086
+ twoButton.setToolTipText("Show 3D view only");
1087
+ twoButton.addActionListener(this);
1088
+ this.fullscreenLayout = twoButton;
1089
+
1090
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1091
+ threeButton.setToolTipText("Show controls and 3D view");
1092
+ threeButton.addActionListener(this);
1093
+ if (Globals.ADVANCED)
1094
+ {
1095
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096
+ sixButton.setToolTipText("Show 3D view and controls");
1097
+ sixButton.addActionListener(this);
1098
+ }
1099
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+// sevenButton.setToolTipText("3-column layout");
1101
+// sevenButton.addActionListener(this);
1102
+ //
1103
+
1104
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1105
+ fullButton.setToolTipText("Full-screen window");
1106
+ fullButton.addActionListener(this);
1107
+
1108
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1109
+ screenfitButton.setToolTipText("Screen fit");
1110
+ screenfitButton.addActionListener(this);
5571111
558
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1113
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1114
+ restoreCameraButton.addActionListener(this);
1115
+
1116
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
+ saveVersionButton.setToolTipText("Duplicate current version");
1118
+ saveVersionButton.addActionListener(this);
1119
+
1120
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1121
+ deleteVersionButton.setToolTipText("Delete current version");
1122
+ deleteVersionButton.addActionListener(this);
1123
+ deleteVersionButton.setEnabled(false);
1124
+
1125
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1126
+ previousVersionButton.setToolTipText("Previous version");
1127
+ previousVersionButton.addActionListener(this);
1128
+ previousVersionButton.setEnabled(false);
1129
+
1130
+ cGridBag updown = new cGridBag().setVertical(true);
1131
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1132
+ restoreButton.setToolTipText("Undo (restore current version)");
1133
+ restoreButton.addActionListener(this);
1134
+ restoreButton.setEnabled(false);
1135
+
1136
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1137
+ replaceButton.setToolTipText("Save (replace current version)");
1138
+ replaceButton.addActionListener(this);
1139
+ replaceButton.setEnabled(false);
1140
+
1141
+ versionManagerPanel.add(updown);
1142
+
1143
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144
+ nextVersionButton.setToolTipText("Next version");
1145
+ nextVersionButton.addActionListener(this);
1146
+ nextVersionButton.setEnabled(false);
1147
+
1148
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
5591149 oneStepButton.setToolTipText("Animate one step forward");
5601150 oneStepButton.addActionListener(this);
5611151
562
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
1152
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1153
+ liveCB.setToolTipText("Enable animation");
1154
+ liveCB.addItemListener(this);
1155
+
1156
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
5631157 fastCB.setToolTipText("Fast mode");
5641158 fastCB.addItemListener(this);
5651159
566
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567
- trackCB.setToolTipText("Enable tracking");
568
- trackCB.addItemListener(this);
569
-
570
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571
- screenfitButton.setToolTipText("Screen fit");
572
- screenfitButton.addActionListener(this);
1160
+ //oe.toolboxPanel.Return();
1161
+
1162
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1163
+// trackCB.setToolTipText("Enable tracking");
1164
+// trackCB.addItemListener(this);
5731165
5741166 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
5751167 // screenfitpointButton.addActionListener(this);
5761168
5771169 if (Globals.ADVANCED)
5781170 {
579
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1171
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
5801172 snapobjectButton.addActionListener(this);
5811173 snapobjectButton.setToolTipText("Snap Object");
1174
+
1175
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1176
+ fourButton.addActionListener(this);
1177
+ fourButton.setToolTipText("Show control panel only");
5821178 }
5831179
584
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585
- flashSelectionButton.setToolTipText("Show selection");
586
- flashSelectionButton.addActionListener(this);
1180
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
5871181
588
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589
-
590
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591
- twoButton.setToolTipText("Show center view only");
592
- twoButton.addActionListener(this);
593
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
- fourButton.addActionListener(this);
595
- fourButton.setToolTipText("Show left panel only");
596
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597
- sixButton.setToolTipText("2-column layout left");
598
- sixButton.addActionListener(this);
599
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
- threeButton.setToolTipText("2-column layout right");
601
- threeButton.addActionListener(this);
602
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603
- sevenButton.setToolTipText("3-column layout");
604
- sevenButton.addActionListener(this);
605
- //
6061182
607
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608
- rootButton.setToolTipText("Edit selection in new tab");
1183
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1184
+ rootButton.setToolTipText("Open selection in new tab");
6091185 rootButton.addActionListener(this);
6101186
611
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1187
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6121188 closeButton.setToolTipText("Close tab");
6131189 closeButton.addActionListener(this);
6141190 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
6151191 //clearButton.addActionListener(this);
616
-
617
- cGridBag commandsPanel = new cGridBag();
1192
+
1193
+ cGridBag row1 = new cGridBag();
6181194
619
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
- editButton.setToolTipText("Edit selection");
1195
+ // INSERT
1196
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
+ gridButton.setToolTipText("Create ground");
1198
+ gridButton.addActionListener(this);
1199
+
1200
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1201
+ boxButton.setToolTipText("Create box");
1202
+ boxButton.addActionListener(this);
1203
+
1204
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1205
+ superButton.setToolTipText("Create superellipsoid");
1206
+ superButton.addActionListener(this);
1207
+
1208
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1209
+ sphereButton.setToolTipText("Create sphere");
1210
+ sphereButton.addActionListener(this);
1211
+
1212
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
+ coneButton.setToolTipText("Create cone");
1214
+ coneButton.addActionListener(this);
1215
+
1216
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1217
+ torusButton.setToolTipText("Create torus");
1218
+ torusButton.addActionListener(this);
1219
+
1220
+ if (Globals.ADVANCED)
1221
+ {
1222
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1223
+ kleinButton.setToolTipText("Create Klein bottle");
1224
+ kleinButton.addActionListener(this);
1225
+ }
1226
+
1227
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
+ particlesButton.setToolTipText("Create particle system");
1229
+ particlesButton.addActionListener(this);
1230
+
1231
+ oe.toolboxPanel.add(row1);
1232
+
1233
+ cGridBag row2 = new cGridBag();
1234
+
1235
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
+ groupButton.setToolTipText("Create group");
1237
+ groupButton.addActionListener(this);
1238
+
1239
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1240
+ compositeButton.setToolTipText("Create composite");
1241
+ compositeButton.addActionListener(this);
1242
+
1243
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1244
+ switchButton.setToolTipText("Create item switcher");
1245
+ switchButton.addActionListener(this);
1246
+
1247
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1248
+ loopButton.setToolTipText("Create loop");
1249
+ loopButton.addActionListener(this);
1250
+
1251
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1252
+ textureButton.setToolTipText("Create texture");
1253
+ textureButton.addActionListener(this);
1254
+
1255
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1256
+ overlayButton.setToolTipText("Create overlay");
1257
+ overlayButton.addActionListener(this);
1258
+
1259
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1260
+ lightButton.setToolTipText("Create light");
1261
+ lightButton.addActionListener(this);
1262
+
1263
+ oe.toolboxPanel.add(row2);
1264
+
1265
+ cGridBag textures = new cGridBag();
1266
+
1267
+ CreateTexturePanel(textures);
1268
+
1269
+ int tabCount = resourcecontainer.getTabCount();
1270
+
1271
+ if (tabCount > 0)
1272
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1273
+
1274
+ oe.toolboxPanel.add(textures);
1275
+
1276
+ textures.preferredHeight = 100;
1277
+
1278
+ CreateSkyboxPanel(oe.skyboxPanel);
1279
+
1280
+ // EDIT panel
1281
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1282
+ editButton.setToolTipText("Pin selection controls");
6211283 editButton.addActionListener(this);
6221284
623
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
- uneditButton.setToolTipText("Unedit selection");
1285
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1286
+ uneditButton.setToolTipText("Unpin and remove selection controls");
6251287 uneditButton.addActionListener(this);
6261288
627
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628
- allParamsButton.setToolTipText("Edit all params");
1289
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1290
+ allParamsButton.setToolTipText("Show all controls");
6291291 allParamsButton.addActionListener(this);
6301292
631
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
- clearPanelButton.setToolTipText("Clear edit panel");
1293
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1294
+ clearPanelButton.setToolTipText("Clear all controls");
6331295 clearPanelButton.addActionListener(this);
6341296
635
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636
- unselectButton.setToolTipText("Unselect");
637
- unselectButton.addActionListener(this);
1297
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1298
+ //unselectButton.setToolTipText("Unselect");
1299
+ //unselectButton.addActionListener(this);
6381300
639
- commandsPanel.preferredHeight = 1;
1301
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1302
+ flashSelectionButton.setToolTipText("Highlight selection");
1303
+ flashSelectionButton.addActionListener(this);
6401304
641
- oe.treePanel.add(commandsPanel);
642
- oe.treePanel.Return();
1305
+ editCommandsPanel.preferredHeight = 1;
1306
+
1307
+ SetPinStates(false);
1308
+// oe.treePanel.add(commandsPanel);
1309
+// oe.treePanel.Return();
6431310
6441311 // oe.aConstraints.gridx += 1;
6451312 // oe.aConstraints.weighty = 0;
....@@ -654,34 +1321,24 @@
6541321
6551322 cGridBag jSPPanel = new cGridBag();
6561323
1324
+ jSPPanel.preferredHeight = 20;
1325
+
6571326 JScrollPane jSP;
6581327 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1328
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
6601329 ResetModel();
6611330
6621331 oe.treePanel.add(jSPPanel);
6631332 oe.treePanel.Return();
6641333
665
- cGridBag copyOptionsPanel = new cGridBag();
666
-
667
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668
- colorCB.setToolTipText("Copy color when dropped");
669
- colorCB.addItemListener(this);
670
-
671
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672
- materialCB.setToolTipText("Copy material when dropped");
673
- materialCB.addItemListener(this);
674
-
675
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676
- textureCB.setToolTipText("Copy texture when dropped");
677
- textureCB.addItemListener(this);
678
-
679
- copyOptionsPanel.preferredHeight = 1;
680
- oe.treePanel.add(copyOptionsPanel);
1334
+ oe.treePanel.add(versionManagerPanel);
6811335 oe.treePanel.Return();
1336
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1337
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1338
+ versionSliderPane.preferredHeight = 3;
6821339
683
-// mainPanel.setDividerLocation(0.5); //1.0);
684
-// mainPanel.setResizeWeight(0.5);
1340
+// mainPanel.setDividerLocation(0.1); //1.0);
1341
+ mainPanel.setResizeWeight(0.4);
6851342
6861343 //jList.addListSelectionListener(this);
6871344 oe.jTree.addTreeSelectionListener(this);
....@@ -689,7 +1346,7 @@
6891346 //jTree.setEditable(true);
6901347 oe.jTree.setDragEnabled(true);
6911348 //jTree.setPreferredSize(new Dimension(10,10));
692
- jSP.setPreferredSize(new Dimension(100,200));
1349
+ //jSP.setPreferredSize(new Dimension(100,200));
6931350
6941351 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6951352
....@@ -701,29 +1358,49 @@
7011358 dgr.addDragGestureListener(this);
7021359 }catch(Exception e) {}
7031360 */
704
- radio.layout = sevenButton;
1361
+ radio.layout = threeButton; // sixButton;
7051362 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
7061363 }
7071364
7081365 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
7091366 {
1367
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1368
+ colorCB.setToolTipText("Copy color when dropped");
1369
+ colorCB.addItemListener(this);
1370
+
1371
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1372
+ materialCB.setToolTipText("Copy material when dropped");
1373
+ materialCB.addItemListener(this);
1374
+
1375
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1376
+ textureCB.setToolTipText("Copy texture when dropped");
1377
+ textureCB.addItemListener(this);
1378
+
1379
+ panel.Return();
1380
+
7101381 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
7111382 boxCB.setToolTipText("Display bounding boxes");
7121383 boxCB.addItemListener(this);
7131384
7141385 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1386
+ zoomBoxCB.setToolTipText("Display only for wheel");
7161387 zoomBoxCB.addItemListener(this);
7171388
7181389 if (true) // Globals.ADVANCED)
7191390 {
720
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721
- supportCB.setToolTipText("Enable rigging");
722
- supportCB.addItemListener(this);
1391
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1392
+// supportCB.setToolTipText("Enable rigging");
1393
+// supportCB.addItemListener(this);
1394
+
1395
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1396
+ freezeCB.setToolTipText("Fast moving camera");
1397
+ freezeCB.addItemListener(this);
7231398
7241399 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
7251400 // localCB.addItemListener(this);
7261401
1402
+ panel.Return();
1403
+
7271404 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
7281405 crowdCB.setToolTipText("Used for crowds");
7291406 crowdCB.addItemListener(this);
....@@ -732,14 +1409,19 @@
7321409 smoothCB.setToolTipText("Snapping delay");
7331410 smoothCB.addItemListener(this);
7341411
735
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736
- slowCB.setToolTipText("Smooth interpolation");
737
- slowCB.addItemListener(this);
1412
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1413
+// slowCB.setToolTipText("Smooth interpolation");
1414
+// slowCB.addItemListener(this);
1415
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1416
+ minshaderCB.setToolTipText("Minimal fast shader");
1417
+ minshaderCB.addItemListener(this);
7381418
7391419 // constraints.gridy += 1;
7401420 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
7411421 // speakerMocapCB.addItemListener(this);
7421422
1423
+ panel.Return();
1424
+
7431425 if (false)
7441426 {
7451427 // handled in scripts
....@@ -754,34 +1436,82 @@
7541436 //constraints.gridy += 1;
7551437 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
7561438 smoothfocusCB.addItemListener(this);
1439
+ panel.Return();
7571440 }
7581441
7591442 //constraints.gridx += 1;
7601443 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
7611444 // debugCB.addItemListener(this);
7621445
1446
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1447
+ trackCB.setToolTipText("Enable tracking target");
1448
+ trackCB.addItemListener(this);
1449
+
7631450 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1451
+ oeilCB.setToolTipText("Move camera when tracking");
7641452 oeilCB.addItemListener(this);
7651453
1454
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1455
+ shadowCB.setToolTipText("When live compute shadows");
1456
+ shadowCB.addItemListener(this);
1457
+
1458
+ panel.Return();
1459
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1460
+ toggleTextureCB.setToolTipText("Load textures");
1461
+ toggleTextureCB.addItemListener(this);
1462
+
1463
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1464
+ toggleSwitchCB.setToolTipText("Choose a single item");
1465
+ toggleSwitchCB.addItemListener(this);
1466
+
1467
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1468
+ autokeepCB.setToolTipText("On structure change");
1469
+ autokeepCB.addItemListener(this);
1470
+
1471
+ panel.Return();
1472
+ if (Globals.ADVANCED)
1473
+ {
7661474 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
7671475 lookAtCB.setToolTipText("Look-at target");
7681476 lookAtCB.addItemListener(this);
1477
+ }
7691478
7701479 }
7711480
7721481 cGridBag fill = new cGridBag();
773
-
7741482 fill.preferredHeight = 200;
1483
+ cGridBag fill2 = new cGridBag();
1484
+ fill2.preferredHeight = 200;
1485
+ cGridBag fill3 = new cGridBag();
1486
+ fill3.preferredHeight = 200;
7751487
7761488 panel.add(fill);
1489
+ panel.add(fill2);
1490
+ panel.add(fill3);
7771491
7781492 }
7791493
7801494 void EditObject(Object3D obj)
7811495 {
1496
+ assert(obj instanceof Composite);
1497
+
1498
+// if (obj.versionlist == null)
1499
+// {
1500
+// obj.versionlist = new Object3D[100];
1501
+// obj.versionindex = -1;
1502
+// }
1503
+
7821504 cRadio radioButton = new cRadio(obj.name);
1505
+
1506
+ // June 2019. Patch to avoid bug with transparency.
1507
+ radioButton.hadMaterial = obj.material != null;
1508
+ if (!radioButton.hadMaterial)
1509
+ {
1510
+ obj.material = new cMaterial();
1511
+ }
1512
+
7831513 radioButton.SetObject(obj);
784
- radioButton.layout = sevenButton;
1514
+ radioButton.layout = threeButton; // sixButton;
7851515 radioButton.SetCamera(cameraView.renderCamera, false);
7861516 radioButton.addActionListener(this);
7871517 radioPanel.add(radioButton);
....@@ -791,31 +1521,41 @@
7911521
7921522 void SetupViews(ObjEditor oe)
7931523 {
1524
+ theFrame = this;
1525
+
7941526 oe.SetupViews();
7951527
1528
+ if (Globals.DEBUG)
7961529 System.out.println("SetupViews");
7971530 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
7981531 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
7991532 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
8001533 }
8011534
802
- JCheckBox liveCB;
803
- JCheckBox supportCB;
804
- JCheckBox localCB;
805
- JCheckBox crowdCB;
806
- JCheckBox smoothCB;
807
- JCheckBox fastCB;
808
- JCheckBox slowCB;
809
- JCheckBox boxCB;
810
- JCheckBox zoomBoxCB;
811
- JCheckBox trackCB;
812
- JCheckBox smoothfocusCB;
1535
+ cToggleButton liveCB;
1536
+ cCheckBox supportCB;
1537
+ cCheckBox localCB;
1538
+ cCheckBox crowdCB;
1539
+ cCheckBox smoothCB;
1540
+ cCheckBox minshaderCB;
1541
+
1542
+ cToggleButton fastCB;
1543
+ cCheckBox slowCB;
1544
+ cCheckBox boxCB;
1545
+ cCheckBox zoomBoxCB;
1546
+ cCheckBox freezeCB;
1547
+ //cToggleButton trackCB;
1548
+ cCheckBox trackCB;
1549
+ cCheckBox smoothfocusCB;
8131550 // JCheckBox speakerMocapCB;
814
- JCheckBox speakerCameraCB;
815
- JCheckBox speakerFocusCB;
816
- JCheckBox debugCB;
817
- JCheckBox oeilCB;
818
- JCheckBox lookAtCB;
1551
+ cCheckBox speakerCameraCB;
1552
+ cCheckBox speakerFocusCB;
1553
+ cCheckBox debugCB;
1554
+
1555
+ cCheckBox oeilCB;
1556
+ cCheckBox shadowCB;
1557
+ cCheckBox autokeepCB;
1558
+ cCheckBox lookAtCB;
8191559
8201560 // static int COLOR = 1;
8211561 // static int MATERIAL = 2;
....@@ -823,9 +1563,9 @@
8231563
8241564 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
8251565
826
- JCheckBox colorCB;
827
- JCheckBox materialCB;
828
- JCheckBox textureCB;
1566
+ cCheckBox colorCB;
1567
+ cCheckBox materialCB;
1568
+ cCheckBox textureCB;
8291569
8301570 public void itemStateChanged(ItemEvent e)
8311571 {
....@@ -853,6 +1593,7 @@
8531593 } else if(e.getSource() == liveCB)
8541594 {
8551595 cameraView.ToggleLive();
1596
+ refreshContents(false);
8561597 }
8571598 else if(e.getSource() == supportCB)
8581599 {
....@@ -868,6 +1609,12 @@
8681609 {
8691610 cameraView.ToggleInertia();
8701611 cameraView.repaint();
1612
+ }
1613
+ else if(e.getSource() == minshaderCB)
1614
+ {
1615
+ Globals.MINSHADER ^= true;
1616
+ cameraView.programInitialized = false;
1617
+ cameraView.repaint();
8711618 }
8721619 else if(e.getSource() == localCB)
8731620 {
....@@ -917,6 +1664,18 @@
9171664 {
9181665 cameraView.ToggleOeil();
9191666 }
1667
+ else if(e.getSource() == shadowCB)
1668
+ {
1669
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1670
+ }
1671
+ else if(e.getSource() == freezeCB)
1672
+ {
1673
+ Globals.FREEZEONMOVE ^= true;
1674
+ }
1675
+ else if(e.getSource() == autokeepCB)
1676
+ {
1677
+ Globals.REPLACEONMAKE ^= true;
1678
+ }
9201679 else if(e.getSource() == lookAtCB)
9211680 {
9221681 cameraView.ToggleLookAt();
....@@ -933,7 +1692,8 @@
9331692
9341693 /**/
9351694 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1695
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1696
+ TreePath path = objEditor.jTree.getSelectionPath();
9371697 if ((path == null) || (path.getPathCount() <= 1)) {
9381698 // We can't move the root node or an empty selection
9391699 return;
....@@ -996,8 +1756,6 @@
9961756 }
9971757 }
9981758
999
- String string = (String) object;
1000
-
10011759 System.out.println("Transfer = " + object + "; drop : " + target);
10021760 // if( object instanceof java.io.File[])
10031761 // {
....@@ -1005,6 +1763,8 @@
10051763 // objEditor.DropFile((java.io.File[]) object, true);
10061764 // return;
10071765 // }
1766
+
1767
+ String string = object.toString();
10081768
10091769 // File path for Mac and Windows
10101770 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1050,23 +1810,33 @@
10501810
10511811 assert target == objEditor.jTree;
10521812 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1813
+ Object3D destinationLeaf;
10531814 try {
1054
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1815
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
10551816 } catch (Exception e) {
10561817 System.out.println("destinationPath : " + destinationPath);
10571818 return;
10581819 }
10591820
1060
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1821
+ for (int i=group.selection.size(); --i>=0;)
10611822 {
1823
+ Object3D child = (Object3D)group.selection.elementAt(i);
1824
+
1825
+ // Cannot move into itself
1826
+ if (child == destinationLeaf)
1827
+ return;
1828
+ }
1829
+
1830
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1831
+// {
10621832 loadClipboard(true);
10631833 objEditor.jTree.setSelectionPath(destinationPath);
10641834 pasteInto(false, false);
1065
- } else {
1066
- loadClipboard(false);
1067
- objEditor.jTree.setSelectionPath(destinationPath);
1068
- pasteInto(false, false); // true); // ???
1069
- }
1835
+// } else {
1836
+// loadClipboard(false);
1837
+// objEditor.jTree.setSelectionPath(destinationPath);
1838
+// pasteInto(false, false); // true); // ???
1839
+// }
10701840 }
10711841 public void dropActionChanged(DropTargetDragEvent dtde)
10721842 // Called if the user has modified the current drop gesture
....@@ -1122,7 +1892,12 @@
11221892 TreePath path;
11231893
11241894 public TransferableTreePath(TreePath tp) {
1125
- path = tp;
1895
+ Object[] objs = new Object[tp.getPathCount()];
1896
+ for (int i=0; i<objs.length; i++)
1897
+ {
1898
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1899
+ }
1900
+ path = new TreePath(objs);
11261901 }
11271902
11281903 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1171,22 +1946,30 @@
11711946 {
11721947 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11731948 //heightFieldItem.addActionListener(this);
1174
- gridItem = menu.add(new MenuItem("Grid"));
1175
- gridItem.addActionListener(this);
1176
- rectoidItem = menu.add(new MenuItem("Box"));
1177
- rectoidItem.addActionListener(this);
1178
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179
- ellipsoidItem.addActionListener(this);
1180
- coneItem = menu.add(new MenuItem("Cone"));
1181
- coneItem.addActionListener(this);
1182
- torusItem = menu.add(new MenuItem("Torus"));
1183
- torusItem.addActionListener(this);
1184
- superItem = menu.add(new MenuItem("Superellipsoid"));
1185
- superItem.addActionListener(this);
1949
+// gridItem = menu.add(new MenuItem("Grid"));
1950
+// gridItem.addActionListener(this);
1951
+// rectoidItem = menu.add(new MenuItem("Box"));
1952
+// rectoidItem.addActionListener(this);
1953
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1954
+// ellipsoidItem.addActionListener(this);
1955
+// coneItem = menu.add(new MenuItem("Cone"));
1956
+// coneItem.addActionListener(this);
1957
+// torusItem = menu.add(new MenuItem("Torus"));
1958
+// torusItem.addActionListener(this);
1959
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1960
+// superItem.addActionListener(this);
1961
+
1962
+ cameraItem = menu.add(new MenuItem("Camera"));
1963
+ cameraItem.addActionListener(this);
1964
+
1965
+ if (!Globals.ADVANCED)
1966
+ {
11861967 kleinItem = menu.add(new MenuItem("Klein Bottle"));
11871968 kleinItem.addActionListener(this);
1188
- particleItem = menu.add(new MenuItem("Particle system"));
1189
- particleItem.addActionListener(this);
1969
+ }
1970
+
1971
+// particleItem = menu.add(new MenuItem("Particle system"));
1972
+// particleItem.addActionListener(this);
11901973 if (Globals.ADVANCED)
11911974 {
11921975 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1212,15 +1995,15 @@
12121995 }
12131996 bezierItem = menu.add(new MenuItem("Bezier Patch"));
12141997 bezierItem.addActionListener(this);
1215
- overlayItem = menu.add(new MenuItem("Overlay"));
1216
- overlayItem.addActionListener(this);
1217
- lightItem = menu.add(new MenuItem("Light"));
1218
- lightItem.addActionListener(this);
1998
+// overlayItem = menu.add(new MenuItem("Overlay"));
1999
+// overlayItem.addActionListener(this);
2000
+// lightItem = menu.add(new MenuItem("Light"));
2001
+// lightItem.addActionListener(this);
12192002 menu.add("-");
12202003 //superLoopItem = menu.add(new MenuItem("Super Loop"));
12212004 //superLoopItem.addActionListener(this);
1222
- loopItem = menu.add(new MenuItem("Loop"));
1223
- loopItem.addActionListener(this);
2005
+// loopItem = menu.add(new MenuItem("Loop"));
2006
+// loopItem.addActionListener(this);
12242007 doubleItem = menu.add(new MenuItem("Fork"));
12252008 doubleItem.addActionListener(this);
12262009 if (Globals.ADVANCED)
....@@ -1236,6 +2019,9 @@
12362019 animationItem.addItemListener(this);
12372020 animationItem.setState(Globals.ANIMATION);
12382021
2022
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2023
+ archiveItem.addActionListener(this);
2024
+
12392025 menu.add("-");
12402026 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
12412027 parseverticesItem.addActionListener(this);
....@@ -1248,6 +2034,8 @@
12482034 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
12492035 reduce34MorphItem.addActionListener(this);
12502036 menu.add("-");
2037
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2038
+ memoryItem.addActionListener(this);
12512039 menu.add(computeAOItem = new MenuItem("Compute AO"));
12522040 computeAOItem.addActionListener(this);
12532041
....@@ -1256,11 +2044,9 @@
12562044 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
12572045 mirrorItem.addActionListener(this);
12582046 menu.add("-");
1259
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260
- memoryItem.addActionListener(this);
12612047 menu.add(analyzeItem = new MenuItem("Analyze"));
12622048 analyzeItem.addActionListener(this);
1263
- menu.add(dumpItem = new MenuItem("Dump"));
2049
+ menu.add(dumpItem = new MenuItem("Print"));
12642050 dumpItem.addActionListener(this);
12652051 // menu.add(pathItem = new MenuItem("From-to path"));
12662052 // pathItem.addActionListener(this);
....@@ -1343,24 +2129,24 @@
13432129 switch(axis)
13442130 {
13452131 case 0 :
1346
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1347
- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1348
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1349
- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2132
+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2133
+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2134
+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2135
+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
13502136 norm = cVector.X;
13512137 break;
13522138 case 1 :
1353
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1354
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1355
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1356
- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2139
+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2140
+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2141
+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2142
+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
13572143 norm = cVector.Y;
13582144 break;
13592145 case 2 :
1360
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1361
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1362
- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1363
- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2146
+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2147
+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2148
+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2149
+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
13642150 norm = cVector.Z;
13652151 break;
13662152 }
....@@ -1401,9 +2187,38 @@
14012187 shadow.material = new cMaterial(obj.material);
14022188 shadow.material.diffuse = 0.0001f;
14032189 shadow.material.specular = 0.0001f;
2190
+ shadow.material.opacity = 0.75f;
2191
+
2192
+ AllocProjectedVertices(shadow);
2193
+
2194
+ shadow.projectedVertices[1].x = 300;
14042195
14052196 makeSomething(shadow);
14062197 }
2198
+
2199
+ private void ClearUnpinned()
2200
+ {
2201
+ //for (Object3D obj : listUI)
2202
+ for (int i=listUI.size(); --i>=0;)
2203
+ {
2204
+ Object3D obj = listUI.elementAt(i);
2205
+ if (!obj.pinned)
2206
+ {
2207
+ obj.CloseUI();
2208
+ listUI.remove(i);
2209
+ }
2210
+ }
2211
+ }
2212
+
2213
+ private void EditElement(Object3D elem, boolean newWindow)
2214
+ {
2215
+ // if (!(elem instanceof Composite))
2216
+ // newWindow = false;
2217
+ listUI.add(elem);
2218
+ elem.openEditWindow(this, newWindow); //, false);
2219
+ System.out.println("edit : " + elem);
2220
+ elem.editWindow.refreshContents(true); // ? new
2221
+ }
14072222
14082223 /**
14092224 * applyExample
....@@ -1648,7 +2463,7 @@
16482463 {
16492464 ScreenFit();
16502465 } else
1651
- if (source == switchItem)
2466
+ if (source == switchViewItem)
16522467 {
16532468 cVector v1 = new cVector();
16542469 cVector v2 = new cVector();
....@@ -1657,11 +2472,11 @@
16572472 objEditor.cameraView.renderCamera.setAim(v2, v1);
16582473 objEditor.cameraView.repaint();
16592474 } else
1660
- if (source == rectoidItem)
2475
+ if (source == rectoidItem || source == boxButton)
16612476 {
16622477 makeSomething(new Box());
16632478 } else
1664
- if (source == particleItem)
2479
+ if (source == particleItem || source == particlesButton)
16652480 {
16662481 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16672482 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1740,27 +2555,27 @@
17402555
17412556 makeSomething(obj);
17422557 } else
1743
- if (source == gridItem)
2558
+ if (source == gridItem || source == gridButton)
17442559 {
17452560 makeSomething(new Grid());
17462561 } else
1747
- if (source == ellipsoidItem)
2562
+ if (source == ellipsoidItem || source == sphereButton)
17482563 {
17492564 makeSomething(new Sphere());
17502565 } else
1751
- if (source == coneItem)
2566
+ if (source == coneItem || source == coneButton)
17522567 {
17532568 makeSomething(new Cone());
17542569 } else
1755
- if (source == torusItem)
2570
+ if (source == torusItem || source == torusButton)
17562571 {
17572572 makeSomething(new Torus());
17582573 } else
1759
- if (source == superItem)
2574
+ if (source == superItem || source == superButton)
17602575 {
17612576 makeSomething(new Superellipsoid());
17622577 } else
1763
- if (source == kleinItem)
2578
+ if (source == kleinItem || source == kleinButton)
17642579 {
17652580 makeSomething(new Klein());
17662581 } else
....@@ -1780,7 +2595,7 @@
17802595 {
17812596 makeSomething(new BezierSurface());
17822597 } else
1783
- if (source == overlayItem)
2598
+ if (source == overlayItem || source == overlayButton)
17842599 {
17852600 /*
17862601 Object3D obj = new BezierSurface(5,8);
....@@ -1828,10 +2643,27 @@
18282643 s.setup();
18292644 makeSomething(s);
18302645 } else
1831
- if (source == lightItem)
2646
+ if (source == lightItem || source == lightButton)
18322647 {
18332648 makeSomething(new Light());
18342649 } else
2650
+// if (source == skybox1Button ||
2651
+// source == skybox2Button ||
2652
+// source == skybox3Button ||
2653
+// source == skybox4Button ||
2654
+// source == skybox5Button ||
2655
+// source == skybox6Button ||
2656
+// source == skybox7Button ||
2657
+// source == skybox11Button ||
2658
+// source == skybox12Button ||
2659
+// source == skybox13Button ||
2660
+// source == skybox14Button ||
2661
+// source == skybox15Button ||
2662
+// source == skybox16Button ||
2663
+// source == skybox17Button)
2664
+// {
2665
+// ChangeSkybox(source);
2666
+// } else
18352667 if (source == csgItem)
18362668 {
18372669 group(new CSG());
....@@ -1878,30 +2710,38 @@
18782710
18792711 group(g);
18802712 } else
1881
- if (source == loopItem)
2713
+ if (source == loopItem || source == loopButton)
18822714 {
2715
+ if (!group.selection.isEmpty())
2716
+ {
18832717 Composite csg = new GroupLeaf();
18842718 csg.count = 5;
1885
- group(csg);
1886
- Composite child = new cGroup();
2719
+ Composite child = new cGroup("Branch");
18872720 csg.addChild(child);
18882721 child.addChild(csg);
2722
+ group(csg);
2723
+ }
18892724 } else
18902725 if (source == doubleItem)
18912726 {
1892
- Composite csg = new GroupLeaf();
2727
+ if (!group.selection.isEmpty())
2728
+ {
2729
+ Composite csg = new GroupLeaf("Fork");
18932730 csg.count = 5;
2731
+ Composite child = new cGroup("Branch A");
2732
+ csg.addChild(child);
2733
+ child.addChild(csg);
2734
+ child = new cGroup("Branch B");
2735
+ csg.addChild(child);
2736
+ child.addChild(csg);
18942737 group(csg);
1895
- Composite child = new cGroup();
1896
- csg.addChild(child);
1897
- child.addChild(csg);
1898
- child = new cGroup();
1899
- csg.addChild(child);
1900
- child.addChild(csg);
2738
+ }
19012739 } else
19022740 if (source == tripleItem)
19032741 {
1904
- Composite csg = new GroupLeaf();
2742
+ if (!group.selection.isEmpty())
2743
+ {
2744
+ Composite csg = new GroupLeaf("Trident");
19052745 csg.count = 4;
19062746 group(csg);
19072747 Composite child = new cGroup();
....@@ -1913,11 +2753,12 @@
19132753 child = new cGroup();
19142754 csg.addChild(child);
19152755 child.addChild(csg);
2756
+ }
19162757 } else
19172758 if (source == computeAOItem)
19182759 {
19192760 Globals.drawMode = CameraPane.OCCLUSION;
1920
- Globals.theRenderer.repaint();
2761
+ cameraView.repaint();
19212762 } else
19222763 if (source == recompileItem)
19232764 {
....@@ -1932,7 +2773,7 @@
19322773 if (source == invariantsItem)
19332774 {
19342775 System.out.println("Invariants:");
1935
- Grafreed.grafreeD.universe.invariants();
2776
+ Grafreed.grafreed.universe.invariants();
19362777 } else
19372778 if (source == memoryItem)
19382779 {
....@@ -1951,6 +2792,65 @@
19512792 {
19522793 DumpObject();
19532794 } else
2795
+ if (source == minButton)
2796
+ {
2797
+ Minimize();
2798
+ } else
2799
+ if (source == maxButton)
2800
+ {
2801
+ Maximize();
2802
+ } else
2803
+ if (source == fullButton)
2804
+ {
2805
+ ToggleFullScreen();
2806
+ } else
2807
+ if (source == collapseButton)
2808
+ {
2809
+ this.expandedLayout = radio.layout;
2810
+ CollapseToolbar();
2811
+ } else
2812
+ if (source == maximize3DButton)
2813
+ {
2814
+ this.expandedLayout = radio.layout;
2815
+ radio.layout = twoButton;
2816
+ Show3DView();
2817
+ CollapseToolbar();
2818
+ } else
2819
+ if (source == previousVersionButton)
2820
+ {
2821
+ // Go to previous version
2822
+ //if (!Undo())
2823
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2824
+ PreviousVersion();
2825
+ } else
2826
+ if (source == restoreButton)
2827
+ {
2828
+ // Restore current version
2829
+ Restore();
2830
+ //restoreButton.setEnabled(false);
2831
+ } else
2832
+ if (source == replaceButton)
2833
+ {
2834
+ // Overwrite current version
2835
+ Replace();
2836
+ //replaceButton.setEnabled(false);
2837
+ } else
2838
+ if (source == nextVersionButton)
2839
+ {
2840
+ // Go to next version
2841
+ NextVersion();
2842
+ } else
2843
+ if (source == saveVersionButton)
2844
+ {
2845
+ // Save a new version
2846
+ if (!Save(true))
2847
+ java.awt.Toolkit.getDefaultToolkit().beep();
2848
+ } else
2849
+ if (source == deleteVersionButton)
2850
+ {
2851
+ // Delete a new version
2852
+ DeleteVersion();
2853
+ } else
19542854 if (source == oneStepButton)
19552855 {
19562856 Globals.ONESTEP = true;
....@@ -1958,17 +2858,14 @@
19582858 } else
19592859 if (source == screenfitButton)
19602860 {
1961
- //Reload(lastConverter, lastFilename, true);
19622861 ScreenFit();
19632862 } else
19642863 if (source == screenfitpointButton)
19652864 {
1966
- //Reload(lastConverter, lastFilename, true);
19672865 ScreenFitPoint();
19682866 } else
19692867 if (source == snapobjectButton)
19702868 {
1971
- //Reload(lastConverter, lastFilename, true);
19722869 SnapObject();
19732870 } else
19742871 // if (event.getSource() == recompileButton)
....@@ -2004,6 +2901,14 @@
20042901 if (source == cutItem || source == clearButton)
20052902 {
20062903 loadClipboard(true);
2904
+ } else
2905
+ if (source == undoItem)
2906
+ {
2907
+ PreviousVersion();
2908
+ } else
2909
+ if (source == redoItem)
2910
+ {
2911
+ NextVersion();
20072912 } else
20082913 if (source == duplicateItem)
20092914 {
....@@ -2324,7 +3229,7 @@
23243229 {
23253230 StepAll();
23263231 } else
2327
- if (source == clearItem) // || event.getSource() == clearButton)
3232
+ if (source == deleteItem) // || event.getSource() == clearButton)
23283233 {
23293234 //int indices[] = jList.getSelectedIndices();
23303235 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2336,9 +3241,9 @@
23363241 {
23373242 ClearSelection(true);
23383243 } else
2339
- if (source == grabItem)
3244
+ if (source == grabItem || source == groupButton)
23403245 {
2341
- group(new cGroup(), true);
3246
+ group(new cGroup(), false); // true);
23423247 } else
23433248 if (source == hideItem)
23443249 {
....@@ -2356,11 +3261,11 @@
23563261 {
23573262 makeSomething(new Camera());
23583263 } else
2359
- if (source == compositeItem)
3264
+ if (source == compositeItem || source == compositeButton)
23603265 {
23613266 group(new Composite());
23623267 } else
2363
- if (source == randomItem)
3268
+ if (source == switchItem || source == switchButton)
23643269 {
23653270 RandomNode random = new RandomNode();
23663271 group(random);
....@@ -2462,7 +3367,7 @@
24623367 {
24633368 group(new cLinker());
24643369 } else
2465
- if (source == textureItem)
3370
+ if (source == textureItem || source == textureButton)
24663371 {
24673372 group(new TextureNode());
24683373 } else
....@@ -2482,17 +3387,42 @@
24823387 {
24833388 CastShadow(2);
24843389 } else
2485
- if (source == ungroupItem)
3390
+ if (source == ungroupItem || source == ungroupButton)
24863391 {
2487
- //ungroup();
3392
+ boolean canUngroup = true;
3393
+
24883394 for (int i=0; i<group.selection.size(); i++)
24893395 {
2490
- Ungroup(group.selection.get(i));
3396
+ Object3D selectedItem = group.selection.get(i);
3397
+
3398
+ if (selectedItem.Size() == 0)
3399
+ {
3400
+ // Cannot ungroup leaves
3401
+ canUngroup = false;
3402
+ break;
3403
+ }
3404
+
3405
+ if (selectedItem == group)
3406
+ {
3407
+ // Cannot ungroup root
3408
+ canUngroup = false;
3409
+ break;
3410
+ }
24913411 }
24923412
2493
- ClearSelection(false);
2494
-
2495
- refreshContents();
3413
+ if (canUngroup)
3414
+ {
3415
+ for (int i=0; i<group.selection.size(); i++)
3416
+ {
3417
+ Object3D selectedItem = group.selection.get(i);
3418
+
3419
+ Ungroup(selectedItem);
3420
+ }
3421
+
3422
+ ClearSelection(false);
3423
+
3424
+ refreshContents();
3425
+ }
24963426 } else
24973427 if (source == genUVItem)
24983428 {
....@@ -2504,7 +3434,7 @@
25043434 } else
25053435 if (source == genNormalsMESHItem)
25063436 {
2507
- GenNormals(true); // TODO
3437
+ GenNormalsMESH();
25083438 } else
25093439 if (source == genNormalsORGANItem)
25103440 {
....@@ -2538,6 +3468,10 @@
25383468 {
25393469 ClearMaterials();
25403470 } else
3471
+ if (source == clearVersionsItem)
3472
+ {
3473
+ ClearVersions();
3474
+ } else
25413475 if (source == liveleavesItem)
25423476 {
25433477 LiveLeaves(true);
....@@ -2569,6 +3503,22 @@
25693503 if (source == unmarkleavesItem)
25703504 {
25713505 MarkLeaves(false);
3506
+ } else
3507
+ if (source == rewindleavesItem)
3508
+ {
3509
+ RewindLeaves(true);
3510
+ } else
3511
+ if (source == unrewindleavesItem)
3512
+ {
3513
+ RewindLeaves(false);
3514
+ } else
3515
+ if (source == randomleavesItem)
3516
+ {
3517
+ RandomLeaves(true);
3518
+ } else
3519
+ if (source == unrandomleavesItem)
3520
+ {
3521
+ RandomLeaves(false);
25723522 } else
25733523 if (source == flipVItem)
25743524 {
....@@ -2777,7 +3727,7 @@
27773727 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
27783728 {
27793729 obj = (Object3D)e.nextElement();
2780
- obj.SetBumpTexture(null);
3730
+ obj.ResetBumpTexture();
27813731 }
27823732
27833733 refreshContents();
....@@ -2793,6 +3743,31 @@
27933743
27943744 refreshContents();
27953745 } else
3746
+ if (source == embedTexturesItem)
3747
+ {
3748
+ Object3D obj;
3749
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3750
+ {
3751
+ obj = (Object3D)e.nextElement();
3752
+ obj.EmbedTextures(true);
3753
+ }
3754
+
3755
+ refreshContents();
3756
+ } else
3757
+ if (source == deEmbedTexturesItem)
3758
+ {
3759
+ Object3D obj;
3760
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3761
+ {
3762
+ obj = (Object3D)e.nextElement();
3763
+ obj.EmbedTextures(false);
3764
+ }
3765
+
3766
+ CameraPane.texturepigment.clear();
3767
+ CameraPane.texturebump.clear();
3768
+
3769
+ refreshContents();
3770
+ } else
27963771 if (source == flashSelectionButton)
27973772 {
27983773 CameraPane.flash = true;
....@@ -2804,42 +3779,36 @@
28043779 if (source == twoButton)
28053780 {
28063781 radio.layout = twoButton;
2807
- // bug
2808
- //gridPanel.setDividerLocation(1.0);
2809
- //bigPanel.setDividerLocation(0.0);
2810
-// bigThree.remove(scenePanel);
2811
-// bigThree.remove(centralPanel);
2812
-// bigThree.remove(XYZPanel);
2813
-// aWindowConstraints.gridx = 0;
2814
-// aWindowConstraints.gridy = 0;
2815
-// aWindowConstraints.gridwidth = 1;
2816
-// // aConstraints.gridheight = 3;
2817
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2818
-// aWindowConstraints.weightx = 0;
2819
-// aWindowConstraints.weighty = 1;
2820
-// //bigThree.add(jtp, aWindowConstraints);
2821
-// aWindowConstraints.weightx = 1;
2822
-// aWindowConstraints.gridwidth = 3;
2823
-// // aConstraints.gridheight = 3;
2824
-// aWindowConstraints.gridx = 1;
2825
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2826
-// bigThree.add(centralPanel, aWindowConstraints);
2827
-// aWindowConstraints.weightx = 0;
2828
-// aWindowConstraints.gridx = 4;
2829
-// aWindowConstraints.gridwidth = 1;
2830
-// // aConstraints.gridheight = 3;
2831
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2832
-// //bigThree.add(XYZPanel, aWindowConstraints);
2833
-// scenePanel.setVisible(false);
2834
-// centralPanel.setVisible(true);
2835
-// XYZPanel.setVisible(false);
2836
- bigThree.ClearUI();
2837
- bigThree.add(centralPanel);
2838
- bigThree.FlushUI();
3782
+
3783
+ if (CameraPane.FULLSCREEN)
3784
+ fullscreenLayout = radio.layout;
3785
+
3786
+ Show3DView();
3787
+
3788
+ cameraView.requestFocusInWindow();
3789
+
3790
+// refreshContents(true);
3791
+//
3792
+// try
3793
+// {
3794
+// java.awt.Robot bot = new java.awt.Robot();
3795
+// int mask = InputEvent.BUTTON1_MASK;
3796
+// bot.mouseMove(100, 100);
3797
+// bot.mousePress(mask);
3798
+// bot.mouseRelease(mask);
3799
+// }
3800
+// catch (Exception e)
3801
+// {
3802
+//
3803
+// }
3804
+
28393805 } else
28403806 if (source == threeButton)
28413807 {
28423808 radio.layout = threeButton;
3809
+
3810
+ if (CameraPane.FULLSCREEN)
3811
+ fullscreenLayout = radio.layout;
28433812
28443813 // bigThree.remove(scenePanel);
28453814 // bigThree.remove(centralPanel);
....@@ -2869,13 +3838,18 @@
28693838 // centralPanel.setVisible(true);
28703839 // XYZPanel.setVisible(true);
28713840 bigThree.ClearUI();
3841
+ bigThree.add(scenePanel);
28723842 bigThree.add(centralPanel);
2873
- bigThree.add(XYZPanel);
28743843 bigThree.FlushUI();
3844
+
3845
+ cameraView.requestFocusInWindow();
28753846 } else
28763847 if (source == fourButton)
28773848 {
28783849 radio.layout = fourButton;
3850
+
3851
+ if (CameraPane.FULLSCREEN)
3852
+ fullscreenLayout = radio.layout;
28793853
28803854 // bigThree.remove(scenePanel);
28813855 // bigThree.remove(centralPanel);
....@@ -2907,10 +3881,15 @@
29073881 bigThree.ClearUI();
29083882 bigThree.add(scenePanel);
29093883 bigThree.FlushUI();
3884
+
3885
+ cameraView.requestFocusInWindow();
29103886 } else
29113887 if (source == sixButton)
29123888 {
29133889 radio.layout = sixButton;
3890
+
3891
+ if (CameraPane.FULLSCREEN)
3892
+ fullscreenLayout = radio.layout;
29143893
29153894 // bigThree.remove(scenePanel);
29163895 // bigThree.remove(centralPanel);
....@@ -2940,13 +3919,18 @@
29403919 // centralPanel.setVisible(true);
29413920 // XYZPanel.setVisible(false);
29423921 bigThree.ClearUI();
2943
- bigThree.add(scenePanel);
29443922 bigThree.add(centralPanel);
3923
+ bigThree.add(scenePanel);
29453924 bigThree.FlushUI();
3925
+
3926
+ cameraView.requestFocusInWindow();
29463927 } else
29473928 if (source == sevenButton)
29483929 {
29493930 radio.layout = sevenButton;
3931
+
3932
+ if (CameraPane.FULLSCREEN)
3933
+ fullscreenLayout = radio.layout;
29503934
29513935 // bigThree.remove(scenePanel);
29523936 // bigThree.remove(centralPanel);
....@@ -2980,9 +3964,12 @@
29803964 bigThree.add(centralPanel);
29813965 bigThree.add(XYZPanel);
29823966 bigThree.FlushUI();
3967
+
3968
+ cameraView.requestFocusInWindow();
29833969 } else
29843970 if (source == rootButton)
29853971 {
3972
+ Replace();
29863973 Object3D obj;
29873974 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
29883975 {
....@@ -2991,31 +3978,49 @@
29913978 EditObject(obj);
29923979 }
29933980
3981
+ cameraView.requestFocusInWindow();
29943982 refreshContents(true);
29953983 } else
29963984 if (source == closeButton)
29973985 {
29983986 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3987
+ Replace();
3988
+
29993989 cRadio ab;
30003990 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
30013991 {
30023992 ab = (cRadio)e.nextElement();
3003
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3993
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
30043994 {
3995
+ // Patch to avoid bug with transparency.
3996
+ if (!ab.hadMaterial)
3997
+ {
3998
+ ab.object.material = null;
3999
+ }
4000
+
30054001 buttonGroup.remove(ab);
30064002 radioPanel.remove(ab);
30074003
3008
- ab.GetObject().editWindow = null;
4004
+ //ab.GetObject().editWindow = null;
4005
+ ab.GetObject().manipWindow = null;
30094006 // ab.GetObject().objectUI = null; // ?????????
30104007
30114008 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
30124009 break;
30134010 }
30144011 }
4012
+
4013
+ cameraView.requestFocusInWindow();
30154014 refreshContents(true);
30164015 } else
30174016 if (source == editItem || source == editButton)
30184017 {
4018
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4019
+ {
4020
+ Object3D child = (Object3D)e.nextElement();
4021
+ child.pinned = true;
4022
+ }
4023
+
30194024 EditSelection(false);
30204025 } else
30214026 if (source == uneditButton)
....@@ -3024,11 +4029,12 @@
30244029 {
30254030 Object3D child = (Object3D)e.nextElement();
30264031 if(child.editWindow != null)
3027
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4032
+ child.pinned = false;
30284033 child.CloseUI();
30294034 listUI.remove(child);
4035
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30304036
3031
- child.editWindow = null; // ???????????
4037
+ //child.editWindow = null; // ???????????
30324038 }
30334039 objEditor.ctrlPanel.FlushUI();
30344040 //objEditor.jTree.clearSelection();
....@@ -3041,16 +4047,18 @@
30414047 //copy.ClearUI();
30424048 for (Object3D obj : listUI)
30434049 {
4050
+ obj.pinned = false;
30444051 obj.CloseUI();
30454052 }
30464053 listUI.clear();
4054
+ SetPinStates(group.selection.size() > 0);
30474055 refreshContents(true);
30484056 } else
30494057 if (source == allParamsButton)
30504058 {
30514059 assert(copy == group);
30524060
3053
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4061
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30544062
30554063 for (Object3D obj : listUI)
30564064 {
....@@ -3076,6 +4084,8 @@
30764084 } else
30774085 if(source instanceof cRadio)
30784086 {
4087
+ Replace();
4088
+
30794089 group.parent = keepparent;
30804090 group.attributes = 0;
30814091 //group.editWindow = null;
....@@ -3099,6 +4109,7 @@
30994109 }
31004110
31014111 copy = group;
4112
+
31024113 //Globals.theRenderer.object = group;
31034114 if(!useclient)
31044115 {
....@@ -3115,7 +4126,9 @@
31154126 sideView.object = group;
31164127 }
31174128
3118
-// fix "+" issue group.editWindow = this;
4129
+// fix "+" issue
4130
+ //group.editWindow = this;
4131
+ group.manipWindow = this;
31194132
31204133 /*
31214134 currentLayout = radio.layout;
....@@ -3123,20 +4136,57 @@
31234136 currentLayout = sevenButton;
31244137 */
31254138 radio.layout.doClick();
4139
+
4140
+ assert(copy instanceof Composite);
4141
+
4142
+ if (copy.versionlist == null)
4143
+ {
4144
+ copy.versionindex = -1;
4145
+
4146
+ // Cannot work with loops
4147
+ // To fix this issue, we first mark all nodes above the root,
4148
+ // and check if any of these nodes are reachable below the root.
4149
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4150
+
4151
+ if (copy.versionlist == null && !copy.HasTags())
4152
+ {
4153
+ copy.versionlist = new Object3D[100];
4154
+
4155
+ //Save(true);
4156
+ }
4157
+ else
4158
+ copy.versionindex = -2;
4159
+
4160
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4161
+ }
4162
+
4163
+ SetVersionStates();
4164
+
4165
+ ClearUnpinned();
4166
+
4167
+ //Grafreed.Assert(group != null);
4168
+ //Grafreed.Assert(group.selection != null);
4169
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4170
+ if (group.selection == null || group.selection.size() == 1)
4171
+ EditSelection(false);
31264172 keepparent = group.parent;
31274173 // PARENT = NULL or not???
31284174 //group.parent = null; // ROOT
31294175 //group.attributes = -1;
31304176 ResetModel();
4177
+
4178
+ cameraView.requestFocusInWindow();
31314179 refreshContents(true);
31324180 } else if (event.getSource() == editCameraItem)
31334181 {
31344182 cameraView.ProtectCamera();
4183
+ cameraView.requestFocusInWindow();
31354184 cameraView.repaint();
31364185 return;
3137
- } else if (event.getSource() == revertCameraItem)
4186
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
31384187 {
31394188 cameraView.RevertCamera();
4189
+ cameraView.requestFocusInWindow();
31404190 cameraView.repaint();
31414191 return;
31424192 // } else if (event.getSource() == textureButton)
....@@ -3151,7 +4201,6 @@
31514201 }
31524202
31534203 boolean useclient = false;
3154
- cRadio radio;
31554204
31564205 void ToggleRoot()
31574206 {
....@@ -3256,7 +4305,7 @@
32564305 TouchTransform(obj);
32574306 continue;
32584307 }
3259
- if ((mask&2) != 0) // Scale
4308
+ if ((mask&2) != 0) // Scale/rotation
32604309 {
32614310 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
32624311 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -3264,10 +4313,6 @@
32644313 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
32654314 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
32664315 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3267
- }
3268
- if ((mask&4) != 0) // Rotation
3269
- {
3270
- // ?
32714316 }
32724317 if ((mask&1) != 0) // Translation
32734318 {
....@@ -3390,7 +4435,8 @@
33904435
33914436 int size = obj.MemorySize();
33924437
3393
- System.err.println((size/1024) + " KB is the size of " + obj);
4438
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4439
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33944440 }
33954441 }
33964442 catch (Exception e)
....@@ -3471,6 +4517,13 @@
34714517 void GenNormals(boolean crease)
34724518 {
34734519 group.GenNormalsS(crease);
4520
+
4521
+ refreshContents();
4522
+ }
4523
+
4524
+ void GenNormalsMESH()
4525
+ {
4526
+ group.GenNormalsMeshS();
34744527
34754528 refreshContents();
34764529 }
....@@ -3706,7 +4759,7 @@
37064759
37074760 try
37084761 {
3709
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4762
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
37104763 }
37114764 catch (Exception e)
37124765 {
....@@ -4068,6 +5121,12 @@
40685121 refreshContents();
40695122 }
40705123
5124
+ void ClearVersions()
5125
+ {
5126
+ group.selection.ClearVersions();
5127
+ refreshContents();
5128
+ }
5129
+
40715130 void FlipV(boolean flip)
40725131 {
40735132 group.selection.FlipV(flip);
....@@ -4095,6 +5154,18 @@
40955154 void MarkLeaves(boolean hide)
40965155 {
40975156 group.selection.MarkLeaves(hide);
5157
+ refreshContents();
5158
+ }
5159
+
5160
+ void RewindLeaves(boolean hide)
5161
+ {
5162
+ group.selection.RewindLeaves(hide);
5163
+ refreshContents();
5164
+ }
5165
+
5166
+ void RandomLeaves(boolean hide)
5167
+ {
5168
+ group.selection.RandomLeaves(hide);
40985169 refreshContents();
40995170 }
41005171
....@@ -4169,28 +5240,25 @@
41695240 // }
41705241 // }
41715242
4172
- static boolean allparams = true;
4173
-
4174
- static Vector<Object3D> listUI = new Vector<Object3D>();
4175
-
41765243 void EditSelection(boolean newWindow)
41775244 {
5245
+ if (group.selection == null)
5246
+ {
5247
+ EditElement(group, newWindow); // ? new
5248
+ return;
5249
+ }
5250
+
41785251 // aConstraints.gridy = 0;
41795252 for (int i=0; i<group.selection.size(); i++)
41805253 {
41815254 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
41825255 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5256
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41845257
41855258 Object3D elem = (Object3D)group.selection.elementAt(i);
41865259 if(elem != group || !newWindow)
41875260 {
4188
- // if (!(elem instanceof Composite))
4189
- // newWindow = false;
4190
- listUI.add(elem);
4191
- elem.openEditWindow(this, newWindow); //, false);
4192
- System.out.println("edit : " + elem);
4193
- elem.editWindow.refreshContents(true); // ? new
5261
+ EditElement(elem, newWindow); // ? new
41945262 }
41955263 }
41965264 }
....@@ -4253,9 +5321,7 @@
42535321
42545322 freezemodel = false;
42555323 }
4256
-
4257
- boolean flashIt = true;
4258
-
5324
+
42595325 public void valueChanged(TreeSelectionEvent e)
42605326 //public boolean handleEvent(Event event)
42615327 {
....@@ -4265,7 +5331,8 @@
42655331 //new Exception().printStackTrace();
42665332
42675333 freezemodel = true;
4268
-
5334
+ ClearUnpinned();
5335
+
42695336 /**/
42705337 //switch (event.id)
42715338 {
....@@ -4273,7 +5340,6 @@
42735340 //case 702: // Event.LIST_DESELECT
42745341 group.deselectAll();
42755342 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276
- objEditor.ClearInfo(); // .GetMaterial());
42775343 if (tps != null)
42785344 {
42795345 for (int i=0; i < tps.length; i++)
....@@ -4282,10 +5348,8 @@
42825348
42835349 //if (child.parent != null)
42845350 //child.parent.addSelectee(child);
5351
+ objEditor.SetMaterial(child);
42855352 group.addSelectee(child);
4286
- objEditor.SetMaterial(child); // .GetMaterial());
4287
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288
- System.err.println("info : " + child.GetPath());
42895353 }
42905354 }
42915355 // else
....@@ -4295,20 +5359,28 @@
42955359 // System.err.println("info : " + group.GetPath());
42965360 // }
42975361
4298
- objEditor.SetText(); // jan 2014
4299
-
4300
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5362
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
43015363 CameraPane.flash = true;
43025364
4303
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5365
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
43045366 // a camera
43055367 {
4306
- CameraPane.camerachangeframe = 0; // don't refuse it
4307
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5368
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5369
+ {
5370
+ CameraPane.camerachangeframe = 0; // don't refuse it
5371
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5372
+ }
43085373 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
43095374 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
43105375 }
43115376
5377
+ if (tps != null && tps.length == 1)
5378
+ {
5379
+ EditSelection(false);
5380
+ }
5381
+
5382
+ SetPinStates(tps != null && tps.length > 0);
5383
+
43125384 refreshContents();
43135385 //return true;
43145386 }
....@@ -4317,6 +5389,53 @@
43175389
43185390 freezemodel = false;
43195391 }
5392
+
5393
+ void SetPinStates(boolean enabled)
5394
+ {
5395
+ editButton.setEnabled(enabled);
5396
+ uneditButton.setEnabled(enabled);
5397
+ //unselectButton.setEnabled(enabled);
5398
+ flashSelectionButton.setEnabled(enabled);
5399
+
5400
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5401
+
5402
+ boolean allComposites = true;
5403
+
5404
+ if (group.selection != null)
5405
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5406
+ {
5407
+ Object next = e.nextElement();
5408
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5409
+ {
5410
+ allComposites = false;
5411
+ break;
5412
+ }
5413
+ }
5414
+
5415
+ rootButton.setEnabled(allComposites);
5416
+ }
5417
+
5418
+ void refreshContents(boolean cp)
5419
+ {
5420
+ if (Globals.ADVANCED)
5421
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5422
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5423
+ {
5424
+ objEditor.ClearInfo(); // .GetMaterial());
5425
+
5426
+ for (int i=0; i < group.selection.Size(); i++)
5427
+ {
5428
+ Object3D child = (Object3D) group.selection.get(i);
5429
+
5430
+ objEditor.AddInfo(child, this, true);
5431
+// System.err.println("info : " + child.GetPath());
5432
+ }
5433
+
5434
+ objEditor.SetText(); // jan 2014
5435
+ }
5436
+
5437
+ super.refreshContents(cp);
5438
+ }
43205439
43215440 void linkSomething(Object3D thing)
43225441 {
....@@ -4388,6 +5507,7 @@
43885507 {
43895508 if (group.selection.isEmpty())
43905509 return;
5510
+
43915511 Grafreed.clipboardIsTempGroup = false;
43925512 Composite tGroup = null;
43935513 if (group.selection.size() > 0) // 1)
....@@ -4398,6 +5518,8 @@
43985518
43995519 if (cut)
44005520 {
5521
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5522
+// Save();
44015523 //int indices[] = jList.getSelectedIndices();
44025524 //for (int i = indices.length - 1; i >= 0; i--)
44035525 //jList.remove(indices[i]);
....@@ -4487,8 +5609,10 @@
44875609 }
44885610
44895611 }
5612
+
44905613 if (Grafreed.clipboardIsTempGroup)
44915614 Grafreed.clipboard = tGroup;
5615
+
44925616 if (cut)
44935617 {
44945618 ResetModel();
....@@ -4498,6 +5622,10 @@
44985622
44995623 void paste(boolean expand)
45005624 {
5625
+ if (Globals.REPLACEONMAKE)
5626
+ Save();
5627
+ boolean keep = Globals.REPLACEONMAKE;
5628
+ Globals.REPLACEONMAKE = false;
45015629 // if (GrafreeD.clipboard == null)
45025630 // return;
45035631 boolean first = true;
....@@ -4557,6 +5685,7 @@
45575685 Grafreed.clipboard.get(0).parent = keepparent;
45585686 }
45595687
5688
+ Globals.REPLACEONMAKE = keep;
45605689 ResetModel();
45615690 refreshContents();
45625691 }
....@@ -4692,6 +5821,10 @@
46925821
46935822 void group(Object3D csg, boolean grab)
46945823 {
5824
+ if (Globals.REPLACEONMAKE)
5825
+ Save();
5826
+ boolean keep = Globals.REPLACEONMAKE;
5827
+ Globals.REPLACEONMAKE = false;
46955828 if (//false) // why??
46965829 !group.selection.isEmpty())
46975830 {
....@@ -4805,10 +5938,15 @@
48055938 //node.add(csg);
48065939 //makeSomething(node);
48075940 makeSomething(csg);
5941
+ Globals.REPLACEONMAKE = keep;
48085942 }
48095943
48105944 void Ungroup(Object3D g)
48115945 {
5946
+ if (Globals.REPLACEONMAKE)
5947
+ Save();
5948
+ boolean keep = Globals.REPLACEONMAKE;
5949
+ Globals.REPLACEONMAKE = false;
48125950 if (g instanceof HiddenObject)
48135951 {
48145952 HiddenObject h = (HiddenObject) g;
....@@ -4825,6 +5963,7 @@
48255963 objEditor.makeSomething(g.get(i), false);
48265964 }
48275965 }
5966
+ Globals.REPLACEONMAKE = keep;
48285967 }
48295968
48305969 void ungroup()
....@@ -5113,7 +6252,43 @@
51136252 cButton clearpanelButton;
51146253 cButton unselectButton;
51156254
6255
+ cButton restoreCameraButton;
6256
+
51166257 cButton oneStepButton;
6258
+
6259
+ cButton groupButton;
6260
+ cButton ungroupButton;
6261
+ cButton compositeButton;
6262
+ cButton switchButton;
6263
+ cButton loopButton;
6264
+ cButton textureButton;
6265
+
6266
+ cButton skybox1Button;
6267
+ cButton skybox2Button;
6268
+ cButton skybox3Button;
6269
+ cButton skybox4Button;
6270
+ cButton skybox5Button;
6271
+ cButton skybox6Button;
6272
+ cButton skybox7Button;
6273
+
6274
+ cButton skybox11Button;
6275
+ cButton skybox12Button;
6276
+ cButton skybox13Button;
6277
+ cButton skybox14Button;
6278
+ cButton skybox15Button;
6279
+ cButton skybox16Button;
6280
+ cButton skybox17Button;
6281
+
6282
+ cButton gridButton;
6283
+ cButton boxButton;
6284
+ cButton sphereButton;
6285
+ cButton coneButton;
6286
+ cButton torusButton;
6287
+ cButton superButton;
6288
+ cButton kleinButton;
6289
+ cButton particlesButton;
6290
+ cButton overlayButton;
6291
+ cButton lightButton;
51176292
51186293 cButton screenfitButton;
51196294 cButton screenfitpointButton;
....@@ -5126,14 +6301,6 @@
51266301
51276302 cButton setsupportButton;
51286303
5129
- cButton twoButton;
5130
- cButton sixButton;
5131
- cButton threeButton;
5132
- cButton sevenButton;
5133
- cButton fourButton; // full panel
5134
- cButton oneButton; // full XYZ
5135
- //cButton currentLayout;
5136
-
51376304 //
51386305 //Composite
51396306 Object3D // to do !!
....@@ -5143,10 +6310,12 @@
51436310 //JTree jTree;
51446311 private MenuItem lookAtItem;
51456312 private MenuItem lookFromItem;
5146
- private MenuItem switchItem;
5147
- private MenuItem cutItem;
5148
- private MenuItem duplicateItem;
5149
- private MenuItem cloneItem;
6313
+ private MenuItem switchViewItem;
6314
+ private JMenuItem cutItem;
6315
+ private MenuItem undoItem;
6316
+ private MenuItem redoItem;
6317
+ private JMenuItem duplicateItem;
6318
+ private JMenuItem cloneItem;
51506319 private MenuItem cloneSupportItem;
51516320 private MenuItem overwriteGeoItem;
51526321 private MenuItem overwriteMatItem;
....@@ -5167,13 +6336,13 @@
51676336 private MenuItem cloneGeometriesItem;
51686337 private MenuItem shareGeometriesItem;
51696338 private MenuItem mergeGeometriesItem;
5170
- private MenuItem copyItem;
6339
+ private JMenuItem copyItem;
51716340 private MenuItem pasteItem;
5172
- private MenuItem pasteIntoItem;
5173
- private MenuItem pasteLinkItem;
5174
- private MenuItem pasteCloneItem;
5175
- private MenuItem pasteExpandItem;
5176
- private MenuItem clearItem;
6341
+ private JMenuItem pasteIntoItem;
6342
+ private JMenuItem pasteLinkItem;
6343
+ private JMenuItem pasteCloneItem;
6344
+ private JMenuItem pasteExpandItem;
6345
+ private JMenuItem deleteItem;
51776346 private MenuItem clearAllItem;
51786347 private MenuItem genUVItem;
51796348 private MenuItem genNormalsMESHItem;
....@@ -5199,6 +6368,7 @@
51996368 private MenuItem clipMeshItem;
52006369 private MenuItem smoothMeshItem;
52016370 private MenuItem clearMaterialsItem;
6371
+ private MenuItem clearVersionsItem;
52026372
52036373 private MenuItem liveleavesItem;
52046374 private MenuItem unliveleavesItem;
....@@ -5208,6 +6378,10 @@
52086378 private MenuItem showleavesItem;
52096379 private MenuItem markleavesItem;
52106380 private MenuItem unmarkleavesItem;
6381
+ private MenuItem rewindleavesItem;
6382
+ private MenuItem unrewindleavesItem;
6383
+ private MenuItem randomleavesItem;
6384
+ private MenuItem unrandomleavesItem;
52116385
52126386 private MenuItem flipVItem;
52136387 private MenuItem unflipVItem;
....@@ -5224,12 +6398,12 @@
52246398 private MenuItem transformGeometryItem;
52256399 private MenuItem transformChildrenItem;
52266400 private MenuItem hideItem;
5227
- private MenuItem grabItem;
6401
+ private JMenuItem grabItem;
52286402 private MenuItem backItem;
52296403 private MenuItem frontItem;
52306404 private MenuItem cameraItem;
52316405 private MenuItem compositeItem;
5232
- private MenuItem randomItem;
6406
+ private MenuItem switchItem;
52336407 private MenuItem physicsItem;
52346408 private MenuItem frameselectorItem;
52356409 private MenuItem scriptNodeItem;
....@@ -5237,7 +6411,7 @@
52376411 private MenuItem switchTransfoItem;
52386412 private MenuItem morphItem;
52396413 private MenuItem linkerItem;
5240
- private MenuItem ungroupItem;
6414
+ private JMenuItem ungroupItem;
52416415 private MenuItem editItem;
52426416 private MenuItem openWindowItem;
52436417 private MenuItem editLeafItem;
....@@ -5253,6 +6427,8 @@
52536427 private MenuItem attachBumpItem;
52546428 private MenuItem detachBumpItem;
52556429 private MenuItem pigmentBumpItem;
6430
+ private MenuItem embedTexturesItem;
6431
+ private MenuItem deEmbedTexturesItem;
52566432
52576433 private MenuItem particleItem;
52586434 private MenuItem ragdollItem;
....@@ -5303,5 +6479,5 @@
53036479
53046480 Menu cameraMenu;
53056481 MenuItem editCameraItem;
5306
- MenuItem revertCameraItem;
6482
+ MenuItem restoreCameraItem;
53076483 }