Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5
GroupEditor.java
....@@ -16,6 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1920 ObjectUI,
2021 Runnable,
2122 ActionListener,
....@@ -23,6 +24,360 @@
2324 DragGestureListener, DragSourceListener, DropTargetListener,
2425 ItemListener // ListSelectionListener
2526 {
27
+
28
+ public void AddSkyboxButton(String f, String s, cGridBag row)
29
+ {
30
+ cButton skyboxButton;
31
+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
+ skyboxButton.addActionListener(new ActionListener()
36
+ {
37
+ @Override
38
+ public void actionPerformed(ActionEvent e)
39
+ {
40
+ ChangeSkybox(path);
41
+ }
42
+ });
43
+ }
44
+
45
+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46
+ {
47
+ cButton textureButton;
48
+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50
+ textureButton.setToolTipText(c + count);
51
+ textureButton.addActionListener(new ActionListener()
52
+ {
53
+ @Override
54
+ public void actionPerformed(ActionEvent e)
55
+ {
56
+ ChangeTexture(path + t);
57
+ }
58
+ });
59
+ }
60
+
61
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
62
+ {
63
+ cGridBag tab0 = new cGridBag().setVertical(true);
64
+
65
+ tab0.setName("Urban");
66
+ skyboxpanel.add(tab0);
67
+
68
+ cGridBag row0 = new cGridBag();
69
+ cGridBag row1 = new cGridBag();
70
+ cGridBag row2 = new cGridBag();
71
+ cGridBag row3 = new cGridBag();
72
+ cGridBag row4 = new cGridBag();
73
+ cGridBag row5 = new cGridBag();
74
+ cGridBag row6 = new cGridBag();
75
+
76
+ AddSkyboxButton("default", "", row0);
77
+ //AddSkyboxButton("default", "cornell", row0);
78
+ AddSkyboxButton("penguins", "dust", row0);
79
+ AddSkyboxButton("penguins", "tropic", row0);
80
+ AddSkyboxButton("penguins", "yonder", row0);
81
+
82
+ AddSkyboxButton("default", "uffizi", row1);
83
+ AddSkyboxButton("bridge", "Bridge", row1);
84
+ AddSkyboxButton("bridge", "Bridge2", row1);
85
+ AddSkyboxButton("urban", "GamlaStan2", row1);
86
+
87
+ AddSkyboxButton("urban", "Parliament", row2);
88
+ AddSkyboxButton("urban", "Roundabout", row2);
89
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
90
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
91
+
92
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
93
+ AddSkyboxButton("urban", "UnionSquare", row3);
94
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
95
+ AddSkyboxButton("park", "BerzeliiPark", row3);
96
+
97
+ AddSkyboxButton("park", "Buddha", row4);
98
+ AddSkyboxButton("park", "CNTower2", row4);
99
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
100
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
101
+
102
+ AddSkyboxButton("park", "Park", row5);
103
+ AddSkyboxButton("park", "Pond", row5);
104
+ AddSkyboxButton("park", "Skansen", row5);
105
+ AddSkyboxButton("park", "Skansen2", row5);
106
+
107
+ AddSkyboxButton("park", "Skansen3", row6);
108
+ AddSkyboxButton("park", "Skansen4", row6);
109
+ AddSkyboxButton("park", "Skansen5", row6);
110
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
111
+
112
+ tab0.add(row0);
113
+ tab0.add(row1);
114
+ tab0.add(row2);
115
+ tab0.add(row3);
116
+ tab0.add(row4);
117
+ tab0.add(row5);
118
+ tab0.add(row6);
119
+
120
+ for (int i=5; --i>=0;)
121
+ {
122
+ //oe.toolboxPanel.Return();
123
+ //tab0.add(new cGridBag());
124
+ }
125
+ }
126
+
127
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
128
+ {
129
+ cGridBag tab0 = new cGridBag().setVertical(true);
130
+
131
+ tab0.setName("Nature");
132
+ skyboxpanel.add(tab0);
133
+
134
+ cGridBag row0 = new cGridBag();
135
+ cGridBag row1 = new cGridBag();
136
+ cGridBag row2 = new cGridBag();
137
+ cGridBag row3 = new cGridBag();
138
+ cGridBag row4 = new cGridBag();
139
+ cGridBag row5 = new cGridBag();
140
+ cGridBag row6 = new cGridBag();
141
+
142
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
143
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
144
+ AddSkyboxButton("beach", "PalmTrees", row0);
145
+ AddSkyboxButton("beach", "Tenerife", row0);
146
+
147
+ AddSkyboxButton("beach", "Tenerife2", row1);
148
+ AddSkyboxButton("beach", "Tenerife3", row1);
149
+ AddSkyboxButton("field", "FishPond", row1);
150
+ AddSkyboxButton("field", "Footballfield", row1);
151
+
152
+ AddSkyboxButton("field", "Meadow", row2);
153
+ AddSkyboxButton("field", "Sorsele", row2);
154
+ AddSkyboxButton("field", "Sorsele2", row2);
155
+ AddSkyboxButton("field", "Sorsele3", row2);
156
+
157
+ AddSkyboxButton("forest", "Brudslojan", row3);
158
+ AddSkyboxButton("forest", "Langholmen2", row3);
159
+ AddSkyboxButton("forest", "Plants", row3);
160
+ AddSkyboxButton("mountain", "Maskonaive", row3);
161
+
162
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
163
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
164
+ AddSkyboxButton("mountain", "Teide", row4);
165
+ AddSkyboxButton("park", "Tantolunden4", row4);
166
+
167
+ AddSkyboxButton("park", "Stairs", row5);
168
+ AddSkyboxButton("default", "skycube", row6);
169
+ AddSkyboxButton("rocky", "Langholmen", row5);
170
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
171
+
172
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
173
+ AddSkyboxButton("default", "CloudyHills", row6);
174
+ AddSkyboxButton("daz", "Autumn", row6);
175
+ AddSkyboxButton("daz", "MountainTrail", row6);
176
+ /*
177
+Autumn
178
+Greenlands
179
+MountainTrail
180
+Oasis
181
+TheRock
182
+TopOfTheWorld
183
+Winter
184
+ */
185
+
186
+ tab0.add(row0);
187
+ tab0.add(row1);
188
+ tab0.add(row2);
189
+ tab0.add(row3);
190
+ tab0.add(row4);
191
+ tab0.add(row5);
192
+ tab0.add(row6);
193
+
194
+ for (int i=5; --i>=0;)
195
+ {
196
+ //oe.toolboxPanel.Return();
197
+ //tab0.add(new cGridBag());
198
+ }
199
+ }
200
+
201
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
202
+ {
203
+ cGridBag tab0 = new cGridBag().setVertical(true);
204
+
205
+ tab0.setName("Night");
206
+ skyboxpanel.add(tab0);
207
+
208
+ cGridBag row0 = new cGridBag();
209
+ cGridBag row1 = new cGridBag();
210
+ cGridBag row2 = new cGridBag();
211
+ cGridBag row3 = new cGridBag();
212
+ cGridBag row4 = new cGridBag();
213
+ cGridBag row5 = new cGridBag();
214
+ cGridBag row6 = new cGridBag();
215
+
216
+ AddSkyboxButton("night", "NightPath", row0);
217
+ AddSkyboxButton("night", "PondNight", row0);
218
+ AddSkyboxButton("night", "Powerlines", row0);
219
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
220
+
221
+ AddSkyboxButton("urban", "CNTower", row1);
222
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
223
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
224
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
225
+
226
+ AddSkyboxButton("penguins", "kenon_star", row2);
227
+ AddSkyboxButton("persson", "corona", row2);
228
+ AddSkyboxButton("persson", "spaceskybox", row2);
229
+ AddSkyboxButton("indoors", "Vasa", row2);
230
+
231
+ AddSkyboxButton("winter", "Backyard", row3);
232
+ AddSkyboxButton("winter", "Creek", row3);
233
+ AddSkyboxButton("winter", "FootballField3", row3);
234
+ AddSkyboxButton("winter", "Forest", row3);
235
+
236
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
237
+ AddSkyboxButton("winter", "House", row4);
238
+ AddSkyboxButton("winter", "IceLake", row4);
239
+ AddSkyboxButton("winter", "IceRiver", row4);
240
+
241
+ AddSkyboxButton("winter", "Park3", row5);
242
+ AddSkyboxButton("winter", "PondWinter", row5);
243
+ AddSkyboxButton("winter", "Tantolunden5", row5);
244
+ AddSkyboxButton("winter", "Vindelalven", row5);
245
+
246
+ AddSkyboxButton("daz", "TheRock", row6);
247
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
248
+ AddSkyboxButton("daz", "Winter", row6);
249
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
250
+
251
+ tab0.add(row0);
252
+ tab0.add(row1);
253
+ tab0.add(row2);
254
+ tab0.add(row3);
255
+ tab0.add(row4);
256
+ tab0.add(row5);
257
+ tab0.add(row6);
258
+
259
+ for (int i=5; --i>=0;)
260
+ {
261
+ //oe.toolboxPanel.Return();
262
+ //tab0.add(new cGridBag());
263
+ }
264
+ }
265
+
266
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
267
+ {
268
+ cGridBag tab0 = new cGridBag().setVertical(true);
269
+
270
+ tab0.setName("Others");
271
+ skyboxpanel.add(tab0);
272
+
273
+ cGridBag row0 = new cGridBag();
274
+ cGridBag row1 = new cGridBag();
275
+ cGridBag row2 = new cGridBag();
276
+ cGridBag row3 = new cGridBag();
277
+ cGridBag row4 = new cGridBag();
278
+ cGridBag row5 = new cGridBag();
279
+ cGridBag row6 = new cGridBag();
280
+
281
+ AddSkyboxButton("mayhem", "afterrain", row0);
282
+ AddSkyboxButton("mayhem", "aqua4", row0);
283
+ AddSkyboxButton("mayhem", "aqua9", row0);
284
+ AddSkyboxButton("mayhem", "flame", row0);
285
+
286
+ AddSkyboxButton("mayhem", "h2s", row1);
287
+ AddSkyboxButton("mayhem", "prehistoric", row1);
288
+ AddSkyboxButton("mayhem", "scorched", row1);
289
+ AddSkyboxButton("penguins", "desertdawn", row1);
290
+
291
+ AddSkyboxButton("persson", "Citadella", row2);
292
+ AddSkyboxButton("persson", "Citadella2", row2);
293
+ AddSkyboxButton("persson", "clouds1", row2);
294
+ AddSkyboxButton("penguins", "wrath", row2);
295
+
296
+ AddSkyboxButton("persson", "FishermansBastion", row3);
297
+ AddSkyboxButton("persson", "HeroesSquare", row3);
298
+ AddSkyboxButton("indoors", "DallasW", row3);
299
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
300
+
301
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
302
+ AddSkyboxButton("persson", "PereaBeach1", row4);
303
+ AddSkyboxButton("persson", "PereaBeach2", row4);
304
+ AddSkyboxButton("persson", "redeclipse", row4);
305
+
306
+ AddSkyboxButton("daz", "Greenlands", row5);
307
+ AddSkyboxButton("daz", "Oasis", row5);
308
+ AddSkyboxButton("elyvisions", "arch3", row5);
309
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
310
+
311
+ AddSkyboxButton("elyvisions", "rainbow", row6);
312
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
313
+ AddSkyboxButton("elyvisions", "heaven", row6);
314
+ AddSkyboxButton("elyvisions", "hot", row6);
315
+
316
+ tab0.add(row0);
317
+ tab0.add(row1);
318
+ tab0.add(row2);
319
+ tab0.add(row3);
320
+ tab0.add(row4);
321
+ tab0.add(row5);
322
+ tab0.add(row6);
323
+
324
+ for (int i=5; --i>=0;)
325
+ {
326
+ //oe.toolboxPanel.Return();
327
+ //tab0.add(new cGridBag());
328
+ }
329
+ }
330
+
331
+ public void ChangeSkybox(String skybox)
332
+ {
333
+ if (skybox.endsWith("/"))
334
+ {
335
+ group.skyboxname = null;
336
+ group.skyboxext = null;
337
+ cameraView.repaint();
338
+ }
339
+ else
340
+ {
341
+ //cameraView.envyoff = false;
342
+ group.skyboxname = skybox;
343
+ group.skyboxext = "jpg";
344
+ cameraView.repaint();
345
+ }
346
+ }
347
+
348
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
+ {
350
+ JTabbedPane skyboxpane = new JTabbedPane();
351
+
352
+ AddSkyboxTab0(skyboxpane);
353
+ AddSkyboxTab1(skyboxpane);
354
+ AddSkyboxTab2(skyboxpane);
355
+ AddSkyboxTab3(skyboxpane);
356
+
357
+ skyboxPanel.add(skyboxpane);
358
+ }
359
+
360
+ public void ChangeTexture(String texture)
361
+ {
362
+ for (int i=0; i<group.selection.size(); i++)
363
+ {
364
+ Object3D obj = group.selection.get(i);
365
+ obj.SetPigmentTexture("@" + texture);
366
+ }
367
+
368
+ refreshContents();
369
+ }
370
+
371
+ public void Show3DView()
372
+ {
373
+ // bug
374
+ //gridPanel.setDividerLocation(1.0);
375
+ //bigPanel.setDividerLocation(0.0);
376
+ bigThree.ClearUI();
377
+ bigThree.add(centralPanel);
378
+ bigThree.FlushUI();
379
+ }
380
+
26381 //ObjEditor objEditor;
27382 public void closeUI2()
28383 {
....@@ -60,6 +415,14 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
418
+ if (copy.versionlist == null)
419
+ {
420
+ copy.versionlist = new Object3D[100];
421
+ copy.versionindex = -1;
422
+
423
+ Save(true);
424
+ }
425
+
63426 if(ui)
64427 SetupUI(objEditor);
65428 }
....@@ -80,10 +443,22 @@
80443 SetupViews(objEditor);
81444
82445 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446
+
447
+ if (copy.versionlist == null)
448
+ {
449
+ copy.versionlist = new Object3D[100];
450
+ copy.versionindex = -1;
451
+
452
+ Save(true);
453
+ }
83454 }
84455
85456 void CloneSelection(boolean supports)
86457 {
458
+ if (Globals.REPLACEONMAKE)
459
+ Save();
460
+ boolean keep = Globals.REPLACEONMAKE;
461
+ Globals.REPLACEONMAKE = false;
87462 // Object3D keep = GrafreeD.clipboard;
88463 //Object3D obj;
89464 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,6 +469,7 @@
94469
95470 makeSomething(clone, i==group.selection.size()-1);
96471 }
472
+ Globals.REPLACEONMAKE = keep;
97473 }
98474
99475 void CloneClipboard(boolean supports)
....@@ -150,6 +526,8 @@
150526
151527 void SetupMenu2(GroupEditor oe)
152528 {
529
+ oe.jTree = new cTree();
530
+
153531 Menu menu;
154532 oe.menuBar.add(menu = new Menu("Edit"));
155533 //editItem = menu.add(new MenuItem("Edit"));
....@@ -160,36 +538,37 @@
160538 // redoItem = menu.add(new MenuItem("Redo"));
161539 // redoItem.addActionListener(this);
162540 // menu.add("-");
163
- duplicateItem = menu.add(new MenuItem("Duplicate"));
541
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164542 duplicateItem.addActionListener(this);
165
- cloneItem = menu.add(new MenuItem("Clone"));
543
+
544
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166545 cloneItem.addActionListener(this);
167
- if (Globals.ADVANCED)
546
+ //if (Globals.ADVANCED)
168547 {
169548 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170549 cloneSupportItem.addActionListener(this);
171550 }
551
+ oe.jTree.popup.addSeparator();
172552 menu.add("-");
173
- cutItem = menu.add(new MenuItem("Cut"));
553
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174554 cutItem.addActionListener(this);
175
- copyItem = menu.add(new MenuItem("Copy"));
555
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176556 copyItem.addActionListener(this);
177557 pasteItem = menu.add(new MenuItem("Paste"));
178558 pasteItem.addActionListener(this);
179
- menu.add("-");
180559
181
- menu.add("-");
182
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
560
+ oe.jTree.popup.addSeparator();
561
+ //menu.add("-");
562
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
183563 pasteIntoItem.addActionListener(this);
184
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
564
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185565 pasteLinkItem.addActionListener(this);
186
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
566
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187567 pasteCloneItem.addActionListener(this);
188
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
568
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189569 // pasteExpandItem.addActionListener(this);
190
- menu.add("-");
191
- clearItem = menu.add(new MenuItem("Clear"));
192
- clearItem.addActionListener(this);
570
+ //menu.add("-");
571
+ oe.jTree.popup.addSeparator();
193572
194573 if (Globals.ADVANCED)
195574 {
....@@ -203,23 +582,23 @@
203582 //zBufferItem.addActionListener(this);
204583 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205584 //normalLensItem.addActionListener(this);
206
- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207
- revertCameraItem.addActionListener(this);
585
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
586
+ restoreCameraItem.addActionListener(this);
208587
209
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210
- toggleFullScreenItem.addItemListener(this);
211
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212
- cameraMenu.add("-");
588
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
589
+// toggleFullScreenItem.addItemListener(this);
590
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
591
+// cameraMenu.add("-");
592
+//
593
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
594
+// toggleTextureItem.addItemListener(this);
595
+// toggleTextureItem.setState(CameraPane.textureon);
596
+//
597
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
598
+// toggleSwitchItem.addItemListener(this);
599
+// toggleSwitchItem.setState(CameraPane.SWITCH);
213600
214
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215
- toggleTextureItem.addItemListener(this);
216
- toggleTextureItem.setState(CameraPane.textureon);
217
-
218
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219
- toggleSwitchItem.addItemListener(this);
220
- toggleSwitchItem.setState(CameraPane.SWITCH);
221
-
222
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
601
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223602 toggleHandleItem.addItemListener(this);
224603 toggleHandleItem.setState(CameraPane.HANDLES);
225604
....@@ -246,7 +625,7 @@
246625
247626 cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248627 toggleDebugItem.addItemListener(this);
249
- toggleDebugItem.setState(CameraPane.DEBUG);
628
+ toggleDebugItem.setState(Globals.DEBUG);
250629
251630 cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252631 toggleFrustumItem.addItemListener(this);
....@@ -274,15 +653,13 @@
274653 {
275654 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276655 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
656
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279657 oe.cameraMenu.add("-");
280658 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281659 openWindowItem.addActionListener(this);
282
- editLeafItem.addActionListener(this);
283660 lookAtItem.addActionListener(this);
284661 //lookFromItem.addActinoListener(this);
285
- //switchItem.addActionListener(this);
662
+ //switchViewItem.addActionListener(this);
286663 }
287664
288665 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -326,22 +703,37 @@
326703 setMasterItem.addActionListener(this);
327704 }
328705
329
- oe.menuBar.add(menu = new Menu("Group"));
330
- grabItem = menu.add(new MenuItem("Grab"));
331
- grabItem.addActionListener(this);
706
+ oe.menuBar.add(menu = new Menu("Order"));
707
+
332708 backItem = menu.add(new MenuItem("Back"));
333709 backItem.addActionListener(this);
334710 frontItem = menu.add(new MenuItem("Front"));
335711 frontItem.addActionListener(this);
336
- compositeItem = menu.add(new MenuItem("Composite"));
337
- compositeItem.addActionListener(this);
712
+// compositeItem = menu.add(new MenuItem("Composite"));
713
+// compositeItem.addActionListener(this);
714
+
715
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
716
+ grabItem.addActionListener(this);
717
+
718
+ if (Globals.ADVANCED)
719
+ {
338720 hideItem = menu.add(new MenuItem("Hidden Group"));
339721 hideItem.addActionListener(this);
340
- ungroupItem = menu.add(new MenuItem("Ungroup"));
722
+ }
723
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341724 ungroupItem.addActionListener(this);
342
- menu.add("-");
343
- randomItem = menu.add(new MenuItem("Switch node"));
344
- randomItem.addActionListener(this);
725
+
726
+ oe.jTree.popup.addSeparator();
727
+
728
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
729
+ deleteItem.addActionListener(this);
730
+
731
+// menu.add("-");
732
+//
733
+// switchItem = menu.add(new MenuItem("Switch node"));
734
+// switchItem.addActionListener(this);
735
+ if (Globals.ADVANCED)
736
+ {
345737 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346738 switchGeoItem.addActionListener(this);
347739 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -349,8 +741,6 @@
349741 morphItem = menu.add(new MenuItem("Morph Group"));
350742 morphItem.addActionListener(this);
351743
352
- if (Globals.ADVANCED)
353
- {
354744 menu.add("-");
355745 physicsItem = menu.add(new MenuItem("Physics"));
356746 physicsItem.addActionListener(this);
....@@ -358,30 +748,29 @@
358748 frameselectorItem.addActionListener(this);
359749 scriptNodeItem = menu.add(new MenuItem("Script Node"));
360750 scriptNodeItem.addActionListener(this);
361
- cameraItem = menu.add(new MenuItem("Camera"));
362
- cameraItem.addActionListener(this);
363751 }
364752
365753 oe.menuBar.add(menu = new Menu("Object"));
366
- textureItem = menu.add(new MenuItem("Texture"));
367
- textureItem.addActionListener(this);
754
+// textureItem = menu.add(new MenuItem("Texture"));
755
+// textureItem.addActionListener(this);
368756 billboardItem = menu.add(new MenuItem("Billboard"));
369757 billboardItem.addActionListener(this);
370758 csgItem = menu.add(new MenuItem("CSG"));
371759 csgItem.addActionListener(this);
372
- shadowXItem = menu.add(new MenuItem("Shadow X"));
760
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373761 shadowXItem.addActionListener(this);
374
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
762
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375763 shadowYItem.addActionListener(this);
376
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
764
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377765 shadowZItem.addActionListener(this);
766
+ attributeItem = menu.add(new MenuItem("Attribute"));
767
+ attributeItem.addActionListener(this);
768
+
378769 if (Globals.ADVANCED)
379770 {
380771 menu.add("-");
381772 linkerItem = menu.add(new MenuItem("Linker"));
382773 linkerItem.addActionListener(this);
383
- attributeItem = menu.add(new MenuItem("Attribute"));
384
- attributeItem.addActionListener(this);
385774 templateItem = menu.add(new MenuItem("Template"));
386775 templateItem.addActionListener(this);
387776 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -410,7 +799,7 @@
410799 genNormalsMESHItem.addActionListener(this);
411800 if (Globals.ADVANCED)
412801 {
413
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
802
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414803 genNormalsMINEItem.addActionListener(this);
415804 }
416805 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -470,6 +859,14 @@
470859 markleavesItem.addActionListener(this);
471860 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472861 unmarkleavesItem.addActionListener(this);
862
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
863
+ rewindleavesItem.addActionListener(this);
864
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
865
+ unrewindleavesItem.addActionListener(this);
866
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
867
+ randomleavesItem.addActionListener(this);
868
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
869
+ unrandomleavesItem.addActionListener(this);
473870 menu.add("-");
474871 flipVItem = menu.add(new MenuItem("Flip V"));
475872 flipVItem.addActionListener(this);
....@@ -495,10 +892,15 @@
495892 attachBumpItem.addActionListener(this);
496893 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497894 pigmentBumpItem.addActionListener(this);
895
+ //embedTexturesItem
498896 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499897 detachPigmentItem.addActionListener(this);
500898 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501899 detachBumpItem.addActionListener(this);
900
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
901
+ embedTexturesItem.addActionListener(this);
902
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
903
+ deEmbedTexturesItem.addActionListener(this);
502904 menu.add("-");
503905 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504906 sortbysizeItem.addActionListener(this);
....@@ -509,6 +911,9 @@
509911 shareGeometriesItem.addActionListener(this);
510912 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
511913 mergeGeometriesItem.addActionListener(this);
914
+ menu.add("-");
915
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
916
+ editLeafItem.addActionListener(this);
512917 if (Globals.ADVANCED)
513918 {
514919 // Pretty much the same as duplicate and clone.
....@@ -525,16 +930,92 @@
525930 buildToolsMenu(menu);
526931 }
527932
933
+ JTabbedPane resourcecontainer;
934
+ cGridBag currenttab;
935
+ //boolean added; // patch for jar
936
+
937
+ int tabcount = 0;
938
+ int colcount = 0;
939
+ int rowcount = 0;
940
+ int texturecount = 0;
941
+
942
+ int columns = 5;
943
+ int rows = 7;
944
+
945
+ public void ResourceCallBack(String[] path)
946
+ {
947
+// for (int i = 0; i < path.length; i++)
948
+// System.out.print(path[i] + "/");
949
+// System.out.println();
950
+
951
+ if (//rowcount == 0 ||
952
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
953
+ {
954
+ currenttab = new cGridBag();
955
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
956
+ currenttab.setName(tabname);
957
+ //added = false;
958
+ resourcecontainer.add(currenttab);
959
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
960
+ rowcount = 1;
961
+ colcount = 0;
962
+ texturecount = 0;
963
+ }
964
+
965
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
966
+ {
967
+ //if (!added)
968
+ {
969
+ //added = true;
970
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
971
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
972
+ }
973
+
974
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
975
+
976
+ if (++colcount >= columns)
977
+ {
978
+ colcount = 0;
979
+ currenttab.Return();
980
+
981
+ if (rowcount++ >= rows)
982
+ {
983
+ rowcount = 0;
984
+ }
985
+ }
986
+ }
987
+ else
988
+ {
989
+// if (!path[path.length-1].equals("icons"))
990
+// resourcecontainer.Return();
991
+ }
992
+ }
993
+
994
+ void CreateTexturePanel(cGridBag container)
995
+ {
996
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
997
+ container.add(resourcecontainer);
998
+
999
+ Grafreed.ParseResources("textures", this);
1000
+ }
1001
+
5281002 void SetupUI2(ObjEditor oe)
5291003 {
1004
+ // June 2019
1005
+ if (oe == null)
1006
+ {
1007
+ //super.SetupUI2(this);
1008
+ //return;
1009
+ }
1010
+
1011
+ if (copy != group)
1012
+ {
1013
+ //super.SetupUI2(this);
1014
+ }
1015
+
5301016 //new Exception().printStackTrace();
5311017
5321018 oe.radioPanel = new JPanel(new GridBagLayout());
533
- oe.aConstraints.weightx = 1;
534
- oe.aConstraints.weighty = 0;
535
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
536
- oe.aConstraints.gridwidth = 100;
537
- oe.aConstraints.gridheight = 1;
5381019 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5391020
5401021 oe.buttonGroup = new ButtonGroup();
....@@ -555,39 +1036,122 @@
5551036 oe.radioPanel.add(dummyButton);
5561037 oe.buttonGroup.add(dummyButton);
5571038 */
1039
+ cGridBag copyOptionsPanel = new cGridBag();
1040
+
1041
+ copyOptionsPanel.preferredHeight = 2;
1042
+
5581043 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
5591044
560
- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
- undoButton.setToolTipText("Undo changes");
562
- undoButton.addActionListener(this);
1045
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1046
+ //minButton.setToolTipText("Minimize window");
1047
+ //minButton.addActionListener(this);
5631048
564
- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
- redoButton.setToolTipText("Redo changes");
566
- redoButton.addActionListener(this);
1049
+ if (Globals.ADVANCED)
1050
+ {
1051
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1052
+// maxButton.setToolTipText("Maximize window");
1053
+// maxButton.addActionListener(this);
1054
+ }
5671055
568
- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569
- saveButton.setToolTipText("Save changes");
570
- saveButton.addActionListener(this);
1056
+ cButton gcButton;
5711057
572
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
573
- liveCB.setToolTipText("Enable animation");
574
- liveCB.addItemListener(this);
1058
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+// gcButton.setToolTipText("Garbage collect");
1060
+// gcButton.addActionListener(new ActionListener()
1061
+// {
1062
+// public void actionPerformed(ActionEvent e)
1063
+// {
1064
+// System.gc();
1065
+// }
1066
+// });
1067
+
1068
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1069
+ collapseButton.setToolTipText("Collapse toolbar");
1070
+ collapseButton.addActionListener(this);
1071
+
1072
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1073
+ maximize3DButton.setToolTipText("Maximize 3D view");
1074
+ maximize3DButton.addActionListener(this);
1075
+
1076
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
+ twoButton.setToolTipText("Show 3D view only");
1078
+ twoButton.addActionListener(this);
1079
+ this.fullscreenLayout = twoButton;
1080
+
1081
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1082
+ threeButton.setToolTipText("Show controls and 3D view");
1083
+ threeButton.addActionListener(this);
1084
+ if (Globals.ADVANCED)
1085
+ {
1086
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1087
+ sixButton.setToolTipText("Show 3D view and controls");
1088
+ sixButton.addActionListener(this);
1089
+ }
1090
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1091
+// sevenButton.setToolTipText("3-column layout");
1092
+// sevenButton.addActionListener(this);
1093
+ //
1094
+
1095
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1096
+ fullButton.setToolTipText("Full-screen window");
1097
+ fullButton.addActionListener(this);
1098
+
1099
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+ screenfitButton.setToolTipText("Screen fit");
1101
+ screenfitButton.addActionListener(this);
5751102
576
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1104
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1105
+ restoreCameraButton.addActionListener(this);
1106
+
1107
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+ saveVersionButton.setToolTipText("Duplicate current version");
1109
+ saveVersionButton.addActionListener(this);
1110
+
1111
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+ deleteVersionButton.setToolTipText("Delete current version");
1113
+ deleteVersionButton.addActionListener(this);
1114
+
1115
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1116
+ previousVersionButton.setToolTipText("Previous version");
1117
+ previousVersionButton.addActionListener(this);
1118
+ previousVersionButton.setEnabled(false);
1119
+
1120
+ cGridBag updown = new cGridBag().setVertical(true);
1121
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1122
+ restoreButton.setToolTipText("Undo (restore current version)");
1123
+ restoreButton.addActionListener(this);
1124
+ //restoreButton.setEnabled(false);
1125
+
1126
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1127
+ replaceButton.setToolTipText("Save (replace current version)");
1128
+ replaceButton.addActionListener(this);
1129
+ //replaceButton.setEnabled(false);
1130
+
1131
+ copyOptionsPanel.add(updown);
1132
+
1133
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+ nextVersionButton.setToolTipText("Next version");
1135
+ nextVersionButton.addActionListener(this);
1136
+ nextVersionButton.setEnabled(false);
1137
+
1138
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5771139 oneStepButton.setToolTipText("Animate one step forward");
5781140 oneStepButton.addActionListener(this);
5791141
580
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
1142
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1143
+ liveCB.setToolTipText("Enable animation");
1144
+ liveCB.addItemListener(this);
1145
+
1146
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
5811147 fastCB.setToolTipText("Fast mode");
5821148 fastCB.addItemListener(this);
5831149
584
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585
- trackCB.setToolTipText("Enable tracking");
586
- trackCB.addItemListener(this);
587
-
588
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589
- screenfitButton.setToolTipText("Screen fit");
590
- screenfitButton.addActionListener(this);
1150
+ //oe.toolboxPanel.Return();
1151
+
1152
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1153
+// trackCB.setToolTipText("Enable tracking");
1154
+// trackCB.addItemListener(this);
5911155
5921156 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
5931157 // screenfitpointButton.addActionListener(this);
....@@ -597,67 +1161,137 @@
5971161 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5981162 snapobjectButton.addActionListener(this);
5991163 snapobjectButton.setToolTipText("Snap Object");
1164
+
1165
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1166
+ fourButton.addActionListener(this);
1167
+ fourButton.setToolTipText("Show control panel only");
6001168 }
6011169
602
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603
- flashSelectionButton.setToolTipText("Show selection");
604
- flashSelectionButton.addActionListener(this);
1170
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6051171
606
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607
-
608
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609
- twoButton.setToolTipText("Show center view only");
610
- twoButton.addActionListener(this);
611
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612
- fourButton.addActionListener(this);
613
- fourButton.setToolTipText("Show left panel only");
614
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615
- sixButton.setToolTipText("2-column layout left");
616
- sixButton.addActionListener(this);
617
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618
- threeButton.setToolTipText("2-column layout right");
619
- threeButton.addActionListener(this);
620
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621
- sevenButton.setToolTipText("3-column layout");
622
- sevenButton.addActionListener(this);
623
- //
6241172
625
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626
- rootButton.setToolTipText("Edit selection in new tab");
1173
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1174
+ rootButton.setToolTipText("Open selection in new tab");
6271175 rootButton.addActionListener(this);
6281176
629
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1177
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6301178 closeButton.setToolTipText("Close tab");
6311179 closeButton.addActionListener(this);
6321180 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
6331181 //clearButton.addActionListener(this);
634
-
635
- cGridBag commandsPanel = new cGridBag();
1182
+
1183
+ cGridBag row1 = new cGridBag();
6361184
637
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638
- editButton.setToolTipText("Edit selection");
1185
+ // INSERT
1186
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1187
+ gridButton.setToolTipText("Create ground");
1188
+ gridButton.addActionListener(this);
1189
+
1190
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1191
+ boxButton.setToolTipText("Create box");
1192
+ boxButton.addActionListener(this);
1193
+
1194
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1195
+ superButton.setToolTipText("Create superellipsoid");
1196
+ superButton.addActionListener(this);
1197
+
1198
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1199
+ sphereButton.setToolTipText("Create sphere");
1200
+ sphereButton.addActionListener(this);
1201
+
1202
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1203
+ coneButton.setToolTipText("Create cone");
1204
+ coneButton.addActionListener(this);
1205
+
1206
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1207
+ torusButton.setToolTipText("Create torus");
1208
+ torusButton.addActionListener(this);
1209
+
1210
+ if (Globals.ADVANCED)
1211
+ {
1212
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1213
+ kleinButton.setToolTipText("Create Klein bottle");
1214
+ kleinButton.addActionListener(this);
1215
+ }
1216
+
1217
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1218
+ particlesButton.setToolTipText("Create particle system");
1219
+ particlesButton.addActionListener(this);
1220
+
1221
+ oe.toolboxPanel.add(row1);
1222
+
1223
+ cGridBag row2 = new cGridBag();
1224
+
1225
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1226
+ groupButton.setToolTipText("Create group");
1227
+ groupButton.addActionListener(this);
1228
+
1229
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1230
+ compositeButton.setToolTipText("Create composite");
1231
+ compositeButton.addActionListener(this);
1232
+
1233
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1234
+ switchButton.setToolTipText("Create item switcher");
1235
+ switchButton.addActionListener(this);
1236
+
1237
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1238
+ loopButton.setToolTipText("Create loop");
1239
+ loopButton.addActionListener(this);
1240
+
1241
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1242
+ textureButton.setToolTipText("Create texture");
1243
+ textureButton.addActionListener(this);
1244
+
1245
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1246
+ overlayButton.setToolTipText("Create overlay");
1247
+ overlayButton.addActionListener(this);
1248
+
1249
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1250
+ lightButton.setToolTipText("Create light");
1251
+ lightButton.addActionListener(this);
1252
+
1253
+ oe.toolboxPanel.add(row2);
1254
+
1255
+ cGridBag textures = new cGridBag();
1256
+
1257
+ CreateTexturePanel(textures);
1258
+
1259
+ oe.toolboxPanel.add(textures);
1260
+
1261
+ textures.preferredHeight = 100;
1262
+
1263
+ CreateSkyboxPanel(oe.skyboxPanel);
1264
+
1265
+ // EDIT panel
1266
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1267
+ editButton.setToolTipText("Pin selection controls");
6391268 editButton.addActionListener(this);
6401269
641
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
- uneditButton.setToolTipText("Unedit selection");
1270
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1271
+ uneditButton.setToolTipText("Unpin and remove selection controls");
6431272 uneditButton.addActionListener(this);
6441273
645
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646
- allParamsButton.setToolTipText("Edit all params");
1274
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1275
+ allParamsButton.setToolTipText("Show all controls");
6471276 allParamsButton.addActionListener(this);
6481277
649
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650
- clearPanelButton.setToolTipText("Clear edit panel");
1278
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+ clearPanelButton.setToolTipText("Clear all controls");
6511280 clearPanelButton.addActionListener(this);
6521281
653
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654
- unselectButton.setToolTipText("Unselect");
655
- unselectButton.addActionListener(this);
1282
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+ //unselectButton.setToolTipText("Unselect");
1284
+ //unselectButton.addActionListener(this);
6561285
657
- commandsPanel.preferredHeight = 1;
1286
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1287
+ flashSelectionButton.setToolTipText("Highlight selection");
1288
+ flashSelectionButton.addActionListener(this);
6581289
659
- oe.treePanel.add(commandsPanel);
660
- oe.treePanel.Return();
1290
+ editCommandsPanel.preferredHeight = 1;
1291
+
1292
+ SetPinStates(false);
1293
+// oe.treePanel.add(commandsPanel);
1294
+// oe.treePanel.Return();
6611295
6621296 // oe.aConstraints.gridx += 1;
6631297 // oe.aConstraints.weighty = 0;
....@@ -674,32 +1308,20 @@
6741308
6751309 JScrollPane jSP;
6761310 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1311
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
6781312 ResetModel();
6791313
6801314 oe.treePanel.add(jSPPanel);
6811315 oe.treePanel.Return();
6821316
683
- cGridBag copyOptionsPanel = new cGridBag();
684
-
685
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686
- colorCB.setToolTipText("Copy color when dropped");
687
- colorCB.addItemListener(this);
688
-
689
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690
- materialCB.setToolTipText("Copy material when dropped");
691
- materialCB.addItemListener(this);
692
-
693
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694
- textureCB.setToolTipText("Copy texture when dropped");
695
- textureCB.addItemListener(this);
696
-
697
- copyOptionsPanel.preferredHeight = 1;
6981317 oe.treePanel.add(copyOptionsPanel);
6991318 oe.treePanel.Return();
1319
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1320
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1321
+ sliderPane.preferredHeight = 1;
7001322
701
-// mainPanel.setDividerLocation(0.5); //1.0);
702
-// mainPanel.setResizeWeight(0.5);
1323
+// mainPanel.setDividerLocation(0.1); //1.0);
1324
+ mainPanel.setResizeWeight(0.4);
7031325
7041326 //jList.addListSelectionListener(this);
7051327 oe.jTree.addTreeSelectionListener(this);
....@@ -707,7 +1329,7 @@
7071329 //jTree.setEditable(true);
7081330 oe.jTree.setDragEnabled(true);
7091331 //jTree.setPreferredSize(new Dimension(10,10));
710
- jSP.setPreferredSize(new Dimension(100,200));
1332
+ //jSP.setPreferredSize(new Dimension(100,200));
7111333
7121334 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
7131335
....@@ -719,29 +1341,49 @@
7191341 dgr.addDragGestureListener(this);
7201342 }catch(Exception e) {}
7211343 */
722
- radio.layout = sevenButton;
1344
+ radio.layout = threeButton; // sixButton;
7231345 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
7241346 }
7251347
7261348 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
7271349 {
1350
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1351
+ colorCB.setToolTipText("Copy color when dropped");
1352
+ colorCB.addItemListener(this);
1353
+
1354
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1355
+ materialCB.setToolTipText("Copy material when dropped");
1356
+ materialCB.addItemListener(this);
1357
+
1358
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1359
+ textureCB.setToolTipText("Copy texture when dropped");
1360
+ textureCB.addItemListener(this);
1361
+
1362
+ panel.Return();
1363
+
7281364 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
7291365 boxCB.setToolTipText("Display bounding boxes");
7301366 boxCB.addItemListener(this);
7311367
7321368 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1369
+ zoomBoxCB.setToolTipText("Display only for wheel");
7341370 zoomBoxCB.addItemListener(this);
7351371
7361372 if (true) // Globals.ADVANCED)
7371373 {
738
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739
- supportCB.setToolTipText("Enable rigging");
740
- supportCB.addItemListener(this);
1374
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1375
+// supportCB.setToolTipText("Enable rigging");
1376
+// supportCB.addItemListener(this);
1377
+
1378
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1379
+ freezeCB.setToolTipText("Fast moving camera");
1380
+ freezeCB.addItemListener(this);
7411381
7421382 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
7431383 // localCB.addItemListener(this);
7441384
1385
+ panel.Return();
1386
+
7451387 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
7461388 crowdCB.setToolTipText("Used for crowds");
7471389 crowdCB.addItemListener(this);
....@@ -750,14 +1392,19 @@
7501392 smoothCB.setToolTipText("Snapping delay");
7511393 smoothCB.addItemListener(this);
7521394
753
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754
- slowCB.setToolTipText("Smooth interpolation");
755
- slowCB.addItemListener(this);
1395
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1396
+// slowCB.setToolTipText("Smooth interpolation");
1397
+// slowCB.addItemListener(this);
1398
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1399
+ minshaderCB.setToolTipText("Minimal fast shader");
1400
+ minshaderCB.addItemListener(this);
7561401
7571402 // constraints.gridy += 1;
7581403 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
7591404 // speakerMocapCB.addItemListener(this);
7601405
1406
+ panel.Return();
1407
+
7611408 if (false)
7621409 {
7631410 // handled in scripts
....@@ -772,34 +1419,82 @@
7721419 //constraints.gridy += 1;
7731420 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
7741421 smoothfocusCB.addItemListener(this);
1422
+ panel.Return();
7751423 }
7761424
7771425 //constraints.gridx += 1;
7781426 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
7791427 // debugCB.addItemListener(this);
7801428
1429
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1430
+ trackCB.setToolTipText("Enable tracking target");
1431
+ trackCB.addItemListener(this);
1432
+
7811433 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1434
+ oeilCB.setToolTipText("Move camera when tracking");
7821435 oeilCB.addItemListener(this);
7831436
1437
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1438
+ shadowCB.setToolTipText("When live compute shadows");
1439
+ shadowCB.addItemListener(this);
1440
+
1441
+ panel.Return();
1442
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1443
+ toggleTextureCB.setToolTipText("Load textures");
1444
+ toggleTextureCB.addItemListener(this);
1445
+
1446
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1447
+ toggleSwitchCB.setToolTipText("Choose a single item");
1448
+ toggleSwitchCB.addItemListener(this);
1449
+
1450
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1451
+ autokeepCB.setToolTipText("On structure change");
1452
+ autokeepCB.addItemListener(this);
1453
+
1454
+ panel.Return();
1455
+ if (Globals.ADVANCED)
1456
+ {
7841457 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
7851458 lookAtCB.setToolTipText("Look-at target");
7861459 lookAtCB.addItemListener(this);
1460
+ }
7871461
7881462 }
7891463
7901464 cGridBag fill = new cGridBag();
791
-
7921465 fill.preferredHeight = 200;
1466
+ cGridBag fill2 = new cGridBag();
1467
+ fill2.preferredHeight = 200;
1468
+ cGridBag fill3 = new cGridBag();
1469
+ fill3.preferredHeight = 200;
7931470
7941471 panel.add(fill);
1472
+ panel.add(fill2);
1473
+ panel.add(fill3);
7951474
7961475 }
7971476
7981477 void EditObject(Object3D obj)
7991478 {
1479
+ assert(obj instanceof Composite);
1480
+
1481
+// if (obj.versionlist == null)
1482
+// {
1483
+// obj.versionlist = new Object3D[100];
1484
+// obj.versionindex = -1;
1485
+// }
1486
+
8001487 cRadio radioButton = new cRadio(obj.name);
1488
+
1489
+ // June 2019. Patch to avoid bug with transparency.
1490
+ radioButton.hadMaterial = obj.material != null;
1491
+ if (!radioButton.hadMaterial)
1492
+ {
1493
+ obj.material = new cMaterial();
1494
+ }
1495
+
8011496 radioButton.SetObject(obj);
802
- radioButton.layout = sevenButton;
1497
+ radioButton.layout = threeButton; // sixButton;
8031498 radioButton.SetCamera(cameraView.renderCamera, false);
8041499 radioButton.addActionListener(this);
8051500 radioPanel.add(radioButton);
....@@ -809,31 +1504,41 @@
8091504
8101505 void SetupViews(ObjEditor oe)
8111506 {
1507
+ theFrame = this;
1508
+
8121509 oe.SetupViews();
8131510
1511
+ if (Globals.DEBUG)
8141512 System.out.println("SetupViews");
8151513 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
8161514 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
8171515 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
8181516 }
8191517
820
- JCheckBox liveCB;
821
- JCheckBox supportCB;
822
- JCheckBox localCB;
823
- JCheckBox crowdCB;
824
- JCheckBox smoothCB;
825
- JCheckBox fastCB;
826
- JCheckBox slowCB;
827
- JCheckBox boxCB;
828
- JCheckBox zoomBoxCB;
829
- JCheckBox trackCB;
830
- JCheckBox smoothfocusCB;
1518
+ cToggleButton liveCB;
1519
+ cCheckBox supportCB;
1520
+ cCheckBox localCB;
1521
+ cCheckBox crowdCB;
1522
+ cCheckBox smoothCB;
1523
+ cCheckBox minshaderCB;
1524
+
1525
+ cToggleButton fastCB;
1526
+ cCheckBox slowCB;
1527
+ cCheckBox boxCB;
1528
+ cCheckBox zoomBoxCB;
1529
+ cCheckBox freezeCB;
1530
+ //cToggleButton trackCB;
1531
+ cCheckBox trackCB;
1532
+ cCheckBox smoothfocusCB;
8311533 // JCheckBox speakerMocapCB;
832
- JCheckBox speakerCameraCB;
833
- JCheckBox speakerFocusCB;
834
- JCheckBox debugCB;
835
- JCheckBox oeilCB;
836
- JCheckBox lookAtCB;
1534
+ cCheckBox speakerCameraCB;
1535
+ cCheckBox speakerFocusCB;
1536
+ cCheckBox debugCB;
1537
+
1538
+ cCheckBox oeilCB;
1539
+ cCheckBox shadowCB;
1540
+ cCheckBox autokeepCB;
1541
+ cCheckBox lookAtCB;
8371542
8381543 // static int COLOR = 1;
8391544 // static int MATERIAL = 2;
....@@ -841,9 +1546,9 @@
8411546
8421547 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
8431548
844
- JCheckBox colorCB;
845
- JCheckBox materialCB;
846
- JCheckBox textureCB;
1549
+ cCheckBox colorCB;
1550
+ cCheckBox materialCB;
1551
+ cCheckBox textureCB;
8471552
8481553 public void itemStateChanged(ItemEvent e)
8491554 {
....@@ -871,6 +1576,7 @@
8711576 } else if(e.getSource() == liveCB)
8721577 {
8731578 cameraView.ToggleLive();
1579
+ refreshContents(false);
8741580 }
8751581 else if(e.getSource() == supportCB)
8761582 {
....@@ -886,6 +1592,12 @@
8861592 {
8871593 cameraView.ToggleInertia();
8881594 cameraView.repaint();
1595
+ }
1596
+ else if(e.getSource() == minshaderCB)
1597
+ {
1598
+ Globals.MINSHADER ^= true;
1599
+ cameraView.programInitialized = false;
1600
+ cameraView.repaint();
8891601 }
8901602 else if(e.getSource() == localCB)
8911603 {
....@@ -935,6 +1647,18 @@
9351647 {
9361648 cameraView.ToggleOeil();
9371649 }
1650
+ else if(e.getSource() == shadowCB)
1651
+ {
1652
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1653
+ }
1654
+ else if(e.getSource() == freezeCB)
1655
+ {
1656
+ Globals.FREEZEONMOVE ^= true;
1657
+ }
1658
+ else if(e.getSource() == autokeepCB)
1659
+ {
1660
+ Globals.REPLACEONMAKE ^= true;
1661
+ }
9381662 else if(e.getSource() == lookAtCB)
9391663 {
9401664 cameraView.ToggleLookAt();
....@@ -951,7 +1675,8 @@
9511675
9521676 /**/
9531677 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1678
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1679
+ TreePath path = objEditor.jTree.getSelectionPath();
9551680 if ((path == null) || (path.getPathCount() <= 1)) {
9561681 // We can't move the root node or an empty selection
9571682 return;
....@@ -1014,8 +1739,6 @@
10141739 }
10151740 }
10161741
1017
- String string = (String) object;
1018
-
10191742 System.out.println("Transfer = " + object + "; drop : " + target);
10201743 // if( object instanceof java.io.File[])
10211744 // {
....@@ -1023,6 +1746,8 @@
10231746 // objEditor.DropFile((java.io.File[]) object, true);
10241747 // return;
10251748 // }
1749
+
1750
+ String string = object.toString();
10261751
10271752 // File path for Mac and Windows
10281753 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1068,23 +1793,33 @@
10681793
10691794 assert target == objEditor.jTree;
10701795 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1796
+ Object3D destinationLeaf;
10711797 try {
1072
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1798
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
10731799 } catch (Exception e) {
10741800 System.out.println("destinationPath : " + destinationPath);
10751801 return;
10761802 }
10771803
1078
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1804
+ for (int i=group.selection.size(); --i>=0;)
10791805 {
1806
+ Object3D child = (Object3D)group.selection.elementAt(i);
1807
+
1808
+ // Cannot move into itself
1809
+ if (child == destinationLeaf)
1810
+ return;
1811
+ }
1812
+
1813
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1814
+// {
10801815 loadClipboard(true);
10811816 objEditor.jTree.setSelectionPath(destinationPath);
10821817 pasteInto(false, false);
1083
- } else {
1084
- loadClipboard(false);
1085
- objEditor.jTree.setSelectionPath(destinationPath);
1086
- pasteInto(false, false); // true); // ???
1087
- }
1818
+// } else {
1819
+// loadClipboard(false);
1820
+// objEditor.jTree.setSelectionPath(destinationPath);
1821
+// pasteInto(false, false); // true); // ???
1822
+// }
10881823 }
10891824 public void dropActionChanged(DropTargetDragEvent dtde)
10901825 // Called if the user has modified the current drop gesture
....@@ -1140,7 +1875,12 @@
11401875 TreePath path;
11411876
11421877 public TransferableTreePath(TreePath tp) {
1143
- path = tp;
1878
+ Object[] objs = new Object[tp.getPathCount()];
1879
+ for (int i=0; i<objs.length; i++)
1880
+ {
1881
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1882
+ }
1883
+ path = new TreePath(objs);
11441884 }
11451885
11461886 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1189,22 +1929,30 @@
11891929 {
11901930 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11911931 //heightFieldItem.addActionListener(this);
1192
- gridItem = menu.add(new MenuItem("Grid"));
1193
- gridItem.addActionListener(this);
1194
- rectoidItem = menu.add(new MenuItem("Box"));
1195
- rectoidItem.addActionListener(this);
1196
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197
- ellipsoidItem.addActionListener(this);
1198
- coneItem = menu.add(new MenuItem("Cone"));
1199
- coneItem.addActionListener(this);
1200
- torusItem = menu.add(new MenuItem("Torus"));
1201
- torusItem.addActionListener(this);
1202
- superItem = menu.add(new MenuItem("Superellipsoid"));
1203
- superItem.addActionListener(this);
1932
+// gridItem = menu.add(new MenuItem("Grid"));
1933
+// gridItem.addActionListener(this);
1934
+// rectoidItem = menu.add(new MenuItem("Box"));
1935
+// rectoidItem.addActionListener(this);
1936
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1937
+// ellipsoidItem.addActionListener(this);
1938
+// coneItem = menu.add(new MenuItem("Cone"));
1939
+// coneItem.addActionListener(this);
1940
+// torusItem = menu.add(new MenuItem("Torus"));
1941
+// torusItem.addActionListener(this);
1942
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1943
+// superItem.addActionListener(this);
1944
+
1945
+ cameraItem = menu.add(new MenuItem("Camera"));
1946
+ cameraItem.addActionListener(this);
1947
+
1948
+ if (!Globals.ADVANCED)
1949
+ {
12041950 kleinItem = menu.add(new MenuItem("Klein Bottle"));
12051951 kleinItem.addActionListener(this);
1206
- particleItem = menu.add(new MenuItem("Particle system"));
1207
- particleItem.addActionListener(this);
1952
+ }
1953
+
1954
+// particleItem = menu.add(new MenuItem("Particle system"));
1955
+// particleItem.addActionListener(this);
12081956 if (Globals.ADVANCED)
12091957 {
12101958 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1230,15 +1978,15 @@
12301978 }
12311979 bezierItem = menu.add(new MenuItem("Bezier Patch"));
12321980 bezierItem.addActionListener(this);
1233
- overlayItem = menu.add(new MenuItem("Overlay"));
1234
- overlayItem.addActionListener(this);
1235
- lightItem = menu.add(new MenuItem("Light"));
1236
- lightItem.addActionListener(this);
1981
+// overlayItem = menu.add(new MenuItem("Overlay"));
1982
+// overlayItem.addActionListener(this);
1983
+// lightItem = menu.add(new MenuItem("Light"));
1984
+// lightItem.addActionListener(this);
12371985 menu.add("-");
12381986 //superLoopItem = menu.add(new MenuItem("Super Loop"));
12391987 //superLoopItem.addActionListener(this);
1240
- loopItem = menu.add(new MenuItem("Loop"));
1241
- loopItem.addActionListener(this);
1988
+// loopItem = menu.add(new MenuItem("Loop"));
1989
+// loopItem.addActionListener(this);
12421990 doubleItem = menu.add(new MenuItem("Fork"));
12431991 doubleItem.addActionListener(this);
12441992 if (Globals.ADVANCED)
....@@ -1254,6 +2002,9 @@
12542002 animationItem.addItemListener(this);
12552003 animationItem.setState(Globals.ANIMATION);
12562004
2005
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2006
+ archiveItem.addActionListener(this);
2007
+
12572008 menu.add("-");
12582009 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
12592010 parseverticesItem.addActionListener(this);
....@@ -1266,6 +2017,8 @@
12662017 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
12672018 reduce34MorphItem.addActionListener(this);
12682019 menu.add("-");
2020
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2021
+ memoryItem.addActionListener(this);
12692022 menu.add(computeAOItem = new MenuItem("Compute AO"));
12702023 computeAOItem.addActionListener(this);
12712024
....@@ -1274,11 +2027,9 @@
12742027 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
12752028 mirrorItem.addActionListener(this);
12762029 menu.add("-");
1277
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1278
- memoryItem.addActionListener(this);
12792030 menu.add(analyzeItem = new MenuItem("Analyze"));
12802031 analyzeItem.addActionListener(this);
1281
- menu.add(dumpItem = new MenuItem("Dump"));
2032
+ menu.add(dumpItem = new MenuItem("Print"));
12822033 dumpItem.addActionListener(this);
12832034 // menu.add(pathItem = new MenuItem("From-to path"));
12842035 // pathItem.addActionListener(this);
....@@ -1419,9 +2170,38 @@
14192170 shadow.material = new cMaterial(obj.material);
14202171 shadow.material.diffuse = 0.0001f;
14212172 shadow.material.specular = 0.0001f;
2173
+ shadow.material.opacity = 0.75f;
2174
+
2175
+ AllocProjectedVertices(shadow);
2176
+
2177
+ shadow.projectedVertices[1].x = 300;
14222178
14232179 makeSomething(shadow);
14242180 }
2181
+
2182
+ private void ClearUnpinned()
2183
+ {
2184
+ //for (Object3D obj : listUI)
2185
+ for (int i=listUI.size(); --i>=0;)
2186
+ {
2187
+ Object3D obj = listUI.elementAt(i);
2188
+ if (!obj.pinned)
2189
+ {
2190
+ obj.CloseUI();
2191
+ listUI.remove(i);
2192
+ }
2193
+ }
2194
+ }
2195
+
2196
+ private void EditElement(Object3D elem, boolean newWindow)
2197
+ {
2198
+ // if (!(elem instanceof Composite))
2199
+ // newWindow = false;
2200
+ listUI.add(elem);
2201
+ elem.openEditWindow(this, newWindow); //, false);
2202
+ System.out.println("edit : " + elem);
2203
+ elem.editWindow.refreshContents(true); // ? new
2204
+ }
14252205
14262206 /**
14272207 * applyExample
....@@ -1666,7 +2446,7 @@
16662446 {
16672447 ScreenFit();
16682448 } else
1669
- if (source == switchItem)
2449
+ if (source == switchViewItem)
16702450 {
16712451 cVector v1 = new cVector();
16722452 cVector v2 = new cVector();
....@@ -1675,11 +2455,11 @@
16752455 objEditor.cameraView.renderCamera.setAim(v2, v1);
16762456 objEditor.cameraView.repaint();
16772457 } else
1678
- if (source == rectoidItem)
2458
+ if (source == rectoidItem || source == boxButton)
16792459 {
16802460 makeSomething(new Box());
16812461 } else
1682
- if (source == particleItem)
2462
+ if (source == particleItem || source == particlesButton)
16832463 {
16842464 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16852465 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1758,27 +2538,27 @@
17582538
17592539 makeSomething(obj);
17602540 } else
1761
- if (source == gridItem)
2541
+ if (source == gridItem || source == gridButton)
17622542 {
17632543 makeSomething(new Grid());
17642544 } else
1765
- if (source == ellipsoidItem)
2545
+ if (source == ellipsoidItem || source == sphereButton)
17662546 {
17672547 makeSomething(new Sphere());
17682548 } else
1769
- if (source == coneItem)
2549
+ if (source == coneItem || source == coneButton)
17702550 {
17712551 makeSomething(new Cone());
17722552 } else
1773
- if (source == torusItem)
2553
+ if (source == torusItem || source == torusButton)
17742554 {
17752555 makeSomething(new Torus());
17762556 } else
1777
- if (source == superItem)
2557
+ if (source == superItem || source == superButton)
17782558 {
17792559 makeSomething(new Superellipsoid());
17802560 } else
1781
- if (source == kleinItem)
2561
+ if (source == kleinItem || source == kleinButton)
17822562 {
17832563 makeSomething(new Klein());
17842564 } else
....@@ -1798,7 +2578,7 @@
17982578 {
17992579 makeSomething(new BezierSurface());
18002580 } else
1801
- if (source == overlayItem)
2581
+ if (source == overlayItem || source == overlayButton)
18022582 {
18032583 /*
18042584 Object3D obj = new BezierSurface(5,8);
....@@ -1846,10 +2626,27 @@
18462626 s.setup();
18472627 makeSomething(s);
18482628 } else
1849
- if (source == lightItem)
2629
+ if (source == lightItem || source == lightButton)
18502630 {
18512631 makeSomething(new Light());
18522632 } else
2633
+// if (source == skybox1Button ||
2634
+// source == skybox2Button ||
2635
+// source == skybox3Button ||
2636
+// source == skybox4Button ||
2637
+// source == skybox5Button ||
2638
+// source == skybox6Button ||
2639
+// source == skybox7Button ||
2640
+// source == skybox11Button ||
2641
+// source == skybox12Button ||
2642
+// source == skybox13Button ||
2643
+// source == skybox14Button ||
2644
+// source == skybox15Button ||
2645
+// source == skybox16Button ||
2646
+// source == skybox17Button)
2647
+// {
2648
+// ChangeSkybox(source);
2649
+// } else
18532650 if (source == csgItem)
18542651 {
18552652 group(new CSG());
....@@ -1896,30 +2693,38 @@
18962693
18972694 group(g);
18982695 } else
1899
- if (source == loopItem)
2696
+ if (source == loopItem || source == loopButton)
19002697 {
2698
+ if (!group.selection.isEmpty())
2699
+ {
19012700 Composite csg = new GroupLeaf();
19022701 csg.count = 5;
1903
- group(csg);
1904
- Composite child = new cGroup();
2702
+ Composite child = new cGroup("Branch");
19052703 csg.addChild(child);
19062704 child.addChild(csg);
2705
+ group(csg);
2706
+ }
19072707 } else
19082708 if (source == doubleItem)
19092709 {
1910
- Composite csg = new GroupLeaf();
2710
+ if (!group.selection.isEmpty())
2711
+ {
2712
+ Composite csg = new GroupLeaf("Fork");
19112713 csg.count = 5;
2714
+ Composite child = new cGroup("Branch A");
2715
+ csg.addChild(child);
2716
+ child.addChild(csg);
2717
+ child = new cGroup("Branch B");
2718
+ csg.addChild(child);
2719
+ child.addChild(csg);
19122720 group(csg);
1913
- Composite child = new cGroup();
1914
- csg.addChild(child);
1915
- child.addChild(csg);
1916
- child = new cGroup();
1917
- csg.addChild(child);
1918
- child.addChild(csg);
2721
+ }
19192722 } else
19202723 if (source == tripleItem)
19212724 {
1922
- Composite csg = new GroupLeaf();
2725
+ if (!group.selection.isEmpty())
2726
+ {
2727
+ Composite csg = new GroupLeaf("Trident");
19232728 csg.count = 4;
19242729 group(csg);
19252730 Composite child = new cGroup();
....@@ -1931,11 +2736,12 @@
19312736 child = new cGroup();
19322737 csg.addChild(child);
19332738 child.addChild(csg);
2739
+ }
19342740 } else
19352741 if (source == computeAOItem)
19362742 {
19372743 Globals.drawMode = CameraPane.OCCLUSION;
1938
- Globals.theRenderer.repaint();
2744
+ cameraView.repaint();
19392745 } else
19402746 if (source == recompileItem)
19412747 {
....@@ -1950,7 +2756,7 @@
19502756 if (source == invariantsItem)
19512757 {
19522758 System.out.println("Invariants:");
1953
- Grafreed.grafreeD.universe.invariants();
2759
+ Grafreed.grafreed.universe.invariants();
19542760 } else
19552761 if (source == memoryItem)
19562762 {
....@@ -1969,17 +2775,64 @@
19692775 {
19702776 DumpObject();
19712777 } else
1972
- if (source == undoButton)
2778
+ if (source == minButton)
19732779 {
1974
- Undo();
2780
+ Minimize();
19752781 } else
1976
- if (source == redoButton)
2782
+ if (source == maxButton)
19772783 {
1978
- Redo();
2784
+ Maximize();
19792785 } else
1980
- if (source == saveButton)
2786
+ if (source == fullButton)
19812787 {
1982
- Save();
2788
+ ToggleFullScreen();
2789
+ } else
2790
+ if (source == collapseButton)
2791
+ {
2792
+ this.expandedLayout = radio.layout;
2793
+ CollapseToolbar();
2794
+ } else
2795
+ if (source == maximize3DButton)
2796
+ {
2797
+ this.expandedLayout = radio.layout;
2798
+ radio.layout = twoButton;
2799
+ Show3DView();
2800
+ CollapseToolbar();
2801
+ } else
2802
+ if (source == previousVersionButton)
2803
+ {
2804
+ // Go to previous version
2805
+ //if (!Undo())
2806
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2807
+ PreviousVersion();
2808
+ } else
2809
+ if (source == restoreButton)
2810
+ {
2811
+ // Restore current version
2812
+ Restore();
2813
+ //restoreButton.setEnabled(false);
2814
+ } else
2815
+ if (source == replaceButton)
2816
+ {
2817
+ // Overwrite current version
2818
+ Replace();
2819
+ //replaceButton.setEnabled(false);
2820
+ } else
2821
+ if (source == nextVersionButton)
2822
+ {
2823
+ // Go to next version
2824
+ NextVersion();
2825
+ } else
2826
+ if (source == saveVersionButton)
2827
+ {
2828
+ // Save a new version
2829
+ if (!Save(true))
2830
+ java.awt.Toolkit.getDefaultToolkit().beep();
2831
+ } else
2832
+ if (source == deleteVersionButton)
2833
+ {
2834
+ // Delete a new version
2835
+ DeleteVersion();
19832836 } else
19842837 if (source == oneStepButton)
19852838 {
....@@ -1988,17 +2841,14 @@
19882841 } else
19892842 if (source == screenfitButton)
19902843 {
1991
- //Reload(lastConverter, lastFilename, true);
19922844 ScreenFit();
19932845 } else
19942846 if (source == screenfitpointButton)
19952847 {
1996
- //Reload(lastConverter, lastFilename, true);
19972848 ScreenFitPoint();
19982849 } else
19992850 if (source == snapobjectButton)
20002851 {
2001
- //Reload(lastConverter, lastFilename, true);
20022852 SnapObject();
20032853 } else
20042854 // if (event.getSource() == recompileButton)
....@@ -2037,11 +2887,11 @@
20372887 } else
20382888 if (source == undoItem)
20392889 {
2040
- Undo();
2890
+ PreviousVersion();
20412891 } else
20422892 if (source == redoItem)
20432893 {
2044
- Redo();
2894
+ NextVersion();
20452895 } else
20462896 if (source == duplicateItem)
20472897 {
....@@ -2362,7 +3212,7 @@
23623212 {
23633213 StepAll();
23643214 } else
2365
- if (source == clearItem) // || event.getSource() == clearButton)
3215
+ if (source == deleteItem) // || event.getSource() == clearButton)
23663216 {
23673217 //int indices[] = jList.getSelectedIndices();
23683218 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2374,9 +3224,9 @@
23743224 {
23753225 ClearSelection(true);
23763226 } else
2377
- if (source == grabItem)
3227
+ if (source == grabItem || source == groupButton)
23783228 {
2379
- group(new cGroup(), true);
3229
+ group(new cGroup(), false); // true);
23803230 } else
23813231 if (source == hideItem)
23823232 {
....@@ -2394,11 +3244,11 @@
23943244 {
23953245 makeSomething(new Camera());
23963246 } else
2397
- if (source == compositeItem)
3247
+ if (source == compositeItem || source == compositeButton)
23983248 {
23993249 group(new Composite());
24003250 } else
2401
- if (source == randomItem)
3251
+ if (source == switchItem || source == switchButton)
24023252 {
24033253 RandomNode random = new RandomNode();
24043254 group(random);
....@@ -2500,7 +3350,7 @@
25003350 {
25013351 group(new cLinker());
25023352 } else
2503
- if (source == textureItem)
3353
+ if (source == textureItem || source == textureButton)
25043354 {
25053355 group(new TextureNode());
25063356 } else
....@@ -2520,17 +3370,42 @@
25203370 {
25213371 CastShadow(2);
25223372 } else
2523
- if (source == ungroupItem)
3373
+ if (source == ungroupItem || source == ungroupButton)
25243374 {
2525
- //ungroup();
3375
+ boolean canUngroup = true;
3376
+
25263377 for (int i=0; i<group.selection.size(); i++)
25273378 {
2528
- Ungroup(group.selection.get(i));
3379
+ Object3D selectedItem = group.selection.get(i);
3380
+
3381
+ if (selectedItem.Size() == 0)
3382
+ {
3383
+ // Cannot ungroup leaves
3384
+ canUngroup = false;
3385
+ break;
3386
+ }
3387
+
3388
+ if (selectedItem == group)
3389
+ {
3390
+ // Cannot ungroup root
3391
+ canUngroup = false;
3392
+ break;
3393
+ }
25293394 }
25303395
2531
- ClearSelection(false);
2532
-
2533
- refreshContents();
3396
+ if (canUngroup)
3397
+ {
3398
+ for (int i=0; i<group.selection.size(); i++)
3399
+ {
3400
+ Object3D selectedItem = group.selection.get(i);
3401
+
3402
+ Ungroup(selectedItem);
3403
+ }
3404
+
3405
+ ClearSelection(false);
3406
+
3407
+ refreshContents();
3408
+ }
25343409 } else
25353410 if (source == genUVItem)
25363411 {
....@@ -2542,7 +3417,7 @@
25423417 } else
25433418 if (source == genNormalsMESHItem)
25443419 {
2545
- GenNormals(true); // TODO
3420
+ GenNormalsMESH();
25463421 } else
25473422 if (source == genNormalsORGANItem)
25483423 {
....@@ -2607,6 +3482,22 @@
26073482 if (source == unmarkleavesItem)
26083483 {
26093484 MarkLeaves(false);
3485
+ } else
3486
+ if (source == rewindleavesItem)
3487
+ {
3488
+ RewindLeaves(true);
3489
+ } else
3490
+ if (source == unrewindleavesItem)
3491
+ {
3492
+ RewindLeaves(false);
3493
+ } else
3494
+ if (source == randomleavesItem)
3495
+ {
3496
+ RandomLeaves(true);
3497
+ } else
3498
+ if (source == unrandomleavesItem)
3499
+ {
3500
+ RandomLeaves(false);
26103501 } else
26113502 if (source == flipVItem)
26123503 {
....@@ -2815,7 +3706,7 @@
28153706 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28163707 {
28173708 obj = (Object3D)e.nextElement();
2818
- obj.SetBumpTexture(null);
3709
+ obj.ResetBumpTexture();
28193710 }
28203711
28213712 refreshContents();
....@@ -2831,6 +3722,31 @@
28313722
28323723 refreshContents();
28333724 } else
3725
+ if (source == embedTexturesItem)
3726
+ {
3727
+ Object3D obj;
3728
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3729
+ {
3730
+ obj = (Object3D)e.nextElement();
3731
+ obj.EmbedTextures(true);
3732
+ }
3733
+
3734
+ refreshContents();
3735
+ } else
3736
+ if (source == deEmbedTexturesItem)
3737
+ {
3738
+ Object3D obj;
3739
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3740
+ {
3741
+ obj = (Object3D)e.nextElement();
3742
+ obj.EmbedTextures(false);
3743
+ }
3744
+
3745
+ CameraPane.texturepigment.clear();
3746
+ CameraPane.texturebump.clear();
3747
+
3748
+ refreshContents();
3749
+ } else
28343750 if (source == flashSelectionButton)
28353751 {
28363752 CameraPane.flash = true;
....@@ -2842,42 +3758,36 @@
28423758 if (source == twoButton)
28433759 {
28443760 radio.layout = twoButton;
2845
- // bug
2846
- //gridPanel.setDividerLocation(1.0);
2847
- //bigPanel.setDividerLocation(0.0);
2848
-// bigThree.remove(scenePanel);
2849
-// bigThree.remove(centralPanel);
2850
-// bigThree.remove(XYZPanel);
2851
-// aWindowConstraints.gridx = 0;
2852
-// aWindowConstraints.gridy = 0;
2853
-// aWindowConstraints.gridwidth = 1;
2854
-// // aConstraints.gridheight = 3;
2855
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2856
-// aWindowConstraints.weightx = 0;
2857
-// aWindowConstraints.weighty = 1;
2858
-// //bigThree.add(jtp, aWindowConstraints);
2859
-// aWindowConstraints.weightx = 1;
2860
-// aWindowConstraints.gridwidth = 3;
2861
-// // aConstraints.gridheight = 3;
2862
-// aWindowConstraints.gridx = 1;
2863
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2864
-// bigThree.add(centralPanel, aWindowConstraints);
2865
-// aWindowConstraints.weightx = 0;
2866
-// aWindowConstraints.gridx = 4;
2867
-// aWindowConstraints.gridwidth = 1;
2868
-// // aConstraints.gridheight = 3;
2869
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2870
-// //bigThree.add(XYZPanel, aWindowConstraints);
2871
-// scenePanel.setVisible(false);
2872
-// centralPanel.setVisible(true);
2873
-// XYZPanel.setVisible(false);
2874
- bigThree.ClearUI();
2875
- bigThree.add(centralPanel);
2876
- bigThree.FlushUI();
3761
+
3762
+ if (CameraPane.FULLSCREEN)
3763
+ fullscreenLayout = radio.layout;
3764
+
3765
+ Show3DView();
3766
+
3767
+ cameraView.requestFocusInWindow();
3768
+
3769
+// refreshContents(true);
3770
+//
3771
+// try
3772
+// {
3773
+// java.awt.Robot bot = new java.awt.Robot();
3774
+// int mask = InputEvent.BUTTON1_MASK;
3775
+// bot.mouseMove(100, 100);
3776
+// bot.mousePress(mask);
3777
+// bot.mouseRelease(mask);
3778
+// }
3779
+// catch (Exception e)
3780
+// {
3781
+//
3782
+// }
3783
+
28773784 } else
28783785 if (source == threeButton)
28793786 {
28803787 radio.layout = threeButton;
3788
+
3789
+ if (CameraPane.FULLSCREEN)
3790
+ fullscreenLayout = radio.layout;
28813791
28823792 // bigThree.remove(scenePanel);
28833793 // bigThree.remove(centralPanel);
....@@ -2907,13 +3817,18 @@
29073817 // centralPanel.setVisible(true);
29083818 // XYZPanel.setVisible(true);
29093819 bigThree.ClearUI();
3820
+ bigThree.add(scenePanel);
29103821 bigThree.add(centralPanel);
2911
- bigThree.add(XYZPanel);
29123822 bigThree.FlushUI();
3823
+
3824
+ cameraView.requestFocusInWindow();
29133825 } else
29143826 if (source == fourButton)
29153827 {
29163828 radio.layout = fourButton;
3829
+
3830
+ if (CameraPane.FULLSCREEN)
3831
+ fullscreenLayout = radio.layout;
29173832
29183833 // bigThree.remove(scenePanel);
29193834 // bigThree.remove(centralPanel);
....@@ -2945,10 +3860,15 @@
29453860 bigThree.ClearUI();
29463861 bigThree.add(scenePanel);
29473862 bigThree.FlushUI();
3863
+
3864
+ cameraView.requestFocusInWindow();
29483865 } else
29493866 if (source == sixButton)
29503867 {
29513868 radio.layout = sixButton;
3869
+
3870
+ if (CameraPane.FULLSCREEN)
3871
+ fullscreenLayout = radio.layout;
29523872
29533873 // bigThree.remove(scenePanel);
29543874 // bigThree.remove(centralPanel);
....@@ -2978,13 +3898,18 @@
29783898 // centralPanel.setVisible(true);
29793899 // XYZPanel.setVisible(false);
29803900 bigThree.ClearUI();
2981
- bigThree.add(scenePanel);
29823901 bigThree.add(centralPanel);
3902
+ bigThree.add(scenePanel);
29833903 bigThree.FlushUI();
3904
+
3905
+ cameraView.requestFocusInWindow();
29843906 } else
29853907 if (source == sevenButton)
29863908 {
29873909 radio.layout = sevenButton;
3910
+
3911
+ if (CameraPane.FULLSCREEN)
3912
+ fullscreenLayout = radio.layout;
29883913
29893914 // bigThree.remove(scenePanel);
29903915 // bigThree.remove(centralPanel);
....@@ -3018,9 +3943,12 @@
30183943 bigThree.add(centralPanel);
30193944 bigThree.add(XYZPanel);
30203945 bigThree.FlushUI();
3946
+
3947
+ cameraView.requestFocusInWindow();
30213948 } else
30223949 if (source == rootButton)
30233950 {
3951
+ Replace();
30243952 Object3D obj;
30253953 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
30263954 {
....@@ -3029,6 +3957,7 @@
30293957 EditObject(obj);
30303958 }
30313959
3960
+ cameraView.requestFocusInWindow();
30323961 refreshContents(true);
30333962 } else
30343963 if (source == closeButton)
....@@ -3038,22 +3967,37 @@
30383967 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
30393968 {
30403969 ab = (cRadio)e.nextElement();
3041
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3970
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
30423971 {
3972
+ // Patch to avoid bug with transparency.
3973
+ if (!ab.hadMaterial)
3974
+ {
3975
+ ab.object.material = null;
3976
+ }
3977
+
30433978 buttonGroup.remove(ab);
30443979 radioPanel.remove(ab);
30453980
3046
- ab.GetObject().editWindow = null;
3981
+ //ab.GetObject().editWindow = null;
3982
+ ab.GetObject().manipWindow = null;
30473983 // ab.GetObject().objectUI = null; // ?????????
30483984
30493985 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
30503986 break;
30513987 }
30523988 }
3989
+
3990
+ cameraView.requestFocusInWindow();
30533991 refreshContents(true);
30543992 } else
30553993 if (source == editItem || source == editButton)
30563994 {
3995
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3996
+ {
3997
+ Object3D child = (Object3D)e.nextElement();
3998
+ child.pinned = true;
3999
+ }
4000
+
30574001 EditSelection(false);
30584002 } else
30594003 if (source == uneditButton)
....@@ -3062,9 +4006,10 @@
30624006 {
30634007 Object3D child = (Object3D)e.nextElement();
30644008 if(child.editWindow != null)
3065
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009
+ child.pinned = false;
30664010 child.CloseUI();
30674011 listUI.remove(child);
4012
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30684013
30694014 //child.editWindow = null; // ???????????
30704015 }
....@@ -3079,16 +4024,18 @@
30794024 //copy.ClearUI();
30804025 for (Object3D obj : listUI)
30814026 {
4027
+ obj.pinned = false;
30824028 obj.CloseUI();
30834029 }
30844030 listUI.clear();
4031
+ SetPinStates(group.selection.size() > 0);
30854032 refreshContents(true);
30864033 } else
30874034 if (source == allParamsButton)
30884035 {
30894036 assert(copy == group);
30904037
3091
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4038
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30924039
30934040 for (Object3D obj : listUI)
30944041 {
....@@ -3137,6 +4084,7 @@
31374084 }
31384085
31394086 copy = group;
4087
+
31404088 //Globals.theRenderer.object = group;
31414089 if(!useclient)
31424090 {
....@@ -3154,7 +4102,8 @@
31544102 }
31554103
31564104 // fix "+" issue
3157
- group.editWindow = this;
4105
+ //group.editWindow = this;
4106
+ group.manipWindow = this;
31584107
31594108 /*
31604109 currentLayout = radio.layout;
....@@ -3162,20 +4111,47 @@
31624111 currentLayout = sevenButton;
31634112 */
31644113 radio.layout.doClick();
4114
+
4115
+ assert(copy instanceof Composite);
4116
+
4117
+ if (copy.versionlist == null)
4118
+ {
4119
+ copy.versionlist = new Object3D[100];
4120
+ copy.versionindex = -1;
4121
+
4122
+ // Cannot work with loops
4123
+ // To fix this issue, first mark all nodes above the root,
4124
+ // and check if any of these nodes are reachable below the root.
4125
+ //Save(true);
4126
+ }
4127
+
4128
+ SetVersionStates();
4129
+
4130
+ ClearUnpinned();
4131
+
4132
+ //Grafreed.Assert(group != null);
4133
+ //Grafreed.Assert(group.selection != null);
4134
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4135
+ if (group.selection == null || group.selection.size() == 1)
4136
+ EditSelection(false);
31654137 keepparent = group.parent;
31664138 // PARENT = NULL or not???
31674139 //group.parent = null; // ROOT
31684140 //group.attributes = -1;
31694141 ResetModel();
4142
+
4143
+ cameraView.requestFocusInWindow();
31704144 refreshContents(true);
31714145 } else if (event.getSource() == editCameraItem)
31724146 {
31734147 cameraView.ProtectCamera();
4148
+ cameraView.requestFocusInWindow();
31744149 cameraView.repaint();
31754150 return;
3176
- } else if (event.getSource() == revertCameraItem)
4151
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
31774152 {
31784153 cameraView.RevertCamera();
4154
+ cameraView.requestFocusInWindow();
31794155 cameraView.repaint();
31804156 return;
31814157 // } else if (event.getSource() == textureButton)
....@@ -3190,7 +4166,6 @@
31904166 }
31914167
31924168 boolean useclient = false;
3193
- cRadio radio;
31944169
31954170 void ToggleRoot()
31964171 {
....@@ -3515,6 +4490,13 @@
35154490 refreshContents();
35164491 }
35174492
4493
+ void GenNormalsMESH()
4494
+ {
4495
+ group.GenNormalsMeshS();
4496
+
4497
+ refreshContents();
4498
+ }
4499
+
35184500 void GenNormalsMINE()
35194501 {
35204502 group.selection.GenNormalsMINE();
....@@ -3746,7 +4728,7 @@
37464728
37474729 try
37484730 {
3749
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4731
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
37504732 }
37514733 catch (Exception e)
37524734 {
....@@ -4138,6 +5120,18 @@
41385120 refreshContents();
41395121 }
41405122
5123
+ void RewindLeaves(boolean hide)
5124
+ {
5125
+ group.selection.RewindLeaves(hide);
5126
+ refreshContents();
5127
+ }
5128
+
5129
+ void RandomLeaves(boolean hide)
5130
+ {
5131
+ group.selection.RandomLeaves(hide);
5132
+ refreshContents();
5133
+ }
5134
+
41415135 void SetTexRes(int tr)
41425136 {
41435137 group.selection.SetTexRes(tr);
....@@ -4209,28 +5203,25 @@
42095203 // }
42105204 // }
42115205
4212
- static boolean allparams = true;
4213
-
4214
- static Vector<Object3D> listUI = new Vector<Object3D>();
4215
-
42165206 void EditSelection(boolean newWindow)
42175207 {
5208
+ if (group.selection == null)
5209
+ {
5210
+ EditElement(group, newWindow); // ? new
5211
+ return;
5212
+ }
5213
+
42185214 // aConstraints.gridy = 0;
42195215 for (int i=0; i<group.selection.size(); i++)
42205216 {
42215217 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
42225218 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4223
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5219
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
42245220
42255221 Object3D elem = (Object3D)group.selection.elementAt(i);
42265222 if(elem != group || !newWindow)
42275223 {
4228
- // if (!(elem instanceof Composite))
4229
- // newWindow = false;
4230
- listUI.add(elem);
4231
- elem.openEditWindow(this, newWindow); //, false);
4232
- System.out.println("edit : " + elem);
4233
- elem.editWindow.refreshContents(true); // ? new
5224
+ EditElement(elem, newWindow); // ? new
42345225 }
42355226 }
42365227 }
....@@ -4293,9 +5284,7 @@
42935284
42945285 freezemodel = false;
42955286 }
4296
-
4297
- boolean flashIt = true;
4298
-
5287
+
42995288 public void valueChanged(TreeSelectionEvent e)
43005289 //public boolean handleEvent(Event event)
43015290 {
....@@ -4305,7 +5294,8 @@
43055294 //new Exception().printStackTrace();
43065295
43075296 freezemodel = true;
4308
-
5297
+ ClearUnpinned();
5298
+
43095299 /**/
43105300 //switch (event.id)
43115301 {
....@@ -4313,7 +5303,6 @@
43135303 //case 702: // Event.LIST_DESELECT
43145304 group.deselectAll();
43155305 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4316
- objEditor.ClearInfo(); // .GetMaterial());
43175306 if (tps != null)
43185307 {
43195308 for (int i=0; i < tps.length; i++)
....@@ -4322,10 +5311,8 @@
43225311
43235312 //if (child.parent != null)
43245313 //child.parent.addSelectee(child);
5314
+ objEditor.SetMaterial(child);
43255315 group.addSelectee(child);
4326
- objEditor.SetMaterial(child); // .GetMaterial());
4327
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4328
- System.err.println("info : " + child.GetPath());
43295316 }
43305317 }
43315318 // else
....@@ -4335,15 +5322,13 @@
43355322 // System.err.println("info : " + group.GetPath());
43365323 // }
43375324
4338
- objEditor.SetText(); // jan 2014
4339
-
43405325 if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
43415326 CameraPane.flash = true;
43425327
43435328 if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
43445329 // a camera
43455330 {
4346
- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
5331
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
43475332 {
43485333 CameraPane.camerachangeframe = 0; // don't refuse it
43495334 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
....@@ -4352,6 +5337,13 @@
43525337 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
43535338 }
43545339
5340
+ if (tps != null && tps.length == 1)
5341
+ {
5342
+ EditSelection(false);
5343
+ }
5344
+
5345
+ SetPinStates(tps != null && tps.length > 0);
5346
+
43555347 refreshContents();
43565348 //return true;
43575349 }
....@@ -4360,6 +5352,52 @@
43605352
43615353 freezemodel = false;
43625354 }
5355
+
5356
+ void SetPinStates(boolean enabled)
5357
+ {
5358
+ editButton.setEnabled(enabled);
5359
+ uneditButton.setEnabled(enabled);
5360
+ //unselectButton.setEnabled(enabled);
5361
+ flashSelectionButton.setEnabled(enabled);
5362
+
5363
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5364
+
5365
+ boolean allComposites = true;
5366
+
5367
+ if (group.selection != null)
5368
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5369
+ {
5370
+ Object next = e.nextElement();
5371
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5372
+ {
5373
+ allComposites = false;
5374
+ break;
5375
+ }
5376
+ }
5377
+
5378
+ rootButton.setEnabled(allComposites);
5379
+ }
5380
+
5381
+ void refreshContents(boolean cp)
5382
+ {
5383
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5384
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5385
+ {
5386
+ objEditor.ClearInfo(); // .GetMaterial());
5387
+
5388
+ for (int i=0; i < group.selection.Size(); i++)
5389
+ {
5390
+ Object3D child = (Object3D) group.selection.get(i);
5391
+
5392
+ objEditor.AddInfo(child, this, true);
5393
+// System.err.println("info : " + child.GetPath());
5394
+ }
5395
+
5396
+ objEditor.SetText(); // jan 2014
5397
+ }
5398
+
5399
+ super.refreshContents(cp);
5400
+ }
43635401
43645402 void linkSomething(Object3D thing)
43655403 {
....@@ -4442,7 +5480,8 @@
44425480
44435481 if (cut)
44445482 {
4445
- Save();
5483
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5484
+// Save();
44465485 //int indices[] = jList.getSelectedIndices();
44475486 //for (int i = indices.length - 1; i >= 0; i--)
44485487 //jList.remove(indices[i]);
....@@ -4545,6 +5584,10 @@
45455584
45465585 void paste(boolean expand)
45475586 {
5587
+ if (Globals.REPLACEONMAKE)
5588
+ Save();
5589
+ boolean keep = Globals.REPLACEONMAKE;
5590
+ Globals.REPLACEONMAKE = false;
45485591 // if (GrafreeD.clipboard == null)
45495592 // return;
45505593 boolean first = true;
....@@ -4604,6 +5647,7 @@
46045647 Grafreed.clipboard.get(0).parent = keepparent;
46055648 }
46065649
5650
+ Globals.REPLACEONMAKE = keep;
46075651 ResetModel();
46085652 refreshContents();
46095653 }
....@@ -4739,6 +5783,10 @@
47395783
47405784 void group(Object3D csg, boolean grab)
47415785 {
5786
+ if (Globals.REPLACEONMAKE)
5787
+ Save();
5788
+ boolean keep = Globals.REPLACEONMAKE;
5789
+ Globals.REPLACEONMAKE = false;
47425790 if (//false) // why??
47435791 !group.selection.isEmpty())
47445792 {
....@@ -4852,10 +5900,15 @@
48525900 //node.add(csg);
48535901 //makeSomething(node);
48545902 makeSomething(csg);
5903
+ Globals.REPLACEONMAKE = keep;
48555904 }
48565905
48575906 void Ungroup(Object3D g)
48585907 {
5908
+ if (Globals.REPLACEONMAKE)
5909
+ Save();
5910
+ boolean keep = Globals.REPLACEONMAKE;
5911
+ Globals.REPLACEONMAKE = false;
48595912 if (g instanceof HiddenObject)
48605913 {
48615914 HiddenObject h = (HiddenObject) g;
....@@ -4872,6 +5925,7 @@
48725925 objEditor.makeSomething(g.get(i), false);
48735926 }
48745927 }
5928
+ Globals.REPLACEONMAKE = keep;
48755929 }
48765930
48775931 void ungroup()
....@@ -5160,10 +6214,43 @@
51606214 cButton clearpanelButton;
51616215 cButton unselectButton;
51626216
5163
- cButton saveButton;
5164
- cButton undoButton;
5165
- cButton redoButton;
6217
+ cButton restoreCameraButton;
6218
+
51666219 cButton oneStepButton;
6220
+
6221
+ cButton groupButton;
6222
+ cButton ungroupButton;
6223
+ cButton compositeButton;
6224
+ cButton switchButton;
6225
+ cButton loopButton;
6226
+ cButton textureButton;
6227
+
6228
+ cButton skybox1Button;
6229
+ cButton skybox2Button;
6230
+ cButton skybox3Button;
6231
+ cButton skybox4Button;
6232
+ cButton skybox5Button;
6233
+ cButton skybox6Button;
6234
+ cButton skybox7Button;
6235
+
6236
+ cButton skybox11Button;
6237
+ cButton skybox12Button;
6238
+ cButton skybox13Button;
6239
+ cButton skybox14Button;
6240
+ cButton skybox15Button;
6241
+ cButton skybox16Button;
6242
+ cButton skybox17Button;
6243
+
6244
+ cButton gridButton;
6245
+ cButton boxButton;
6246
+ cButton sphereButton;
6247
+ cButton coneButton;
6248
+ cButton torusButton;
6249
+ cButton superButton;
6250
+ cButton kleinButton;
6251
+ cButton particlesButton;
6252
+ cButton overlayButton;
6253
+ cButton lightButton;
51676254
51686255 cButton screenfitButton;
51696256 cButton screenfitpointButton;
....@@ -5176,14 +6263,6 @@
51766263
51776264 cButton setsupportButton;
51786265
5179
- cButton twoButton;
5180
- cButton sixButton;
5181
- cButton threeButton;
5182
- cButton sevenButton;
5183
- cButton fourButton; // full panel
5184
- cButton oneButton; // full XYZ
5185
- //cButton currentLayout;
5186
-
51876266 //
51886267 //Composite
51896268 Object3D // to do !!
....@@ -5193,12 +6272,12 @@
51936272 //JTree jTree;
51946273 private MenuItem lookAtItem;
51956274 private MenuItem lookFromItem;
5196
- private MenuItem switchItem;
5197
- private MenuItem cutItem;
6275
+ private MenuItem switchViewItem;
6276
+ private JMenuItem cutItem;
51986277 private MenuItem undoItem;
51996278 private MenuItem redoItem;
5200
- private MenuItem duplicateItem;
5201
- private MenuItem cloneItem;
6279
+ private JMenuItem duplicateItem;
6280
+ private JMenuItem cloneItem;
52026281 private MenuItem cloneSupportItem;
52036282 private MenuItem overwriteGeoItem;
52046283 private MenuItem overwriteMatItem;
....@@ -5219,13 +6298,13 @@
52196298 private MenuItem cloneGeometriesItem;
52206299 private MenuItem shareGeometriesItem;
52216300 private MenuItem mergeGeometriesItem;
5222
- private MenuItem copyItem;
6301
+ private JMenuItem copyItem;
52236302 private MenuItem pasteItem;
5224
- private MenuItem pasteIntoItem;
5225
- private MenuItem pasteLinkItem;
5226
- private MenuItem pasteCloneItem;
5227
- private MenuItem pasteExpandItem;
5228
- private MenuItem clearItem;
6303
+ private JMenuItem pasteIntoItem;
6304
+ private JMenuItem pasteLinkItem;
6305
+ private JMenuItem pasteCloneItem;
6306
+ private JMenuItem pasteExpandItem;
6307
+ private JMenuItem deleteItem;
52296308 private MenuItem clearAllItem;
52306309 private MenuItem genUVItem;
52316310 private MenuItem genNormalsMESHItem;
....@@ -5260,6 +6339,10 @@
52606339 private MenuItem showleavesItem;
52616340 private MenuItem markleavesItem;
52626341 private MenuItem unmarkleavesItem;
6342
+ private MenuItem rewindleavesItem;
6343
+ private MenuItem unrewindleavesItem;
6344
+ private MenuItem randomleavesItem;
6345
+ private MenuItem unrandomleavesItem;
52636346
52646347 private MenuItem flipVItem;
52656348 private MenuItem unflipVItem;
....@@ -5276,12 +6359,12 @@
52766359 private MenuItem transformGeometryItem;
52776360 private MenuItem transformChildrenItem;
52786361 private MenuItem hideItem;
5279
- private MenuItem grabItem;
6362
+ private JMenuItem grabItem;
52806363 private MenuItem backItem;
52816364 private MenuItem frontItem;
52826365 private MenuItem cameraItem;
52836366 private MenuItem compositeItem;
5284
- private MenuItem randomItem;
6367
+ private MenuItem switchItem;
52856368 private MenuItem physicsItem;
52866369 private MenuItem frameselectorItem;
52876370 private MenuItem scriptNodeItem;
....@@ -5289,7 +6372,7 @@
52896372 private MenuItem switchTransfoItem;
52906373 private MenuItem morphItem;
52916374 private MenuItem linkerItem;
5292
- private MenuItem ungroupItem;
6375
+ private JMenuItem ungroupItem;
52936376 private MenuItem editItem;
52946377 private MenuItem openWindowItem;
52956378 private MenuItem editLeafItem;
....@@ -5305,6 +6388,8 @@
53056388 private MenuItem attachBumpItem;
53066389 private MenuItem detachBumpItem;
53076390 private MenuItem pigmentBumpItem;
6391
+ private MenuItem embedTexturesItem;
6392
+ private MenuItem deEmbedTexturesItem;
53086393
53096394 private MenuItem particleItem;
53106395 private MenuItem ragdollItem;
....@@ -5355,5 +6440,5 @@
53556440
53566441 Menu cameraMenu;
53576442 MenuItem editCameraItem;
5358
- MenuItem revertCameraItem;
6443
+ MenuItem restoreCameraItem;
53596444 }