Normand Briere
2019-08-15 24a2a946b35279605e645349bd6b82e9e60aac88
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 }
....@@ -74,16 +437,28 @@
74437 this.copy = this.group = copy;
75438 //selectees = this.group.selectees;
76439
77
- SetupMenu2(objEditor);
440
+ SetupMenu2(this); //objEditor);
78441 SetupUI2(objEditor);
79442 objEditor.SetupUI(true);
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)
....@@ -148,57 +524,54 @@
148524
149525 //JTextField nameField;
150526
151
- void SetupMenu2(ObjEditor oe)
527
+ void SetupMenu2(GroupEditor oe)
152528 {
153
- if (Globals.ADVANCED)
154
- {
155
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159
- oe.cameraMenu.add("-");
160
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161
- openWindowItem.addActionListener(this);
162
- editLeafItem.addActionListener(this);
163
- lookAtItem.addActionListener(this);
164
- //lookFromItem.addActinoListener(this);
165
- //switchItem.addActionListener(this);
166
- }
167
-
529
+ oe.jTree = new cTree();
530
+
168531 Menu menu;
169532 oe.menuBar.add(menu = new Menu("Edit"));
170533 //editItem = menu.add(new MenuItem("Edit"));
171534 //editItem.addActionListener(this);
172
- duplicateItem = menu.add(new MenuItem("Duplicate"));
535
+
536
+// undoItem = menu.add(new MenuItem("Undo"));
537
+// undoItem.addActionListener(this);
538
+// redoItem = menu.add(new MenuItem("Redo"));
539
+// redoItem.addActionListener(this);
540
+// menu.add("-");
541
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173542 duplicateItem.addActionListener(this);
174
- cloneItem = menu.add(new MenuItem("Clone"));
543
+
544
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
175545 cloneItem.addActionListener(this);
176
- if (Globals.ADVANCED)
546
+ //if (Globals.ADVANCED)
177547 {
178548 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179549 cloneSupportItem.addActionListener(this);
180550 }
551
+ oe.jTree.popup.addSeparator();
181552 menu.add("-");
182
- cutItem = menu.add(new MenuItem("Cut"));
553
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
183554 cutItem.addActionListener(this);
184
- copyItem = menu.add(new MenuItem("Copy"));
555
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
185556 copyItem.addActionListener(this);
186557 pasteItem = menu.add(new MenuItem("Paste"));
187558 pasteItem.addActionListener(this);
188
- menu.add("-");
189559
190
- menu.add("-");
191
- 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"));
192563 pasteIntoItem.addActionListener(this);
193
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
564
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
194565 pasteLinkItem.addActionListener(this);
195
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
566
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
196567 pasteCloneItem.addActionListener(this);
197
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
568
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
198569 // pasteExpandItem.addActionListener(this);
199
- menu.add("-");
200
- clearItem = menu.add(new MenuItem("Clear"));
201
- clearItem.addActionListener(this);
570
+ //menu.add("-");
571
+ oe.jTree.popup.addSeparator();
572
+
573
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
574
+ deleteItem.addActionListener(this);
202575
203576 if (Globals.ADVANCED)
204577 {
....@@ -206,7 +579,92 @@
206579 clearAllItem = menu.add(new MenuItem("Clear All"));
207580 clearAllItem.addActionListener(this);
208581 }
582
+
583
+ menuBar.add(cameraMenu = new Menu("View"));
584
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
585
+ //zBufferItem.addActionListener(this);
586
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
587
+ //normalLensItem.addActionListener(this);
588
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
589
+ restoreCameraItem.addActionListener(this);
590
+
591
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
592
+// toggleFullScreenItem.addItemListener(this);
593
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
594
+// cameraMenu.add("-");
595
+//
596
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
597
+// toggleTextureItem.addItemListener(this);
598
+// toggleTextureItem.setState(CameraPane.textureon);
599
+//
600
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
601
+// toggleSwitchItem.addItemListener(this);
602
+// toggleSwitchItem.setState(CameraPane.SWITCH);
603
+
604
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
605
+ toggleHandleItem.addItemListener(this);
606
+ toggleHandleItem.setState(CameraPane.HANDLES);
607
+
608
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
609
+ togglePaintItem.addItemListener(this);
610
+ togglePaintItem.setState(CameraPane.PAINTMODE);
611
+
612
+ if (Globals.ADVANCED)
613
+ {
614
+ cameraMenu.add("-");
615
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
616
+ toggleLiveItem.addItemListener(this);
617
+ toggleLiveItem.setState(Globals.isLIVE());
209618
619
+ cameraMenu.add(stepItem = new MenuItem("Step"));
620
+ stepItem.addActionListener(this);
621
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
622
+ // toggleDLItem.addItemListener(this);
623
+ // toggleDLItem.setState(false);
624
+
625
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
626
+ toggleRenderItem.addItemListener(this);
627
+ toggleRenderItem.setState(!CameraPane.frozen);
628
+
629
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
630
+ toggleDebugItem.addItemListener(this);
631
+ toggleDebugItem.setState(Globals.DEBUG);
632
+
633
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
634
+ toggleFrustumItem.addItemListener(this);
635
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
636
+
637
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
638
+ toggleFootContactItem.addItemListener(this);
639
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
640
+
641
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
642
+ toggleTimelineItem.addItemListener(this);
643
+ }
644
+
645
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
646
+// toggleRootItem.addItemListener(this);
647
+// toggleRootItem.setState(false);
648
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
649
+// animationItem.addItemListener(this);
650
+// animationItem.setState(CameraPane.ANIMATION);
651
+ cameraMenu.add("-");
652
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
653
+ editCameraItem.addActionListener(this);
654
+
655
+ if (Globals.ADVANCED)
656
+ {
657
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
658
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
659
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
660
+ oe.cameraMenu.add("-");
661
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
662
+ openWindowItem.addActionListener(this);
663
+ lookAtItem.addActionListener(this);
664
+ //lookFromItem.addActinoListener(this);
665
+ //switchViewItem.addActionListener(this);
666
+ }
667
+
210668 oe.menuBar.add(menu = new Menu("Setting"));
211669 if (Globals.ADVANCED)
212670 {
....@@ -249,21 +707,29 @@
249707 }
250708
251709 oe.menuBar.add(menu = new Menu("Group"));
252
- grabItem = menu.add(new MenuItem("Grab"));
253
- grabItem.addActionListener(this);
710
+// grabItem = menu.add(new MenuItem("Grab"));
711
+// grabItem.addActionListener(this);
254712 backItem = menu.add(new MenuItem("Back"));
255713 backItem.addActionListener(this);
256714 frontItem = menu.add(new MenuItem("Front"));
257715 frontItem.addActionListener(this);
258
- compositeItem = menu.add(new MenuItem("Composite"));
259
- compositeItem.addActionListener(this);
716
+// compositeItem = menu.add(new MenuItem("Composite"));
717
+// compositeItem.addActionListener(this);
718
+
719
+ if (Globals.ADVANCED)
720
+ {
260721 hideItem = menu.add(new MenuItem("Hidden Group"));
261722 hideItem.addActionListener(this);
262
- ungroupItem = menu.add(new MenuItem("Ungroup"));
723
+ }
724
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
263725 ungroupItem.addActionListener(this);
264
- menu.add("-");
265
- randomItem = menu.add(new MenuItem("Switch node"));
266
- randomItem.addActionListener(this);
726
+
727
+// menu.add("-");
728
+//
729
+// switchItem = menu.add(new MenuItem("Switch node"));
730
+// switchItem.addActionListener(this);
731
+ if (Globals.ADVANCED)
732
+ {
267733 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268734 switchGeoItem.addActionListener(this);
269735 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -271,8 +737,6 @@
271737 morphItem = menu.add(new MenuItem("Morph Group"));
272738 morphItem.addActionListener(this);
273739
274
- if (Globals.ADVANCED)
275
- {
276740 menu.add("-");
277741 physicsItem = menu.add(new MenuItem("Physics"));
278742 physicsItem.addActionListener(this);
....@@ -280,30 +744,29 @@
280744 frameselectorItem.addActionListener(this);
281745 scriptNodeItem = menu.add(new MenuItem("Script Node"));
282746 scriptNodeItem.addActionListener(this);
283
- cameraItem = menu.add(new MenuItem("Camera"));
284
- cameraItem.addActionListener(this);
285747 }
286748
287749 oe.menuBar.add(menu = new Menu("Object"));
288
- textureItem = menu.add(new MenuItem("Texture"));
289
- textureItem.addActionListener(this);
750
+// textureItem = menu.add(new MenuItem("Texture"));
751
+// textureItem.addActionListener(this);
290752 billboardItem = menu.add(new MenuItem("Billboard"));
291753 billboardItem.addActionListener(this);
292754 csgItem = menu.add(new MenuItem("CSG"));
293755 csgItem.addActionListener(this);
294
- shadowXItem = menu.add(new MenuItem("Shadow X"));
756
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295757 shadowXItem.addActionListener(this);
296
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
758
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297759 shadowYItem.addActionListener(this);
298
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
760
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299761 shadowZItem.addActionListener(this);
762
+ attributeItem = menu.add(new MenuItem("Attribute"));
763
+ attributeItem.addActionListener(this);
764
+
300765 if (Globals.ADVANCED)
301766 {
302767 menu.add("-");
303768 linkerItem = menu.add(new MenuItem("Linker"));
304769 linkerItem.addActionListener(this);
305
- attributeItem = menu.add(new MenuItem("Attribute"));
306
- attributeItem.addActionListener(this);
307770 templateItem = menu.add(new MenuItem("Template"));
308771 templateItem.addActionListener(this);
309772 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -332,7 +795,7 @@
332795 genNormalsMESHItem.addActionListener(this);
333796 if (Globals.ADVANCED)
334797 {
335
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
798
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336799 genNormalsMINEItem.addActionListener(this);
337800 }
338801 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -392,6 +855,14 @@
392855 markleavesItem.addActionListener(this);
393856 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394857 unmarkleavesItem.addActionListener(this);
858
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
859
+ rewindleavesItem.addActionListener(this);
860
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
861
+ unrewindleavesItem.addActionListener(this);
862
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
863
+ randomleavesItem.addActionListener(this);
864
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
865
+ unrandomleavesItem.addActionListener(this);
395866 menu.add("-");
396867 flipVItem = menu.add(new MenuItem("Flip V"));
397868 flipVItem.addActionListener(this);
....@@ -417,10 +888,15 @@
417888 attachBumpItem.addActionListener(this);
418889 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419890 pigmentBumpItem.addActionListener(this);
891
+ //embedTexturesItem
420892 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421893 detachPigmentItem.addActionListener(this);
422894 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423895 detachBumpItem.addActionListener(this);
896
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
897
+ embedTexturesItem.addActionListener(this);
898
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
899
+ deEmbedTexturesItem.addActionListener(this);
424900 menu.add("-");
425901 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426902 sortbysizeItem.addActionListener(this);
....@@ -431,6 +907,9 @@
431907 shareGeometriesItem.addActionListener(this);
432908 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433909 mergeGeometriesItem.addActionListener(this);
910
+ menu.add("-");
911
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
912
+ editLeafItem.addActionListener(this);
434913 if (Globals.ADVANCED)
435914 {
436915 // Pretty much the same as duplicate and clone.
....@@ -443,33 +922,96 @@
443922 oe.menuBar.add(menu = new Menu("Insert"));
444923 buildCreateMenu(menu);
445924
446
- oe.menuBar.add(menu = new Menu("Include"));
447
- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448
- importOBJItem.addActionListener(this);
449
- menu.add("-");
450
- import3DSItem = menu.add(new MenuItem("3DS file..."));
451
- import3DSItem.addActionListener(this);
452
- menu.add("-");
453
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454
- importVRMLX3DItem.addActionListener(this);
455
- menu.add("-");
456
- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457
- importGFDItem.addActionListener(this);
458
-
459925 oe.menuBar.add(menu = new Menu("Tools"));
460926 buildToolsMenu(menu);
461927 }
462928
929
+ JTabbedPane resourcecontainer;
930
+ cGridBag currenttab;
931
+ //boolean added; // patch for jar
932
+
933
+ int tabcount = 0;
934
+ int colcount = 0;
935
+ int rowcount = 0;
936
+ int texturecount = 0;
937
+
938
+ int columns = 5;
939
+ int rows = 7;
940
+
941
+ public void ResourceCallBack(String[] path)
942
+ {
943
+// for (int i = 0; i < path.length; i++)
944
+// System.out.print(path[i] + "/");
945
+// System.out.println();
946
+
947
+ if (//rowcount == 0 ||
948
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
949
+ {
950
+ currenttab = new cGridBag();
951
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
952
+ currenttab.setName(tabname);
953
+ //added = false;
954
+ resourcecontainer.add(currenttab);
955
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
956
+ rowcount = 1;
957
+ colcount = 0;
958
+ texturecount = 0;
959
+ }
960
+
961
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
962
+ {
963
+ //if (!added)
964
+ {
965
+ //added = true;
966
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
967
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
968
+ }
969
+
970
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
971
+
972
+ if (++colcount >= columns)
973
+ {
974
+ colcount = 0;
975
+ currenttab.Return();
976
+
977
+ if (rowcount++ >= rows)
978
+ {
979
+ rowcount = 0;
980
+ }
981
+ }
982
+ }
983
+ else
984
+ {
985
+// if (!path[path.length-1].equals("icons"))
986
+// resourcecontainer.Return();
987
+ }
988
+ }
989
+
990
+ void CreateTexturePanel(cGridBag container)
991
+ {
992
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
993
+ container.add(resourcecontainer);
994
+
995
+ Grafreed.ParseResources("textures", this);
996
+ }
997
+
463998 void SetupUI2(ObjEditor oe)
464999 {
1000
+ // June 2019
1001
+ if (oe == null)
1002
+ {
1003
+ //super.SetupUI2(this);
1004
+ //return;
1005
+ }
1006
+
1007
+ if (copy != group)
1008
+ {
1009
+ //super.SetupUI2(this);
1010
+ }
1011
+
4651012 //new Exception().printStackTrace();
4661013
4671014 oe.radioPanel = new JPanel(new GridBagLayout());
468
- oe.aConstraints.weightx = 1;
469
- oe.aConstraints.weighty = 0;
470
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
471
- oe.aConstraints.gridwidth = 100;
472
- oe.aConstraints.gridheight = 1;
4731015 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
4741016
4751017 oe.buttonGroup = new ButtonGroup();
....@@ -490,27 +1032,122 @@
4901032 oe.radioPanel.add(dummyButton);
4911033 oe.buttonGroup.add(dummyButton);
4921034 */
1035
+ cGridBag copyOptionsPanel = new cGridBag();
1036
+
1037
+ copyOptionsPanel.preferredHeight = 2;
1038
+
4931039 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
4941040
495
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496
- liveCB.setToolTipText("Enable animation");
497
- liveCB.addItemListener(this);
1041
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1042
+ //minButton.setToolTipText("Minimize window");
1043
+ //minButton.addActionListener(this);
1044
+
1045
+ if (Globals.ADVANCED)
1046
+ {
1047
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1048
+// maxButton.setToolTipText("Maximize window");
1049
+// maxButton.addActionListener(this);
1050
+ }
1051
+
1052
+ cButton gcButton;
1053
+
1054
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
+// gcButton.setToolTipText("Garbage collect");
1056
+// gcButton.addActionListener(new ActionListener()
1057
+// {
1058
+// public void actionPerformed(ActionEvent e)
1059
+// {
1060
+// System.gc();
1061
+// }
1062
+// });
1063
+
1064
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065
+ collapseButton.setToolTipText("Collapse toolbar");
1066
+ collapseButton.addActionListener(this);
1067
+
1068
+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1069
+ maximize3DButton.setToolTipText("Maximize 3D view");
1070
+ maximize3DButton.addActionListener(this);
1071
+
1072
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1073
+ twoButton.setToolTipText("Show 3D view only");
1074
+ twoButton.addActionListener(this);
1075
+ this.fullscreenLayout = twoButton;
1076
+
1077
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1078
+ threeButton.setToolTipText("Show controls and 3D view");
1079
+ threeButton.addActionListener(this);
1080
+ if (Globals.ADVANCED)
1081
+ {
1082
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1083
+ sixButton.setToolTipText("Show 3D view and controls");
1084
+ sixButton.addActionListener(this);
1085
+ }
1086
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1087
+// sevenButton.setToolTipText("3-column layout");
1088
+// sevenButton.addActionListener(this);
1089
+ //
1090
+
1091
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1092
+ fullButton.setToolTipText("Full-screen window");
1093
+ fullButton.addActionListener(this);
1094
+
1095
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1096
+ screenfitButton.setToolTipText("Screen fit");
1097
+ screenfitButton.addActionListener(this);
4981098
499
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1099
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1101
+ restoreCameraButton.addActionListener(this);
1102
+
1103
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1104
+ saveVersionButton.setToolTipText("Duplicate current version");
1105
+ saveVersionButton.addActionListener(this);
1106
+
1107
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+ deleteVersionButton.setToolTipText("Delete current version");
1109
+ deleteVersionButton.addActionListener(this);
1110
+
1111
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+ previousVersionButton.setToolTipText("Previous version");
1113
+ previousVersionButton.addActionListener(this);
1114
+ previousVersionButton.setEnabled(false);
1115
+
1116
+ cGridBag updown = new cGridBag().setVertical(true);
1117
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+ restoreButton.setToolTipText("Undo (restore current version)");
1119
+ restoreButton.addActionListener(this);
1120
+ //restoreButton.setEnabled(false);
1121
+
1122
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+ replaceButton.setToolTipText("Save (replace current version)");
1124
+ replaceButton.addActionListener(this);
1125
+ //replaceButton.setEnabled(false);
1126
+
1127
+ copyOptionsPanel.add(updown);
1128
+
1129
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1130
+ nextVersionButton.setToolTipText("Next version");
1131
+ nextVersionButton.addActionListener(this);
1132
+ nextVersionButton.setEnabled(false);
1133
+
1134
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5001135 oneStepButton.setToolTipText("Animate one step forward");
5011136 oneStepButton.addActionListener(this);
5021137
503
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
1138
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1139
+ liveCB.setToolTipText("Enable animation");
1140
+ liveCB.addItemListener(this);
1141
+
1142
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
5041143 fastCB.setToolTipText("Fast mode");
5051144 fastCB.addItemListener(this);
5061145
507
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508
- trackCB.setToolTipText("Enable tracking");
509
- trackCB.addItemListener(this);
510
-
511
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512
- screenfitButton.setToolTipText("Screen fit");
513
- screenfitButton.addActionListener(this);
1146
+ //oe.toolboxPanel.Return();
1147
+
1148
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1149
+// trackCB.setToolTipText("Enable tracking");
1150
+// trackCB.addItemListener(this);
5141151
5151152 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
5161153 // screenfitpointButton.addActionListener(this);
....@@ -520,67 +1157,137 @@
5201157 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5211158 snapobjectButton.addActionListener(this);
5221159 snapobjectButton.setToolTipText("Snap Object");
1160
+
1161
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1162
+ fourButton.addActionListener(this);
1163
+ fourButton.setToolTipText("Show control panel only");
5231164 }
5241165
525
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526
- flashSelectionButton.setToolTipText("Show selection");
527
- flashSelectionButton.addActionListener(this);
1166
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
5281167
529
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530
-
531
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532
- twoButton.setToolTipText("Show center view only");
533
- twoButton.addActionListener(this);
534
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535
- fourButton.addActionListener(this);
536
- fourButton.setToolTipText("Show left panel only");
537
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538
- sixButton.setToolTipText("2-column layout left");
539
- sixButton.addActionListener(this);
540
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541
- threeButton.setToolTipText("2-column layout right");
542
- threeButton.addActionListener(this);
543
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544
- sevenButton.setToolTipText("3-column layout");
545
- sevenButton.addActionListener(this);
546
- //
5471168
548
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549
- rootButton.setToolTipText("Edit selection in new tab");
1169
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1170
+ rootButton.setToolTipText("Open selection in new tab");
5501171 rootButton.addActionListener(this);
5511172
552
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1173
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5531174 closeButton.setToolTipText("Close tab");
5541175 closeButton.addActionListener(this);
5551176 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
5561177 //clearButton.addActionListener(this);
557
-
558
- cGridBag commandsPanel = new cGridBag();
1178
+
1179
+ cGridBag row1 = new cGridBag();
5591180
560
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
- editButton.setToolTipText("Edit selection");
1181
+ // INSERT
1182
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1183
+ gridButton.setToolTipText("Create ground");
1184
+ gridButton.addActionListener(this);
1185
+
1186
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1187
+ boxButton.setToolTipText("Create box");
1188
+ boxButton.addActionListener(this);
1189
+
1190
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1191
+ sphereButton.setToolTipText("Create sphere");
1192
+ sphereButton.addActionListener(this);
1193
+
1194
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1195
+ coneButton.setToolTipText("Create cone");
1196
+ coneButton.addActionListener(this);
1197
+
1198
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1199
+ torusButton.setToolTipText("Create torus");
1200
+ torusButton.addActionListener(this);
1201
+
1202
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1203
+ superButton.setToolTipText("Create superellipsoid");
1204
+ superButton.addActionListener(this);
1205
+
1206
+ if (Globals.ADVANCED)
1207
+ {
1208
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1209
+ kleinButton.setToolTipText("Create Klein bottle");
1210
+ kleinButton.addActionListener(this);
1211
+ }
1212
+
1213
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1214
+ particlesButton.setToolTipText("Create particle system");
1215
+ particlesButton.addActionListener(this);
1216
+
1217
+ oe.toolboxPanel.add(row1);
1218
+
1219
+ cGridBag row2 = new cGridBag();
1220
+
1221
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1222
+ groupButton.setToolTipText("Create group");
1223
+ groupButton.addActionListener(this);
1224
+
1225
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1226
+ compositeButton.setToolTipText("Create composite");
1227
+ compositeButton.addActionListener(this);
1228
+
1229
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1230
+ switchButton.setToolTipText("Create item switcher");
1231
+ switchButton.addActionListener(this);
1232
+
1233
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1234
+ loopButton.setToolTipText("Create loop");
1235
+ loopButton.addActionListener(this);
1236
+
1237
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1238
+ textureButton.setToolTipText("Create texture");
1239
+ textureButton.addActionListener(this);
1240
+
1241
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1242
+ overlayButton.setToolTipText("Create overlay");
1243
+ overlayButton.addActionListener(this);
1244
+
1245
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1246
+ lightButton.setToolTipText("Create light");
1247
+ lightButton.addActionListener(this);
1248
+
1249
+ oe.toolboxPanel.add(row2);
1250
+
1251
+ cGridBag textures = new cGridBag();
1252
+
1253
+ CreateTexturePanel(textures);
1254
+
1255
+ oe.toolboxPanel.add(textures);
1256
+
1257
+ textures.preferredHeight = 100;
1258
+
1259
+ CreateSkyboxPanel(oe.skyboxPanel);
1260
+
1261
+ // EDIT panel
1262
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1263
+ editButton.setToolTipText("Pin selection controls");
5621264 editButton.addActionListener(this);
5631265
564
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
- uneditButton.setToolTipText("Unedit selection");
1266
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1267
+ uneditButton.setToolTipText("Unpin and remove selection controls");
5661268 uneditButton.addActionListener(this);
5671269
568
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569
- allParamsButton.setToolTipText("Edit all params");
1270
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1271
+ allParamsButton.setToolTipText("Show all controls");
5701272 allParamsButton.addActionListener(this);
5711273
572
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573
- clearPanelButton.setToolTipText("Clear edit panel");
1274
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1275
+ clearPanelButton.setToolTipText("Clear all controls");
5741276 clearPanelButton.addActionListener(this);
5751277
576
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577
- unselectButton.setToolTipText("Unselect");
578
- unselectButton.addActionListener(this);
1278
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+ //unselectButton.setToolTipText("Unselect");
1280
+ //unselectButton.addActionListener(this);
5791281
580
- commandsPanel.preferredHeight = 1;
1282
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+ flashSelectionButton.setToolTipText("Highlight selection");
1284
+ flashSelectionButton.addActionListener(this);
5811285
582
- oe.treePanel.add(commandsPanel);
583
- oe.treePanel.Return();
1286
+ editCommandsPanel.preferredHeight = 1;
1287
+
1288
+ SetPinStates(false);
1289
+// oe.treePanel.add(commandsPanel);
1290
+// oe.treePanel.Return();
5841291
5851292 // oe.aConstraints.gridx += 1;
5861293 // oe.aConstraints.weighty = 0;
....@@ -597,32 +1304,20 @@
5971304
5981305 JScrollPane jSP;
5991306 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1307
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
6011308 ResetModel();
6021309
6031310 oe.treePanel.add(jSPPanel);
6041311 oe.treePanel.Return();
6051312
606
- cGridBag copyOptionsPanel = new cGridBag();
607
-
608
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609
- colorCB.setToolTipText("Copy color when dropped");
610
- colorCB.addItemListener(this);
611
-
612
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613
- materialCB.setToolTipText("Copy material when dropped");
614
- materialCB.addItemListener(this);
615
-
616
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617
- textureCB.setToolTipText("Copy texture when dropped");
618
- textureCB.addItemListener(this);
619
-
620
- copyOptionsPanel.preferredHeight = 1;
6211313 oe.treePanel.add(copyOptionsPanel);
6221314 oe.treePanel.Return();
1315
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1316
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1317
+ sliderPane.preferredHeight = 1;
6231318
624
-// mainPanel.setDividerLocation(0.5); //1.0);
625
-// mainPanel.setResizeWeight(0.5);
1319
+// mainPanel.setDividerLocation(0.1); //1.0);
1320
+ mainPanel.setResizeWeight(0.4);
6261321
6271322 //jList.addListSelectionListener(this);
6281323 oe.jTree.addTreeSelectionListener(this);
....@@ -630,7 +1325,7 @@
6301325 //jTree.setEditable(true);
6311326 oe.jTree.setDragEnabled(true);
6321327 //jTree.setPreferredSize(new Dimension(10,10));
633
- jSP.setPreferredSize(new Dimension(100,200));
1328
+ //jSP.setPreferredSize(new Dimension(100,200));
6341329
6351330 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6361331
....@@ -642,29 +1337,49 @@
6421337 dgr.addDragGestureListener(this);
6431338 }catch(Exception e) {}
6441339 */
645
- radio.layout = sevenButton;
1340
+ radio.layout = threeButton; // sixButton;
6461341 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6471342 }
6481343
6491344 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
6501345 {
1346
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1347
+ colorCB.setToolTipText("Copy color when dropped");
1348
+ colorCB.addItemListener(this);
1349
+
1350
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1351
+ materialCB.setToolTipText("Copy material when dropped");
1352
+ materialCB.addItemListener(this);
1353
+
1354
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1355
+ textureCB.setToolTipText("Copy texture when dropped");
1356
+ textureCB.addItemListener(this);
1357
+
1358
+ panel.Return();
1359
+
6511360 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
6521361 boxCB.setToolTipText("Display bounding boxes");
6531362 boxCB.addItemListener(this);
6541363
6551364 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1365
+ zoomBoxCB.setToolTipText("Display only for wheel");
6571366 zoomBoxCB.addItemListener(this);
6581367
6591368 if (true) // Globals.ADVANCED)
6601369 {
661
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662
- supportCB.setToolTipText("Enable rigging");
663
- supportCB.addItemListener(this);
1370
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1371
+// supportCB.setToolTipText("Enable rigging");
1372
+// supportCB.addItemListener(this);
1373
+
1374
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1375
+ freezeCB.setToolTipText("Fast moving camera");
1376
+ freezeCB.addItemListener(this);
6641377
6651378 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
6661379 // localCB.addItemListener(this);
6671380
1381
+ panel.Return();
1382
+
6681383 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
6691384 crowdCB.setToolTipText("Used for crowds");
6701385 crowdCB.addItemListener(this);
....@@ -673,14 +1388,19 @@
6731388 smoothCB.setToolTipText("Snapping delay");
6741389 smoothCB.addItemListener(this);
6751390
676
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677
- slowCB.setToolTipText("Smooth interpolation");
678
- slowCB.addItemListener(this);
1391
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1392
+// slowCB.setToolTipText("Smooth interpolation");
1393
+// slowCB.addItemListener(this);
1394
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1395
+ minshaderCB.setToolTipText("Minimal fast shader");
1396
+ minshaderCB.addItemListener(this);
6791397
6801398 // constraints.gridy += 1;
6811399 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
6821400 // speakerMocapCB.addItemListener(this);
6831401
1402
+ panel.Return();
1403
+
6841404 if (false)
6851405 {
6861406 // handled in scripts
....@@ -695,42 +1415,93 @@
6951415 //constraints.gridy += 1;
6961416 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
6971417 smoothfocusCB.addItemListener(this);
1418
+ panel.Return();
6981419 }
6991420
7001421 //constraints.gridx += 1;
7011422 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
7021423 // debugCB.addItemListener(this);
7031424
1425
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1426
+ trackCB.setToolTipText("Enable tracking target");
1427
+ trackCB.addItemListener(this);
1428
+
7041429 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1430
+ oeilCB.setToolTipText("Move camera when tracking");
7051431 oeilCB.addItemListener(this);
7061432
1433
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1434
+ shadowCB.setToolTipText("When live compute shadows");
1435
+ shadowCB.addItemListener(this);
1436
+
1437
+ panel.Return();
1438
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1439
+ toggleTextureCB.setToolTipText("Load textures");
1440
+ toggleTextureCB.addItemListener(this);
1441
+
1442
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1443
+ toggleSwitchCB.setToolTipText("Choose a single item");
1444
+ toggleSwitchCB.addItemListener(this);
1445
+
1446
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1447
+ autokeepCB.setToolTipText("On structure change");
1448
+ autokeepCB.addItemListener(this);
1449
+
1450
+ panel.Return();
1451
+ if (Globals.ADVANCED)
1452
+ {
7071453 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
7081454 lookAtCB.setToolTipText("Look-at target");
7091455 lookAtCB.addItemListener(this);
1456
+ }
7101457
7111458 }
7121459
7131460 cGridBag fill = new cGridBag();
714
-
7151461 fill.preferredHeight = 200;
1462
+ cGridBag fill2 = new cGridBag();
1463
+ fill2.preferredHeight = 200;
1464
+ cGridBag fill3 = new cGridBag();
1465
+ fill3.preferredHeight = 200;
7161466
7171467 panel.add(fill);
1468
+ panel.add(fill2);
1469
+ panel.add(fill3);
7181470
7191471 }
7201472
7211473 void EditObject(Object3D obj)
7221474 {
1475
+ assert(obj instanceof Composite);
1476
+
1477
+// if (obj.versionlist == null)
1478
+// {
1479
+// obj.versionlist = new Object3D[100];
1480
+// obj.versionindex = -1;
1481
+// }
1482
+
7231483 cRadio radioButton = new cRadio(obj.name);
1484
+
1485
+ // June 2019. Patch to avoid bug with transparency.
1486
+ radioButton.hadMaterial = obj.material != null;
1487
+ if (!radioButton.hadMaterial)
1488
+ {
1489
+ obj.material = new cMaterial();
1490
+ }
1491
+
7241492 radioButton.SetObject(obj);
725
- radioButton.layout = sevenButton;
1493
+ radioButton.layout = threeButton; // sixButton;
7261494 radioButton.SetCamera(cameraView.renderCamera, false);
7271495 radioButton.addActionListener(this);
7281496 radioPanel.add(radioButton);
7291497 buttonGroup.add(radioButton);
7301498 radioButton.doClick();
7311499 }
1500
+
7321501 void SetupViews(ObjEditor oe)
7331502 {
1503
+ theFrame = this;
1504
+
7341505 oe.SetupViews();
7351506
7361507 System.out.println("SetupViews");
....@@ -739,23 +1510,30 @@
7391510 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
7401511 }
7411512
742
- JCheckBox liveCB;
743
- JCheckBox supportCB;
744
- JCheckBox localCB;
745
- JCheckBox crowdCB;
746
- JCheckBox smoothCB;
747
- JCheckBox fastCB;
748
- JCheckBox slowCB;
749
- JCheckBox boxCB;
750
- JCheckBox zoomBoxCB;
751
- JCheckBox trackCB;
752
- JCheckBox smoothfocusCB;
1513
+ cToggleButton liveCB;
1514
+ cCheckBox supportCB;
1515
+ cCheckBox localCB;
1516
+ cCheckBox crowdCB;
1517
+ cCheckBox smoothCB;
1518
+ cCheckBox minshaderCB;
1519
+
1520
+ cToggleButton fastCB;
1521
+ cCheckBox slowCB;
1522
+ cCheckBox boxCB;
1523
+ cCheckBox zoomBoxCB;
1524
+ cCheckBox freezeCB;
1525
+ //cToggleButton trackCB;
1526
+ cCheckBox trackCB;
1527
+ cCheckBox smoothfocusCB;
7531528 // JCheckBox speakerMocapCB;
754
- JCheckBox speakerCameraCB;
755
- JCheckBox speakerFocusCB;
756
- JCheckBox debugCB;
757
- JCheckBox oeilCB;
758
- JCheckBox lookAtCB;
1529
+ cCheckBox speakerCameraCB;
1530
+ cCheckBox speakerFocusCB;
1531
+ cCheckBox debugCB;
1532
+
1533
+ cCheckBox oeilCB;
1534
+ cCheckBox shadowCB;
1535
+ cCheckBox autokeepCB;
1536
+ cCheckBox lookAtCB;
7591537
7601538 // static int COLOR = 1;
7611539 // static int MATERIAL = 2;
....@@ -763,9 +1541,9 @@
7631541
7641542 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7651543
766
- JCheckBox colorCB;
767
- JCheckBox materialCB;
768
- JCheckBox textureCB;
1544
+ cCheckBox colorCB;
1545
+ cCheckBox materialCB;
1546
+ cCheckBox textureCB;
7691547
7701548 public void itemStateChanged(ItemEvent e)
7711549 {
....@@ -793,6 +1571,7 @@
7931571 } else if(e.getSource() == liveCB)
7941572 {
7951573 cameraView.ToggleLive();
1574
+ refreshContents(false);
7961575 }
7971576 else if(e.getSource() == supportCB)
7981577 {
....@@ -808,6 +1587,12 @@
8081587 {
8091588 cameraView.ToggleInertia();
8101589 cameraView.repaint();
1590
+ }
1591
+ else if(e.getSource() == minshaderCB)
1592
+ {
1593
+ Globals.MINSHADER ^= true;
1594
+ cameraView.programInitialized = false;
1595
+ cameraView.repaint();
8111596 }
8121597 else if(e.getSource() == localCB)
8131598 {
....@@ -857,6 +1642,18 @@
8571642 {
8581643 cameraView.ToggleOeil();
8591644 }
1645
+ else if(e.getSource() == shadowCB)
1646
+ {
1647
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1648
+ }
1649
+ else if(e.getSource() == freezeCB)
1650
+ {
1651
+ Globals.FREEZEONMOVE ^= true;
1652
+ }
1653
+ else if(e.getSource() == autokeepCB)
1654
+ {
1655
+ Globals.REPLACEONMAKE ^= true;
1656
+ }
8601657 else if(e.getSource() == lookAtCB)
8611658 {
8621659 cameraView.ToggleLookAt();
....@@ -873,7 +1670,8 @@
8731670
8741671 /**/
8751672 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1673
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1674
+ TreePath path = objEditor.jTree.getSelectionPath();
8771675 if ((path == null) || (path.getPathCount() <= 1)) {
8781676 // We can't move the root node or an empty selection
8791677 return;
....@@ -936,8 +1734,6 @@
9361734 }
9371735 }
9381736
939
- String string = (String) object;
940
-
9411737 System.out.println("Transfer = " + object + "; drop : " + target);
9421738 // if( object instanceof java.io.File[])
9431739 // {
....@@ -945,6 +1741,8 @@
9451741 // objEditor.DropFile((java.io.File[]) object, true);
9461742 // return;
9471743 // }
1744
+
1745
+ String string = object.toString();
9481746
9491747 // File path for Mac and Windows
9501748 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -990,23 +1788,33 @@
9901788
9911789 assert target == objEditor.jTree;
9921790 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1791
+ Object3D destinationLeaf;
9931792 try {
994
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1793
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9951794 } catch (Exception e) {
9961795 System.out.println("destinationPath : " + destinationPath);
9971796 return;
9981797 }
9991798
1000
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1799
+ for (int i=group.selection.size(); --i>=0;)
10011800 {
1801
+ Object3D child = (Object3D)group.selection.elementAt(i);
1802
+
1803
+ // Cannot move into itself
1804
+ if (child == destinationLeaf)
1805
+ return;
1806
+ }
1807
+
1808
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1809
+// {
10021810 loadClipboard(true);
10031811 objEditor.jTree.setSelectionPath(destinationPath);
10041812 pasteInto(false, false);
1005
- } else {
1006
- loadClipboard(false);
1007
- objEditor.jTree.setSelectionPath(destinationPath);
1008
- pasteInto(false, false); // true); // ???
1009
- }
1813
+// } else {
1814
+// loadClipboard(false);
1815
+// objEditor.jTree.setSelectionPath(destinationPath);
1816
+// pasteInto(false, false); // true); // ???
1817
+// }
10101818 }
10111819 public void dropActionChanged(DropTargetDragEvent dtde)
10121820 // Called if the user has modified the current drop gesture
....@@ -1062,7 +1870,12 @@
10621870 TreePath path;
10631871
10641872 public TransferableTreePath(TreePath tp) {
1065
- path = tp;
1873
+ Object[] objs = new Object[tp.getPathCount()];
1874
+ for (int i=0; i<objs.length; i++)
1875
+ {
1876
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1877
+ }
1878
+ path = new TreePath(objs);
10661879 }
10671880
10681881 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1111,22 +1924,30 @@
11111924 {
11121925 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11131926 //heightFieldItem.addActionListener(this);
1114
- gridItem = menu.add(new MenuItem("Grid"));
1115
- gridItem.addActionListener(this);
1116
- rectoidItem = menu.add(new MenuItem("Box"));
1117
- rectoidItem.addActionListener(this);
1118
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1119
- ellipsoidItem.addActionListener(this);
1120
- coneItem = menu.add(new MenuItem("Cone"));
1121
- coneItem.addActionListener(this);
1122
- torusItem = menu.add(new MenuItem("Torus"));
1123
- torusItem.addActionListener(this);
1124
- superItem = menu.add(new MenuItem("Superellipsoid"));
1125
- superItem.addActionListener(this);
1927
+// gridItem = menu.add(new MenuItem("Grid"));
1928
+// gridItem.addActionListener(this);
1929
+// rectoidItem = menu.add(new MenuItem("Box"));
1930
+// rectoidItem.addActionListener(this);
1931
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1932
+// ellipsoidItem.addActionListener(this);
1933
+// coneItem = menu.add(new MenuItem("Cone"));
1934
+// coneItem.addActionListener(this);
1935
+// torusItem = menu.add(new MenuItem("Torus"));
1936
+// torusItem.addActionListener(this);
1937
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1938
+// superItem.addActionListener(this);
1939
+
1940
+ cameraItem = menu.add(new MenuItem("Camera"));
1941
+ cameraItem.addActionListener(this);
1942
+
1943
+ if (!Globals.ADVANCED)
1944
+ {
11261945 kleinItem = menu.add(new MenuItem("Klein Bottle"));
11271946 kleinItem.addActionListener(this);
1128
- particleItem = menu.add(new MenuItem("Particle system"));
1129
- particleItem.addActionListener(this);
1947
+ }
1948
+
1949
+// particleItem = menu.add(new MenuItem("Particle system"));
1950
+// particleItem.addActionListener(this);
11301951 if (Globals.ADVANCED)
11311952 {
11321953 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1152,15 +1973,15 @@
11521973 }
11531974 bezierItem = menu.add(new MenuItem("Bezier Patch"));
11541975 bezierItem.addActionListener(this);
1155
- overlayItem = menu.add(new MenuItem("Overlay"));
1156
- overlayItem.addActionListener(this);
1157
- lightItem = menu.add(new MenuItem("Light"));
1158
- lightItem.addActionListener(this);
1976
+// overlayItem = menu.add(new MenuItem("Overlay"));
1977
+// overlayItem.addActionListener(this);
1978
+// lightItem = menu.add(new MenuItem("Light"));
1979
+// lightItem.addActionListener(this);
11591980 menu.add("-");
11601981 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11611982 //superLoopItem.addActionListener(this);
1162
- loopItem = menu.add(new MenuItem("Loop"));
1163
- loopItem.addActionListener(this);
1983
+// loopItem = menu.add(new MenuItem("Loop"));
1984
+// loopItem.addActionListener(this);
11641985 doubleItem = menu.add(new MenuItem("Fork"));
11651986 doubleItem.addActionListener(this);
11661987 if (Globals.ADVANCED)
....@@ -1176,6 +1997,9 @@
11761997 animationItem.addItemListener(this);
11771998 animationItem.setState(Globals.ANIMATION);
11781999
2000
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2001
+ archiveItem.addActionListener(this);
2002
+
11792003 menu.add("-");
11802004 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11812005 parseverticesItem.addActionListener(this);
....@@ -1188,6 +2012,8 @@
11882012 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11892013 reduce34MorphItem.addActionListener(this);
11902014 menu.add("-");
2015
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2016
+ memoryItem.addActionListener(this);
11912017 menu.add(computeAOItem = new MenuItem("Compute AO"));
11922018 computeAOItem.addActionListener(this);
11932019
....@@ -1196,11 +2022,9 @@
11962022 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
11972023 mirrorItem.addActionListener(this);
11982024 menu.add("-");
1199
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1200
- memoryItem.addActionListener(this);
12012025 menu.add(analyzeItem = new MenuItem("Analyze"));
12022026 analyzeItem.addActionListener(this);
1203
- menu.add(dumpItem = new MenuItem("Dump"));
2027
+ menu.add(dumpItem = new MenuItem("Print"));
12042028 dumpItem.addActionListener(this);
12052029 // menu.add(pathItem = new MenuItem("From-to path"));
12062030 // pathItem.addActionListener(this);
....@@ -1341,9 +2165,34 @@
13412165 shadow.material = new cMaterial(obj.material);
13422166 shadow.material.diffuse = 0.0001f;
13432167 shadow.material.specular = 0.0001f;
2168
+ //shadow.projectedVertices[1].x = 300;
13442169
13452170 makeSomething(shadow);
13462171 }
2172
+
2173
+ private void ClearUnpinned()
2174
+ {
2175
+ //for (Object3D obj : listUI)
2176
+ for (int i=listUI.size(); --i>=0;)
2177
+ {
2178
+ Object3D obj = listUI.elementAt(i);
2179
+ if (!obj.pinned)
2180
+ {
2181
+ obj.CloseUI();
2182
+ listUI.remove(i);
2183
+ }
2184
+ }
2185
+ }
2186
+
2187
+ private void EditElement(Object3D elem, boolean newWindow)
2188
+ {
2189
+ // if (!(elem instanceof Composite))
2190
+ // newWindow = false;
2191
+ listUI.add(elem);
2192
+ elem.openEditWindow(this, newWindow); //, false);
2193
+ System.out.println("edit : " + elem);
2194
+ elem.editWindow.refreshContents(true); // ? new
2195
+ }
13472196
13482197 /**
13492198 * applyExample
....@@ -1588,7 +2437,7 @@
15882437 {
15892438 ScreenFit();
15902439 } else
1591
- if (source == switchItem)
2440
+ if (source == switchViewItem)
15922441 {
15932442 cVector v1 = new cVector();
15942443 cVector v2 = new cVector();
....@@ -1597,11 +2446,11 @@
15972446 objEditor.cameraView.renderCamera.setAim(v2, v1);
15982447 objEditor.cameraView.repaint();
15992448 } else
1600
- if (source == rectoidItem)
2449
+ if (source == rectoidItem || source == boxButton)
16012450 {
16022451 makeSomething(new Box());
16032452 } else
1604
- if (source == particleItem)
2453
+ if (source == particleItem || source == particlesButton)
16052454 {
16062455 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16072456 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1680,27 +2529,27 @@
16802529
16812530 makeSomething(obj);
16822531 } else
1683
- if (source == gridItem)
2532
+ if (source == gridItem || source == gridButton)
16842533 {
16852534 makeSomething(new Grid());
16862535 } else
1687
- if (source == ellipsoidItem)
2536
+ if (source == ellipsoidItem || source == sphereButton)
16882537 {
16892538 makeSomething(new Sphere());
16902539 } else
1691
- if (source == coneItem)
2540
+ if (source == coneItem || source == coneButton)
16922541 {
16932542 makeSomething(new Cone());
16942543 } else
1695
- if (source == torusItem)
2544
+ if (source == torusItem || source == torusButton)
16962545 {
16972546 makeSomething(new Torus());
16982547 } else
1699
- if (source == superItem)
2548
+ if (source == superItem || source == superButton)
17002549 {
17012550 makeSomething(new Superellipsoid());
17022551 } else
1703
- if (source == kleinItem)
2552
+ if (source == kleinItem || source == kleinButton)
17042553 {
17052554 makeSomething(new Klein());
17062555 } else
....@@ -1720,7 +2569,7 @@
17202569 {
17212570 makeSomething(new BezierSurface());
17222571 } else
1723
- if (source == overlayItem)
2572
+ if (source == overlayItem || source == overlayButton)
17242573 {
17252574 /*
17262575 Object3D obj = new BezierSurface(5,8);
....@@ -1768,10 +2617,27 @@
17682617 s.setup();
17692618 makeSomething(s);
17702619 } else
1771
- if (source == lightItem)
2620
+ if (source == lightItem || source == lightButton)
17722621 {
17732622 makeSomething(new Light());
17742623 } else
2624
+// if (source == skybox1Button ||
2625
+// source == skybox2Button ||
2626
+// source == skybox3Button ||
2627
+// source == skybox4Button ||
2628
+// source == skybox5Button ||
2629
+// source == skybox6Button ||
2630
+// source == skybox7Button ||
2631
+// source == skybox11Button ||
2632
+// source == skybox12Button ||
2633
+// source == skybox13Button ||
2634
+// source == skybox14Button ||
2635
+// source == skybox15Button ||
2636
+// source == skybox16Button ||
2637
+// source == skybox17Button)
2638
+// {
2639
+// ChangeSkybox(source);
2640
+// } else
17752641 if (source == csgItem)
17762642 {
17772643 group(new CSG());
....@@ -1818,30 +2684,38 @@
18182684
18192685 group(g);
18202686 } else
1821
- if (source == loopItem)
2687
+ if (source == loopItem || source == loopButton)
18222688 {
2689
+ if (!group.selection.isEmpty())
2690
+ {
18232691 Composite csg = new GroupLeaf();
18242692 csg.count = 5;
1825
- group(csg);
1826
- Composite child = new cGroup();
2693
+ Composite child = new cGroup("Branch");
18272694 csg.addChild(child);
18282695 child.addChild(csg);
2696
+ group(csg);
2697
+ }
18292698 } else
18302699 if (source == doubleItem)
18312700 {
1832
- Composite csg = new GroupLeaf();
2701
+ if (!group.selection.isEmpty())
2702
+ {
2703
+ Composite csg = new GroupLeaf("Fork");
18332704 csg.count = 5;
2705
+ Composite child = new cGroup("Branch A");
2706
+ csg.addChild(child);
2707
+ child.addChild(csg);
2708
+ child = new cGroup("Branch B");
2709
+ csg.addChild(child);
2710
+ child.addChild(csg);
18342711 group(csg);
1835
- Composite child = new cGroup();
1836
- csg.addChild(child);
1837
- child.addChild(csg);
1838
- child = new cGroup();
1839
- csg.addChild(child);
1840
- child.addChild(csg);
2712
+ }
18412713 } else
18422714 if (source == tripleItem)
18432715 {
1844
- Composite csg = new GroupLeaf();
2716
+ if (!group.selection.isEmpty())
2717
+ {
2718
+ Composite csg = new GroupLeaf("Trident");
18452719 csg.count = 4;
18462720 group(csg);
18472721 Composite child = new cGroup();
....@@ -1853,36 +2727,12 @@
18532727 child = new cGroup();
18542728 csg.addChild(child);
18552729 child.addChild(csg);
1856
- } else
1857
-
1858
- if (source == importGFDItem)
1859
- {
1860
- ImportGFD();
1861
- } else
1862
- if (source == importVRMLX3DItem)
1863
- {
1864
- ImportVRMLX3D();
1865
- } else
1866
- if (source == import3DSItem)
1867
- {
1868
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1869
- } else
1870
- if (source == importOBJItem)
1871
- {
1872
- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873
- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874
- browser.setVisible(true);
1875
- String filename = browser.getFile();
1876
- if (filename != null && filename.length() > 0)
1877
- {
1878
- String fullname = browser.getDirectory() + filename;
1879
- makeSomething(ReadOBJ(fullname), true);
1880
- }
2730
+ }
18812731 } else
18822732 if (source == computeAOItem)
18832733 {
18842734 Globals.drawMode = CameraPane.OCCLUSION;
1885
- Globals.theRenderer.repaint();
2735
+ cameraView.repaint();
18862736 } else
18872737 if (source == recompileItem)
18882738 {
....@@ -1897,7 +2747,7 @@
18972747 if (source == invariantsItem)
18982748 {
18992749 System.out.println("Invariants:");
1900
- Grafreed.grafreeD.universe.invariants();
2750
+ Grafreed.grafreed.universe.invariants();
19012751 } else
19022752 if (source == memoryItem)
19032753 {
....@@ -1916,6 +2766,65 @@
19162766 {
19172767 DumpObject();
19182768 } else
2769
+ if (source == minButton)
2770
+ {
2771
+ Minimize();
2772
+ } else
2773
+ if (source == maxButton)
2774
+ {
2775
+ Maximize();
2776
+ } else
2777
+ if (source == fullButton)
2778
+ {
2779
+ ToggleFullScreen();
2780
+ } else
2781
+ if (source == collapseButton)
2782
+ {
2783
+ this.expandedLayout = radio.layout;
2784
+ CollapseToolbar();
2785
+ } else
2786
+ if (source == maximize3DButton)
2787
+ {
2788
+ this.expandedLayout = radio.layout;
2789
+ radio.layout = twoButton;
2790
+ Show3DView();
2791
+ CollapseToolbar();
2792
+ } else
2793
+ if (source == previousVersionButton)
2794
+ {
2795
+ // Go to previous version
2796
+ //if (!Undo())
2797
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2798
+ PreviousVersion();
2799
+ } else
2800
+ if (source == restoreButton)
2801
+ {
2802
+ // Restore current version
2803
+ Restore();
2804
+ //restoreButton.setEnabled(false);
2805
+ } else
2806
+ if (source == replaceButton)
2807
+ {
2808
+ // Overwrite current version
2809
+ Replace();
2810
+ //replaceButton.setEnabled(false);
2811
+ } else
2812
+ if (source == nextVersionButton)
2813
+ {
2814
+ // Go to next version
2815
+ NextVersion();
2816
+ } else
2817
+ if (source == saveVersionButton)
2818
+ {
2819
+ // Save a new version
2820
+ if (!Save(true))
2821
+ java.awt.Toolkit.getDefaultToolkit().beep();
2822
+ } else
2823
+ if (source == deleteVersionButton)
2824
+ {
2825
+ // Delete a new version
2826
+ DeleteVersion();
2827
+ } else
19192828 if (source == oneStepButton)
19202829 {
19212830 Globals.ONESTEP = true;
....@@ -1923,17 +2832,14 @@
19232832 } else
19242833 if (source == screenfitButton)
19252834 {
1926
- //Reload(lastConverter, lastFilename, true);
19272835 ScreenFit();
19282836 } else
19292837 if (source == screenfitpointButton)
19302838 {
1931
- //Reload(lastConverter, lastFilename, true);
19322839 ScreenFitPoint();
19332840 } else
19342841 if (source == snapobjectButton)
19352842 {
1936
- //Reload(lastConverter, lastFilename, true);
19372843 SnapObject();
19382844 } else
19392845 // if (event.getSource() == recompileButton)
....@@ -1969,6 +2875,14 @@
19692875 if (source == cutItem || source == clearButton)
19702876 {
19712877 loadClipboard(true);
2878
+ } else
2879
+ if (source == undoItem)
2880
+ {
2881
+ PreviousVersion();
2882
+ } else
2883
+ if (source == redoItem)
2884
+ {
2885
+ NextVersion();
19722886 } else
19732887 if (source == duplicateItem)
19742888 {
....@@ -2289,7 +3203,7 @@
22893203 {
22903204 StepAll();
22913205 } else
2292
- if (source == clearItem) // || event.getSource() == clearButton)
3206
+ if (source == deleteItem) // || event.getSource() == clearButton)
22933207 {
22943208 //int indices[] = jList.getSelectedIndices();
22953209 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2301,9 +3215,9 @@
23013215 {
23023216 ClearSelection(true);
23033217 } else
2304
- if (source == grabItem)
3218
+ if (source == grabItem || source == groupButton)
23053219 {
2306
- group(new cGroup(), true);
3220
+ group(new cGroup(), false); // true);
23073221 } else
23083222 if (source == hideItem)
23093223 {
....@@ -2321,11 +3235,11 @@
23213235 {
23223236 makeSomething(new Camera());
23233237 } else
2324
- if (source == compositeItem)
3238
+ if (source == compositeItem || source == compositeButton)
23253239 {
23263240 group(new Composite());
23273241 } else
2328
- if (source == randomItem)
3242
+ if (source == switchItem || source == switchButton)
23293243 {
23303244 RandomNode random = new RandomNode();
23313245 group(random);
....@@ -2427,7 +3341,7 @@
24273341 {
24283342 group(new cLinker());
24293343 } else
2430
- if (source == textureItem)
3344
+ if (source == textureItem || source == textureButton)
24313345 {
24323346 group(new TextureNode());
24333347 } else
....@@ -2447,17 +3361,42 @@
24473361 {
24483362 CastShadow(2);
24493363 } else
2450
- if (source == ungroupItem)
3364
+ if (source == ungroupItem || source == ungroupButton)
24513365 {
2452
- //ungroup();
3366
+ boolean canUngroup = true;
3367
+
24533368 for (int i=0; i<group.selection.size(); i++)
24543369 {
2455
- Ungroup(group.selection.get(i));
3370
+ Object3D selectedItem = group.selection.get(i);
3371
+
3372
+ if (selectedItem.Size() == 0)
3373
+ {
3374
+ // Cannot ungroup leaves
3375
+ canUngroup = false;
3376
+ break;
3377
+ }
3378
+
3379
+ if (selectedItem == group)
3380
+ {
3381
+ // Cannot ungroup root
3382
+ canUngroup = false;
3383
+ break;
3384
+ }
24563385 }
24573386
2458
- ClearSelection(false);
2459
-
2460
- refreshContents();
3387
+ if (canUngroup)
3388
+ {
3389
+ for (int i=0; i<group.selection.size(); i++)
3390
+ {
3391
+ Object3D selectedItem = group.selection.get(i);
3392
+
3393
+ Ungroup(selectedItem);
3394
+ }
3395
+
3396
+ ClearSelection(false);
3397
+
3398
+ refreshContents();
3399
+ }
24613400 } else
24623401 if (source == genUVItem)
24633402 {
....@@ -2469,7 +3408,7 @@
24693408 } else
24703409 if (source == genNormalsMESHItem)
24713410 {
2472
- GenNormals(true); // TODO
3411
+ GenNormalsMESH();
24733412 } else
24743413 if (source == genNormalsORGANItem)
24753414 {
....@@ -2534,6 +3473,22 @@
25343473 if (source == unmarkleavesItem)
25353474 {
25363475 MarkLeaves(false);
3476
+ } else
3477
+ if (source == rewindleavesItem)
3478
+ {
3479
+ RewindLeaves(true);
3480
+ } else
3481
+ if (source == unrewindleavesItem)
3482
+ {
3483
+ RewindLeaves(false);
3484
+ } else
3485
+ if (source == randomleavesItem)
3486
+ {
3487
+ RandomLeaves(true);
3488
+ } else
3489
+ if (source == unrandomleavesItem)
3490
+ {
3491
+ RandomLeaves(false);
25373492 } else
25383493 if (source == flipVItem)
25393494 {
....@@ -2742,7 +3697,7 @@
27423697 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
27433698 {
27443699 obj = (Object3D)e.nextElement();
2745
- obj.SetBumpTexture(null);
3700
+ obj.ResetBumpTexture();
27463701 }
27473702
27483703 refreshContents();
....@@ -2758,6 +3713,31 @@
27583713
27593714 refreshContents();
27603715 } else
3716
+ if (source == embedTexturesItem)
3717
+ {
3718
+ Object3D obj;
3719
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3720
+ {
3721
+ obj = (Object3D)e.nextElement();
3722
+ obj.EmbedTextures(true);
3723
+ }
3724
+
3725
+ refreshContents();
3726
+ } else
3727
+ if (source == deEmbedTexturesItem)
3728
+ {
3729
+ Object3D obj;
3730
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3731
+ {
3732
+ obj = (Object3D)e.nextElement();
3733
+ obj.EmbedTextures(false);
3734
+ }
3735
+
3736
+ CameraPane.texturepigment.clear();
3737
+ CameraPane.texturebump.clear();
3738
+
3739
+ refreshContents();
3740
+ } else
27613741 if (source == flashSelectionButton)
27623742 {
27633743 CameraPane.flash = true;
....@@ -2769,42 +3749,36 @@
27693749 if (source == twoButton)
27703750 {
27713751 radio.layout = twoButton;
2772
- // bug
2773
- //gridPanel.setDividerLocation(1.0);
2774
- //bigPanel.setDividerLocation(0.0);
2775
-// bigThree.remove(scenePanel);
2776
-// bigThree.remove(centralPanel);
2777
-// bigThree.remove(XYZPanel);
2778
-// aWindowConstraints.gridx = 0;
2779
-// aWindowConstraints.gridy = 0;
2780
-// aWindowConstraints.gridwidth = 1;
2781
-// // aConstraints.gridheight = 3;
2782
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2783
-// aWindowConstraints.weightx = 0;
2784
-// aWindowConstraints.weighty = 1;
2785
-// //bigThree.add(jtp, aWindowConstraints);
2786
-// aWindowConstraints.weightx = 1;
2787
-// aWindowConstraints.gridwidth = 3;
2788
-// // aConstraints.gridheight = 3;
2789
-// aWindowConstraints.gridx = 1;
2790
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2791
-// bigThree.add(centralPanel, aWindowConstraints);
2792
-// aWindowConstraints.weightx = 0;
2793
-// aWindowConstraints.gridx = 4;
2794
-// aWindowConstraints.gridwidth = 1;
2795
-// // aConstraints.gridheight = 3;
2796
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2797
-// //bigThree.add(XYZPanel, aWindowConstraints);
2798
-// scenePanel.setVisible(false);
2799
-// centralPanel.setVisible(true);
2800
-// XYZPanel.setVisible(false);
2801
- bigThree.ClearUI();
2802
- bigThree.add(centralPanel);
2803
- bigThree.FlushUI();
3752
+
3753
+ if (CameraPane.FULLSCREEN)
3754
+ fullscreenLayout = radio.layout;
3755
+
3756
+ Show3DView();
3757
+
3758
+ cameraView.requestFocusInWindow();
3759
+
3760
+// refreshContents(true);
3761
+//
3762
+// try
3763
+// {
3764
+// java.awt.Robot bot = new java.awt.Robot();
3765
+// int mask = InputEvent.BUTTON1_MASK;
3766
+// bot.mouseMove(100, 100);
3767
+// bot.mousePress(mask);
3768
+// bot.mouseRelease(mask);
3769
+// }
3770
+// catch (Exception e)
3771
+// {
3772
+//
3773
+// }
3774
+
28043775 } else
28053776 if (source == threeButton)
28063777 {
28073778 radio.layout = threeButton;
3779
+
3780
+ if (CameraPane.FULLSCREEN)
3781
+ fullscreenLayout = radio.layout;
28083782
28093783 // bigThree.remove(scenePanel);
28103784 // bigThree.remove(centralPanel);
....@@ -2834,13 +3808,18 @@
28343808 // centralPanel.setVisible(true);
28353809 // XYZPanel.setVisible(true);
28363810 bigThree.ClearUI();
3811
+ bigThree.add(scenePanel);
28373812 bigThree.add(centralPanel);
2838
- bigThree.add(XYZPanel);
28393813 bigThree.FlushUI();
3814
+
3815
+ cameraView.requestFocusInWindow();
28403816 } else
28413817 if (source == fourButton)
28423818 {
28433819 radio.layout = fourButton;
3820
+
3821
+ if (CameraPane.FULLSCREEN)
3822
+ fullscreenLayout = radio.layout;
28443823
28453824 // bigThree.remove(scenePanel);
28463825 // bigThree.remove(centralPanel);
....@@ -2872,10 +3851,15 @@
28723851 bigThree.ClearUI();
28733852 bigThree.add(scenePanel);
28743853 bigThree.FlushUI();
3854
+
3855
+ cameraView.requestFocusInWindow();
28753856 } else
28763857 if (source == sixButton)
28773858 {
28783859 radio.layout = sixButton;
3860
+
3861
+ if (CameraPane.FULLSCREEN)
3862
+ fullscreenLayout = radio.layout;
28793863
28803864 // bigThree.remove(scenePanel);
28813865 // bigThree.remove(centralPanel);
....@@ -2905,13 +3889,18 @@
29053889 // centralPanel.setVisible(true);
29063890 // XYZPanel.setVisible(false);
29073891 bigThree.ClearUI();
2908
- bigThree.add(scenePanel);
29093892 bigThree.add(centralPanel);
3893
+ bigThree.add(scenePanel);
29103894 bigThree.FlushUI();
3895
+
3896
+ cameraView.requestFocusInWindow();
29113897 } else
29123898 if (source == sevenButton)
29133899 {
29143900 radio.layout = sevenButton;
3901
+
3902
+ if (CameraPane.FULLSCREEN)
3903
+ fullscreenLayout = radio.layout;
29153904
29163905 // bigThree.remove(scenePanel);
29173906 // bigThree.remove(centralPanel);
....@@ -2945,9 +3934,12 @@
29453934 bigThree.add(centralPanel);
29463935 bigThree.add(XYZPanel);
29473936 bigThree.FlushUI();
3937
+
3938
+ cameraView.requestFocusInWindow();
29483939 } else
29493940 if (source == rootButton)
29503941 {
3942
+ Replace();
29513943 Object3D obj;
29523944 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
29533945 {
....@@ -2956,6 +3948,7 @@
29563948 EditObject(obj);
29573949 }
29583950
3951
+ cameraView.requestFocusInWindow();
29593952 refreshContents(true);
29603953 } else
29613954 if (source == closeButton)
....@@ -2965,22 +3958,37 @@
29653958 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
29663959 {
29673960 ab = (cRadio)e.nextElement();
2968
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3961
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
29693962 {
3963
+ // Patch to avoid bug with transparency.
3964
+ if (!ab.hadMaterial)
3965
+ {
3966
+ ab.object.material = null;
3967
+ }
3968
+
29703969 buttonGroup.remove(ab);
29713970 radioPanel.remove(ab);
29723971
2973
- ab.GetObject().editWindow = null;
3972
+ //ab.GetObject().editWindow = null;
3973
+ ab.GetObject().manipWindow = null;
29743974 // ab.GetObject().objectUI = null; // ?????????
29753975
29763976 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
29773977 break;
29783978 }
29793979 }
3980
+
3981
+ cameraView.requestFocusInWindow();
29803982 refreshContents(true);
29813983 } else
29823984 if (source == editItem || source == editButton)
29833985 {
3986
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3987
+ {
3988
+ Object3D child = (Object3D)e.nextElement();
3989
+ child.pinned = true;
3990
+ }
3991
+
29843992 EditSelection(false);
29853993 } else
29863994 if (source == uneditButton)
....@@ -2989,11 +3997,12 @@
29893997 {
29903998 Object3D child = (Object3D)e.nextElement();
29913999 if(child.editWindow != null)
2992
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4000
+ child.pinned = false;
29934001 child.CloseUI();
29944002 listUI.remove(child);
4003
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29954004
2996
- child.editWindow = null; // ???????????
4005
+ //child.editWindow = null; // ???????????
29974006 }
29984007 objEditor.ctrlPanel.FlushUI();
29994008 //objEditor.jTree.clearSelection();
....@@ -3006,16 +4015,18 @@
30064015 //copy.ClearUI();
30074016 for (Object3D obj : listUI)
30084017 {
4018
+ obj.pinned = false;
30094019 obj.CloseUI();
30104020 }
30114021 listUI.clear();
4022
+ SetPinStates(group.selection.size() > 0);
30124023 refreshContents(true);
30134024 } else
30144025 if (source == allParamsButton)
30154026 {
30164027 assert(copy == group);
30174028
3018
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4029
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30194030
30204031 for (Object3D obj : listUI)
30214032 {
....@@ -3064,6 +4075,7 @@
30644075 }
30654076
30664077 copy = group;
4078
+
30674079 //Globals.theRenderer.object = group;
30684080 if(!useclient)
30694081 {
....@@ -3079,20 +4091,61 @@
30794091 frontView.object = group;
30804092 sideView.object = group;
30814093 }
3082
- group.editWindow = this;
4094
+
4095
+// fix "+" issue
4096
+ //group.editWindow = this;
4097
+ group.manipWindow = this;
4098
+
30834099 /*
30844100 currentLayout = radio.layout;
30854101 if (currentLayout == null)
30864102 currentLayout = sevenButton;
30874103 */
30884104 radio.layout.doClick();
4105
+
4106
+ assert(copy instanceof Composite);
4107
+
4108
+ if (copy.versionlist == null)
4109
+ {
4110
+ copy.versionlist = new Object3D[100];
4111
+ copy.versionindex = -1;
4112
+
4113
+ Save(true);
4114
+ }
4115
+
4116
+ SetVersionStates();
4117
+
4118
+ ClearUnpinned();
4119
+
4120
+ //Grafreed.Assert(group != null);
4121
+ //Grafreed.Assert(group.selection != null);
4122
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4123
+ if (group.selection == null || group.selection.size() == 1)
4124
+ EditSelection(false);
30894125 keepparent = group.parent;
30904126 // PARENT = NULL or not???
30914127 //group.parent = null; // ROOT
30924128 //group.attributes = -1;
30934129 ResetModel();
4130
+
4131
+ cameraView.requestFocusInWindow();
30944132 refreshContents(true);
3095
- }
4133
+ } else if (event.getSource() == editCameraItem)
4134
+ {
4135
+ cameraView.ProtectCamera();
4136
+ cameraView.requestFocusInWindow();
4137
+ cameraView.repaint();
4138
+ return;
4139
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
4140
+ {
4141
+ cameraView.RevertCamera();
4142
+ cameraView.requestFocusInWindow();
4143
+ cameraView.repaint();
4144
+ return;
4145
+ // } else if (event.getSource() == textureButton)
4146
+ // {
4147
+ // return; // true;
4148
+ }
30964149 else
30974150 {
30984151 //return super.action(event, arg);
....@@ -3101,7 +4154,6 @@
31014154 }
31024155
31034156 boolean useclient = false;
3104
- cRadio radio;
31054157
31064158 void ToggleRoot()
31074159 {
....@@ -3340,7 +4392,8 @@
33404392
33414393 int size = obj.MemorySize();
33424394
3343
- System.err.println((size/1024) + " KB is the size of " + obj);
4395
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4396
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33444397 }
33454398 }
33464399 catch (Exception e)
....@@ -3421,6 +4474,13 @@
34214474 void GenNormals(boolean crease)
34224475 {
34234476 group.GenNormalsS(crease);
4477
+
4478
+ refreshContents();
4479
+ }
4480
+
4481
+ void GenNormalsMESH()
4482
+ {
4483
+ group.GenNormalsMeshS();
34244484
34254485 refreshContents();
34264486 }
....@@ -3656,7 +4716,7 @@
36564716
36574717 try
36584718 {
3659
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4719
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
36604720 }
36614721 catch (Exception e)
36624722 {
....@@ -4048,6 +5108,18 @@
40485108 refreshContents();
40495109 }
40505110
5111
+ void RewindLeaves(boolean hide)
5112
+ {
5113
+ group.selection.RewindLeaves(hide);
5114
+ refreshContents();
5115
+ }
5116
+
5117
+ void RandomLeaves(boolean hide)
5118
+ {
5119
+ group.selection.RandomLeaves(hide);
5120
+ refreshContents();
5121
+ }
5122
+
40515123 void SetTexRes(int tr)
40525124 {
40535125 group.selection.SetTexRes(tr);
....@@ -4119,28 +5191,25 @@
41195191 // }
41205192 // }
41215193
4122
- static boolean allparams = true;
4123
-
4124
- static Vector<Object3D> listUI = new Vector<Object3D>();
4125
-
41265194 void EditSelection(boolean newWindow)
41275195 {
5196
+ if (group.selection == null)
5197
+ {
5198
+ EditElement(group, newWindow); // ? new
5199
+ return;
5200
+ }
5201
+
41285202 // aConstraints.gridy = 0;
41295203 for (int i=0; i<group.selection.size(); i++)
41305204 {
41315205 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
41325206 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4133
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5207
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41345208
41355209 Object3D elem = (Object3D)group.selection.elementAt(i);
4136
- if(elem != group)
5210
+ if(elem != group || !newWindow)
41375211 {
4138
- // if (!(elem instanceof Composite))
4139
- // newWindow = false;
4140
- listUI.add(elem);
4141
- elem.openEditWindow(this, newWindow); //, false);
4142
- System.out.println("edit : " + elem);
4143
- elem.editWindow.refreshContents(true); // ? new
5212
+ EditElement(elem, newWindow); // ? new
41445213 }
41455214 }
41465215 }
....@@ -4203,9 +5272,7 @@
42035272
42045273 freezemodel = false;
42055274 }
4206
-
4207
- boolean flashIt = true;
4208
-
5275
+
42095276 public void valueChanged(TreeSelectionEvent e)
42105277 //public boolean handleEvent(Event event)
42115278 {
....@@ -4215,7 +5282,8 @@
42155282 //new Exception().printStackTrace();
42165283
42175284 freezemodel = true;
4218
-
5285
+ ClearUnpinned();
5286
+
42195287 /**/
42205288 //switch (event.id)
42215289 {
....@@ -4223,7 +5291,6 @@
42235291 //case 702: // Event.LIST_DESELECT
42245292 group.deselectAll();
42255293 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226
- objEditor.ClearInfo(); // .GetMaterial());
42275294 if (tps != null)
42285295 {
42295296 for (int i=0; i < tps.length; i++)
....@@ -4232,10 +5299,8 @@
42325299
42335300 //if (child.parent != null)
42345301 //child.parent.addSelectee(child);
5302
+ objEditor.SetMaterial(child);
42355303 group.addSelectee(child);
4236
- objEditor.SetMaterial(child); // .GetMaterial());
4237
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4238
- System.err.println("info : " + child.GetPath());
42395304 }
42405305 }
42415306 // else
....@@ -4245,20 +5310,28 @@
42455310 // System.err.println("info : " + group.GetPath());
42465311 // }
42475312
4248
- objEditor.SetText(); // jan 2014
4249
-
4250
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5313
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
42515314 CameraPane.flash = true;
42525315
4253
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5316
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
42545317 // a camera
42555318 {
4256
- CameraPane.camerachangeframe = 0; // don't refuse it
4257
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5319
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5320
+ {
5321
+ CameraPane.camerachangeframe = 0; // don't refuse it
5322
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5323
+ }
42585324 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
42595325 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
42605326 }
42615327
5328
+ if (tps != null && tps.length == 1)
5329
+ {
5330
+ EditSelection(false);
5331
+ }
5332
+
5333
+ SetPinStates(tps != null && tps.length > 0);
5334
+
42625335 refreshContents();
42635336 //return true;
42645337 }
....@@ -4267,6 +5340,51 @@
42675340
42685341 freezemodel = false;
42695342 }
5343
+
5344
+ void SetPinStates(boolean enabled)
5345
+ {
5346
+ editButton.setEnabled(enabled);
5347
+ uneditButton.setEnabled(enabled);
5348
+ //unselectButton.setEnabled(enabled);
5349
+ flashSelectionButton.setEnabled(enabled);
5350
+
5351
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5352
+
5353
+ boolean allComposites = true;
5354
+
5355
+ if (group.selection != null)
5356
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5357
+ {
5358
+ if (!(e.nextElement() instanceof Composite))
5359
+ {
5360
+ allComposites = false;
5361
+ break;
5362
+ }
5363
+ }
5364
+
5365
+ rootButton.setEnabled(allComposites);
5366
+ }
5367
+
5368
+ void refreshContents(boolean cp)
5369
+ {
5370
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5371
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5372
+ {
5373
+ objEditor.ClearInfo(); // .GetMaterial());
5374
+
5375
+ for (int i=0; i < group.selection.Size(); i++)
5376
+ {
5377
+ Object3D child = (Object3D) group.selection.get(i);
5378
+
5379
+ objEditor.AddInfo(child, this, true);
5380
+// System.err.println("info : " + child.GetPath());
5381
+ }
5382
+
5383
+ objEditor.SetText(); // jan 2014
5384
+ }
5385
+
5386
+ super.refreshContents(cp);
5387
+ }
42705388
42715389 void linkSomething(Object3D thing)
42725390 {
....@@ -4338,6 +5456,7 @@
43385456 {
43395457 if (group.selection.isEmpty())
43405458 return;
5459
+
43415460 Grafreed.clipboardIsTempGroup = false;
43425461 Composite tGroup = null;
43435462 if (group.selection.size() > 0) // 1)
....@@ -4348,6 +5467,8 @@
43485467
43495468 if (cut)
43505469 {
5470
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5471
+// Save();
43515472 //int indices[] = jList.getSelectedIndices();
43525473 //for (int i = indices.length - 1; i >= 0; i--)
43535474 //jList.remove(indices[i]);
....@@ -4437,8 +5558,10 @@
44375558 }
44385559
44395560 }
5561
+
44405562 if (Grafreed.clipboardIsTempGroup)
44415563 Grafreed.clipboard = tGroup;
5564
+
44425565 if (cut)
44435566 {
44445567 ResetModel();
....@@ -4448,6 +5571,10 @@
44485571
44495572 void paste(boolean expand)
44505573 {
5574
+ if (Globals.REPLACEONMAKE)
5575
+ Save();
5576
+ boolean keep = Globals.REPLACEONMAKE;
5577
+ Globals.REPLACEONMAKE = false;
44515578 // if (GrafreeD.clipboard == null)
44525579 // return;
44535580 boolean first = true;
....@@ -4507,6 +5634,7 @@
45075634 Grafreed.clipboard.get(0).parent = keepparent;
45085635 }
45095636
5637
+ Globals.REPLACEONMAKE = keep;
45105638 ResetModel();
45115639 refreshContents();
45125640 }
....@@ -4642,6 +5770,10 @@
46425770
46435771 void group(Object3D csg, boolean grab)
46445772 {
5773
+ if (Globals.REPLACEONMAKE)
5774
+ Save();
5775
+ boolean keep = Globals.REPLACEONMAKE;
5776
+ Globals.REPLACEONMAKE = false;
46455777 if (//false) // why??
46465778 !group.selection.isEmpty())
46475779 {
....@@ -4755,10 +5887,15 @@
47555887 //node.add(csg);
47565888 //makeSomething(node);
47575889 makeSomething(csg);
5890
+ Globals.REPLACEONMAKE = keep;
47585891 }
47595892
47605893 void Ungroup(Object3D g)
47615894 {
5895
+ if (Globals.REPLACEONMAKE)
5896
+ Save();
5897
+ boolean keep = Globals.REPLACEONMAKE;
5898
+ Globals.REPLACEONMAKE = false;
47625899 if (g instanceof HiddenObject)
47635900 {
47645901 HiddenObject h = (HiddenObject) g;
....@@ -4775,6 +5912,7 @@
47755912 objEditor.makeSomething(g.get(i), false);
47765913 }
47775914 }
5915
+ Globals.REPLACEONMAKE = keep;
47785916 }
47795917
47805918 void ungroup()
....@@ -4970,21 +6108,6 @@
49706108 }
49716109 */
49726110
4973
- void ImportGFD()
4974
- {
4975
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4976
- browser.show();
4977
- String filename = browser.getFile();
4978
- if (filename != null && filename.length() > 0)
4979
- {
4980
- String fullname = browser.getDirectory() + filename;
4981
-
4982
- //Object3D readobj =
4983
- objEditor.ReadGFD(fullname, objEditor);
4984
- //makeSomething(readobj);
4985
- }
4986
- }
4987
-
49886111 /*
49896112 public void Callback(Object obj)
49906113 {
....@@ -5008,23 +6131,6 @@
50086131 }
50096132 */
50106133
5011
- void ImportVRMLX3D()
5012
- {
5013
- if (Grafreed.standAlone)
5014
- {
5015
- /**/
5016
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5017
- browser.show();
5018
- String filename = browser.getFile();
5019
- if (filename != null && filename.length() > 0)
5020
- {
5021
- String fullname = browser.getDirectory() + filename;
5022
- LoadVRMLX3D(fullname);
5023
- }
5024
- /**/
5025
- }
5026
- }
5027
-
50286134 String GetFile(String dialogName)
50296135 {
50306136 if (Grafreed.standAlone)
....@@ -5095,7 +6201,43 @@
50956201 cButton clearpanelButton;
50966202 cButton unselectButton;
50976203
6204
+ cButton restoreCameraButton;
6205
+
50986206 cButton oneStepButton;
6207
+
6208
+ cButton groupButton;
6209
+ cButton ungroupButton;
6210
+ cButton compositeButton;
6211
+ cButton switchButton;
6212
+ cButton loopButton;
6213
+ cButton textureButton;
6214
+
6215
+ cButton skybox1Button;
6216
+ cButton skybox2Button;
6217
+ cButton skybox3Button;
6218
+ cButton skybox4Button;
6219
+ cButton skybox5Button;
6220
+ cButton skybox6Button;
6221
+ cButton skybox7Button;
6222
+
6223
+ cButton skybox11Button;
6224
+ cButton skybox12Button;
6225
+ cButton skybox13Button;
6226
+ cButton skybox14Button;
6227
+ cButton skybox15Button;
6228
+ cButton skybox16Button;
6229
+ cButton skybox17Button;
6230
+
6231
+ cButton gridButton;
6232
+ cButton boxButton;
6233
+ cButton sphereButton;
6234
+ cButton coneButton;
6235
+ cButton torusButton;
6236
+ cButton superButton;
6237
+ cButton kleinButton;
6238
+ cButton particlesButton;
6239
+ cButton overlayButton;
6240
+ cButton lightButton;
50996241
51006242 cButton screenfitButton;
51016243 cButton screenfitpointButton;
....@@ -5108,14 +6250,6 @@
51086250
51096251 cButton setsupportButton;
51106252
5111
- cButton twoButton;
5112
- cButton sixButton;
5113
- cButton threeButton;
5114
- cButton sevenButton;
5115
- cButton fourButton; // full panel
5116
- cButton oneButton; // full XYZ
5117
- //cButton currentLayout;
5118
-
51196253 //
51206254 //Composite
51216255 Object3D // to do !!
....@@ -5125,10 +6259,12 @@
51256259 //JTree jTree;
51266260 private MenuItem lookAtItem;
51276261 private MenuItem lookFromItem;
5128
- private MenuItem switchItem;
5129
- private MenuItem cutItem;
5130
- private MenuItem duplicateItem;
5131
- private MenuItem cloneItem;
6262
+ private MenuItem switchViewItem;
6263
+ private JMenuItem cutItem;
6264
+ private MenuItem undoItem;
6265
+ private MenuItem redoItem;
6266
+ private JMenuItem duplicateItem;
6267
+ private JMenuItem cloneItem;
51326268 private MenuItem cloneSupportItem;
51336269 private MenuItem overwriteGeoItem;
51346270 private MenuItem overwriteMatItem;
....@@ -5149,13 +6285,13 @@
51496285 private MenuItem cloneGeometriesItem;
51506286 private MenuItem shareGeometriesItem;
51516287 private MenuItem mergeGeometriesItem;
5152
- private MenuItem copyItem;
6288
+ private JMenuItem copyItem;
51536289 private MenuItem pasteItem;
5154
- private MenuItem pasteIntoItem;
5155
- private MenuItem pasteLinkItem;
5156
- private MenuItem pasteCloneItem;
5157
- private MenuItem pasteExpandItem;
5158
- private MenuItem clearItem;
6290
+ private JMenuItem pasteIntoItem;
6291
+ private JMenuItem pasteLinkItem;
6292
+ private JMenuItem pasteCloneItem;
6293
+ private JMenuItem pasteExpandItem;
6294
+ private JMenuItem deleteItem;
51596295 private MenuItem clearAllItem;
51606296 private MenuItem genUVItem;
51616297 private MenuItem genNormalsMESHItem;
....@@ -5190,6 +6326,10 @@
51906326 private MenuItem showleavesItem;
51916327 private MenuItem markleavesItem;
51926328 private MenuItem unmarkleavesItem;
6329
+ private MenuItem rewindleavesItem;
6330
+ private MenuItem unrewindleavesItem;
6331
+ private MenuItem randomleavesItem;
6332
+ private MenuItem unrandomleavesItem;
51936333
51946334 private MenuItem flipVItem;
51956335 private MenuItem unflipVItem;
....@@ -5211,7 +6351,7 @@
52116351 private MenuItem frontItem;
52126352 private MenuItem cameraItem;
52136353 private MenuItem compositeItem;
5214
- private MenuItem randomItem;
6354
+ private MenuItem switchItem;
52156355 private MenuItem physicsItem;
52166356 private MenuItem frameselectorItem;
52176357 private MenuItem scriptNodeItem;
....@@ -5219,7 +6359,7 @@
52196359 private MenuItem switchTransfoItem;
52206360 private MenuItem morphItem;
52216361 private MenuItem linkerItem;
5222
- private MenuItem ungroupItem;
6362
+ private JMenuItem ungroupItem;
52236363 private MenuItem editItem;
52246364 private MenuItem openWindowItem;
52256365 private MenuItem editLeafItem;
....@@ -5235,6 +6375,8 @@
52356375 private MenuItem attachBumpItem;
52366376 private MenuItem detachBumpItem;
52376377 private MenuItem pigmentBumpItem;
6378
+ private MenuItem embedTexturesItem;
6379
+ private MenuItem deEmbedTexturesItem;
52386380
52396381 private MenuItem particleItem;
52406382 private MenuItem ragdollItem;
....@@ -5273,11 +6415,6 @@
52736415 private MenuItem doubleItem;
52746416 private MenuItem tripleItem;
52756417
5276
- private MenuItem importGFDItem;
5277
- private MenuItem importVRMLX3DItem;
5278
- private MenuItem import3DSItem;
5279
- private MenuItem importOBJItem;
5280
-
52816418 private MenuItem computeAOItem;
52826419 private MenuItem recompileItem;
52836420 private MenuItem editScriptItem;
....@@ -5287,4 +6424,8 @@
52876424 private MenuItem analyzeItem;
52886425 private MenuItem dumpItem;
52896426 //boolean freezemodel = false;
6427
+
6428
+ Menu cameraMenu;
6429
+ MenuItem editCameraItem;
6430
+ MenuItem restoreCameraItem;
52906431 }