Normand Briere
2019-08-12 8f1afe25ea8fc8801aab66331c32a50859a758c2
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,351 @@
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);
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", "rgb", 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
+ //cameraView.envyoff = false;
334
+ group.skyboxname = skybox;
335
+ group.skyboxext = "jpg";
336
+ cameraView.repaint();
337
+ }
338
+
339
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
340
+ {
341
+ JTabbedPane skyboxpane = new JTabbedPane();
342
+
343
+ AddSkyboxTab0(skyboxpane);
344
+ AddSkyboxTab1(skyboxpane);
345
+ AddSkyboxTab2(skyboxpane);
346
+ AddSkyboxTab3(skyboxpane);
347
+
348
+ skyboxPanel.add(skyboxpane);
349
+ }
350
+
351
+ public void ChangeTexture(String texture)
352
+ {
353
+ for (int i=0; i<group.selection.size(); i++)
354
+ {
355
+ Object3D obj = group.selection.get(i);
356
+ obj.SetPigmentTexture("@" + texture);
357
+ }
358
+
359
+ refreshContents();
360
+ }
361
+
362
+ public void Show3DView()
363
+ {
364
+ // bug
365
+ //gridPanel.setDividerLocation(1.0);
366
+ //bigPanel.setDividerLocation(0.0);
367
+ bigThree.ClearUI();
368
+ bigThree.add(centralPanel);
369
+ bigThree.FlushUI();
370
+ }
371
+
26372 //ObjEditor objEditor;
27373 public void closeUI2()
28374 {
....@@ -60,6 +406,14 @@
60406 this.copy = this.group = group;
61407 //selectees = this.group.selectees;
62408
409
+ if (copy.versionlist == null)
410
+ {
411
+ copy.versionlist = new Object3D[100];
412
+ copy.versionindex = -1;
413
+
414
+ Save(true);
415
+ }
416
+
63417 if(ui)
64418 SetupUI(objEditor);
65419 }
....@@ -74,16 +428,28 @@
74428 this.copy = this.group = copy;
75429 //selectees = this.group.selectees;
76430
77
- SetupMenu2(objEditor);
431
+ SetupMenu2(this); //objEditor);
78432 SetupUI2(objEditor);
79433 objEditor.SetupUI(true);
80434 SetupViews(objEditor);
81435
82436 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
437
+
438
+ if (copy.versionlist == null)
439
+ {
440
+ copy.versionlist = new Object3D[100];
441
+ copy.versionindex = -1;
442
+
443
+ Save(true);
444
+ }
83445 }
84446
85447 void CloneSelection(boolean supports)
86448 {
449
+ if (Globals.REPLACEONMAKE)
450
+ Save();
451
+ boolean keep = Globals.REPLACEONMAKE;
452
+ Globals.REPLACEONMAKE = false;
87453 // Object3D keep = GrafreeD.clipboard;
88454 //Object3D obj;
89455 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,6 +460,7 @@
94460
95461 makeSomething(clone, i==group.selection.size()-1);
96462 }
463
+ Globals.REPLACEONMAKE = keep;
97464 }
98465
99466 void CloneClipboard(boolean supports)
....@@ -148,28 +515,21 @@
148515
149516 //JTextField nameField;
150517
151
- void SetupMenu2(ObjEditor oe)
518
+ void SetupMenu2(GroupEditor oe)
152519 {
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
-
520
+ oe.jTree = new cTree();
521
+
168522 Menu menu;
169523 oe.menuBar.add(menu = new Menu("Edit"));
170524 //editItem = menu.add(new MenuItem("Edit"));
171525 //editItem.addActionListener(this);
172
- duplicateItem = menu.add(new MenuItem("Duplicate"));
526
+
527
+// undoItem = menu.add(new MenuItem("Undo"));
528
+// undoItem.addActionListener(this);
529
+// redoItem = menu.add(new MenuItem("Redo"));
530
+// redoItem.addActionListener(this);
531
+// menu.add("-");
532
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173533 duplicateItem.addActionListener(this);
174534 cloneItem = menu.add(new MenuItem("Clone"));
175535 cloneItem.addActionListener(this);
....@@ -185,7 +545,6 @@
185545 copyItem.addActionListener(this);
186546 pasteItem = menu.add(new MenuItem("Paste"));
187547 pasteItem.addActionListener(this);
188
- menu.add("-");
189548
190549 menu.add("-");
191550 pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -197,8 +556,8 @@
197556 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198557 // pasteExpandItem.addActionListener(this);
199558 menu.add("-");
200
- clearItem = menu.add(new MenuItem("Clear"));
201
- clearItem.addActionListener(this);
559
+ deleteItem = menu.add(new MenuItem("Delete"));
560
+ deleteItem.addActionListener(this);
202561
203562 if (Globals.ADVANCED)
204563 {
....@@ -206,7 +565,92 @@
206565 clearAllItem = menu.add(new MenuItem("Clear All"));
207566 clearAllItem.addActionListener(this);
208567 }
568
+
569
+ menuBar.add(cameraMenu = new Menu("View"));
570
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
571
+ //zBufferItem.addActionListener(this);
572
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
573
+ //normalLensItem.addActionListener(this);
574
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
575
+ restoreCameraItem.addActionListener(this);
576
+
577
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
578
+// toggleFullScreenItem.addItemListener(this);
579
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
580
+// cameraMenu.add("-");
581
+//
582
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
583
+// toggleTextureItem.addItemListener(this);
584
+// toggleTextureItem.setState(CameraPane.textureon);
585
+//
586
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
587
+// toggleSwitchItem.addItemListener(this);
588
+// toggleSwitchItem.setState(CameraPane.SWITCH);
589
+
590
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
591
+ toggleHandleItem.addItemListener(this);
592
+ toggleHandleItem.setState(CameraPane.HANDLES);
593
+
594
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
595
+ togglePaintItem.addItemListener(this);
596
+ togglePaintItem.setState(CameraPane.PAINTMODE);
597
+
598
+ if (Globals.ADVANCED)
599
+ {
600
+ cameraMenu.add("-");
601
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
602
+ toggleLiveItem.addItemListener(this);
603
+ toggleLiveItem.setState(Globals.isLIVE());
209604
605
+ cameraMenu.add(stepItem = new MenuItem("Step"));
606
+ stepItem.addActionListener(this);
607
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
608
+ // toggleDLItem.addItemListener(this);
609
+ // toggleDLItem.setState(false);
610
+
611
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
612
+ toggleRenderItem.addItemListener(this);
613
+ toggleRenderItem.setState(!CameraPane.frozen);
614
+
615
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
616
+ toggleDebugItem.addItemListener(this);
617
+ toggleDebugItem.setState(Globals.DEBUG);
618
+
619
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
620
+ toggleFrustumItem.addItemListener(this);
621
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
622
+
623
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
624
+ toggleFootContactItem.addItemListener(this);
625
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
626
+
627
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
628
+ toggleTimelineItem.addItemListener(this);
629
+ }
630
+
631
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
632
+// toggleRootItem.addItemListener(this);
633
+// toggleRootItem.setState(false);
634
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
635
+// animationItem.addItemListener(this);
636
+// animationItem.setState(CameraPane.ANIMATION);
637
+ cameraMenu.add("-");
638
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
639
+ editCameraItem.addActionListener(this);
640
+
641
+ if (Globals.ADVANCED)
642
+ {
643
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
644
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
645
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
646
+ oe.cameraMenu.add("-");
647
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
648
+ openWindowItem.addActionListener(this);
649
+ lookAtItem.addActionListener(this);
650
+ //lookFromItem.addActinoListener(this);
651
+ //switchViewItem.addActionListener(this);
652
+ }
653
+
210654 oe.menuBar.add(menu = new Menu("Setting"));
211655 if (Globals.ADVANCED)
212656 {
....@@ -249,21 +693,29 @@
249693 }
250694
251695 oe.menuBar.add(menu = new Menu("Group"));
252
- grabItem = menu.add(new MenuItem("Grab"));
253
- grabItem.addActionListener(this);
696
+// grabItem = menu.add(new MenuItem("Grab"));
697
+// grabItem.addActionListener(this);
254698 backItem = menu.add(new MenuItem("Back"));
255699 backItem.addActionListener(this);
256700 frontItem = menu.add(new MenuItem("Front"));
257701 frontItem.addActionListener(this);
258
- compositeItem = menu.add(new MenuItem("Composite"));
259
- compositeItem.addActionListener(this);
702
+// compositeItem = menu.add(new MenuItem("Composite"));
703
+// compositeItem.addActionListener(this);
704
+
705
+ if (Globals.ADVANCED)
706
+ {
260707 hideItem = menu.add(new MenuItem("Hidden Group"));
261708 hideItem.addActionListener(this);
709
+ }
262710 ungroupItem = menu.add(new MenuItem("Ungroup"));
263711 ungroupItem.addActionListener(this);
264
- menu.add("-");
265
- randomItem = menu.add(new MenuItem("Switch node"));
266
- randomItem.addActionListener(this);
712
+
713
+// menu.add("-");
714
+//
715
+// switchItem = menu.add(new MenuItem("Switch node"));
716
+// switchItem.addActionListener(this);
717
+ if (Globals.ADVANCED)
718
+ {
267719 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268720 switchGeoItem.addActionListener(this);
269721 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -271,8 +723,6 @@
271723 morphItem = menu.add(new MenuItem("Morph Group"));
272724 morphItem.addActionListener(this);
273725
274
- if (Globals.ADVANCED)
275
- {
276726 menu.add("-");
277727 physicsItem = menu.add(new MenuItem("Physics"));
278728 physicsItem.addActionListener(this);
....@@ -280,30 +730,29 @@
280730 frameselectorItem.addActionListener(this);
281731 scriptNodeItem = menu.add(new MenuItem("Script Node"));
282732 scriptNodeItem.addActionListener(this);
283
- cameraItem = menu.add(new MenuItem("Camera"));
284
- cameraItem.addActionListener(this);
285733 }
286734
287735 oe.menuBar.add(menu = new Menu("Object"));
288
- textureItem = menu.add(new MenuItem("Texture"));
289
- textureItem.addActionListener(this);
736
+// textureItem = menu.add(new MenuItem("Texture"));
737
+// textureItem.addActionListener(this);
290738 billboardItem = menu.add(new MenuItem("Billboard"));
291739 billboardItem.addActionListener(this);
292740 csgItem = menu.add(new MenuItem("CSG"));
293741 csgItem.addActionListener(this);
294
- shadowXItem = menu.add(new MenuItem("Shadow X"));
742
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295743 shadowXItem.addActionListener(this);
296
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
744
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297745 shadowYItem.addActionListener(this);
298
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
746
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299747 shadowZItem.addActionListener(this);
748
+ attributeItem = menu.add(new MenuItem("Attribute"));
749
+ attributeItem.addActionListener(this);
750
+
300751 if (Globals.ADVANCED)
301752 {
302753 menu.add("-");
303754 linkerItem = menu.add(new MenuItem("Linker"));
304755 linkerItem.addActionListener(this);
305
- attributeItem = menu.add(new MenuItem("Attribute"));
306
- attributeItem.addActionListener(this);
307756 templateItem = menu.add(new MenuItem("Template"));
308757 templateItem.addActionListener(this);
309758 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -332,7 +781,7 @@
332781 genNormalsMESHItem.addActionListener(this);
333782 if (Globals.ADVANCED)
334783 {
335
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
784
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336785 genNormalsMINEItem.addActionListener(this);
337786 }
338787 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -392,6 +841,14 @@
392841 markleavesItem.addActionListener(this);
393842 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394843 unmarkleavesItem.addActionListener(this);
844
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
845
+ rewindleavesItem.addActionListener(this);
846
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
847
+ unrewindleavesItem.addActionListener(this);
848
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
849
+ randomleavesItem.addActionListener(this);
850
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
851
+ unrandomleavesItem.addActionListener(this);
395852 menu.add("-");
396853 flipVItem = menu.add(new MenuItem("Flip V"));
397854 flipVItem.addActionListener(this);
....@@ -417,10 +874,15 @@
417874 attachBumpItem.addActionListener(this);
418875 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419876 pigmentBumpItem.addActionListener(this);
877
+ //embedTexturesItem
420878 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421879 detachPigmentItem.addActionListener(this);
422880 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423881 detachBumpItem.addActionListener(this);
882
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
883
+ embedTexturesItem.addActionListener(this);
884
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
885
+ deEmbedTexturesItem.addActionListener(this);
424886 menu.add("-");
425887 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426888 sortbysizeItem.addActionListener(this);
....@@ -431,6 +893,9 @@
431893 shareGeometriesItem.addActionListener(this);
432894 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433895 mergeGeometriesItem.addActionListener(this);
896
+ menu.add("-");
897
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
898
+ editLeafItem.addActionListener(this);
434899 if (Globals.ADVANCED)
435900 {
436901 // Pretty much the same as duplicate and clone.
....@@ -443,33 +908,95 @@
443908 oe.menuBar.add(menu = new Menu("Insert"));
444909 buildCreateMenu(menu);
445910
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
-
459911 oe.menuBar.add(menu = new Menu("Tools"));
460912 buildToolsMenu(menu);
461913 }
462914
915
+ JTabbedPane resourcecontainer;
916
+ cGridBag currenttab;
917
+ boolean added; // patch for jar
918
+
919
+ int tabcount = 0;
920
+ int colcount = 0;
921
+ int rowcount = 0;
922
+ int texturecount = 0;
923
+
924
+ int columns = 5;
925
+ int rows = 7;
926
+
927
+ public void ResourceCallBack(String[] path)
928
+ {
929
+// for (int i = 0; i < path.length; i++)
930
+// System.out.print(path[i] + "/");
931
+// System.out.println();
932
+
933
+ if (//rowcount == 0 ||
934
+ path.length == 1)
935
+ {
936
+ currenttab = new cGridBag();
937
+ added = false;
938
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939
+ currenttab.setName(tabname);
940
+ rowcount = 1;
941
+ colcount = 0;
942
+ texturecount = 0;
943
+ }
944
+
945
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
946
+ {
947
+ if (!added)
948
+ {
949
+ added = true;
950
+ resourcecontainer.add(currenttab);
951
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
952
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
953
+ }
954
+
955
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
956
+
957
+ if (++colcount >= columns)
958
+ {
959
+ colcount = 0;
960
+ currenttab.Return();
961
+
962
+ if (rowcount++ >= rows)
963
+ {
964
+ rowcount = 0;
965
+ }
966
+ }
967
+ }
968
+ else
969
+ {
970
+// if (!path[path.length-1].equals("icons"))
971
+// resourcecontainer.Return();
972
+ }
973
+ }
974
+
975
+ void CreateTexturePanel(cGridBag container)
976
+ {
977
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
978
+ container.add(resourcecontainer);
979
+
980
+ Grafreed.ParseResources("textures", this);
981
+ }
982
+
463983 void SetupUI2(ObjEditor oe)
464984 {
985
+ // June 2019
986
+ if (oe == null)
987
+ {
988
+ //super.SetupUI2(this);
989
+ //return;
990
+ }
991
+
992
+ if (copy != group)
993
+ {
994
+ //super.SetupUI2(this);
995
+ }
996
+
465997 //new Exception().printStackTrace();
466998
467999 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;
4731000 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
4741001
4751002 oe.buttonGroup = new ButtonGroup();
....@@ -490,27 +1017,122 @@
4901017 oe.radioPanel.add(dummyButton);
4911018 oe.buttonGroup.add(dummyButton);
4921019 */
1020
+ cGridBag copyOptionsPanel = new cGridBag();
1021
+
1022
+ copyOptionsPanel.preferredHeight = 2;
1023
+
4931024 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
4941025
495
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496
- liveCB.setToolTipText("Enable animation");
497
- liveCB.addItemListener(this);
1026
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1027
+ //minButton.setToolTipText("Minimize window");
1028
+ //minButton.addActionListener(this);
1029
+
1030
+ if (Globals.ADVANCED)
1031
+ {
1032
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1033
+// maxButton.setToolTipText("Maximize window");
1034
+// maxButton.addActionListener(this);
1035
+ }
1036
+
1037
+// cButton gcButton;
1038
+//
1039
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040
+// gcButton.setToolTipText("Garbage collect");
1041
+// gcButton.addActionListener(new ActionListener()
1042
+// {
1043
+// public void actionPerformed(ActionEvent e)
1044
+// {
1045
+// System.gc();
1046
+// }
1047
+// });
1048
+
1049
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050
+ collapseButton.setToolTipText("Collapse toolbar");
1051
+ collapseButton.addActionListener(this);
1052
+
1053
+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
+ maximize3DButton.setToolTipText("Maximize 3D view");
1055
+ maximize3DButton.addActionListener(this);
1056
+
1057
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
+ twoButton.setToolTipText("Show 3D view only");
1059
+ twoButton.addActionListener(this);
1060
+ this.fullscreenLayout = twoButton;
1061
+
1062
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
+ threeButton.setToolTipText("Show controls and 3D view");
1064
+ threeButton.addActionListener(this);
1065
+ if (Globals.ADVANCED)
1066
+ {
1067
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+ sixButton.setToolTipText("Show 3D view and controls");
1069
+ sixButton.addActionListener(this);
1070
+ }
1071
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1072
+// sevenButton.setToolTipText("3-column layout");
1073
+// sevenButton.addActionListener(this);
1074
+ //
1075
+
1076
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
+ fullButton.setToolTipText("Full-screen window");
1078
+ fullButton.addActionListener(this);
1079
+
1080
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1081
+ screenfitButton.setToolTipText("Screen fit");
1082
+ screenfitButton.addActionListener(this);
4981083
499
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1084
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1085
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1086
+ restoreCameraButton.addActionListener(this);
1087
+
1088
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1089
+ saveVersionButton.setToolTipText("Duplicate current version");
1090
+ saveVersionButton.addActionListener(this);
1091
+
1092
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093
+ deleteVersionButton.setToolTipText("Delete current version");
1094
+ deleteVersionButton.addActionListener(this);
1095
+
1096
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1097
+ previousVersionButton.setToolTipText("Previous version");
1098
+ previousVersionButton.addActionListener(this);
1099
+ previousVersionButton.setEnabled(false);
1100
+
1101
+ cGridBag updown = new cGridBag().setVertical(true);
1102
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103
+ restoreButton.setToolTipText("Undo (restore current version)");
1104
+ restoreButton.addActionListener(this);
1105
+ //restoreButton.setEnabled(false);
1106
+
1107
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+ replaceButton.setToolTipText("Save (replace current version)");
1109
+ replaceButton.addActionListener(this);
1110
+ //replaceButton.setEnabled(false);
1111
+
1112
+ copyOptionsPanel.add(updown);
1113
+
1114
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115
+ nextVersionButton.setToolTipText("Next version");
1116
+ nextVersionButton.addActionListener(this);
1117
+ nextVersionButton.setEnabled(false);
1118
+
1119
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5001120 oneStepButton.setToolTipText("Animate one step forward");
5011121 oneStepButton.addActionListener(this);
5021122
503
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
1123
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1124
+ liveCB.setToolTipText("Enable animation");
1125
+ liveCB.addItemListener(this);
1126
+
1127
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
5041128 fastCB.setToolTipText("Fast mode");
5051129 fastCB.addItemListener(this);
5061130
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);
1131
+ //oe.toolboxPanel.Return();
1132
+
1133
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1134
+// trackCB.setToolTipText("Enable tracking");
1135
+// trackCB.addItemListener(this);
5141136
5151137 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
5161138 // screenfitpointButton.addActionListener(this);
....@@ -520,67 +1142,137 @@
5201142 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5211143 snapobjectButton.addActionListener(this);
5221144 snapobjectButton.setToolTipText("Snap Object");
1145
+
1146
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1147
+ fourButton.addActionListener(this);
1148
+ fourButton.setToolTipText("Show control panel only");
5231149 }
5241150
525
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526
- flashSelectionButton.setToolTipText("Show selection");
527
- flashSelectionButton.addActionListener(this);
1151
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
5281152
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
- //
5471153
548
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549
- rootButton.setToolTipText("Edit selection in new tab");
1154
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1155
+ rootButton.setToolTipText("Open selection in new tab");
5501156 rootButton.addActionListener(this);
5511157
552
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1158
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5531159 closeButton.setToolTipText("Close tab");
5541160 closeButton.addActionListener(this);
5551161 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
5561162 //clearButton.addActionListener(this);
557
-
558
- cGridBag commandsPanel = new cGridBag();
1163
+
1164
+ cGridBag row1 = new cGridBag();
5591165
560
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
- editButton.setToolTipText("Edit selection");
1166
+ // INSERT
1167
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+ gridButton.setToolTipText("Create ground");
1169
+ gridButton.addActionListener(this);
1170
+
1171
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1172
+ boxButton.setToolTipText("Create box");
1173
+ boxButton.addActionListener(this);
1174
+
1175
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176
+ sphereButton.setToolTipText("Create sphere");
1177
+ sphereButton.addActionListener(this);
1178
+
1179
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+ coneButton.setToolTipText("Create cone");
1181
+ coneButton.addActionListener(this);
1182
+
1183
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184
+ torusButton.setToolTipText("Create torus");
1185
+ torusButton.addActionListener(this);
1186
+
1187
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1188
+ superButton.setToolTipText("Create superellipsoid");
1189
+ superButton.addActionListener(this);
1190
+
1191
+ if (Globals.ADVANCED)
1192
+ {
1193
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+ kleinButton.setToolTipText("Create Klein bottle");
1195
+ kleinButton.addActionListener(this);
1196
+ }
1197
+
1198
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1199
+ particlesButton.setToolTipText("Create particle system");
1200
+ particlesButton.addActionListener(this);
1201
+
1202
+ oe.toolboxPanel.add(row1);
1203
+
1204
+ cGridBag row2 = new cGridBag();
1205
+
1206
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1207
+ groupButton.setToolTipText("Create group");
1208
+ groupButton.addActionListener(this);
1209
+
1210
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1211
+ compositeButton.setToolTipText("Create composite");
1212
+ compositeButton.addActionListener(this);
1213
+
1214
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1215
+ switchButton.setToolTipText("Create item switcher");
1216
+ switchButton.addActionListener(this);
1217
+
1218
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1219
+ loopButton.setToolTipText("Create loop");
1220
+ loopButton.addActionListener(this);
1221
+
1222
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1223
+ textureButton.setToolTipText("Create texture");
1224
+ textureButton.addActionListener(this);
1225
+
1226
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1227
+ overlayButton.setToolTipText("Create overlay");
1228
+ overlayButton.addActionListener(this);
1229
+
1230
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1231
+ lightButton.setToolTipText("Create light");
1232
+ lightButton.addActionListener(this);
1233
+
1234
+ oe.toolboxPanel.add(row2);
1235
+
1236
+ cGridBag textures = new cGridBag();
1237
+
1238
+ CreateTexturePanel(textures);
1239
+
1240
+ oe.toolboxPanel.add(textures);
1241
+
1242
+ textures.preferredHeight = 100;
1243
+
1244
+ CreateSkyboxPanel(oe.skyboxPanel);
1245
+
1246
+ // EDIT panel
1247
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+ editButton.setToolTipText("Pin selection controls");
5621249 editButton.addActionListener(this);
5631250
564
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
- uneditButton.setToolTipText("Unedit selection");
1251
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+ uneditButton.setToolTipText("Unpin and remove selection controls");
5661253 uneditButton.addActionListener(this);
5671254
568
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569
- allParamsButton.setToolTipText("Edit all params");
1255
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1256
+ allParamsButton.setToolTipText("Show all controls");
5701257 allParamsButton.addActionListener(this);
5711258
572
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573
- clearPanelButton.setToolTipText("Clear edit panel");
1259
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1260
+ clearPanelButton.setToolTipText("Clear all controls");
5741261 clearPanelButton.addActionListener(this);
5751262
576
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577
- unselectButton.setToolTipText("Unselect");
578
- unselectButton.addActionListener(this);
1263
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1264
+ //unselectButton.setToolTipText("Unselect");
1265
+ //unselectButton.addActionListener(this);
5791266
580
- commandsPanel.preferredHeight = 1;
1267
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1268
+ flashSelectionButton.setToolTipText("Highlight selection");
1269
+ flashSelectionButton.addActionListener(this);
5811270
582
- oe.treePanel.add(commandsPanel);
583
- oe.treePanel.Return();
1271
+ editCommandsPanel.preferredHeight = 1;
1272
+
1273
+ SetPinStates(false);
1274
+// oe.treePanel.add(commandsPanel);
1275
+// oe.treePanel.Return();
5841276
5851277 // oe.aConstraints.gridx += 1;
5861278 // oe.aConstraints.weighty = 0;
....@@ -597,32 +1289,20 @@
5971289
5981290 JScrollPane jSP;
5991291 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1292
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
6011293 ResetModel();
6021294
6031295 oe.treePanel.add(jSPPanel);
6041296 oe.treePanel.Return();
6051297
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;
6211298 oe.treePanel.add(copyOptionsPanel);
6221299 oe.treePanel.Return();
1300
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1301
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1302
+ sliderPane.preferredHeight = 1;
6231303
624
-// mainPanel.setDividerLocation(0.5); //1.0);
625
-// mainPanel.setResizeWeight(0.5);
1304
+// mainPanel.setDividerLocation(0.1); //1.0);
1305
+ mainPanel.setResizeWeight(0.4);
6261306
6271307 //jList.addListSelectionListener(this);
6281308 oe.jTree.addTreeSelectionListener(this);
....@@ -630,7 +1310,7 @@
6301310 //jTree.setEditable(true);
6311311 oe.jTree.setDragEnabled(true);
6321312 //jTree.setPreferredSize(new Dimension(10,10));
633
- jSP.setPreferredSize(new Dimension(100,200));
1313
+ //jSP.setPreferredSize(new Dimension(100,200));
6341314
6351315 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6361316
....@@ -642,29 +1322,49 @@
6421322 dgr.addDragGestureListener(this);
6431323 }catch(Exception e) {}
6441324 */
645
- radio.layout = sevenButton;
1325
+ radio.layout = threeButton; // sixButton;
6461326 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6471327 }
6481328
6491329 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
6501330 {
1331
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1332
+ colorCB.setToolTipText("Copy color when dropped");
1333
+ colorCB.addItemListener(this);
1334
+
1335
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1336
+ materialCB.setToolTipText("Copy material when dropped");
1337
+ materialCB.addItemListener(this);
1338
+
1339
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1340
+ textureCB.setToolTipText("Copy texture when dropped");
1341
+ textureCB.addItemListener(this);
1342
+
1343
+ panel.Return();
1344
+
6511345 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
6521346 boxCB.setToolTipText("Display bounding boxes");
6531347 boxCB.addItemListener(this);
6541348
6551349 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1350
+ zoomBoxCB.setToolTipText("Display only for wheel");
6571351 zoomBoxCB.addItemListener(this);
6581352
6591353 if (true) // Globals.ADVANCED)
6601354 {
661
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662
- supportCB.setToolTipText("Enable rigging");
663
- supportCB.addItemListener(this);
1355
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1356
+// supportCB.setToolTipText("Enable rigging");
1357
+// supportCB.addItemListener(this);
1358
+
1359
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1360
+ freezeCB.setToolTipText("Fast moving camera");
1361
+ freezeCB.addItemListener(this);
6641362
6651363 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
6661364 // localCB.addItemListener(this);
6671365
1366
+ panel.Return();
1367
+
6681368 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
6691369 crowdCB.setToolTipText("Used for crowds");
6701370 crowdCB.addItemListener(this);
....@@ -673,14 +1373,19 @@
6731373 smoothCB.setToolTipText("Snapping delay");
6741374 smoothCB.addItemListener(this);
6751375
676
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677
- slowCB.setToolTipText("Smooth interpolation");
678
- slowCB.addItemListener(this);
1376
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1377
+// slowCB.setToolTipText("Smooth interpolation");
1378
+// slowCB.addItemListener(this);
1379
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1380
+ minshaderCB.setToolTipText("Minimal fast shader");
1381
+ minshaderCB.addItemListener(this);
6791382
6801383 // constraints.gridy += 1;
6811384 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
6821385 // speakerMocapCB.addItemListener(this);
6831386
1387
+ panel.Return();
1388
+
6841389 if (false)
6851390 {
6861391 // handled in scripts
....@@ -695,42 +1400,93 @@
6951400 //constraints.gridy += 1;
6961401 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
6971402 smoothfocusCB.addItemListener(this);
1403
+ panel.Return();
6981404 }
6991405
7001406 //constraints.gridx += 1;
7011407 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
7021408 // debugCB.addItemListener(this);
7031409
1410
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1411
+ trackCB.setToolTipText("Enable tracking target");
1412
+ trackCB.addItemListener(this);
1413
+
7041414 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1415
+ oeilCB.setToolTipText("Move camera when tracking");
7051416 oeilCB.addItemListener(this);
7061417
1418
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1419
+ shadowCB.setToolTipText("When live compute shadows");
1420
+ shadowCB.addItemListener(this);
1421
+
1422
+ panel.Return();
1423
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1424
+ toggleTextureCB.setToolTipText("Load textures");
1425
+ toggleTextureCB.addItemListener(this);
1426
+
1427
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1428
+ toggleSwitchCB.setToolTipText("Choose a single item");
1429
+ toggleSwitchCB.addItemListener(this);
1430
+
1431
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1432
+ autokeepCB.setToolTipText("On structure change");
1433
+ autokeepCB.addItemListener(this);
1434
+
1435
+ panel.Return();
1436
+ if (Globals.ADVANCED)
1437
+ {
7071438 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
7081439 lookAtCB.setToolTipText("Look-at target");
7091440 lookAtCB.addItemListener(this);
1441
+ }
7101442
7111443 }
7121444
7131445 cGridBag fill = new cGridBag();
714
-
7151446 fill.preferredHeight = 200;
1447
+ cGridBag fill2 = new cGridBag();
1448
+ fill2.preferredHeight = 200;
1449
+ cGridBag fill3 = new cGridBag();
1450
+ fill3.preferredHeight = 200;
7161451
7171452 panel.add(fill);
1453
+ panel.add(fill2);
1454
+ panel.add(fill3);
7181455
7191456 }
7201457
7211458 void EditObject(Object3D obj)
7221459 {
1460
+ assert(obj instanceof Composite);
1461
+
1462
+ if (obj.versionlist == null)
1463
+ {
1464
+ obj.versionlist = new Object3D[100];
1465
+ obj.versionindex = -1;
1466
+ }
1467
+
7231468 cRadio radioButton = new cRadio(obj.name);
1469
+
1470
+ // June 2019. Patch to avoid bug with transparency.
1471
+ radioButton.hadMaterial = obj.material != null;
1472
+ if (!radioButton.hadMaterial)
1473
+ {
1474
+ obj.material = new cMaterial();
1475
+ }
1476
+
7241477 radioButton.SetObject(obj);
725
- radioButton.layout = sevenButton;
1478
+ radioButton.layout = threeButton; // sixButton;
7261479 radioButton.SetCamera(cameraView.renderCamera, false);
7271480 radioButton.addActionListener(this);
7281481 radioPanel.add(radioButton);
7291482 buttonGroup.add(radioButton);
7301483 radioButton.doClick();
7311484 }
1485
+
7321486 void SetupViews(ObjEditor oe)
7331487 {
1488
+ theFrame = this;
1489
+
7341490 oe.SetupViews();
7351491
7361492 System.out.println("SetupViews");
....@@ -739,23 +1495,30 @@
7391495 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
7401496 }
7411497
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;
1498
+ cToggleButton liveCB;
1499
+ cCheckBox supportCB;
1500
+ cCheckBox localCB;
1501
+ cCheckBox crowdCB;
1502
+ cCheckBox smoothCB;
1503
+ cCheckBox minshaderCB;
1504
+
1505
+ cToggleButton fastCB;
1506
+ cCheckBox slowCB;
1507
+ cCheckBox boxCB;
1508
+ cCheckBox zoomBoxCB;
1509
+ cCheckBox freezeCB;
1510
+ //cToggleButton trackCB;
1511
+ cCheckBox trackCB;
1512
+ cCheckBox smoothfocusCB;
7531513 // JCheckBox speakerMocapCB;
754
- JCheckBox speakerCameraCB;
755
- JCheckBox speakerFocusCB;
756
- JCheckBox debugCB;
757
- JCheckBox oeilCB;
758
- JCheckBox lookAtCB;
1514
+ cCheckBox speakerCameraCB;
1515
+ cCheckBox speakerFocusCB;
1516
+ cCheckBox debugCB;
1517
+
1518
+ cCheckBox oeilCB;
1519
+ cCheckBox shadowCB;
1520
+ cCheckBox autokeepCB;
1521
+ cCheckBox lookAtCB;
7591522
7601523 // static int COLOR = 1;
7611524 // static int MATERIAL = 2;
....@@ -763,9 +1526,9 @@
7631526
7641527 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7651528
766
- JCheckBox colorCB;
767
- JCheckBox materialCB;
768
- JCheckBox textureCB;
1529
+ cCheckBox colorCB;
1530
+ cCheckBox materialCB;
1531
+ cCheckBox textureCB;
7691532
7701533 public void itemStateChanged(ItemEvent e)
7711534 {
....@@ -793,6 +1556,7 @@
7931556 } else if(e.getSource() == liveCB)
7941557 {
7951558 cameraView.ToggleLive();
1559
+ refreshContents(false);
7961560 }
7971561 else if(e.getSource() == supportCB)
7981562 {
....@@ -808,6 +1572,12 @@
8081572 {
8091573 cameraView.ToggleInertia();
8101574 cameraView.repaint();
1575
+ }
1576
+ else if(e.getSource() == minshaderCB)
1577
+ {
1578
+ Globals.MINSHADER ^= true;
1579
+ cameraView.programInitialized = false;
1580
+ cameraView.repaint();
8111581 }
8121582 else if(e.getSource() == localCB)
8131583 {
....@@ -857,6 +1627,18 @@
8571627 {
8581628 cameraView.ToggleOeil();
8591629 }
1630
+ else if(e.getSource() == shadowCB)
1631
+ {
1632
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1633
+ }
1634
+ else if(e.getSource() == freezeCB)
1635
+ {
1636
+ Globals.FREEZEONMOVE ^= true;
1637
+ }
1638
+ else if(e.getSource() == autokeepCB)
1639
+ {
1640
+ Globals.REPLACEONMAKE ^= true;
1641
+ }
8601642 else if(e.getSource() == lookAtCB)
8611643 {
8621644 cameraView.ToggleLookAt();
....@@ -873,7 +1655,8 @@
8731655
8741656 /**/
8751657 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1658
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1659
+ TreePath path = objEditor.jTree.getSelectionPath();
8771660 if ((path == null) || (path.getPathCount() <= 1)) {
8781661 // We can't move the root node or an empty selection
8791662 return;
....@@ -936,8 +1719,6 @@
9361719 }
9371720 }
9381721
939
- String string = (String) object;
940
-
9411722 System.out.println("Transfer = " + object + "; drop : " + target);
9421723 // if( object instanceof java.io.File[])
9431724 // {
....@@ -945,6 +1726,8 @@
9451726 // objEditor.DropFile((java.io.File[]) object, true);
9461727 // return;
9471728 // }
1729
+
1730
+ String string = object.toString();
9481731
9491732 // File path for Mac and Windows
9501733 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -990,23 +1773,33 @@
9901773
9911774 assert target == objEditor.jTree;
9921775 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1776
+ Object3D destinationLeaf;
9931777 try {
994
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1778
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9951779 } catch (Exception e) {
9961780 System.out.println("destinationPath : " + destinationPath);
9971781 return;
9981782 }
9991783
1000
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1784
+ for (int i=group.selection.size(); --i>=0;)
10011785 {
1786
+ Object3D child = (Object3D)group.selection.elementAt(i);
1787
+
1788
+ // Cannot move into itself
1789
+ if (child == destinationLeaf)
1790
+ return;
1791
+ }
1792
+
1793
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1794
+// {
10021795 loadClipboard(true);
10031796 objEditor.jTree.setSelectionPath(destinationPath);
10041797 pasteInto(false, false);
1005
- } else {
1006
- loadClipboard(false);
1007
- objEditor.jTree.setSelectionPath(destinationPath);
1008
- pasteInto(false, false); // true); // ???
1009
- }
1798
+// } else {
1799
+// loadClipboard(false);
1800
+// objEditor.jTree.setSelectionPath(destinationPath);
1801
+// pasteInto(false, false); // true); // ???
1802
+// }
10101803 }
10111804 public void dropActionChanged(DropTargetDragEvent dtde)
10121805 // Called if the user has modified the current drop gesture
....@@ -1062,7 +1855,12 @@
10621855 TreePath path;
10631856
10641857 public TransferableTreePath(TreePath tp) {
1065
- path = tp;
1858
+ Object[] objs = new Object[tp.getPathCount()];
1859
+ for (int i=0; i<objs.length; i++)
1860
+ {
1861
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1862
+ }
1863
+ path = new TreePath(objs);
10661864 }
10671865
10681866 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1111,22 +1909,30 @@
11111909 {
11121910 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11131911 //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);
1912
+// gridItem = menu.add(new MenuItem("Grid"));
1913
+// gridItem.addActionListener(this);
1914
+// rectoidItem = menu.add(new MenuItem("Box"));
1915
+// rectoidItem.addActionListener(this);
1916
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1917
+// ellipsoidItem.addActionListener(this);
1918
+// coneItem = menu.add(new MenuItem("Cone"));
1919
+// coneItem.addActionListener(this);
1920
+// torusItem = menu.add(new MenuItem("Torus"));
1921
+// torusItem.addActionListener(this);
1922
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1923
+// superItem.addActionListener(this);
1924
+
1925
+ cameraItem = menu.add(new MenuItem("Camera"));
1926
+ cameraItem.addActionListener(this);
1927
+
1928
+ if (!Globals.ADVANCED)
1929
+ {
11261930 kleinItem = menu.add(new MenuItem("Klein Bottle"));
11271931 kleinItem.addActionListener(this);
1128
- particleItem = menu.add(new MenuItem("Particle system"));
1129
- particleItem.addActionListener(this);
1932
+ }
1933
+
1934
+// particleItem = menu.add(new MenuItem("Particle system"));
1935
+// particleItem.addActionListener(this);
11301936 if (Globals.ADVANCED)
11311937 {
11321938 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1152,15 +1958,15 @@
11521958 }
11531959 bezierItem = menu.add(new MenuItem("Bezier Patch"));
11541960 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);
1961
+// overlayItem = menu.add(new MenuItem("Overlay"));
1962
+// overlayItem.addActionListener(this);
1963
+// lightItem = menu.add(new MenuItem("Light"));
1964
+// lightItem.addActionListener(this);
11591965 menu.add("-");
11601966 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11611967 //superLoopItem.addActionListener(this);
1162
- loopItem = menu.add(new MenuItem("Loop"));
1163
- loopItem.addActionListener(this);
1968
+// loopItem = menu.add(new MenuItem("Loop"));
1969
+// loopItem.addActionListener(this);
11641970 doubleItem = menu.add(new MenuItem("Fork"));
11651971 doubleItem.addActionListener(this);
11661972 if (Globals.ADVANCED)
....@@ -1176,6 +1982,9 @@
11761982 animationItem.addItemListener(this);
11771983 animationItem.setState(Globals.ANIMATION);
11781984
1985
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
1986
+ archiveItem.addActionListener(this);
1987
+
11791988 menu.add("-");
11801989 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11811990 parseverticesItem.addActionListener(this);
....@@ -1188,6 +1997,8 @@
11881997 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11891998 reduce34MorphItem.addActionListener(this);
11901999 menu.add("-");
2000
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2001
+ memoryItem.addActionListener(this);
11912002 menu.add(computeAOItem = new MenuItem("Compute AO"));
11922003 computeAOItem.addActionListener(this);
11932004
....@@ -1196,11 +2007,9 @@
11962007 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
11972008 mirrorItem.addActionListener(this);
11982009 menu.add("-");
1199
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1200
- memoryItem.addActionListener(this);
12012010 menu.add(analyzeItem = new MenuItem("Analyze"));
12022011 analyzeItem.addActionListener(this);
1203
- menu.add(dumpItem = new MenuItem("Dump"));
2012
+ menu.add(dumpItem = new MenuItem("Print"));
12042013 dumpItem.addActionListener(this);
12052014 // menu.add(pathItem = new MenuItem("From-to path"));
12062015 // pathItem.addActionListener(this);
....@@ -1341,9 +2150,34 @@
13412150 shadow.material = new cMaterial(obj.material);
13422151 shadow.material.diffuse = 0.0001f;
13432152 shadow.material.specular = 0.0001f;
2153
+ //shadow.projectedVertices[1].x = 300;
13442154
13452155 makeSomething(shadow);
13462156 }
2157
+
2158
+ private void ClearUnpinned()
2159
+ {
2160
+ //for (Object3D obj : listUI)
2161
+ for (int i=listUI.size(); --i>=0;)
2162
+ {
2163
+ Object3D obj = listUI.elementAt(i);
2164
+ if (!obj.pinned)
2165
+ {
2166
+ obj.CloseUI();
2167
+ listUI.remove(i);
2168
+ }
2169
+ }
2170
+ }
2171
+
2172
+ private void EditElement(Object3D elem, boolean newWindow)
2173
+ {
2174
+ // if (!(elem instanceof Composite))
2175
+ // newWindow = false;
2176
+ listUI.add(elem);
2177
+ elem.openEditWindow(this, newWindow); //, false);
2178
+ System.out.println("edit : " + elem);
2179
+ elem.editWindow.refreshContents(true); // ? new
2180
+ }
13472181
13482182 /**
13492183 * applyExample
....@@ -1588,7 +2422,7 @@
15882422 {
15892423 ScreenFit();
15902424 } else
1591
- if (source == switchItem)
2425
+ if (source == switchViewItem)
15922426 {
15932427 cVector v1 = new cVector();
15942428 cVector v2 = new cVector();
....@@ -1597,11 +2431,11 @@
15972431 objEditor.cameraView.renderCamera.setAim(v2, v1);
15982432 objEditor.cameraView.repaint();
15992433 } else
1600
- if (source == rectoidItem)
2434
+ if (source == rectoidItem || source == boxButton)
16012435 {
16022436 makeSomething(new Box());
16032437 } else
1604
- if (source == particleItem)
2438
+ if (source == particleItem || source == particlesButton)
16052439 {
16062440 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16072441 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1680,27 +2514,27 @@
16802514
16812515 makeSomething(obj);
16822516 } else
1683
- if (source == gridItem)
2517
+ if (source == gridItem || source == gridButton)
16842518 {
16852519 makeSomething(new Grid());
16862520 } else
1687
- if (source == ellipsoidItem)
2521
+ if (source == ellipsoidItem || source == sphereButton)
16882522 {
16892523 makeSomething(new Sphere());
16902524 } else
1691
- if (source == coneItem)
2525
+ if (source == coneItem || source == coneButton)
16922526 {
16932527 makeSomething(new Cone());
16942528 } else
1695
- if (source == torusItem)
2529
+ if (source == torusItem || source == torusButton)
16962530 {
16972531 makeSomething(new Torus());
16982532 } else
1699
- if (source == superItem)
2533
+ if (source == superItem || source == superButton)
17002534 {
17012535 makeSomething(new Superellipsoid());
17022536 } else
1703
- if (source == kleinItem)
2537
+ if (source == kleinItem || source == kleinButton)
17042538 {
17052539 makeSomething(new Klein());
17062540 } else
....@@ -1720,7 +2554,7 @@
17202554 {
17212555 makeSomething(new BezierSurface());
17222556 } else
1723
- if (source == overlayItem)
2557
+ if (source == overlayItem || source == overlayButton)
17242558 {
17252559 /*
17262560 Object3D obj = new BezierSurface(5,8);
....@@ -1768,10 +2602,27 @@
17682602 s.setup();
17692603 makeSomething(s);
17702604 } else
1771
- if (source == lightItem)
2605
+ if (source == lightItem || source == lightButton)
17722606 {
17732607 makeSomething(new Light());
17742608 } else
2609
+// if (source == skybox1Button ||
2610
+// source == skybox2Button ||
2611
+// source == skybox3Button ||
2612
+// source == skybox4Button ||
2613
+// source == skybox5Button ||
2614
+// source == skybox6Button ||
2615
+// source == skybox7Button ||
2616
+// source == skybox11Button ||
2617
+// source == skybox12Button ||
2618
+// source == skybox13Button ||
2619
+// source == skybox14Button ||
2620
+// source == skybox15Button ||
2621
+// source == skybox16Button ||
2622
+// source == skybox17Button)
2623
+// {
2624
+// ChangeSkybox(source);
2625
+// } else
17752626 if (source == csgItem)
17762627 {
17772628 group(new CSG());
....@@ -1818,30 +2669,30 @@
18182669
18192670 group(g);
18202671 } else
1821
- if (source == loopItem)
2672
+ if (source == loopItem || source == loopButton)
18222673 {
18232674 Composite csg = new GroupLeaf();
18242675 csg.count = 5;
18252676 group(csg);
1826
- Composite child = new cGroup();
2677
+ Composite child = new cGroup("Branch");
18272678 csg.addChild(child);
18282679 child.addChild(csg);
18292680 } else
18302681 if (source == doubleItem)
18312682 {
1832
- Composite csg = new GroupLeaf();
2683
+ Composite csg = new GroupLeaf("Fork");
18332684 csg.count = 5;
18342685 group(csg);
1835
- Composite child = new cGroup();
2686
+ Composite child = new cGroup("Branch A");
18362687 csg.addChild(child);
18372688 child.addChild(csg);
1838
- child = new cGroup();
2689
+ child = new cGroup("Branch B");
18392690 csg.addChild(child);
18402691 child.addChild(csg);
18412692 } else
18422693 if (source == tripleItem)
18432694 {
1844
- Composite csg = new GroupLeaf();
2695
+ Composite csg = new GroupLeaf("Trident");
18452696 csg.count = 4;
18462697 group(csg);
18472698 Composite child = new cGroup();
....@@ -1854,35 +2705,10 @@
18542705 csg.addChild(child);
18552706 child.addChild(csg);
18562707 } 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
- }
1881
- } else
18822708 if (source == computeAOItem)
18832709 {
18842710 Globals.drawMode = CameraPane.OCCLUSION;
1885
- Globals.theRenderer.repaint();
2711
+ cameraView.repaint();
18862712 } else
18872713 if (source == recompileItem)
18882714 {
....@@ -1897,7 +2723,7 @@
18972723 if (source == invariantsItem)
18982724 {
18992725 System.out.println("Invariants:");
1900
- Grafreed.grafreeD.universe.invariants();
2726
+ Grafreed.grafreed.universe.invariants();
19012727 } else
19022728 if (source == memoryItem)
19032729 {
....@@ -1916,6 +2742,65 @@
19162742 {
19172743 DumpObject();
19182744 } else
2745
+ if (source == minButton)
2746
+ {
2747
+ Minimize();
2748
+ } else
2749
+ if (source == maxButton)
2750
+ {
2751
+ Maximize();
2752
+ } else
2753
+ if (source == fullButton)
2754
+ {
2755
+ ToggleFullScreen();
2756
+ } else
2757
+ if (source == collapseButton)
2758
+ {
2759
+ this.expandedLayout = radio.layout;
2760
+ CollapseToolbar();
2761
+ } else
2762
+ if (source == maximize3DButton)
2763
+ {
2764
+ this.expandedLayout = radio.layout;
2765
+ radio.layout = twoButton;
2766
+ Show3DView();
2767
+ CollapseToolbar();
2768
+ } else
2769
+ if (source == previousVersionButton)
2770
+ {
2771
+ // Go to previous version
2772
+ //if (!Undo())
2773
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2774
+ PreviousVersion();
2775
+ } else
2776
+ if (source == restoreButton)
2777
+ {
2778
+ // Restore current version
2779
+ Restore();
2780
+ //restoreButton.setEnabled(false);
2781
+ } else
2782
+ if (source == replaceButton)
2783
+ {
2784
+ // Overwrite current version
2785
+ Replace();
2786
+ //replaceButton.setEnabled(false);
2787
+ } else
2788
+ if (source == nextVersionButton)
2789
+ {
2790
+ // Go to next version
2791
+ NextVersion();
2792
+ } else
2793
+ if (source == saveVersionButton)
2794
+ {
2795
+ // Save a new version
2796
+ if (!Save(true))
2797
+ java.awt.Toolkit.getDefaultToolkit().beep();
2798
+ } else
2799
+ if (source == deleteVersionButton)
2800
+ {
2801
+ // Delete a new version
2802
+ DeleteVersion();
2803
+ } else
19192804 if (source == oneStepButton)
19202805 {
19212806 Globals.ONESTEP = true;
....@@ -1923,17 +2808,14 @@
19232808 } else
19242809 if (source == screenfitButton)
19252810 {
1926
- //Reload(lastConverter, lastFilename, true);
19272811 ScreenFit();
19282812 } else
19292813 if (source == screenfitpointButton)
19302814 {
1931
- //Reload(lastConverter, lastFilename, true);
19322815 ScreenFitPoint();
19332816 } else
19342817 if (source == snapobjectButton)
19352818 {
1936
- //Reload(lastConverter, lastFilename, true);
19372819 SnapObject();
19382820 } else
19392821 // if (event.getSource() == recompileButton)
....@@ -1969,6 +2851,14 @@
19692851 if (source == cutItem || source == clearButton)
19702852 {
19712853 loadClipboard(true);
2854
+ } else
2855
+ if (source == undoItem)
2856
+ {
2857
+ PreviousVersion();
2858
+ } else
2859
+ if (source == redoItem)
2860
+ {
2861
+ NextVersion();
19722862 } else
19732863 if (source == duplicateItem)
19742864 {
....@@ -2289,7 +3179,7 @@
22893179 {
22903180 StepAll();
22913181 } else
2292
- if (source == clearItem) // || event.getSource() == clearButton)
3182
+ if (source == deleteItem) // || event.getSource() == clearButton)
22933183 {
22943184 //int indices[] = jList.getSelectedIndices();
22953185 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2301,9 +3191,9 @@
23013191 {
23023192 ClearSelection(true);
23033193 } else
2304
- if (source == grabItem)
3194
+ if (source == grabItem || source == groupButton)
23053195 {
2306
- group(new cGroup(), true);
3196
+ group(new cGroup(), false); // true);
23073197 } else
23083198 if (source == hideItem)
23093199 {
....@@ -2321,11 +3211,11 @@
23213211 {
23223212 makeSomething(new Camera());
23233213 } else
2324
- if (source == compositeItem)
3214
+ if (source == compositeItem || source == compositeButton)
23253215 {
23263216 group(new Composite());
23273217 } else
2328
- if (source == randomItem)
3218
+ if (source == switchItem || source == switchButton)
23293219 {
23303220 RandomNode random = new RandomNode();
23313221 group(random);
....@@ -2427,7 +3317,7 @@
24273317 {
24283318 group(new cLinker());
24293319 } else
2430
- if (source == textureItem)
3320
+ if (source == textureItem || source == textureButton)
24313321 {
24323322 group(new TextureNode());
24333323 } else
....@@ -2447,17 +3337,30 @@
24473337 {
24483338 CastShadow(2);
24493339 } else
2450
- if (source == ungroupItem)
3340
+ if (source == ungroupItem || source == ungroupButton)
24513341 {
2452
- //ungroup();
3342
+ boolean hasRoot = false;
3343
+
24533344 for (int i=0; i<group.selection.size(); i++)
24543345 {
2455
- Ungroup(group.selection.get(i));
3346
+ if (group.selection.get(i) == group)
3347
+ {
3348
+ hasRoot = true;
3349
+ break;
3350
+ }
24563351 }
24573352
2458
- ClearSelection(false);
2459
-
2460
- refreshContents();
3353
+ if (!hasRoot)
3354
+ {
3355
+ for (int i=0; i<group.selection.size(); i++)
3356
+ {
3357
+ Ungroup(group.selection.get(i));
3358
+ }
3359
+
3360
+ ClearSelection(false);
3361
+
3362
+ refreshContents();
3363
+ }
24613364 } else
24623365 if (source == genUVItem)
24633366 {
....@@ -2469,7 +3372,7 @@
24693372 } else
24703373 if (source == genNormalsMESHItem)
24713374 {
2472
- GenNormals(true); // TODO
3375
+ GenNormalsMESH();
24733376 } else
24743377 if (source == genNormalsORGANItem)
24753378 {
....@@ -2534,6 +3437,22 @@
25343437 if (source == unmarkleavesItem)
25353438 {
25363439 MarkLeaves(false);
3440
+ } else
3441
+ if (source == rewindleavesItem)
3442
+ {
3443
+ RewindLeaves(true);
3444
+ } else
3445
+ if (source == unrewindleavesItem)
3446
+ {
3447
+ RewindLeaves(false);
3448
+ } else
3449
+ if (source == randomleavesItem)
3450
+ {
3451
+ RandomLeaves(true);
3452
+ } else
3453
+ if (source == unrandomleavesItem)
3454
+ {
3455
+ RandomLeaves(false);
25373456 } else
25383457 if (source == flipVItem)
25393458 {
....@@ -2742,7 +3661,7 @@
27423661 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
27433662 {
27443663 obj = (Object3D)e.nextElement();
2745
- obj.SetBumpTexture(null);
3664
+ obj.ResetBumpTexture();
27463665 }
27473666
27483667 refreshContents();
....@@ -2758,6 +3677,31 @@
27583677
27593678 refreshContents();
27603679 } else
3680
+ if (source == embedTexturesItem)
3681
+ {
3682
+ Object3D obj;
3683
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3684
+ {
3685
+ obj = (Object3D)e.nextElement();
3686
+ obj.EmbedTextures(true);
3687
+ }
3688
+
3689
+ refreshContents();
3690
+ } else
3691
+ if (source == deEmbedTexturesItem)
3692
+ {
3693
+ Object3D obj;
3694
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3695
+ {
3696
+ obj = (Object3D)e.nextElement();
3697
+ obj.EmbedTextures(false);
3698
+ }
3699
+
3700
+ CameraPane.texturepigment.clear();
3701
+ CameraPane.texturebump.clear();
3702
+
3703
+ refreshContents();
3704
+ } else
27613705 if (source == flashSelectionButton)
27623706 {
27633707 CameraPane.flash = true;
....@@ -2769,42 +3713,36 @@
27693713 if (source == twoButton)
27703714 {
27713715 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();
3716
+
3717
+ if (CameraPane.FULLSCREEN)
3718
+ fullscreenLayout = radio.layout;
3719
+
3720
+ Show3DView();
3721
+
3722
+ cameraView.requestFocusInWindow();
3723
+
3724
+// refreshContents(true);
3725
+//
3726
+// try
3727
+// {
3728
+// java.awt.Robot bot = new java.awt.Robot();
3729
+// int mask = InputEvent.BUTTON1_MASK;
3730
+// bot.mouseMove(100, 100);
3731
+// bot.mousePress(mask);
3732
+// bot.mouseRelease(mask);
3733
+// }
3734
+// catch (Exception e)
3735
+// {
3736
+//
3737
+// }
3738
+
28043739 } else
28053740 if (source == threeButton)
28063741 {
28073742 radio.layout = threeButton;
3743
+
3744
+ if (CameraPane.FULLSCREEN)
3745
+ fullscreenLayout = radio.layout;
28083746
28093747 // bigThree.remove(scenePanel);
28103748 // bigThree.remove(centralPanel);
....@@ -2834,13 +3772,18 @@
28343772 // centralPanel.setVisible(true);
28353773 // XYZPanel.setVisible(true);
28363774 bigThree.ClearUI();
3775
+ bigThree.add(scenePanel);
28373776 bigThree.add(centralPanel);
2838
- bigThree.add(XYZPanel);
28393777 bigThree.FlushUI();
3778
+
3779
+ cameraView.requestFocusInWindow();
28403780 } else
28413781 if (source == fourButton)
28423782 {
28433783 radio.layout = fourButton;
3784
+
3785
+ if (CameraPane.FULLSCREEN)
3786
+ fullscreenLayout = radio.layout;
28443787
28453788 // bigThree.remove(scenePanel);
28463789 // bigThree.remove(centralPanel);
....@@ -2872,10 +3815,15 @@
28723815 bigThree.ClearUI();
28733816 bigThree.add(scenePanel);
28743817 bigThree.FlushUI();
3818
+
3819
+ cameraView.requestFocusInWindow();
28753820 } else
28763821 if (source == sixButton)
28773822 {
28783823 radio.layout = sixButton;
3824
+
3825
+ if (CameraPane.FULLSCREEN)
3826
+ fullscreenLayout = radio.layout;
28793827
28803828 // bigThree.remove(scenePanel);
28813829 // bigThree.remove(centralPanel);
....@@ -2905,13 +3853,18 @@
29053853 // centralPanel.setVisible(true);
29063854 // XYZPanel.setVisible(false);
29073855 bigThree.ClearUI();
2908
- bigThree.add(scenePanel);
29093856 bigThree.add(centralPanel);
3857
+ bigThree.add(scenePanel);
29103858 bigThree.FlushUI();
3859
+
3860
+ cameraView.requestFocusInWindow();
29113861 } else
29123862 if (source == sevenButton)
29133863 {
29143864 radio.layout = sevenButton;
3865
+
3866
+ if (CameraPane.FULLSCREEN)
3867
+ fullscreenLayout = radio.layout;
29153868
29163869 // bigThree.remove(scenePanel);
29173870 // bigThree.remove(centralPanel);
....@@ -2945,9 +3898,12 @@
29453898 bigThree.add(centralPanel);
29463899 bigThree.add(XYZPanel);
29473900 bigThree.FlushUI();
3901
+
3902
+ cameraView.requestFocusInWindow();
29483903 } else
29493904 if (source == rootButton)
29503905 {
3906
+ Replace();
29513907 Object3D obj;
29523908 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
29533909 {
....@@ -2956,6 +3912,7 @@
29563912 EditObject(obj);
29573913 }
29583914
3915
+ cameraView.requestFocusInWindow();
29593916 refreshContents(true);
29603917 } else
29613918 if (source == closeButton)
....@@ -2965,22 +3922,37 @@
29653922 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
29663923 {
29673924 ab = (cRadio)e.nextElement();
2968
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3925
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
29693926 {
3927
+ // Patch to avoid bug with transparency.
3928
+ if (!ab.hadMaterial)
3929
+ {
3930
+ ab.object.material = null;
3931
+ }
3932
+
29703933 buttonGroup.remove(ab);
29713934 radioPanel.remove(ab);
29723935
2973
- ab.GetObject().editWindow = null;
3936
+ //ab.GetObject().editWindow = null;
3937
+ ab.GetObject().manipWindow = null;
29743938 // ab.GetObject().objectUI = null; // ?????????
29753939
29763940 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
29773941 break;
29783942 }
29793943 }
3944
+
3945
+ cameraView.requestFocusInWindow();
29803946 refreshContents(true);
29813947 } else
29823948 if (source == editItem || source == editButton)
29833949 {
3950
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3951
+ {
3952
+ Object3D child = (Object3D)e.nextElement();
3953
+ child.pinned = true;
3954
+ }
3955
+
29843956 EditSelection(false);
29853957 } else
29863958 if (source == uneditButton)
....@@ -2989,11 +3961,12 @@
29893961 {
29903962 Object3D child = (Object3D)e.nextElement();
29913963 if(child.editWindow != null)
2992
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3964
+ child.pinned = false;
29933965 child.CloseUI();
29943966 listUI.remove(child);
3967
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29953968
2996
- child.editWindow = null; // ???????????
3969
+ //child.editWindow = null; // ???????????
29973970 }
29983971 objEditor.ctrlPanel.FlushUI();
29993972 //objEditor.jTree.clearSelection();
....@@ -3006,16 +3979,18 @@
30063979 //copy.ClearUI();
30073980 for (Object3D obj : listUI)
30083981 {
3982
+ obj.pinned = false;
30093983 obj.CloseUI();
30103984 }
30113985 listUI.clear();
3986
+ SetPinStates(group.selection.size() > 0);
30123987 refreshContents(true);
30133988 } else
30143989 if (source == allParamsButton)
30153990 {
30163991 assert(copy == group);
30173992
3018
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3993
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30193994
30203995 for (Object3D obj : listUI)
30213996 {
....@@ -3064,6 +4039,7 @@
30644039 }
30654040
30664041 copy = group;
4042
+
30674043 //Globals.theRenderer.object = group;
30684044 if(!useclient)
30694045 {
....@@ -3079,20 +4055,51 @@
30794055 frontView.object = group;
30804056 sideView.object = group;
30814057 }
3082
- group.editWindow = this;
4058
+
4059
+// fix "+" issue
4060
+ //group.editWindow = this;
4061
+ group.manipWindow = this;
4062
+
30834063 /*
30844064 currentLayout = radio.layout;
30854065 if (currentLayout == null)
30864066 currentLayout = sevenButton;
30874067 */
30884068 radio.layout.doClick();
4069
+
4070
+ SetUndoStates();
4071
+
4072
+ ClearUnpinned();
4073
+
4074
+ //Grafreed.Assert(group != null);
4075
+ //Grafreed.Assert(group.selection != null);
4076
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4077
+ if (group.selection == null || group.selection.size() == 1)
4078
+ EditSelection(false);
30894079 keepparent = group.parent;
30904080 // PARENT = NULL or not???
30914081 //group.parent = null; // ROOT
30924082 //group.attributes = -1;
30934083 ResetModel();
4084
+
4085
+ cameraView.requestFocusInWindow();
30944086 refreshContents(true);
3095
- }
4087
+ } else if (event.getSource() == editCameraItem)
4088
+ {
4089
+ cameraView.ProtectCamera();
4090
+ cameraView.requestFocusInWindow();
4091
+ cameraView.repaint();
4092
+ return;
4093
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
4094
+ {
4095
+ cameraView.RevertCamera();
4096
+ cameraView.requestFocusInWindow();
4097
+ cameraView.repaint();
4098
+ return;
4099
+ // } else if (event.getSource() == textureButton)
4100
+ // {
4101
+ // return; // true;
4102
+ }
30964103 else
30974104 {
30984105 //return super.action(event, arg);
....@@ -3101,7 +4108,6 @@
31014108 }
31024109
31034110 boolean useclient = false;
3104
- cRadio radio;
31054111
31064112 void ToggleRoot()
31074113 {
....@@ -3340,7 +4346,8 @@
33404346
33414347 int size = obj.MemorySize();
33424348
3343
- System.err.println((size/1024) + " KB is the size of " + obj);
4349
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4350
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33444351 }
33454352 }
33464353 catch (Exception e)
....@@ -3421,6 +4428,13 @@
34214428 void GenNormals(boolean crease)
34224429 {
34234430 group.GenNormalsS(crease);
4431
+
4432
+ refreshContents();
4433
+ }
4434
+
4435
+ void GenNormalsMESH()
4436
+ {
4437
+ group.GenNormalsMeshS();
34244438
34254439 refreshContents();
34264440 }
....@@ -3656,7 +4670,7 @@
36564670
36574671 try
36584672 {
3659
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4673
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
36604674 }
36614675 catch (Exception e)
36624676 {
....@@ -4048,6 +5062,18 @@
40485062 refreshContents();
40495063 }
40505064
5065
+ void RewindLeaves(boolean hide)
5066
+ {
5067
+ group.selection.RewindLeaves(hide);
5068
+ refreshContents();
5069
+ }
5070
+
5071
+ void RandomLeaves(boolean hide)
5072
+ {
5073
+ group.selection.RandomLeaves(hide);
5074
+ refreshContents();
5075
+ }
5076
+
40515077 void SetTexRes(int tr)
40525078 {
40535079 group.selection.SetTexRes(tr);
....@@ -4119,28 +5145,25 @@
41195145 // }
41205146 // }
41215147
4122
- static boolean allparams = true;
4123
-
4124
- static Vector<Object3D> listUI = new Vector<Object3D>();
4125
-
41265148 void EditSelection(boolean newWindow)
41275149 {
5150
+ if (group.selection == null)
5151
+ {
5152
+ EditElement(group, newWindow); // ? new
5153
+ return;
5154
+ }
5155
+
41285156 // aConstraints.gridy = 0;
41295157 for (int i=0; i<group.selection.size(); i++)
41305158 {
41315159 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
41325160 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4133
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5161
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41345162
41355163 Object3D elem = (Object3D)group.selection.elementAt(i);
4136
- if(elem != group)
5164
+ if(elem != group || !newWindow)
41375165 {
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
5166
+ EditElement(elem, newWindow); // ? new
41445167 }
41455168 }
41465169 }
....@@ -4203,9 +5226,7 @@
42035226
42045227 freezemodel = false;
42055228 }
4206
-
4207
- boolean flashIt = true;
4208
-
5229
+
42095230 public void valueChanged(TreeSelectionEvent e)
42105231 //public boolean handleEvent(Event event)
42115232 {
....@@ -4215,7 +5236,8 @@
42155236 //new Exception().printStackTrace();
42165237
42175238 freezemodel = true;
4218
-
5239
+ ClearUnpinned();
5240
+
42195241 /**/
42205242 //switch (event.id)
42215243 {
....@@ -4223,7 +5245,6 @@
42235245 //case 702: // Event.LIST_DESELECT
42245246 group.deselectAll();
42255247 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226
- objEditor.ClearInfo(); // .GetMaterial());
42275248 if (tps != null)
42285249 {
42295250 for (int i=0; i < tps.length; i++)
....@@ -4232,10 +5253,8 @@
42325253
42335254 //if (child.parent != null)
42345255 //child.parent.addSelectee(child);
5256
+ objEditor.SetMaterial(child);
42355257 group.addSelectee(child);
4236
- objEditor.SetMaterial(child); // .GetMaterial());
4237
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4238
- System.err.println("info : " + child.GetPath());
42395258 }
42405259 }
42415260 // else
....@@ -4245,20 +5264,28 @@
42455264 // System.err.println("info : " + group.GetPath());
42465265 // }
42475266
4248
- objEditor.SetText(); // jan 2014
4249
-
4250
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5267
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
42515268 CameraPane.flash = true;
42525269
4253
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5270
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
42545271 // a camera
42555272 {
4256
- CameraPane.camerachangeframe = 0; // don't refuse it
4257
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5273
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5274
+ {
5275
+ CameraPane.camerachangeframe = 0; // don't refuse it
5276
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5277
+ }
42585278 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
42595279 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
42605280 }
42615281
5282
+ if (tps != null && tps.length == 1)
5283
+ {
5284
+ EditSelection(false);
5285
+ }
5286
+
5287
+ SetPinStates(tps != null && tps.length > 0);
5288
+
42625289 refreshContents();
42635290 //return true;
42645291 }
....@@ -4267,6 +5294,50 @@
42675294
42685295 freezemodel = false;
42695296 }
5297
+
5298
+ void SetPinStates(boolean enabled)
5299
+ {
5300
+ editButton.setEnabled(enabled);
5301
+ uneditButton.setEnabled(enabled);
5302
+ //unselectButton.setEnabled(enabled);
5303
+ flashSelectionButton.setEnabled(enabled);
5304
+
5305
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5306
+
5307
+ boolean allComposites = true;
5308
+
5309
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310
+ {
5311
+ if (!(e.nextElement() instanceof Composite))
5312
+ {
5313
+ allComposites = false;
5314
+ break;
5315
+ }
5316
+ }
5317
+
5318
+ rootButton.setEnabled(allComposites);
5319
+ }
5320
+
5321
+ void refreshContents(boolean cp)
5322
+ {
5323
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5324
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5325
+ {
5326
+ objEditor.ClearInfo(); // .GetMaterial());
5327
+
5328
+ for (int i=0; i < group.selection.Size(); i++)
5329
+ {
5330
+ Object3D child = (Object3D) group.selection.get(i);
5331
+
5332
+ objEditor.AddInfo(child, this, true);
5333
+// System.err.println("info : " + child.GetPath());
5334
+ }
5335
+
5336
+ objEditor.SetText(); // jan 2014
5337
+ }
5338
+
5339
+ super.refreshContents(cp);
5340
+ }
42705341
42715342 void linkSomething(Object3D thing)
42725343 {
....@@ -4338,6 +5409,7 @@
43385409 {
43395410 if (group.selection.isEmpty())
43405411 return;
5412
+
43415413 Grafreed.clipboardIsTempGroup = false;
43425414 Composite tGroup = null;
43435415 if (group.selection.size() > 0) // 1)
....@@ -4348,6 +5420,8 @@
43485420
43495421 if (cut)
43505422 {
5423
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5424
+// Save();
43515425 //int indices[] = jList.getSelectedIndices();
43525426 //for (int i = indices.length - 1; i >= 0; i--)
43535427 //jList.remove(indices[i]);
....@@ -4437,8 +5511,10 @@
44375511 }
44385512
44395513 }
5514
+
44405515 if (Grafreed.clipboardIsTempGroup)
44415516 Grafreed.clipboard = tGroup;
5517
+
44425518 if (cut)
44435519 {
44445520 ResetModel();
....@@ -4448,6 +5524,10 @@
44485524
44495525 void paste(boolean expand)
44505526 {
5527
+ if (Globals.REPLACEONMAKE)
5528
+ Save();
5529
+ boolean keep = Globals.REPLACEONMAKE;
5530
+ Globals.REPLACEONMAKE = false;
44515531 // if (GrafreeD.clipboard == null)
44525532 // return;
44535533 boolean first = true;
....@@ -4507,6 +5587,7 @@
45075587 Grafreed.clipboard.get(0).parent = keepparent;
45085588 }
45095589
5590
+ Globals.REPLACEONMAKE = keep;
45105591 ResetModel();
45115592 refreshContents();
45125593 }
....@@ -4642,6 +5723,10 @@
46425723
46435724 void group(Object3D csg, boolean grab)
46445725 {
5726
+ if (Globals.REPLACEONMAKE)
5727
+ Save();
5728
+ boolean keep = Globals.REPLACEONMAKE;
5729
+ Globals.REPLACEONMAKE = false;
46455730 if (//false) // why??
46465731 !group.selection.isEmpty())
46475732 {
....@@ -4755,10 +5840,15 @@
47555840 //node.add(csg);
47565841 //makeSomething(node);
47575842 makeSomething(csg);
5843
+ Globals.REPLACEONMAKE = keep;
47585844 }
47595845
47605846 void Ungroup(Object3D g)
47615847 {
5848
+ if (Globals.REPLACEONMAKE)
5849
+ Save();
5850
+ boolean keep = Globals.REPLACEONMAKE;
5851
+ Globals.REPLACEONMAKE = false;
47625852 if (g instanceof HiddenObject)
47635853 {
47645854 HiddenObject h = (HiddenObject) g;
....@@ -4775,6 +5865,7 @@
47755865 objEditor.makeSomething(g.get(i), false);
47765866 }
47775867 }
5868
+ Globals.REPLACEONMAKE = keep;
47785869 }
47795870
47805871 void ungroup()
....@@ -4970,21 +6061,6 @@
49706061 }
49716062 */
49726063
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
-
49886064 /*
49896065 public void Callback(Object obj)
49906066 {
....@@ -5008,23 +6084,6 @@
50086084 }
50096085 */
50106086
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
-
50286087 String GetFile(String dialogName)
50296088 {
50306089 if (Grafreed.standAlone)
....@@ -5095,7 +6154,43 @@
50956154 cButton clearpanelButton;
50966155 cButton unselectButton;
50976156
6157
+ cButton restoreCameraButton;
6158
+
50986159 cButton oneStepButton;
6160
+
6161
+ cButton groupButton;
6162
+ cButton ungroupButton;
6163
+ cButton compositeButton;
6164
+ cButton switchButton;
6165
+ cButton loopButton;
6166
+ cButton textureButton;
6167
+
6168
+ cButton skybox1Button;
6169
+ cButton skybox2Button;
6170
+ cButton skybox3Button;
6171
+ cButton skybox4Button;
6172
+ cButton skybox5Button;
6173
+ cButton skybox6Button;
6174
+ cButton skybox7Button;
6175
+
6176
+ cButton skybox11Button;
6177
+ cButton skybox12Button;
6178
+ cButton skybox13Button;
6179
+ cButton skybox14Button;
6180
+ cButton skybox15Button;
6181
+ cButton skybox16Button;
6182
+ cButton skybox17Button;
6183
+
6184
+ cButton gridButton;
6185
+ cButton boxButton;
6186
+ cButton sphereButton;
6187
+ cButton coneButton;
6188
+ cButton torusButton;
6189
+ cButton superButton;
6190
+ cButton kleinButton;
6191
+ cButton particlesButton;
6192
+ cButton overlayButton;
6193
+ cButton lightButton;
50996194
51006195 cButton screenfitButton;
51016196 cButton screenfitpointButton;
....@@ -5108,14 +6203,6 @@
51086203
51096204 cButton setsupportButton;
51106205
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
-
51196206 //
51206207 //Composite
51216208 Object3D // to do !!
....@@ -5125,9 +6212,11 @@
51256212 //JTree jTree;
51266213 private MenuItem lookAtItem;
51276214 private MenuItem lookFromItem;
5128
- private MenuItem switchItem;
6215
+ private MenuItem switchViewItem;
51296216 private MenuItem cutItem;
5130
- private MenuItem duplicateItem;
6217
+ private MenuItem undoItem;
6218
+ private MenuItem redoItem;
6219
+ private JMenuItem duplicateItem;
51316220 private MenuItem cloneItem;
51326221 private MenuItem cloneSupportItem;
51336222 private MenuItem overwriteGeoItem;
....@@ -5155,7 +6244,7 @@
51556244 private MenuItem pasteLinkItem;
51566245 private MenuItem pasteCloneItem;
51576246 private MenuItem pasteExpandItem;
5158
- private MenuItem clearItem;
6247
+ private MenuItem deleteItem;
51596248 private MenuItem clearAllItem;
51606249 private MenuItem genUVItem;
51616250 private MenuItem genNormalsMESHItem;
....@@ -5190,6 +6279,10 @@
51906279 private MenuItem showleavesItem;
51916280 private MenuItem markleavesItem;
51926281 private MenuItem unmarkleavesItem;
6282
+ private MenuItem rewindleavesItem;
6283
+ private MenuItem unrewindleavesItem;
6284
+ private MenuItem randomleavesItem;
6285
+ private MenuItem unrandomleavesItem;
51936286
51946287 private MenuItem flipVItem;
51956288 private MenuItem unflipVItem;
....@@ -5211,7 +6304,7 @@
52116304 private MenuItem frontItem;
52126305 private MenuItem cameraItem;
52136306 private MenuItem compositeItem;
5214
- private MenuItem randomItem;
6307
+ private MenuItem switchItem;
52156308 private MenuItem physicsItem;
52166309 private MenuItem frameselectorItem;
52176310 private MenuItem scriptNodeItem;
....@@ -5235,6 +6328,8 @@
52356328 private MenuItem attachBumpItem;
52366329 private MenuItem detachBumpItem;
52376330 private MenuItem pigmentBumpItem;
6331
+ private MenuItem embedTexturesItem;
6332
+ private MenuItem deEmbedTexturesItem;
52386333
52396334 private MenuItem particleItem;
52406335 private MenuItem ragdollItem;
....@@ -5273,11 +6368,6 @@
52736368 private MenuItem doubleItem;
52746369 private MenuItem tripleItem;
52756370
5276
- private MenuItem importGFDItem;
5277
- private MenuItem importVRMLX3DItem;
5278
- private MenuItem import3DSItem;
5279
- private MenuItem importOBJItem;
5280
-
52816371 private MenuItem computeAOItem;
52826372 private MenuItem recompileItem;
52836373 private MenuItem editScriptItem;
....@@ -5287,4 +6377,8 @@
52876377 private MenuItem analyzeItem;
52886378 private MenuItem dumpItem;
52896379 //boolean freezemodel = false;
6380
+
6381
+ Menu cameraMenu;
6382
+ MenuItem editCameraItem;
6383
+ MenuItem restoreCameraItem;
52906384 }