Normand Briere
2019-08-01 c99d954f5e2bffa601c599142371cfeb45630f40
GroupEditor.java
....@@ -12,6 +12,7 @@
1212 import com.jme.math.Vector3f;
1313 import com.jme.renderer.ColorRGBA;
1414
15
+import grafeme.ui.*;
1516 //import buoy.widget.BFileChooser;
1617
1718 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
....@@ -22,6 +23,302 @@
2223 DragGestureListener, DragSourceListener, DropTargetListener,
2324 ItemListener // ListSelectionListener
2425 {
26
+
27
+ public void AddSkyboxButton(String f, String s, cGridBag row)
28
+ {
29
+ cButton skyboxButton;
30
+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
+ skyboxButton.setToolTipText(s);
34
+ skyboxButton.addActionListener(new ActionListener()
35
+ {
36
+ @Override
37
+ public void actionPerformed(ActionEvent e)
38
+ {
39
+ ChangeSkybox(path);
40
+ }
41
+ });
42
+ }
43
+
44
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45
+ {
46
+ cGridBag tab0 = new cGridBag().setVertical(true);
47
+
48
+ tab0.setName("Urban");
49
+ skyboxpanel.add(tab0);
50
+
51
+ cGridBag row0 = new cGridBag();
52
+ cGridBag row1 = new cGridBag();
53
+ cGridBag row2 = new cGridBag();
54
+ cGridBag row3 = new cGridBag();
55
+ cGridBag row4 = new cGridBag();
56
+ cGridBag row5 = new cGridBag();
57
+ cGridBag row6 = new cGridBag();
58
+
59
+ AddSkyboxButton("default", "rgb", row0);
60
+ //AddSkyboxButton("default", "cornell", row0);
61
+ AddSkyboxButton("penguins", "dust", row0);
62
+ AddSkyboxButton("penguins", "tropic", row0);
63
+ AddSkyboxButton("penguins", "yonder", row0);
64
+
65
+ AddSkyboxButton("default", "uffizi", row1);
66
+ AddSkyboxButton("bridge", "Bridge", row1);
67
+ AddSkyboxButton("bridge", "Bridge2", row1);
68
+ AddSkyboxButton("urban", "GamlaStan2", row1);
69
+
70
+ AddSkyboxButton("urban", "Parliament", row2);
71
+ AddSkyboxButton("urban", "Roundabout", row2);
72
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
73
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
74
+
75
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
76
+ AddSkyboxButton("urban", "UnionSquare", row3);
77
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
78
+ AddSkyboxButton("park", "BerzeliiPark", row3);
79
+
80
+ AddSkyboxButton("park", "Buddha", row4);
81
+ AddSkyboxButton("park", "CNTower2", row4);
82
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
83
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
84
+
85
+ AddSkyboxButton("park", "Park", row5);
86
+ AddSkyboxButton("park", "Pond", row5);
87
+ AddSkyboxButton("park", "Skansen", row5);
88
+ AddSkyboxButton("park", "Skansen2", row5);
89
+
90
+ AddSkyboxButton("park", "Skansen3", row6);
91
+ AddSkyboxButton("park", "Skansen4", row6);
92
+ AddSkyboxButton("park", "Skansen5", row6);
93
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94
+
95
+ tab0.add(row0);
96
+ tab0.add(row1);
97
+ tab0.add(row2);
98
+ tab0.add(row3);
99
+ tab0.add(row4);
100
+ tab0.add(row5);
101
+ tab0.add(row6);
102
+
103
+ for (int i=5; --i>=0;)
104
+ {
105
+ //oe.toolboxPanel.Return();
106
+ //tab0.add(new cGridBag());
107
+ }
108
+ }
109
+
110
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
111
+ {
112
+ cGridBag tab0 = new cGridBag().setVertical(true);
113
+
114
+ tab0.setName("Nature");
115
+ skyboxpanel.add(tab0);
116
+
117
+ cGridBag row0 = new cGridBag();
118
+ cGridBag row1 = new cGridBag();
119
+ cGridBag row2 = new cGridBag();
120
+ cGridBag row3 = new cGridBag();
121
+ cGridBag row4 = new cGridBag();
122
+ cGridBag row5 = new cGridBag();
123
+ cGridBag row6 = new cGridBag();
124
+
125
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
126
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
127
+ AddSkyboxButton("beach", "PalmTrees", row0);
128
+ AddSkyboxButton("beach", "Tenerife", row0);
129
+
130
+ AddSkyboxButton("beach", "Tenerife2", row1);
131
+ AddSkyboxButton("beach", "Tenerife3", row1);
132
+ AddSkyboxButton("field", "FishPond", row1);
133
+ AddSkyboxButton("field", "Footballfield", row1);
134
+
135
+ AddSkyboxButton("field", "Meadow", row2);
136
+ AddSkyboxButton("field", "Sorsele", row2);
137
+ AddSkyboxButton("field", "Sorsele2", row2);
138
+ AddSkyboxButton("field", "Sorsele3", row2);
139
+
140
+ AddSkyboxButton("forest", "Brudslojan", row3);
141
+ AddSkyboxButton("forest", "Langholmen2", row3);
142
+ AddSkyboxButton("forest", "Plants", row3);
143
+ AddSkyboxButton("mountain", "Maskonaive", row3);
144
+
145
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
146
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
147
+ AddSkyboxButton("mountain", "Teide", row4);
148
+ AddSkyboxButton("park", "Tantolunden4", row4);
149
+
150
+ AddSkyboxButton("park", "Stairs", row5);
151
+ AddSkyboxButton("default", "skycube", row6);
152
+ AddSkyboxButton("rocky", "Langholmen", row5);
153
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
154
+
155
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
156
+ AddSkyboxButton("default", "CloudyHills", row6);
157
+ AddSkyboxButton("daz", "Autumn", row6);
158
+ AddSkyboxButton("daz", "MountainTrail", row6);
159
+ /*
160
+Autumn
161
+Greenlands
162
+MountainTrail
163
+Oasis
164
+TheRock
165
+TopOfTheWorld
166
+Winter
167
+ */
168
+
169
+ tab0.add(row0);
170
+ tab0.add(row1);
171
+ tab0.add(row2);
172
+ tab0.add(row3);
173
+ tab0.add(row4);
174
+ tab0.add(row5);
175
+ tab0.add(row6);
176
+
177
+ for (int i=5; --i>=0;)
178
+ {
179
+ //oe.toolboxPanel.Return();
180
+ //tab0.add(new cGridBag());
181
+ }
182
+ }
183
+
184
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
185
+ {
186
+ cGridBag tab0 = new cGridBag().setVertical(true);
187
+
188
+ tab0.setName("Night");
189
+ skyboxpanel.add(tab0);
190
+
191
+ cGridBag row0 = new cGridBag();
192
+ cGridBag row1 = new cGridBag();
193
+ cGridBag row2 = new cGridBag();
194
+ cGridBag row3 = new cGridBag();
195
+ cGridBag row4 = new cGridBag();
196
+ cGridBag row5 = new cGridBag();
197
+ cGridBag row6 = new cGridBag();
198
+
199
+ AddSkyboxButton("night", "NightPath", row0);
200
+ AddSkyboxButton("night", "PondNight", row0);
201
+ AddSkyboxButton("night", "Powerlines", row0);
202
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
203
+
204
+ AddSkyboxButton("urban", "CNTower", row1);
205
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
206
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
207
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
208
+
209
+ AddSkyboxButton("penguins", "kenon_star", row2);
210
+ AddSkyboxButton("persson", "corona", row2);
211
+ AddSkyboxButton("persson", "spaceskybox", row2);
212
+ AddSkyboxButton("indoors", "Vasa", row2);
213
+
214
+ AddSkyboxButton("winter", "Backyard", row3);
215
+ AddSkyboxButton("winter", "Creek", row3);
216
+ AddSkyboxButton("winter", "FootballField3", row3);
217
+ AddSkyboxButton("winter", "Forest", row3);
218
+
219
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
220
+ AddSkyboxButton("winter", "House", row4);
221
+ AddSkyboxButton("winter", "IceLake", row4);
222
+ AddSkyboxButton("winter", "IceRiver", row4);
223
+
224
+ AddSkyboxButton("winter", "Park3", row5);
225
+ AddSkyboxButton("winter", "PondWinter", row5);
226
+ AddSkyboxButton("winter", "Tantolunden5", row5);
227
+ AddSkyboxButton("winter", "Vindelalven", row5);
228
+
229
+ AddSkyboxButton("daz", "TheRock", row6);
230
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
231
+ AddSkyboxButton("daz", "Winter", row6);
232
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
233
+
234
+ tab0.add(row0);
235
+ tab0.add(row1);
236
+ tab0.add(row2);
237
+ tab0.add(row3);
238
+ tab0.add(row4);
239
+ tab0.add(row5);
240
+ tab0.add(row6);
241
+
242
+ for (int i=5; --i>=0;)
243
+ {
244
+ //oe.toolboxPanel.Return();
245
+ //tab0.add(new cGridBag());
246
+ }
247
+ }
248
+
249
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
250
+ {
251
+ cGridBag tab0 = new cGridBag().setVertical(true);
252
+
253
+ tab0.setName("Others");
254
+ skyboxpanel.add(tab0);
255
+
256
+ cGridBag row0 = new cGridBag();
257
+ cGridBag row1 = new cGridBag();
258
+ cGridBag row2 = new cGridBag();
259
+ cGridBag row3 = new cGridBag();
260
+ cGridBag row4 = new cGridBag();
261
+ cGridBag row5 = new cGridBag();
262
+ cGridBag row6 = new cGridBag();
263
+
264
+ AddSkyboxButton("mayhem", "afterrain", row0);
265
+ AddSkyboxButton("mayhem", "aqua4", row0);
266
+ AddSkyboxButton("mayhem", "aqua9", row0);
267
+ AddSkyboxButton("mayhem", "flame", row0);
268
+
269
+ AddSkyboxButton("mayhem", "h2s", row1);
270
+ AddSkyboxButton("mayhem", "prehistoric", row1);
271
+ AddSkyboxButton("mayhem", "scorched", row1);
272
+ AddSkyboxButton("penguins", "desertdawn", row1);
273
+
274
+ AddSkyboxButton("persson", "Citadella", row2);
275
+ AddSkyboxButton("persson", "Citadella2", row2);
276
+ AddSkyboxButton("persson", "clouds1", row2);
277
+ AddSkyboxButton("penguins", "wrath", row2);
278
+
279
+ AddSkyboxButton("persson", "FishermansBastion", row3);
280
+ AddSkyboxButton("persson", "HeroesSquare", row3);
281
+ AddSkyboxButton("indoors", "DallasW", row3);
282
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
283
+
284
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
285
+ AddSkyboxButton("persson", "PereaBeach1", row4);
286
+ AddSkyboxButton("persson", "PereaBeach2", row4);
287
+ AddSkyboxButton("persson", "redeclipse", row4);
288
+
289
+ AddSkyboxButton("daz", "Greenlands", row5);
290
+ AddSkyboxButton("daz", "Oasis", row5);
291
+ AddSkyboxButton("elyvisions", "arch3", row5);
292
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
293
+
294
+ AddSkyboxButton("elyvisions", "rainbow", row6);
295
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
296
+ AddSkyboxButton("elyvisions", "heaven", row6);
297
+ AddSkyboxButton("elyvisions", "hot", row6);
298
+
299
+ tab0.add(row0);
300
+ tab0.add(row1);
301
+ tab0.add(row2);
302
+ tab0.add(row3);
303
+ tab0.add(row4);
304
+ tab0.add(row5);
305
+ tab0.add(row6);
306
+
307
+ for (int i=5; --i>=0;)
308
+ {
309
+ //oe.toolboxPanel.Return();
310
+ //tab0.add(new cGridBag());
311
+ }
312
+ }
313
+
314
+ public void ChangeSkybox(String name)
315
+ {
316
+ //cameraView.envyoff = false;
317
+ group.skyboxname = name;
318
+ group.skyboxext = "jpg";
319
+ cameraView.repaint();
320
+ }
321
+
25322 //ObjEditor objEditor;
26323 public void closeUI2()
27324 {
....@@ -59,6 +356,12 @@
59356 this.copy = this.group = group;
60357 //selectees = this.group.selectees;
61358
359
+ if (copy.versions == null)
360
+ {
361
+ copy.versions = new byte[100][];
362
+ copy.versionindex = -1;
363
+ }
364
+
62365 if(ui)
63366 SetupUI(objEditor);
64367 }
....@@ -73,16 +376,28 @@
73376 this.copy = this.group = copy;
74377 //selectees = this.group.selectees;
75378
76
- SetupMenu2(objEditor);
379
+ SetupMenu2(this); //objEditor);
77380 SetupUI2(objEditor);
78381 objEditor.SetupUI(true);
79382 SetupViews(objEditor);
80383
81384 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385
+
386
+ if (copy.versions == null)
387
+ {
388
+ copy.versions = new byte[100][];
389
+ copy.versionindex = -1;
390
+
391
+ Save(true);
392
+ }
82393 }
83394
84395 void CloneSelection(boolean supports)
85396 {
397
+ if (Globals.REPLACEONMAKE)
398
+ Save();
399
+ boolean keep = Globals.REPLACEONMAKE;
400
+ Globals.REPLACEONMAKE = false;
86401 // Object3D keep = GrafreeD.clipboard;
87402 //Object3D obj;
88403 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -93,18 +408,19 @@
93408
94409 makeSomething(clone, i==group.selection.size()-1);
95410 }
411
+ Globals.REPLACEONMAKE = keep;
96412 }
97413
98414 void CloneClipboard(boolean supports)
99415 {
100
- assert(GrafreeD.clipboard.parent == null);
101
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
102
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104
- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
416
+ assert(Grafreed.clipboard.parent == null);
417
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
418
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
419
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
420
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105421 else
106
- makeSomething(CloneObject(GrafreeD.clipboard, false));
107
- GrafreeD.clipboard.get(0).parent = keepparent;
422
+ makeSomething(CloneObject(Grafreed.clipboard, false));
423
+ Grafreed.clipboard.get(0).parent = keepparent;
108424 }
109425
110426 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -118,7 +434,7 @@
118434 // obj.support = null;
119435 if (!supports)
120436 obj.SaveSupports();
121
- Object3D clone = (Object3D)GrafreeD.clone(obj);
437
+ Object3D clone = (Object3D)Grafreed.clone(obj);
122438 obj.parent = parent;
123439 // obj.support = support;
124440 // clone.support = support; // aout 2013
....@@ -147,30 +463,29 @@
147463
148464 //JTextField nameField;
149465
150
- void SetupMenu2(ObjEditor oe)
466
+ void SetupMenu2(GroupEditor oe)
151467 {
152
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156
- oe.cameraMenu.add("-");
157
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158
- openWindowItem.addActionListener(this);
159
- editLeafItem.addActionListener(this);
160
- lookAtItem.addActionListener(this);
161
- //lookFromItem.addActinoListener(this);
162
- //switchItem.addActionListener(this);
468
+ oe.jTree = new cTree();
469
+
163470 Menu menu;
164471 oe.menuBar.add(menu = new Menu("Edit"));
165472 //editItem = menu.add(new MenuItem("Edit"));
166473 //editItem.addActionListener(this);
167
- duplicateItem = menu.add(new MenuItem("Duplicate"));
474
+
475
+// undoItem = menu.add(new MenuItem("Undo"));
476
+// undoItem.addActionListener(this);
477
+// redoItem = menu.add(new MenuItem("Redo"));
478
+// redoItem.addActionListener(this);
479
+// menu.add("-");
480
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168481 duplicateItem.addActionListener(this);
169
- menu.add("-");
170482 cloneItem = menu.add(new MenuItem("Clone"));
171483 cloneItem.addActionListener(this);
484
+ if (Globals.ADVANCED)
485
+ {
172486 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173487 cloneSupportItem.addActionListener(this);
488
+ }
174489 menu.add("-");
175490 cutItem = menu.add(new MenuItem("Cut"));
176491 cutItem.addActionListener(this);
....@@ -178,27 +493,123 @@
178493 copyItem.addActionListener(this);
179494 pasteItem = menu.add(new MenuItem("Paste"));
180495 pasteItem.addActionListener(this);
496
+
497
+ menu.add("-");
498
+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
499
+ pasteIntoItem.addActionListener(this);
181500 pasteLinkItem = menu.add(new MenuItem("Paste link"));
182501 pasteLinkItem.addActionListener(this);
183502 pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184503 pasteCloneItem.addActionListener(this);
185504 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186505 // pasteExpandItem.addActionListener(this);
187
- clearItem = menu.add(new MenuItem("Clear"));
188
- clearItem.addActionListener(this);
506
+ menu.add("-");
507
+ deleteItem = menu.add(new MenuItem("Delete"));
508
+ deleteItem.addActionListener(this);
509
+
510
+ if (Globals.ADVANCED)
511
+ {
512
+ // Deletes the cameras...
189513 clearAllItem = menu.add(new MenuItem("Clear All"));
190514 clearAllItem.addActionListener(this);
515
+ }
516
+
517
+ menuBar.add(cameraMenu = new Menu("View"));
518
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
519
+ //zBufferItem.addActionListener(this);
520
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
521
+ //normalLensItem.addActionListener(this);
522
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
523
+ restoreCameraItem.addActionListener(this);
524
+
525
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
526
+// toggleFullScreenItem.addItemListener(this);
527
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
528
+// cameraMenu.add("-");
529
+//
530
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
531
+// toggleTextureItem.addItemListener(this);
532
+// toggleTextureItem.setState(CameraPane.textureon);
533
+//
534
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
535
+// toggleSwitchItem.addItemListener(this);
536
+// toggleSwitchItem.setState(CameraPane.SWITCH);
537
+
538
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
539
+ toggleHandleItem.addItemListener(this);
540
+ toggleHandleItem.setState(CameraPane.HANDLES);
541
+
542
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
543
+ togglePaintItem.addItemListener(this);
544
+ togglePaintItem.setState(CameraPane.PAINTMODE);
545
+
546
+ if (Globals.ADVANCED)
547
+ {
548
+ cameraMenu.add("-");
549
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
550
+ toggleLiveItem.addItemListener(this);
551
+ toggleLiveItem.setState(Globals.isLIVE());
191552
553
+ cameraMenu.add(stepItem = new MenuItem("Step"));
554
+ stepItem.addActionListener(this);
555
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
556
+ // toggleDLItem.addItemListener(this);
557
+ // toggleDLItem.setState(false);
558
+
559
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
560
+ toggleRenderItem.addItemListener(this);
561
+ toggleRenderItem.setState(!CameraPane.frozen);
562
+
563
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
564
+ toggleDebugItem.addItemListener(this);
565
+ toggleDebugItem.setState(Globals.DEBUG);
566
+
567
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
568
+ toggleFrustumItem.addItemListener(this);
569
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
570
+
571
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
572
+ toggleFootContactItem.addItemListener(this);
573
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
574
+
575
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
576
+ toggleTimelineItem.addItemListener(this);
577
+ }
578
+
579
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
580
+// toggleRootItem.addItemListener(this);
581
+// toggleRootItem.setState(false);
582
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
583
+// animationItem.addItemListener(this);
584
+// animationItem.setState(CameraPane.ANIMATION);
585
+ cameraMenu.add("-");
586
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
587
+ editCameraItem.addActionListener(this);
588
+
589
+ if (Globals.ADVANCED)
590
+ {
591
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
592
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
593
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
594
+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
595
+ oe.cameraMenu.add("-");
596
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
597
+ openWindowItem.addActionListener(this);
598
+ editLeafItem.addActionListener(this);
599
+ lookAtItem.addActionListener(this);
600
+ //lookFromItem.addActinoListener(this);
601
+ //switchViewItem.addActionListener(this);
602
+ }
603
+
192604 oe.menuBar.add(menu = new Menu("Setting"));
193
- resetMeshItem = menu.add(new MenuItem("Reset All"));
194
- resetMeshItem.addActionListener(this);
195
- stepAllItem = menu.add(new MenuItem("Step All"));
196
- stepAllItem.addActionListener(this);
605
+ if (Globals.ADVANCED)
606
+ {
197607 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198608 revertMeshItem.addActionListener(this);
199609 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200610 resetreferencesItem.addActionListener(this);
201611 menu.add("-");
612
+ }
202613 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203614 overwriteGeoItem.addActionListener(this);
204615 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -210,73 +621,104 @@
210621 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211622 overwriteUVItem.addActionListener(this);
212623 menu.add("-");
624
+ if (Globals.ADVANCED)
625
+ {
213626 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214627 generateMeshItem.addActionListener(this);
215628 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216629 poseMeshItem.addActionListener(this);
217630 menu.add("-");
631
+ }
218632 resetsupportItem = menu.add(new MenuItem("Reset support"));
219633 resetsupportItem.addActionListener(this);
220634 linkverticesItem = menu.add(new MenuItem("Link to Support"));
221635 linkverticesItem.addActionListener(this);
636
+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
637
+ relinkverticesItem.addActionListener(this);
638
+
639
+ if (Globals.ADVANCED)
640
+ {
222641 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223642 setMasterItem.addActionListener(this);
643
+ }
224644
225645 oe.menuBar.add(menu = new Menu("Group"));
226
- grabItem = menu.add(new MenuItem("Grab"));
227
- grabItem.addActionListener(this);
646
+// grabItem = menu.add(new MenuItem("Grab"));
647
+// grabItem.addActionListener(this);
228648 backItem = menu.add(new MenuItem("Back"));
229649 backItem.addActionListener(this);
230650 frontItem = menu.add(new MenuItem("Front"));
231651 frontItem.addActionListener(this);
232
- compositeItem = menu.add(new MenuItem("Composite"));
233
- compositeItem.addActionListener(this);
234
- menu.add("-");
235
- randomItem = menu.add(new MenuItem("Random"));
236
- randomItem.addActionListener(this);
237
- physicsItem = menu.add(new MenuItem("Physics"));
238
- physicsItem.addActionListener(this);
239
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240
- frameselectorItem.addActionListener(this);
652
+// compositeItem = menu.add(new MenuItem("Composite"));
653
+// compositeItem.addActionListener(this);
654
+
655
+ if (Globals.ADVANCED)
656
+ {
657
+ hideItem = menu.add(new MenuItem("Hidden Group"));
658
+ hideItem.addActionListener(this);
659
+ }
660
+ ungroupItem = menu.add(new MenuItem("Ungroup"));
661
+ ungroupItem.addActionListener(this);
662
+
663
+// menu.add("-");
664
+//
665
+// switchItem = menu.add(new MenuItem("Switch node"));
666
+// switchItem.addActionListener(this);
667
+ if (Globals.ADVANCED)
668
+ {
241669 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242670 switchGeoItem.addActionListener(this);
243671 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244672 switchTransfoItem.addActionListener(this);
245
- morphItem = menu.add(new MenuItem("Morph"));
673
+ morphItem = menu.add(new MenuItem("Morph Group"));
246674 morphItem.addActionListener(this);
675
+
676
+ menu.add("-");
677
+ physicsItem = menu.add(new MenuItem("Physics"));
678
+ physicsItem.addActionListener(this);
679
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
680
+ frameselectorItem.addActionListener(this);
247681 scriptNodeItem = menu.add(new MenuItem("Script Node"));
248682 scriptNodeItem.addActionListener(this);
249
- cameraItem = menu.add(new MenuItem("Camera"));
250
- cameraItem.addActionListener(this);
683
+ }
251684
252685 oe.menuBar.add(menu = new Menu("Object"));
253
- textureItem = menu.add(new MenuItem("Texture"));
254
- textureItem.addActionListener(this);
686
+// textureItem = menu.add(new MenuItem("Texture"));
687
+// textureItem.addActionListener(this);
688
+ billboardItem = menu.add(new MenuItem("Billboard"));
689
+ billboardItem.addActionListener(this);
255690 csgItem = menu.add(new MenuItem("CSG"));
256691 csgItem.addActionListener(this);
257
- shadowXItem = menu.add(new MenuItem("Shadow X"));
692
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258693 shadowXItem.addActionListener(this);
259
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
694
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260695 shadowYItem.addActionListener(this);
261
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
696
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262697 shadowZItem.addActionListener(this);
698
+ attributeItem = menu.add(new MenuItem("Attribute"));
699
+ attributeItem.addActionListener(this);
700
+
701
+ if (Globals.ADVANCED)
702
+ {
703
+ menu.add("-");
263704 linkerItem = menu.add(new MenuItem("Linker"));
264705 linkerItem.addActionListener(this);
265706 templateItem = menu.add(new MenuItem("Template"));
266707 templateItem.addActionListener(this);
267
- attributeItem = menu.add(new MenuItem("Attribute"));
268
- attributeItem.addActionListener(this);
269708 pointflowItem = menu.add(new MenuItem("Point Flow"));
270709 pointflowItem.addActionListener(this);
710
+ }
271711 menu.add("-");
272
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273
- transformgeometryItem.addActionListener(this);
274712 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275713 resetTransformItem.addActionListener(this);
276714 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277715 resetCentroidItem.addActionListener(this);
278
- ungroupItem = menu.add(new MenuItem("Ungroup"));
279
- ungroupItem.addActionListener(this);
716
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
717
+ resetCentroidXZItem.addActionListener(this);
718
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
719
+ transformGeometryItem.addActionListener(this);
720
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
721
+ transformChildrenItem.addActionListener(this);
280722
281723 oe.menuBar.add(menu = new Menu("Geometry"));
282724 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -285,6 +727,13 @@
285727 genNormalsORGANItem.addActionListener(this);
286728 genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287729 genNormalsCADItem.addActionListener(this);
730
+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
731
+ genNormalsMESHItem.addActionListener(this);
732
+ if (Globals.ADVANCED)
733
+ {
734
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
735
+ genNormalsMINEItem.addActionListener(this);
736
+ }
288737 stripifyItem = menu.add(new MenuItem("Stripify"));
289738 stripifyItem.addActionListener(this);
290739 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -306,23 +755,34 @@
306755 reduce34MeshItem.addActionListener(this);
307756 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308757 increaseMeshItem.addActionListener(this);
309
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310
- smoothMeshItem.addActionListener(this);
311758 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312759 clipMeshItem.addActionListener(this);
760
+
761
+ if (Globals.ADVANCED)
762
+ {
763
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
764
+ smoothMeshItem.addActionListener(this);
765
+ }
313766
314767 oe.menuBar.add(menu = new Menu("Attributes"));
315768 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316769 clearMaterialsItem.addActionListener(this);
770
+ resetAllItem = menu.add(new MenuItem("Reset All"));
771
+ resetAllItem.addActionListener(this);
772
+ stepAllItem = menu.add(new MenuItem("Step All"));
773
+ stepAllItem.addActionListener(this);
317774 menu.add("-");
318775 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319776 liveleavesItem.addActionListener(this);
320777 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321778 unliveleavesItem.addActionListener(this);
779
+ if (Globals.ADVANCED)
780
+ {
322781 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323782 supportleavesItem.addActionListener(this);
324783 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325784 unsupportleavesItem.addActionListener(this);
785
+ }
326786 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327787 hideleavesItem.addActionListener(this);
328788 showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -331,6 +791,14 @@
331791 markleavesItem.addActionListener(this);
332792 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333793 unmarkleavesItem.addActionListener(this);
794
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
795
+ rewindleavesItem.addActionListener(this);
796
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
797
+ unrewindleavesItem.addActionListener(this);
798
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
799
+ randomleavesItem.addActionListener(this);
800
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
801
+ unrandomleavesItem.addActionListener(this);
334802 menu.add("-");
335803 flipVItem = menu.add(new MenuItem("Flip V"));
336804 flipVItem.addActionListener(this);
....@@ -356,45 +824,56 @@
356824 attachBumpItem.addActionListener(this);
357825 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358826 pigmentBumpItem.addActionListener(this);
827
+ //embedTexturesItem
359828 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360829 detachPigmentItem.addActionListener(this);
361830 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362831 detachBumpItem.addActionListener(this);
832
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
833
+ embedTexturesItem.addActionListener(this);
834
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
835
+ deEmbedTexturesItem.addActionListener(this);
363836 menu.add("-");
364837 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365838 sortbysizeItem.addActionListener(this);
366839 sortbynameItem = menu.add(new MenuItem("Sort by name"));
367840 sortbynameItem.addActionListener(this);
368841 menu.add("-");
842
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
843
+ shareGeometriesItem.addActionListener(this);
844
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
845
+ mergeGeometriesItem.addActionListener(this);
846
+ if (Globals.ADVANCED)
847
+ {
848
+ // Pretty much the same as duplicate and clone.
369849 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370850 extractGeometriesItem.addActionListener(this);
371851 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372852 cloneGeometriesItem.addActionListener(this);
373
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374
- shareGeometriesItem.addActionListener(this);
375
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376
- mergeGeometriesItem.addActionListener(this);
853
+ }
377854
378855 oe.menuBar.add(menu = new Menu("Insert"));
379856 buildCreateMenu(menu);
380857
381
-
382
- oe.menuBar.add(menu = new Menu("Include"));
383
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384
- importGFDItem.addActionListener(this);
385
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386
- importVRMLX3DItem.addActionListener(this);
387
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388
- importOBJItem.addActionListener(this);
389
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390
- import3DSItem.addActionListener(this);
391
-
392858 oe.menuBar.add(menu = new Menu("Tools"));
393859 buildToolsMenu(menu);
394860 }
395861
862
+
396863 void SetupUI2(ObjEditor oe)
397864 {
865
+ // June 2019
866
+ if (oe == null)
867
+ {
868
+ //super.SetupUI2(this);
869
+ //return;
870
+ }
871
+
872
+ if (copy != group)
873
+ {
874
+ //super.SetupUI2(this);
875
+ }
876
+
398877 //new Exception().printStackTrace();
399878
400879 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -423,150 +902,239 @@
423902 oe.radioPanel.add(dummyButton);
424903 oe.buttonGroup.add(dummyButton);
425904 */
426
- aConstraints.gridy += 1;
427
- oe.aConstraints.gridwidth = 1;
428
- oe.aConstraints.gridx = 0;
905
+ cGridBag copyOptionsPanel = new cGridBag();
906
+
907
+ copyOptionsPanel.preferredHeight = 2;
429908
430
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
909
+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
910
+
911
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
912
+ //minButton.setToolTipText("Minimize window");
913
+ //minButton.addActionListener(this);
914
+
915
+ if (Globals.ADVANCED)
916
+ {
917
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
918
+ maxButton.setToolTipText("Maximize window");
919
+ maxButton.addActionListener(this);
920
+ }
921
+
922
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
923
+ fullButton.setToolTipText("Full-screen window");
924
+ fullButton.addActionListener(this);
925
+
926
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
927
+ screenfitButton.setToolTipText("Screen fit");
928
+ screenfitButton.addActionListener(this);
929
+
930
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
+ restoreCameraButton.setToolTipText("Restore viewpoint");
932
+ restoreCameraButton.addActionListener(this);
933
+
934
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
+ saveButton.setToolTipText("New version");
936
+ saveButton.addActionListener(this);
937
+
938
+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
+ undoButton.setToolTipText("Previous version");
940
+ undoButton.addActionListener(this);
941
+ undoButton.setEnabled(false);
942
+
943
+ cGridBag updown = new cGridBag().setVertical(true);
944
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
+ restoreButton.setToolTipText("Restore current");
946
+ restoreButton.addActionListener(this);
947
+ restoreButton.setEnabled(false);
948
+
949
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950
+ replaceButton.setToolTipText("Replace current");
951
+ replaceButton.addActionListener(this);
952
+ replaceButton.setEnabled(false);
953
+
954
+ copyOptionsPanel.add(updown);
955
+
956
+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
957
+ redoButton.setToolTipText("Next version");
958
+ redoButton.addActionListener(this);
959
+ redoButton.setEnabled(false);
960
+
961
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
962
+ liveCB.setToolTipText("Enable animation");
431963 liveCB.addItemListener(this);
432964
433
- oe.aConstraints.gridx += 1;
434
- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435
- supportCB.addItemListener(this);
436
-
437
- // oe.aConstraints.gridx += 1;
438
- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439
- // localCB.addItemListener(this);
440
-
441
- oe.aConstraints.gridx += 1;
442
- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443
- crowdCB.addItemListener(this);
444
-
445
- oe.aConstraints.gridx += 1;
446
- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447
- smoothCB.addItemListener(this);
448
-
449
- oe.aConstraints.gridx += 1;
450
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
965
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
966
+ oneStepButton.setToolTipText("Animate one step forward");
967
+ oneStepButton.addActionListener(this);
968
+
969
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
970
+ fastCB.setToolTipText("Fast mode");
451971 fastCB.addItemListener(this);
452
- oe.aConstraints.gridx += 1;
453
- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454
- slowCB.addItemListener(this);
455
- oe.aConstraints.gridx += 1;
456
- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457
- boxCB.addItemListener(this);
972
+
973
+ //oe.toolboxPanel.Return();
974
+
975
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
976
+// trackCB.setToolTipText("Enable tracking");
977
+// trackCB.addItemListener(this);
458978
459
-// oe.aConstraints.gridx += 1;
460
-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461
-// speakerMocapCB.addItemListener(this);
462
-
463
- if (false)
464
- {
465
- // handled in scripts
466
- oe.aConstraints.gridx += 1;
467
- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468
- speakerCameraCB.addItemListener(this);
469
-
470
- oe.aConstraints.gridx += 1;
471
- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472
- speakerFocusCB.addItemListener(this);
473
-
474
- oe.aConstraints.gridx += 1;
475
- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476
- smoothfocusCB.addItemListener(this);
477
- }
478
-
479
-//oe.aConstraints.gridx += 1;
480
-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481
-// debugCB.addItemListener(this);
482
-
483
- oe.aConstraints.gridx += 1;
484
- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485
- oeilCB.addItemListener(this);
486
-
487
- oe.aConstraints.gridx += 1;
488
- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489
- lookAtCB.addItemListener(this);
490
-
491
- oe.aConstraints.gridx += 1;
492
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493
- trackCB.addItemListener(this);
494
-
495
- oe.aConstraints.gridx += 1;
496
- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497
- screenfitButton.addActionListener(this);
498
- oe.aConstraints.gridx += 1;
499979 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500980 // screenfitpointButton.addActionListener(this);
501
-// oe.aConstraints.gridx += 1;
502
- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503
- snapobjectButton.addActionListener(this);
504
- oe.aConstraints.gridx += 1;
505981
506
- //aConstraints.gridx = 0;
507
- //aConstraints.gridy += 1;
508
- oe.aConstraints.weighty = 0;
509
- oe.aConstraints.gridwidth = 1;
510
-
511
- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512
- flashSelectionButton.addActionListener(this);
513
- oe.aConstraints.gridx += 1;
514
- oe.aConstraints.weighty = 0;
515
- oe.aConstraints.gridwidth = 1;
516
-
517
- //
518
- oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
519
- twoButton.addActionListener(this);
520
- oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
982
+ if (Globals.ADVANCED)
983
+ {
984
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
985
+ snapobjectButton.addActionListener(this);
986
+ snapobjectButton.setToolTipText("Snap Object");
987
+
988
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521989 fourButton.addActionListener(this);
522
- oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
523
- sixButton.addActionListener(this);
524
- oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
990
+ fourButton.setToolTipText("Show control panel only");
991
+ }
992
+
993
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
994
+
995
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
996
+ twoButton.setToolTipText("Show 3D view only");
997
+ twoButton.addActionListener(this);
998
+ this.fullscreenLayout = twoButton;
999
+
1000
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1001
+ threeButton.setToolTipText("Show controls and 3D view");
5251002 threeButton.addActionListener(this);
526
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
527
- sevenButton.addActionListener(this);
1003
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1004
+ sixButton.setToolTipText("Show 3D view and controls");
1005
+ sixButton.addActionListener(this);
1006
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1007
+// sevenButton.setToolTipText("3-column layout");
1008
+// sevenButton.addActionListener(this);
5281009 //
5291010
530
- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
1011
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1012
+ rootButton.setToolTipText("Open selection in new tab");
5311013 rootButton.addActionListener(this);
532
- oe.aConstraints.gridx += 1;
533
- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
1014
+
1015
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1016
+ closeButton.setToolTipText("Close tab");
5341017 closeButton.addActionListener(this);
5351018 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
5361019 //clearButton.addActionListener(this);
537
- oe.aConstraints.gridx += 1;
538
-
539
- oe.aConstraints.gridx = 1; //
540
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541
- editButton.addActionListener(this);
542
- oe.aConstraints.gridx += 1;
543
- oe.aConstraints.weighty = 0;
544
- oe.aConstraints.gridwidth = 1;
5451020
546
- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
1021
+ cGridBag row1 = new cGridBag();
1022
+
1023
+ // INSERT
1024
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025
+ gridButton.setToolTipText("Create grid");
1026
+ gridButton.addActionListener(this);
1027
+
1028
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1029
+ boxButton.setToolTipText("Create box");
1030
+ boxButton.addActionListener(this);
1031
+
1032
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1033
+ sphereButton.setToolTipText("Create sphere");
1034
+ sphereButton.addActionListener(this);
1035
+
1036
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037
+ coneButton.setToolTipText("Create cone");
1038
+ coneButton.addActionListener(this);
1039
+
1040
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1041
+ torusButton.setToolTipText("Create torus");
1042
+ torusButton.addActionListener(this);
1043
+
1044
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1045
+ superButton.setToolTipText("Create superellipsoid");
1046
+ superButton.addActionListener(this);
1047
+
1048
+ if (Globals.ADVANCED)
1049
+ {
1050
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1051
+ kleinButton.setToolTipText("Create Klein bottle");
1052
+ kleinButton.addActionListener(this);
1053
+ }
1054
+
1055
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1056
+ particlesButton.setToolTipText("Create particle system");
1057
+ particlesButton.addActionListener(this);
1058
+
1059
+ oe.toolboxPanel.add(row1);
1060
+
1061
+ cGridBag row2 = new cGridBag();
1062
+
1063
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1064
+ groupButton.setToolTipText("Create group");
1065
+ groupButton.addActionListener(this);
1066
+
1067
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+ compositeButton.setToolTipText("Create composite");
1069
+ compositeButton.addActionListener(this);
1070
+
1071
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1072
+ switchButton.setToolTipText("Create item switcher");
1073
+ switchButton.addActionListener(this);
1074
+
1075
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1076
+ loopButton.setToolTipText("Create loop");
1077
+ loopButton.addActionListener(this);
1078
+
1079
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1080
+ textureButton.setToolTipText("Create texture");
1081
+ textureButton.addActionListener(this);
1082
+
1083
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1084
+ overlayButton.setToolTipText("Create overlay");
1085
+ overlayButton.addActionListener(this);
1086
+
1087
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1088
+ lightButton.setToolTipText("Create light");
1089
+ lightButton.addActionListener(this);
1090
+
1091
+ oe.toolboxPanel.add(row2);
1092
+
1093
+ // ENVYMAPS
1094
+ cGridBag skyboxpane = new cGridBag();
1095
+ skyboxpane.preferredHeight = 100;
1096
+
1097
+ oe.toolboxPanel.add(skyboxpane);
1098
+
1099
+ JTabbedPane skyboxpanel = new JTabbedPane();
1100
+ skyboxpane.add(skyboxpanel);
1101
+
1102
+ AddSkyboxTab0(skyboxpanel);
1103
+ AddSkyboxTab1(skyboxpanel);
1104
+ AddSkyboxTab2(skyboxpanel);
1105
+ AddSkyboxTab3(skyboxpanel);
1106
+
1107
+ // EDIT panel
1108
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1109
+ editButton.setToolTipText("Pin selection controls");
1110
+ editButton.addActionListener(this);
1111
+
1112
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+ uneditButton.setToolTipText("Remove selection controls");
5471114 uneditButton.addActionListener(this);
5481115
549
- oe.aConstraints.gridx += 1;
550
- oe.aConstraints.weighty = 0;
551
- oe.aConstraints.gridwidth = 1;
552
-
553
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554
- clearPanelButton.addActionListener(this);
555
-
556
- oe.aConstraints.gridx += 1;
557
- oe.aConstraints.weighty = 0;
558
- oe.aConstraints.gridwidth = 1;
559
-
560
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
1116
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117
+ allParamsButton.setToolTipText("Show all controle");
5611118 allParamsButton.addActionListener(this);
5621119
563
- oe.aConstraints.gridx += 1;
564
- oe.aConstraints.weighty = 0;
565
- oe.aConstraints.gridwidth = 1;
566
-
567
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
1120
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121
+ clearPanelButton.setToolTipText("Clear edit panel");
1122
+ clearPanelButton.addActionListener(this);
1123
+
1124
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125
+ unselectButton.setToolTipText("Unselect");
5681126 unselectButton.addActionListener(this);
5691127
1128
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+ flashSelectionButton.setToolTipText("Highlight selection");
1130
+ flashSelectionButton.addActionListener(this);
1131
+
1132
+ editCommandsPanel.preferredHeight = 1;
1133
+
1134
+ SetPinStates(false);
1135
+// oe.treePanel.add(commandsPanel);
1136
+// oe.treePanel.Return();
1137
+
5701138 // oe.aConstraints.gridx += 1;
5711139 // oe.aConstraints.weighty = 0;
5721140 // oe.aConstraints.gridwidth = 1;
....@@ -578,47 +1146,32 @@
5781146 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
5791147 // gcButton.addActionListener(this);
5801148
581
- oe.aConstraints.gridx = 0;
582
- oe.aConstraints.gridy += 1;
583
-
584
- //ctrlPanel.add(objList = new List(5, true));
585
- oe.aConstraints.gridwidth = 100;
586
- // oe.aConstraints.gridheight = 100;
587
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588
- oe.aConstraints.gridheight = 1;
589
- oe.aConstraints.weighty = 0.5;
590
- oe.aConstraints.gridx = 0;
591
- JScrollPane jSP;
1149
+ cGridBag jSPPanel = new cGridBag();
1150
+
1151
+ JScrollPane jSP;
5921152 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
1153
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
5941154 ResetModel();
595
- oe.aConstraints.weighty = 0.5;
596
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597
- oe.aConstraints.gridy += 1;
598
- oe.aConstraints.gridwidth = 1;
599
-
600
- oe.aConstraints.weighty = 0;
601
- oe.aConstraints.gridwidth = 2;
602
-
603
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604
- colorCB.addItemListener(this);
605
- oe.aConstraints.gridx += 2;
606
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607
- materialCB.addItemListener(this);
608
- oe.aConstraints.gridx += 2;
609
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610
- textureCB.addItemListener(this);
611
-
612
- oe.aConstraints.gridx = 0;
613
- oe.aConstraints.gridy += 1;
6141155
1156
+ oe.treePanel.add(jSPPanel);
1157
+ oe.treePanel.Return();
1158
+
1159
+ oe.treePanel.add(copyOptionsPanel);
1160
+ oe.treePanel.Return();
1161
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1162
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1163
+ sliderPane.preferredHeight = 1;
1164
+
1165
+// mainPanel.setDividerLocation(0.1); //1.0);
1166
+ mainPanel.setResizeWeight(0.4);
1167
+
6151168 //jList.addListSelectionListener(this);
6161169 oe.jTree.addTreeSelectionListener(this);
6171170 //jTree.setRootVisible(false);
6181171 //jTree.setEditable(true);
6191172 oe.jTree.setDragEnabled(true);
6201173 //jTree.setPreferredSize(new Dimension(10,10));
621
- jSP.setPreferredSize(new Dimension(100,200));
1174
+ //jSP.setPreferredSize(new Dimension(100,200));
6221175
6231176 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6241177
....@@ -630,23 +1183,160 @@
6301183 dgr.addDragGestureListener(this);
6311184 }catch(Exception e) {}
6321185 */
633
- radio.layout = sevenButton;
1186
+ radio.layout = sixButton; // sevenButton;
6341187 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6351188 }
1189
+
1190
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1191
+ {
1192
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1193
+ colorCB.setToolTipText("Copy color when dropped");
1194
+ colorCB.addItemListener(this);
1195
+
1196
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1197
+ materialCB.setToolTipText("Copy material when dropped");
1198
+ materialCB.addItemListener(this);
1199
+
1200
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1201
+ textureCB.setToolTipText("Copy texture when dropped");
1202
+ textureCB.addItemListener(this);
1203
+
1204
+ panel.Return();
1205
+
1206
+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
1207
+ boxCB.setToolTipText("Display bounding boxes");
1208
+ boxCB.addItemListener(this);
1209
+
1210
+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
1211
+ zoomBoxCB.setToolTipText("Display only for wheel");
1212
+ zoomBoxCB.addItemListener(this);
1213
+
1214
+ if (true) // Globals.ADVANCED)
1215
+ {
1216
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1217
+// supportCB.setToolTipText("Enable rigging");
1218
+// supportCB.addItemListener(this);
1219
+
1220
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1221
+ freezeCB.setToolTipText("Fast moving camera");
1222
+ freezeCB.addItemListener(this);
1223
+
1224
+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
1225
+ // localCB.addItemListener(this);
1226
+
1227
+ panel.Return();
1228
+
1229
+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1230
+ crowdCB.setToolTipText("Used for crowds");
1231
+ crowdCB.addItemListener(this);
1232
+
1233
+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1234
+ smoothCB.setToolTipText("Snapping delay");
1235
+ smoothCB.addItemListener(this);
1236
+
1237
+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1238
+ slowCB.setToolTipText("Smooth interpolation");
1239
+ slowCB.addItemListener(this);
1240
+
1241
+// constraints.gridy += 1;
1242
+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1243
+// speakerMocapCB.addItemListener(this);
1244
+
1245
+ panel.Return();
1246
+
1247
+ if (false)
1248
+ {
1249
+ // handled in scripts
1250
+ //constraints.gridy += 1;
1251
+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1252
+ speakerCameraCB.addItemListener(this);
1253
+
1254
+ //constraints.gridy += 1;
1255
+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1256
+ speakerFocusCB.addItemListener(this);
1257
+
1258
+ //constraints.gridy += 1;
1259
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1260
+ smoothfocusCB.addItemListener(this);
1261
+ panel.Return();
1262
+ }
1263
+
1264
+//constraints.gridx += 1;
1265
+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1266
+// debugCB.addItemListener(this);
1267
+
1268
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1269
+ trackCB.setToolTipText("Enable tracking target");
1270
+ trackCB.addItemListener(this);
1271
+
1272
+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1273
+ oeilCB.setToolTipText("Move camera when tracking");
1274
+ oeilCB.addItemListener(this);
1275
+
1276
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1277
+ shadowCB.setToolTipText("When live compute shadows");
1278
+ shadowCB.addItemListener(this);
1279
+
1280
+ panel.Return();
1281
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1282
+ toggleTextureCB.setToolTipText("Load textures");
1283
+ toggleTextureCB.addItemListener(this);
1284
+
1285
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1286
+ toggleSwitchCB.setToolTipText("Choose a single item");
1287
+ toggleSwitchCB.addItemListener(this);
1288
+
1289
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1290
+ autokeepCB.setToolTipText("On structure change");
1291
+ autokeepCB.addItemListener(this);
1292
+
1293
+ panel.Return();
1294
+ if (Globals.ADVANCED)
1295
+ {
1296
+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
1297
+ lookAtCB.setToolTipText("Look-at target");
1298
+ lookAtCB.addItemListener(this);
1299
+ }
1300
+
1301
+ }
1302
+
1303
+ cGridBag fill = new cGridBag();
1304
+ fill.preferredHeight = 200;
1305
+ cGridBag fill2 = new cGridBag();
1306
+ fill2.preferredHeight = 200;
1307
+ cGridBag fill3 = new cGridBag();
1308
+ fill3.preferredHeight = 200;
1309
+
1310
+ panel.add(fill);
1311
+ panel.add(fill2);
1312
+ panel.add(fill3);
1313
+
1314
+ }
6361315
6371316 void EditObject(Object3D obj)
6381317 {
639
- cRadio dummyButton = new cRadio(obj.name);
640
- dummyButton.SetObject(obj);
641
- dummyButton.layout = sevenButton;
642
- dummyButton.SetCamera(cameraView.renderCamera, false);
643
- dummyButton.addActionListener(this);
644
- radioPanel.add(dummyButton);
645
- buttonGroup.add(dummyButton);
646
- dummyButton.doClick();
1318
+ cRadio radioButton = new cRadio(obj.name);
1319
+
1320
+ // June 2019. Patch to avoid bug with transparency.
1321
+ radioButton.hadMaterial = obj.material != null;
1322
+ if (!radioButton.hadMaterial)
1323
+ {
1324
+ obj.material = new cMaterial();
1325
+ }
1326
+
1327
+ radioButton.SetObject(obj);
1328
+ radioButton.layout = sixButton; // sevenButton;
1329
+ radioButton.SetCamera(cameraView.renderCamera, false);
1330
+ radioButton.addActionListener(this);
1331
+ radioPanel.add(radioButton);
1332
+ buttonGroup.add(radioButton);
1333
+ radioButton.doClick();
6471334 }
1335
+
6481336 void SetupViews(ObjEditor oe)
6491337 {
1338
+ theFrame = this;
1339
+
6501340 oe.SetupViews();
6511341
6521342 System.out.println("SetupViews");
....@@ -655,22 +1345,28 @@
6551345 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
6561346 }
6571347
658
- JCheckBox liveCB;
659
- JCheckBox supportCB;
660
- JCheckBox localCB;
661
- JCheckBox crowdCB;
662
- JCheckBox smoothCB;
663
- JCheckBox fastCB;
664
- JCheckBox slowCB;
665
- JCheckBox boxCB;
666
- JCheckBox trackCB;
667
- JCheckBox smoothfocusCB;
1348
+ cToggleButton liveCB;
1349
+ cCheckBox supportCB;
1350
+ cCheckBox localCB;
1351
+ cCheckBox crowdCB;
1352
+ cCheckBox smoothCB;
1353
+ cToggleButton fastCB;
1354
+ cCheckBox slowCB;
1355
+ cCheckBox boxCB;
1356
+ cCheckBox zoomBoxCB;
1357
+ cCheckBox freezeCB;
1358
+ //cToggleButton trackCB;
1359
+ cCheckBox trackCB;
1360
+ cCheckBox smoothfocusCB;
6681361 // JCheckBox speakerMocapCB;
669
- JCheckBox speakerCameraCB;
670
- JCheckBox speakerFocusCB;
671
- JCheckBox debugCB;
672
- JCheckBox oeilCB;
673
- JCheckBox lookAtCB;
1362
+ cCheckBox speakerCameraCB;
1363
+ cCheckBox speakerFocusCB;
1364
+ cCheckBox debugCB;
1365
+
1366
+ cCheckBox oeilCB;
1367
+ cCheckBox shadowCB;
1368
+ cCheckBox autokeepCB;
1369
+ cCheckBox lookAtCB;
6741370
6751371 // static int COLOR = 1;
6761372 // static int MATERIAL = 2;
....@@ -678,9 +1374,9 @@
6781374
6791375 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
6801376
681
- JCheckBox colorCB;
682
- JCheckBox materialCB;
683
- JCheckBox textureCB;
1377
+ cCheckBox colorCB;
1378
+ cCheckBox materialCB;
1379
+ cCheckBox textureCB;
6841380
6851381 public void itemStateChanged(ItemEvent e)
6861382 {
....@@ -705,10 +1401,10 @@
7051401 dropAttributes |= Object3D.TEXTURE;
7061402 else
7071403 dropAttributes &= ~Object3D.TEXTURE;
708
- }
709
- else if(e.getSource() == liveCB)
1404
+ } else if(e.getSource() == liveCB)
7101405 {
7111406 cameraView.ToggleLive();
1407
+ refreshContents(false);
7121408 }
7131409 else if(e.getSource() == supportCB)
7141410 {
....@@ -744,6 +1440,10 @@
7441440 cameraView.repaint();
7451441 // refreshContents();
7461442 }
1443
+ else if(e.getSource() == zoomBoxCB)
1444
+ {
1445
+ cameraView.ToggleZoomBoxMode();
1446
+ }
7471447 else if(e.getSource() == smoothfocusCB)
7481448 {
7491449 cameraView.ToggleSmoothFocus();
....@@ -769,6 +1469,18 @@
7691469 {
7701470 cameraView.ToggleOeil();
7711471 }
1472
+ else if(e.getSource() == shadowCB)
1473
+ {
1474
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1475
+ }
1476
+ else if(e.getSource() == freezeCB)
1477
+ {
1478
+ Globals.FREEZEONMOVE ^= true;
1479
+ }
1480
+ else if(e.getSource() == autokeepCB)
1481
+ {
1482
+ Globals.REPLACEONMAKE ^= true;
1483
+ }
7721484 else if(e.getSource() == lookAtCB)
7731485 {
7741486 cameraView.ToggleLookAt();
....@@ -785,7 +1497,8 @@
7851497
7861498 /**/
7871499 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1500
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1501
+ TreePath path = objEditor.jTree.getSelectionPath();
7891502 if ((path == null) || (path.getPathCount() <= 1)) {
7901503 // We can't move the root node or an empty selection
7911504 return;
....@@ -848,8 +1561,6 @@
8481561 }
8491562 }
8501563
851
- String string = (String) object;
852
-
8531564 System.out.println("Transfer = " + object + "; drop : " + target);
8541565 // if( object instanceof java.io.File[])
8551566 // {
....@@ -857,7 +1568,11 @@
8571568 // objEditor.DropFile((java.io.File[]) object, true);
8581569 // return;
8591570 // }
860
- if (string.charAt(0) == '/')
1571
+
1572
+ String string = object.toString();
1573
+
1574
+ // File path for Mac and Windows
1575
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
8611576 {
8621577 // file(s)
8631578 String[] names = string.split("\n");
....@@ -884,7 +1599,7 @@
8841599
8851600 flashIt = false;
8861601 CameraPane pane = (CameraPane) target;
887
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1602
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
8881603 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
8891604
8901605 if (group.selection.size() == 1)
....@@ -900,23 +1615,33 @@
9001615
9011616 assert target == objEditor.jTree;
9021617 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1618
+ Object3D destinationLeaf;
9031619 try {
904
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1620
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9051621 } catch (Exception e) {
9061622 System.out.println("destinationPath : " + destinationPath);
9071623 return;
9081624 }
9091625
910
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1626
+ for (int i=group.selection.size(); --i>=0;)
9111627 {
1628
+ Object3D child = (Object3D)group.selection.elementAt(i);
1629
+
1630
+ // Cannot move into itself
1631
+ if (child == destinationLeaf)
1632
+ return;
1633
+ }
1634
+
1635
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1636
+// {
9121637 loadClipboard(true);
9131638 objEditor.jTree.setSelectionPath(destinationPath);
914
- pasteInto(false);
915
- } else {
916
- loadClipboard(false);
917
- objEditor.jTree.setSelectionPath(destinationPath);
918
- pasteInto(false); // true); // ???
919
- }
1639
+ pasteInto(false, false);
1640
+// } else {
1641
+// loadClipboard(false);
1642
+// objEditor.jTree.setSelectionPath(destinationPath);
1643
+// pasteInto(false, false); // true); // ???
1644
+// }
9201645 }
9211646 public void dropActionChanged(DropTargetDragEvent dtde)
9221647 // Called if the user has modified the current drop gesture
....@@ -1021,83 +1746,107 @@
10211746 {
10221747 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10231748 //heightFieldItem.addActionListener(this);
1024
- gridItem = menu.add(new MenuItem("Grid"));
1025
- gridItem.addActionListener(this);
1026
- rectoidItem = menu.add(new MenuItem("Box"));
1027
- rectoidItem.addActionListener(this);
1028
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029
- ellipsoidItem.addActionListener(this);
1030
- coneItem = menu.add(new MenuItem("Cone"));
1031
- coneItem.addActionListener(this);
1032
- torusItem = menu.add(new MenuItem("Torus"));
1033
- torusItem.addActionListener(this);
1034
- superItem = menu.add(new MenuItem("Superellipsoid"));
1035
- superItem.addActionListener(this);
1036
- particleItem = menu.add(new MenuItem("Particle system"));
1037
- particleItem.addActionListener(this);
1749
+// gridItem = menu.add(new MenuItem("Grid"));
1750
+// gridItem.addActionListener(this);
1751
+// rectoidItem = menu.add(new MenuItem("Box"));
1752
+// rectoidItem.addActionListener(this);
1753
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1754
+// ellipsoidItem.addActionListener(this);
1755
+// coneItem = menu.add(new MenuItem("Cone"));
1756
+// coneItem.addActionListener(this);
1757
+// torusItem = menu.add(new MenuItem("Torus"));
1758
+// torusItem.addActionListener(this);
1759
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1760
+// superItem.addActionListener(this);
1761
+
1762
+ cameraItem = menu.add(new MenuItem("Camera"));
1763
+ cameraItem.addActionListener(this);
1764
+
1765
+ if (!Globals.ADVANCED)
1766
+ {
1767
+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
1768
+ kleinItem.addActionListener(this);
1769
+ }
1770
+
1771
+// particleItem = menu.add(new MenuItem("Particle system"));
1772
+// particleItem.addActionListener(this);
1773
+ if (Globals.ADVANCED)
1774
+ {
10381775 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10391776 ragdollItem.addActionListener(this);
10401777 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10411778 ragdoll2Item.addActionListener(this);
1779
+ }
10421780 menu.add("-");
1043
- meshItem = menu.add(new MenuItem("Mesh"));
1781
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10441782 meshItem.addActionListener(this);
10451783 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10461784 // meshGroupItem.addActionListener(this);
1785
+ if (Globals.ADVANCED)
1786
+ {
10471787 springItem = menu.add(new MenuItem("Spring"));
10481788 springItem.addActionListener(this);
10491789 flagItem = menu.add(new MenuItem("Flag"));
10501790 flagItem.addActionListener(this);
1051
- bezierItem = menu.add(new MenuItem("Patch"));
1052
- bezierItem.addActionListener(this);
1053
- checkerItem = menu.add(new MenuItem("Checker"));
1054
- checkerItem.addActionListener(this);
10551791 blobItem = menu.add(new MenuItem("Blob"));
10561792 blobItem.addActionListener(this);
10571793 latheItem = menu.add(new MenuItem("Lathe"));
10581794 latheItem.addActionListener(this);
1059
- lightItem = menu.add(new MenuItem("Light"));
1060
- lightItem.addActionListener(this);
1795
+ }
1796
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
1797
+ bezierItem.addActionListener(this);
1798
+// overlayItem = menu.add(new MenuItem("Overlay"));
1799
+// overlayItem.addActionListener(this);
1800
+// lightItem = menu.add(new MenuItem("Light"));
1801
+// lightItem.addActionListener(this);
10611802 menu.add("-");
10621803 //superLoopItem = menu.add(new MenuItem("Super Loop"));
10631804 //superLoopItem.addActionListener(this);
1064
- loopItem = menu.add(new MenuItem("Loop"));
1065
- loopItem.addActionListener(this);
1805
+// loopItem = menu.add(new MenuItem("Loop"));
1806
+// loopItem.addActionListener(this);
10661807 doubleItem = menu.add(new MenuItem("Fork"));
10671808 doubleItem.addActionListener(this);
1809
+ if (Globals.ADVANCED)
1810
+ {
10681811 tripleItem = menu.add(new MenuItem("Trident"));
10691812 tripleItem.addActionListener(this);
1813
+ }
10701814 }
10711815
10721816 void buildToolsMenu(Menu menu)
10731817 {
10741818 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
10751819 animationItem.addItemListener(this);
1076
- animationItem.setState(CameraPane.ANIMATION);
1820
+ animationItem.setState(Globals.ANIMATION);
1821
+
1822
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
1823
+ archiveItem.addActionListener(this);
10771824
10781825 menu.add("-");
10791826 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
10801827 parseverticesItem.addActionListener(this);
10811828 textureFieldItem = menu.add(new MenuItem("Texture Field"));
10821829 textureFieldItem.addActionListener(this);
1083
- alignItem = menu.add(new MenuItem("Align"));
1830
+ alignItem = menu.add(new MenuItem("Align Objects"));
10841831 alignItem.addActionListener(this);
1085
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086
- mirrorItem.addActionListener(this);
10871832 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
10881833 reduceMorphItem.addActionListener(this);
10891834 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
10901835 reduce34MorphItem.addActionListener(this);
1091
-
1092
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093
- computeAOItem.addActionListener(this);
10941836 menu.add("-");
1095
-
10961837 menu.add(memoryItem = new MenuItem("Memory Usage"));
10971838 memoryItem.addActionListener(this);
1839
+ menu.add(computeAOItem = new MenuItem("Compute AO"));
1840
+ computeAOItem.addActionListener(this);
1841
+
1842
+ if (Globals.ADVANCED)
1843
+ {
1844
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1845
+ mirrorItem.addActionListener(this);
1846
+ menu.add("-");
10981847 menu.add(analyzeItem = new MenuItem("Analyze"));
10991848 analyzeItem.addActionListener(this);
1100
- menu.add(dumpItem = new MenuItem("Dump"));
1849
+ menu.add(dumpItem = new MenuItem("Print"));
11011850 dumpItem.addActionListener(this);
11021851 // menu.add(pathItem = new MenuItem("From-to path"));
11031852 // pathItem.addActionListener(this);
....@@ -1106,6 +1855,8 @@
11061855 resetParentItem.addActionListener(this);
11071856 repairParentItem = menu.add(new MenuItem("Repair Parent"));
11081857 repairParentItem.addActionListener(this);
1858
+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
1859
+ repairShadowItem.addActionListener(this);
11091860 menu.add(invariantsItem = new MenuItem("Invariants"));
11101861 invariantsItem.addActionListener(this);
11111862 menu.add(recompileItem = new MenuItem("Recompile"));
....@@ -1113,6 +1864,7 @@
11131864 menu.add("-");
11141865 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11151866 editScriptItem.addActionListener(this);
1867
+ }
11161868 }
11171869
11181870 void ScreenFit()
....@@ -1235,9 +1987,34 @@
12351987 shadow.material = new cMaterial(obj.material);
12361988 shadow.material.diffuse = 0.0001f;
12371989 shadow.material.specular = 0.0001f;
1990
+ //shadow.projectedVertices[1].x = 300;
12381991
12391992 makeSomething(shadow);
12401993 }
1994
+
1995
+ private void ClearUnpinned()
1996
+ {
1997
+ //for (Object3D obj : listUI)
1998
+ for (int i=listUI.size(); --i>=0;)
1999
+ {
2000
+ Object3D obj = listUI.elementAt(i);
2001
+ if (!obj.pinned)
2002
+ {
2003
+ obj.CloseUI();
2004
+ listUI.remove(i);
2005
+ }
2006
+ }
2007
+ }
2008
+
2009
+ private void EditElement(Object3D elem, boolean newWindow)
2010
+ {
2011
+ // if (!(elem instanceof Composite))
2012
+ // newWindow = false;
2013
+ listUI.add(elem);
2014
+ elem.openEditWindow(this, newWindow); //, false);
2015
+ System.out.println("edit : " + elem);
2016
+ elem.editWindow.refreshContents(true); // ? new
2017
+ }
12412018
12422019 /**
12432020 * applyExample
....@@ -1441,9 +2218,9 @@
14412218
14422219 void Overwrite(int mask)
14432220 {
1444
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2221
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14452222 {
1446
- Object3D content = GrafreeD.clipboard.get(0);
2223
+ Object3D content = Grafreed.clipboard.get(0);
14472224
14482225 if (content instanceof cGroup && ((cGroup)content).transientlink )
14492226 content = ((cGroup)content).get(0);
....@@ -1466,6 +2243,7 @@
14662243 //
14672244 public void actionPerformed(ActionEvent event) // , Object arg)
14682245 {
2246
+ Object source = event.getSource();
14692247 /*
14702248 if (event.getSource() == nameField)
14712249 {
....@@ -1477,11 +2255,11 @@
14772255 }
14782256 else
14792257 */
1480
- if (event.getSource() == lookAtItem || event.getSource() == lookFromItem)
2258
+ if (source == lookAtItem || source == lookFromItem)
14812259 {
14822260 ScreenFit();
14832261 } else
1484
- if (event.getSource() == switchItem)
2262
+ if (source == switchViewItem)
14852263 {
14862264 cVector v1 = new cVector();
14872265 cVector v2 = new cVector();
....@@ -1490,11 +2268,11 @@
14902268 objEditor.cameraView.renderCamera.setAim(v2, v1);
14912269 objEditor.cameraView.repaint();
14922270 } else
1493
- if (event.getSource() == rectoidItem)
2271
+ if (source == rectoidItem || source == boxButton)
14942272 {
14952273 makeSomething(new Box());
14962274 } else
1497
- if (event.getSource() == particleItem)
2275
+ if (source == particleItem || source == particlesButton)
14982276 {
14992277 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15002278 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1515,9 +2293,9 @@
15152293 applyExample(particleGeom, "SMOKE");
15162294 makeSomething(particleGeom);
15172295 } else
1518
- if (event.getSource() == ragdollItem || event.getSource() == ragdoll2Item)
2296
+ if (source == ragdollItem || source == ragdoll2Item)
15192297 {
1520
- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
2298
+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
15212299
15222300 ragdoll.toParent = LA.newMatrix();
15232301 ragdoll.fromParent = LA.newMatrix();
....@@ -1535,7 +2313,7 @@
15352313 } else
15362314 /*
15372315 */
1538
- if (event.getSource() == heightFieldItem)
2316
+ if (source == heightFieldItem)
15392317 {
15402318 Object3D obj = new Object3D();
15412319
....@@ -1573,27 +2351,31 @@
15732351
15742352 makeSomething(obj);
15752353 } else
1576
- if (event.getSource() == gridItem)
2354
+ if (source == gridItem || source == gridButton)
15772355 {
15782356 makeSomething(new Grid());
15792357 } else
1580
- if (event.getSource() == ellipsoidItem)
2358
+ if (source == ellipsoidItem || source == sphereButton)
15812359 {
15822360 makeSomething(new Sphere());
15832361 } else
1584
- if (event.getSource() == coneItem)
2362
+ if (source == coneItem || source == coneButton)
15852363 {
15862364 makeSomething(new Cone());
15872365 } else
1588
- if (event.getSource() == torusItem)
2366
+ if (source == torusItem || source == torusButton)
15892367 {
15902368 makeSomething(new Torus());
15912369 } else
1592
- if (event.getSource() == superItem)
2370
+ if (source == superItem || source == superButton)
15932371 {
15942372 makeSomething(new Superellipsoid());
15952373 } else
1596
- if (event.getSource() == blobItem)
2374
+ if (source == kleinItem || source == kleinButton)
2375
+ {
2376
+ makeSomething(new Klein());
2377
+ } else
2378
+ if (source == blobItem)
15972379 {
15982380 Blob blob = new Blob();
15992381 BlobComponent comp = new BlobComponent();
....@@ -1601,15 +2383,15 @@
16012383 //blob.retile();
16022384 makeSomething(blob);
16032385 } else
1604
- if (event.getSource() == latheItem)
2386
+ if (source == latheItem)
16052387 {
16062388 makeSomething(new Lathe());
16072389 } else
1608
- if (event.getSource() == bezierItem)
2390
+ if (source == bezierItem)
16092391 {
16102392 makeSomething(new BezierSurface());
16112393 } else
1612
- if (event.getSource() == checkerItem)
2394
+ if (source == overlayItem || source == overlayButton)
16132395 {
16142396 /*
16152397 Object3D obj = new BezierSurface(5,8);
....@@ -1624,7 +2406,7 @@
16242406 */
16252407 makeSomething(new Checker());
16262408 } else
1627
- if (event.getSource() == meshItem)
2409
+ if (source == meshItem)
16282410 {
16292411 Object3D itemtomake = new Object3D();
16302412 Object3D child;
....@@ -1645,35 +2427,52 @@
16452427 makeSomething(child);
16462428 }
16472429 } else
1648
- if (event.getSource() == springItem)
2430
+ if (source == springItem)
16492431 {
16502432 cSpring s = new cSpring();
16512433 s.setup();
16522434 makeSomething(s);
16532435 } else
1654
- if (event.getSource() == flagItem)
2436
+ if (source == flagItem)
16552437 {
16562438 cSpring s = new cFlag();
16572439 s.setup();
16582440 makeSomething(s);
16592441 } else
1660
- if (event.getSource() == lightItem)
2442
+ if (source == lightItem || source == lightButton)
16612443 {
16622444 makeSomething(new Light());
16632445 } else
1664
- if (event.getSource() == csgItem)
2446
+// if (source == skybox1Button ||
2447
+// source == skybox2Button ||
2448
+// source == skybox3Button ||
2449
+// source == skybox4Button ||
2450
+// source == skybox5Button ||
2451
+// source == skybox6Button ||
2452
+// source == skybox7Button ||
2453
+// source == skybox11Button ||
2454
+// source == skybox12Button ||
2455
+// source == skybox13Button ||
2456
+// source == skybox14Button ||
2457
+// source == skybox15Button ||
2458
+// source == skybox16Button ||
2459
+// source == skybox17Button)
2460
+// {
2461
+// ChangeSkybox(source);
2462
+// } else
2463
+ if (source == csgItem)
16652464 {
16662465 group(new CSG());
16672466 } else
1668
- if (event.getSource() == templateItem)
2467
+ if (source == templateItem)
16692468 {
16702469 group(new cTemplate());
16712470 } else
1672
- if (event.getSource() == attributeItem)
2471
+ if (source == attributeItem)
16732472 {
16742473 makeSomething(new Attribute());
16752474 } else
1676
- if (event.getSource() == pointflowItem)
2475
+ if (source == pointflowItem)
16772476 {
16782477 makeSomething(new PointFlow());
16792478 } else
....@@ -1685,7 +2484,7 @@
16852484 } else
16862485 */
16872486
1688
- if (event.getSource() == superLoopItem)
2487
+ if (source == superLoopItem)
16892488 {
16902489 Composite g = new cGroup();
16912490 for (int i=0; i<15; i++)
....@@ -1707,30 +2506,30 @@
17072506
17082507 group(g);
17092508 } else
1710
- if (event.getSource() == loopItem)
2509
+ if (source == loopItem || source == loopButton)
17112510 {
17122511 Composite csg = new GroupLeaf();
17132512 csg.count = 5;
17142513 group(csg);
1715
- Composite child = new cGroup();
2514
+ Composite child = new cGroup("Branch");
17162515 csg.addChild(child);
17172516 child.addChild(csg);
17182517 } else
1719
- if (event.getSource() == doubleItem)
2518
+ if (source == doubleItem)
17202519 {
1721
- Composite csg = new GroupLeaf();
2520
+ Composite csg = new GroupLeaf("Fork");
17222521 csg.count = 5;
17232522 group(csg);
1724
- Composite child = new cGroup();
2523
+ Composite child = new cGroup("Branch A");
17252524 csg.addChild(child);
17262525 child.addChild(csg);
1727
- child = new cGroup();
2526
+ child = new cGroup("Branch B");
17282527 csg.addChild(child);
17292528 child.addChild(csg);
17302529 } else
1731
- if (event.getSource() == tripleItem)
2530
+ if (source == tripleItem)
17322531 {
1733
- Composite csg = new GroupLeaf();
2532
+ Composite csg = new GroupLeaf("Trident");
17342533 csg.count = 4;
17352534 group(csg);
17362535 Composite child = new cGroup();
....@@ -1743,73 +2542,98 @@
17432542 csg.addChild(child);
17442543 child.addChild(csg);
17452544 } else
1746
-
1747
- if (event.getSource() == importGFDItem)
2545
+ if (source == computeAOItem)
17482546 {
1749
- ImportGFD();
2547
+ Globals.drawMode = CameraPane.OCCLUSION;
2548
+ cameraView.repaint();
17502549 } else
1751
- if (event.getSource() == importVRMLX3DItem)
1752
- {
1753
- ImportVRMLX3D();
1754
- } else
1755
- if (event.getSource() == import3DSItem)
1756
- {
1757
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758
- } else
1759
- if (event.getSource() == importOBJItem)
1760
- {
1761
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762
- } else
1763
- if (event.getSource() == computeAOItem)
1764
- {
1765
- CameraPane.drawMode = CameraPane.OCCLUSION;
1766
- CameraPane.theRenderer.repaint();
1767
- } else
1768
- if (event.getSource() == recompileItem)
2550
+ if (source == recompileItem)
17692551 {
17702552 Recompile();
17712553 refreshContents();
17722554 } else
1773
- if (event.getSource() == editScriptItem)
2555
+ if (source == editScriptItem)
17742556 {
17752557 OpenDialog();
17762558 refreshContents();
17772559 } else
1778
- if (event.getSource() == invariantsItem)
2560
+ if (source == invariantsItem)
17792561 {
17802562 System.out.println("Invariants:");
1781
- GrafreeD.theApplet3D.universe.invariants();
2563
+ Grafreed.grafreeD.universe.invariants();
17822564 } else
1783
- if (event.getSource() == memoryItem)
2565
+ if (source == memoryItem)
17842566 {
17852567 //System.out.println("Invariants:");
17862568 PrintMemory();
17872569 } else
1788
- if (event.getSource() == pathItem)
2570
+ if (source == pathItem)
17892571 {
17902572 PrintPath();
17912573 } else
1792
- if (event.getSource() == analyzeItem)
2574
+ if (source == analyzeItem)
17932575 {
17942576 AnalyzeObject();
17952577 } else
1796
- if (event.getSource() == dumpItem)
2578
+ if (source == dumpItem)
17972579 {
17982580 DumpObject();
17992581 } else
1800
- if (event.getSource() == screenfitButton)
2582
+ if (source == minButton)
18012583 {
1802
- //Reload(lastConverter, lastFilename, true);
2584
+ Minimize();
2585
+ } else
2586
+ if (source == maxButton)
2587
+ {
2588
+ Maximize();
2589
+ } else
2590
+ if (source == fullButton)
2591
+ {
2592
+ ToggleFullScreen();
2593
+ } else
2594
+ if (source == undoButton)
2595
+ {
2596
+ // Go to previous version
2597
+ //if (!Undo())
2598
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2599
+ Undo();
2600
+ } else
2601
+ if (source == restoreButton)
2602
+ {
2603
+ // Restore current version
2604
+ Restore();
2605
+ } else
2606
+ if (source == replaceButton)
2607
+ {
2608
+ // Overwrite current version
2609
+ Replace();
2610
+ } else
2611
+ if (source == redoButton)
2612
+ {
2613
+ // Go to next version
2614
+ Redo();
2615
+ } else
2616
+ if (source == saveButton)
2617
+ {
2618
+ // Save a new version
2619
+ if (!Save(true))
2620
+ java.awt.Toolkit.getDefaultToolkit().beep();
2621
+ } else
2622
+ if (source == oneStepButton)
2623
+ {
2624
+ Globals.ONESTEP = true;
2625
+ cameraView.repaint();
2626
+ } else
2627
+ if (source == screenfitButton)
2628
+ {
18032629 ScreenFit();
18042630 } else
1805
- if (event.getSource() == screenfitpointButton)
2631
+ if (source == screenfitpointButton)
18062632 {
1807
- //Reload(lastConverter, lastFilename, true);
18082633 ScreenFitPoint();
18092634 } else
1810
- if (event.getSource() == snapobjectButton)
2635
+ if (source == snapobjectButton)
18112636 {
1812
- //Reload(lastConverter, lastFilename, true);
18132637 SnapObject();
18142638 } else
18152639 // if (event.getSource() == recompileButton)
....@@ -1818,13 +2642,13 @@
18182642 // Recompile();
18192643 // refreshContents();
18202644 // } else
1821
- if (event.getSource() == gcButton)
2645
+ if (source == gcButton)
18222646 {
18232647 System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18242648 System.gc();
18252649 System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18262650 } else
1827
- if (event.getSource() == editLeafItem)
2651
+ if (source == editLeafItem)
18282652 {
18292653 Object3D obj;
18302654 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -1838,62 +2662,74 @@
18382662 }
18392663 refreshContents(true);
18402664 } else
1841
- if (event.getSource() == openWindowItem)
2665
+ if (source == openWindowItem)
18422666 {
18432667 EditSelection(true);
18442668 } else
1845
- if (event.getSource() == cutItem || event.getSource() == clearButton)
2669
+ if (source == cutItem || source == clearButton)
18462670 {
18472671 loadClipboard(true);
18482672 } else
1849
- if (event.getSource() == duplicateItem)
2673
+ if (source == undoItem)
18502674 {
1851
- Object3D keep = GrafreeD.clipboard;
2675
+ Undo();
2676
+ } else
2677
+ if (source == redoItem)
2678
+ {
2679
+ Redo();
2680
+ } else
2681
+ if (source == duplicateItem)
2682
+ {
2683
+ Object3D keep = Grafreed.clipboard;
18522684 loadClipboard(false);
18532685 paste(false);
1854
- GrafreeD.clipboard = keep;
2686
+ Grafreed.clipboard = keep;
18552687 } else
1856
- if (event.getSource() == cloneItem)
2688
+ if (source == cloneItem)
18572689 {
18582690 CloneSelection(false);
18592691 } else
1860
- if (event.getSource() == cloneSupportItem)
2692
+ if (source == cloneSupportItem)
18612693 {
18622694 CloneSelection(true);
18632695 } else
1864
- if (event.getSource() == copyItem)
2696
+ if (source == copyItem)
18652697 {
18662698 loadClipboard(false);
18672699 } else
1868
- if (event.getSource() == pasteItem)
2700
+ if (source == pasteItem)
18692701 {
18702702 paste(false);
18712703 } else
1872
- if (event.getSource() == pasteLinkItem)
2704
+ if (source == pasteIntoItem)
18732705 {
1874
- pasteInto(false);
2706
+ pasteInto(true, false);
18752707 } else
1876
- if (event.getSource() == pasteCloneItem)
2708
+ if (source == pasteLinkItem)
18772709 {
1878
- pasteInto(true);
2710
+ pasteInto(false, false);
18792711 } else
1880
- if (event.getSource() == pasteExpandItem)
2712
+ if (source == pasteCloneItem)
2713
+ {
2714
+ pasteInto(true, true);
2715
+ } else
2716
+ if (source == pasteExpandItem)
18812717 {
18822718 paste(true);
18832719 } else
1884
- if (event.getSource() == synchronizeItem)
2720
+ if (source == synchronizeItem)
18852721 {
18862722 Overwrite(Object3D.TRANSFORM);
18872723 } else
1888
- if (event.getSource() == overwriteNameItem)
2724
+ if (source == overwriteNameItem)
18892725 {
18902726 Overwrite(Object3D.NAME);
18912727 } else
1892
- if (event.getSource() == overwriteUVItem)
2728
+ if (source == overwriteUVItem)
18932729 {
18942730 Overwrite(Object3D.UV);
18952731 } else
1896
- if (event.getSource() == overwriteMatItem)
2732
+ if (source == overwriteMatItem)
18972733 {
18982734 /* july 2015
18992735 if ((dropAttributes & Object3D.TEXTURE) == 0)
....@@ -1913,7 +2749,7 @@
19132749
19142750 Overwrite(dropAttributes);
19152751 }
1916
- if (event.getSource() == overwriteGeoItem)
2752
+ if (source == overwriteGeoItem)
19172753 {
19182754 Overwrite(Object3D.GEOMETRY);
19192755 // if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
....@@ -1930,7 +2766,7 @@
19302766 // refreshContents();
19312767 // }
19322768 } else
1933
- if (event.getSource() == generateMeshItem)
2769
+ if (source == generateMeshItem)
19342770 {
19352771 //if (group.selection.size() == 1)
19362772 // for (int i=0; i<group.selection.size(); i++)
....@@ -1941,7 +2777,7 @@
19412777 ResetModel();
19422778 refreshContents();
19432779 } else
1944
- if (event.getSource() == extractGeometriesItem)
2780
+ if (source == extractGeometriesItem)
19452781 {
19462782 boolean one = false;
19472783
....@@ -1968,7 +2804,7 @@
19682804 ResetModel();
19692805 refreshContents();
19702806 } else
1971
- if (event.getSource() == cloneGeometriesItem)
2807
+ if (source == cloneGeometriesItem)
19722808 {
19732809 boolean one = false;
19742810
....@@ -1994,32 +2830,37 @@
19942830 ResetModel();
19952831 refreshContents();
19962832 } else
1997
- if (event.getSource() == shareGeometriesItem)
2833
+ if (source == shareGeometriesItem)
19982834 {
19992835 boolean one = false;
20002836
20012837 if (group.selection.size() == 1)
20022838 one = true;
20032839
2840
+ Object3D merge = null;
2841
+
20042842 Object3D content = new cGroup();
20052843
20062844 for (int i=0; i<group.selection.size(); i++)
20072845 {
2008
- Object3D sel = new Merge(group.selection.get(i));
2846
+ merge = new Merge(group.selection.get(i));
20092847
20102848 if (one)
2011
- makeSomething(sel, false);
2849
+ makeSomething(merge, false);
20122850 else
2013
- content.addChild(sel);
2851
+ content.addChild(merge);
20142852 }
20152853
20162854 if (!one)
2017
- makeSomething(content, false);
2018
-
2019
- ResetModel();
2020
- refreshContents();
2855
+ makeSomething(content, true);
2856
+ else
2857
+ {
2858
+ ResetModel();
2859
+ Select(merge.GetTreePath(), true, false); // unselect... false);
2860
+ refreshContents();
2861
+ }
20212862 } else
2022
- if (event.getSource() == mergeGeometriesItem)
2863
+ if (source == mergeGeometriesItem)
20232864 {
20242865 boolean one = false;
20252866
....@@ -2049,7 +2890,7 @@
20492890 ResetModel();
20502891 refreshContents();
20512892 } else
2052
- if (event.getSource() == linkverticesItem)
2893
+ if (source == linkverticesItem)
20532894 {
20542895 // if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
20552896 // {
....@@ -2062,39 +2903,48 @@
20622903 // group.selection.get(0).setMasterThis(content); // should be identity
20632904 // refreshContents();
20642905 // }
2065
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2906
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
20662907 {
2067
- Object3D content = GrafreeD.clipboard.get(0);
2908
+ Object3D content = Grafreed.clipboard.get(0);
20682909
20692910 if (content instanceof cGroup && ((cGroup)content).transientlink )
20702911 content = ((cGroup)content).get(0);
20712912
2072
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2913
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
20732914 for (int i=0; i<group.selection.size(); i++)
20742915 {
2075
- boolean random = CameraPane.RANDOM;
2076
- CameraPane.RANDOM = false; // parse all random nodes
2916
+ boolean random = CameraPane.SWITCH;
2917
+ CameraPane.SWITCH = false; // parse all random nodes
20772918 group.selection.get(i).linkVerticesThis(content);
20782919 // group.selection.get(i).setMasterThis(content); // should be identity
2079
- CameraPane.RANDOM = random;
2920
+ CameraPane.SWITCH = random;
20802921 }
2081
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2922
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
20822923 refreshContents();
20832924 }
20842925 } else
2085
- if (event.getSource() == resetsupportItem)
2926
+ if (source == resetsupportItem)
20862927 {
20872928 for (int i=0; i<group.selection.size(); i++)
20882929 {
2089
- boolean random = CameraPane.RANDOM;
2090
- CameraPane.RANDOM = false; // parse all random nodes
2930
+ boolean random = CameraPane.SWITCH;
2931
+ CameraPane.SWITCH = false; // parse all random nodes
20912932 group.selection.get(i).linkVerticesThis(null);
2092
- CameraPane.RANDOM = random;
2933
+ CameraPane.SWITCH = random;
20932934 }
20942935
20952936 refreshContents();
20962937 } else
2097
- if (event.getSource() == resetreferencesItem)
2938
+ if (source == relinkverticesItem)
2939
+ {
2940
+ boolean random = CameraPane.SWITCH;
2941
+ CameraPane.SWITCH = false; // parse all random nodes
2942
+ group.selection.RelinkToSupport();
2943
+ CameraPane.SWITCH = random;
2944
+
2945
+ refreshContents();
2946
+ } else
2947
+ if (source == resetreferencesItem)
20982948 {
20992949 for (int i=0; i<group.selection.size(); i++)
21002950 {
....@@ -2103,11 +2953,11 @@
21032953
21042954 refreshContents();
21052955 } else
2106
- if (event.getSource() == setMasterItem)
2956
+ if (source == setMasterItem)
21072957 {
2108
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2958
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21092959 {
2110
- Object3D content = GrafreeD.clipboard.get(0);
2960
+ Object3D content = Grafreed.clipboard.get(0);
21112961
21122962 if (content instanceof cGroup && ((cGroup)content).transientlink )
21132963 content = ((cGroup)content).get(0);
....@@ -2116,13 +2966,13 @@
21162966 refreshContents();
21172967 }
21182968 } else
2119
- if (event.getSource() == poseMeshItem)
2969
+ if (source == poseMeshItem)
21202970 {
21212971 if (group.selection.size() == 1)
21222972 {
2123
- if (GrafreeD.clipboard.size() == 1)
2973
+ if (Grafreed.clipboard.size() == 1)
21242974 {
2125
- Object3D content = GrafreeD.clipboard.get(0);
2975
+ Object3D content = Grafreed.clipboard.get(0);
21262976
21272977 if (content instanceof cGroup && ((cGroup)content).transientlink )
21282978 content = ((cGroup)content).get(0);
....@@ -2135,19 +2985,19 @@
21352985 }
21362986
21372987 } else
2138
- if (event.getSource() == revertMeshItem)
2988
+ if (source == revertMeshItem)
21392989 {
21402990 RevertMeshes();
21412991 } else
2142
- if (event.getSource() == resetMeshItem)
2992
+ if (source == resetAllItem)
21432993 {
21442994 ResetAll();
21452995 } else
2146
- if (event.getSource() == stepAllItem)
2996
+ if (source == stepAllItem)
21472997 {
21482998 StepAll();
21492999 } else
2150
- if (event.getSource() == clearItem) // || event.getSource() == clearButton)
3000
+ if (source == deleteItem) // || event.getSource() == clearButton)
21513001 {
21523002 //int indices[] = jList.getSelectedIndices();
21533003 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2155,42 +3005,46 @@
21553005
21563006 ClearSelection(false);
21573007 } else
2158
- if (event.getSource() == clearAllItem)
3008
+ if (source == clearAllItem)
21593009 {
21603010 ClearSelection(true);
21613011 } else
2162
- if (event.getSource() == grabItem)
3012
+ if (source == grabItem || source == groupButton)
21633013 {
2164
- group(new cGroup(), true);
3014
+ group(new cGroup(), false); // true);
21653015 } else
2166
- if (event.getSource() == frontItem)
3016
+ if (source == hideItem)
3017
+ {
3018
+ group(new HiddenObject());
3019
+ } else
3020
+ if (source == frontItem)
21673021 {
21683022 front();
21693023 } else
2170
- if (event.getSource() == backItem)
3024
+ if (source == backItem)
21713025 {
21723026 back();
21733027 } else
2174
- if (event.getSource() == cameraItem)
3028
+ if (source == cameraItem)
21753029 {
21763030 makeSomething(new Camera());
21773031 } else
2178
- if (event.getSource() == compositeItem)
3032
+ if (source == compositeItem || source == compositeButton)
21793033 {
21803034 group(new Composite());
21813035 } else
2182
- if (event.getSource() == randomItem)
3036
+ if (source == switchItem || source == switchButton)
21833037 {
21843038 RandomNode random = new RandomNode();
21853039 group(random);
21863040 if (random.size() > 0)
2187
- random.name = random.get(0).name + "Rnd";
3041
+ random.name = random.get(0).name + "Switch";
21883042 } else
2189
- if (event.getSource() == physicsItem)
3043
+ if (source == physicsItem)
21903044 {
21913045 group(new PhysicsNode());
21923046 } else
2193
- if (event.getSource() == frameselectorItem)
3047
+ if (source == frameselectorItem)
21943048 {
21953049 for (int i=0; i<group.selection.size(); i++)
21963050 {
....@@ -2202,7 +3056,7 @@
22023056 ResetModel();
22033057 refreshContents();
22043058 } else
2205
- if (event.getSource() == switchGeoItem)
3059
+ if (source == switchGeoItem)
22063060 {
22073061 for (int i=0; i<group.selection.size(); i++)
22083062 {
....@@ -2214,7 +3068,7 @@
22143068 ResetModel();
22153069 refreshContents();
22163070 } else
2217
- if (event.getSource() == switchTransfoItem)
3071
+ if (source == switchTransfoItem)
22183072 {
22193073 for (int i=0; i<group.selection.size(); i++)
22203074 {
....@@ -2226,7 +3080,7 @@
22263080 ResetModel();
22273081 refreshContents();
22283082 } else
2229
- if (event.getSource() == morphItem)
3083
+ if (source == morphItem)
22303084 {
22313085 for (int i=0; i<group.selection.size(); i++)
22323086 {
....@@ -2238,7 +3092,7 @@
22383092 ResetModel();
22393093 refreshContents();
22403094 } else
2241
- if (event.getSource() == scriptNodeItem)
3095
+ if (source == scriptNodeItem)
22423096 {
22433097 boolean atleastone = false;
22443098
....@@ -2277,195 +3131,252 @@
22773131 }
22783132 }
22793133 } else
2280
- if (event.getSource() == linkerItem)
3134
+ if (source == linkerItem)
22813135 {
22823136 group(new cLinker());
22833137 } else
2284
- if (event.getSource() == textureItem)
3138
+ if (source == textureItem || source == textureButton)
22853139 {
22863140 group(new TextureNode());
22873141 } else
2288
- if (event.getSource() == shadowXItem)
3142
+ if (source == billboardItem)
3143
+ {
3144
+ group(new BillboardNode());
3145
+ } else
3146
+ if (source == shadowXItem)
22893147 {
22903148 CastShadow(0);
22913149 } else
2292
- if (event.getSource() == shadowYItem)
3150
+ if (source == shadowYItem)
22933151 {
22943152 CastShadow(1);
22953153 } else
2296
- if (event.getSource() == shadowZItem)
3154
+ if (source == shadowZItem)
22973155 {
22983156 CastShadow(2);
22993157 } else
2300
- if (event.getSource() == ungroupItem)
3158
+ if (source == ungroupItem || source == ungroupButton)
23013159 {
2302
- ungroup();
3160
+ boolean hasRoot = false;
3161
+
3162
+ for (int i=0; i<group.selection.size(); i++)
3163
+ {
3164
+ if (group.selection.get(i) == group)
3165
+ {
3166
+ hasRoot = true;
3167
+ break;
3168
+ }
3169
+ }
3170
+
3171
+ if (!hasRoot)
3172
+ {
3173
+ for (int i=0; i<group.selection.size(); i++)
3174
+ {
3175
+ Ungroup(group.selection.get(i));
3176
+ }
3177
+
3178
+ ClearSelection(false);
3179
+
3180
+ refreshContents();
3181
+ }
23033182 } else
2304
- if (event.getSource() == genUVItem)
3183
+ if (source == genUVItem)
23053184 {
23063185 GenUV();
23073186 } else
2308
- if (event.getSource() == genNormalsCADItem)
3187
+ if (source == genNormalsCADItem)
23093188 {
23103189 GenNormals(true);
23113190 } else
2312
- if (event.getSource() == genNormalsORGANItem)
3191
+ if (source == genNormalsMESHItem)
3192
+ {
3193
+ GenNormalsMESH();
3194
+ } else
3195
+ if (source == genNormalsORGANItem)
23133196 {
23143197 GenNormals(false);
23153198 } else
2316
- if (event.getSource() == stripifyItem)
3199
+ if (source == genNormalsMINEItem)
3200
+ {
3201
+ GenNormalsMINE();
3202
+ } else
3203
+ if (source == stripifyItem)
23173204 {
23183205 Stripify();
23193206 } else
2320
- if (event.getSource() == unstripifyItem)
3207
+ if (source == unstripifyItem)
23213208 {
23223209 Unstripify();
23233210 } else
2324
- if (event.getSource() == trimItem)
3211
+ if (source == trimItem)
23253212 {
23263213 Trim();
23273214 } else
2328
- if (event.getSource() == untrimItem)
3215
+ if (source == untrimItem)
23293216 {
23303217 Untrim();
23313218 } else
2332
- if (event.getSource() == clearColorsItem)
3219
+ if (source == clearColorsItem)
23333220 {
23343221 ClearColors();
23353222 } else
2336
- if (event.getSource() == clearMaterialsItem)
3223
+ if (source == clearMaterialsItem)
23373224 {
23383225 ClearMaterials();
23393226 } else
2340
- if (event.getSource() == liveleavesItem)
3227
+ if (source == liveleavesItem)
23413228 {
23423229 LiveLeaves(true);
23433230 } else
2344
- if (event.getSource() == unliveleavesItem)
3231
+ if (source == unliveleavesItem)
23453232 {
23463233 LiveLeaves(false);
23473234 } else
2348
- if (event.getSource() == supportleavesItem)
3235
+ if (source == supportleavesItem)
23493236 {
23503237 SupportLeaves(true);
23513238 } else
2352
- if (event.getSource() == unsupportleavesItem)
3239
+ if (source == unsupportleavesItem)
23533240 {
23543241 SupportLeaves(false);
23553242 } else
2356
- if (event.getSource() == hideleavesItem)
3243
+ if (source == hideleavesItem)
23573244 {
23583245 HideLeaves(true);
23593246 } else
2360
- if (event.getSource() == showleavesItem)
3247
+ if (source == showleavesItem)
23613248 {
23623249 HideLeaves(false);
23633250 } else
2364
- if (event.getSource() == markleavesItem)
3251
+ if (source == markleavesItem)
23653252 {
23663253 MarkLeaves(true);
23673254 } else
2368
- if (event.getSource() == unmarkleavesItem)
3255
+ if (source == unmarkleavesItem)
23693256 {
23703257 MarkLeaves(false);
23713258 } else
2372
- if (event.getSource() == flipVItem)
3259
+ if (source == rewindleavesItem)
3260
+ {
3261
+ RewindLeaves(true);
3262
+ } else
3263
+ if (source == unrewindleavesItem)
3264
+ {
3265
+ RewindLeaves(false);
3266
+ } else
3267
+ if (source == randomleavesItem)
3268
+ {
3269
+ RandomLeaves(true);
3270
+ } else
3271
+ if (source == unrandomleavesItem)
3272
+ {
3273
+ RandomLeaves(false);
3274
+ } else
3275
+ if (source == flipVItem)
23733276 {
23743277 FlipV(true);
23753278 } else
2376
- if (event.getSource() == unflipVItem)
3279
+ if (source == unflipVItem)
23773280 {
23783281 FlipV(false);
23793282 } else
2380
- if (event.getSource() == lowTexturesItem)
3283
+ if (source == lowTexturesItem)
23813284 {
23823285 SetTexRes(0);
23833286 } else
2384
- if (event.getSource() == normalTexturesItem)
3287
+ if (source == normalTexturesItem)
23853288 {
23863289 SetTexRes(1);
23873290 } else
2388
- if (event.getSource() == highTexturesItem)
3291
+ if (source == highTexturesItem)
23893292 {
23903293 SetTexRes(2);
23913294 } else
2392
- if (event.getSource() == veryhighTexturesItem)
3295
+ if (source == veryhighTexturesItem)
23933296 {
23943297 SetTexRes(3);
23953298 } else
2396
- if (event.getSource() == maxTexturesItem)
3299
+ if (source == maxTexturesItem)
23973300 {
23983301 SetTexRes(4);
23993302 } else
2400
- if (event.getSource() == panoTexturesItem)
3303
+ if (source == panoTexturesItem)
24013304 {
24023305 SetTexRes(5);
24033306 } else
2404
- if (event.getSource() == reverseNormalsItem)
3307
+ if (source == reverseNormalsItem)
24053308 {
24063309 ReverseNormals();
24073310 } else
2408
- if (event.getSource() == parseverticesItem)
3311
+ if (source == parseverticesItem)
24093312 {
24103313 ParseVertices();
24113314 } else
2412
- if (event.getSource() == textureFieldItem)
3315
+ if (source == textureFieldItem)
24133316 {
24143317 TextureVertices();
24153318 } else
2416
- if (event.getSource() == alignItem)
3319
+ if (source == alignItem)
24173320 {
24183321 Align();
24193322 } else
2420
- if (event.getSource() == mirrorItem)
3323
+ if (source == mirrorItem)
24213324 {
24223325 MirrorPoses();
24233326 } else
2424
- if (event.getSource() == reduceMorphItem)
3327
+ if (source == reduceMorphItem)
24253328 {
24263329 MeshReduction(false);
24273330 } else
2428
- if (event.getSource() == reduce34MorphItem)
3331
+ if (source == reduce34MorphItem)
24293332 {
24303333 MeshReduction(true);
24313334 } else
2432
- if (event.getSource() == reverseTrianglesItem)
3335
+ if (source == reverseTrianglesItem)
24333336 {
24343337 ReverseTriangles();
24353338 } else
2436
- if (event.getSource() == reduceMeshItem)
3339
+ if (source == reduceMeshItem)
24373340 {
24383341 ReduceMesh(false);
24393342 } else
2440
- if (event.getSource() == reduce34MeshItem)
3343
+ if (source == reduce34MeshItem)
24413344 {
24423345 ReduceMesh(true);
24433346 } else
2444
- if (event.getSource() == increaseMeshItem)
3347
+ if (source == increaseMeshItem)
24453348 {
24463349 IncreaseMesh();
24473350 } else
2448
- if (event.getSource() == clipMeshItem)
3351
+ if (source == clipMeshItem)
24493352 {
24503353 ClipMesh();
24513354 } else
2452
- if (event.getSource() == smoothMeshItem)
3355
+ if (source == smoothMeshItem)
24533356 {
24543357 SmoothMesh();
24553358 } else
2456
- if (event.getSource() == transformgeometryItem)
3359
+ if (source == transformGeometryItem)
24573360 {
24583361 TransformGeometry();
24593362 } else
2460
- if (event.getSource() == resetTransformItem)
3363
+ if (source == transformChildrenItem)
3364
+ {
3365
+ TransformChildren();
3366
+ } else
3367
+ if (source == resetTransformItem)
24613368 {
24623369 ResetTransform();
24633370 } else
2464
- if (event.getSource() == resetCentroidItem)
3371
+ if (source == resetCentroidItem)
24653372 {
2466
- ResetCentroid();
3373
+ ResetCentroid(true);
24673374 } else
2468
- if (event.getSource() == resetParentItem)
3375
+ if (source == resetCentroidXZItem)
3376
+ {
3377
+ ResetCentroid(false);
3378
+ } else
3379
+ if (source == resetParentItem)
24693380 {
24703381 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24713382 {
....@@ -2475,7 +3386,7 @@
24753386
24763387 refreshContents();
24773388 } else
2478
- if (event.getSource() == repairParentItem)
3389
+ if (source == repairParentItem)
24793390 {
24803391 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24813392 {
....@@ -2489,7 +3400,21 @@
24893400
24903401 refreshContents();
24913402 } else
2492
- if (event.getSource() == sortbysizeItem)
3403
+ if (source == repairShadowItem)
3404
+ {
3405
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3406
+ {
3407
+ Object3D obj = (Object3D)e.nextElement();
3408
+ obj.RepairShadow();
3409
+// for (int i=0; i<obj.size(); i++)
3410
+// {
3411
+// obj.get(i).parent = obj;
3412
+// }
3413
+ }
3414
+
3415
+ refreshContents();
3416
+ } else
3417
+ if (source == sortbysizeItem)
24933418 {
24943419 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24953420 {
....@@ -2501,7 +3426,7 @@
25013426 ResetModel();
25023427 refreshContents();
25033428 } else
2504
- if (event.getSource() == sortbynameItem)
3429
+ if (source == sortbynameItem)
25053430 {
25063431 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25073432 {
....@@ -2513,7 +3438,7 @@
25133438 ResetModel();
25143439 refreshContents();
25153440 } else
2516
- if (event.getSource() == attachPigmentItem)
3441
+ if (source == attachPigmentItem)
25173442 {
25183443 String texture = GetFile("Attach pigment");
25193444 Object3D obj;
....@@ -2525,7 +3450,7 @@
25253450
25263451 refreshContents();
25273452 } else
2528
- if (event.getSource() == detachPigmentItem)
3453
+ if (source == detachPigmentItem)
25293454 {
25303455 Object3D obj;
25313456 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2536,7 +3461,7 @@
25363461
25373462 refreshContents();
25383463 } else
2539
- if (event.getSource() == attachBumpItem)
3464
+ if (source == attachBumpItem)
25403465 {
25413466 String texture = GetFile("Attach bump");
25423467 Object3D obj;
....@@ -2548,18 +3473,18 @@
25483473
25493474 refreshContents();
25503475 } else
2551
- if (event.getSource() == detachBumpItem)
3476
+ if (source == detachBumpItem)
25523477 {
25533478 Object3D obj;
25543479 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25553480 {
25563481 obj = (Object3D)e.nextElement();
2557
- obj.SetBumpTexture(null);
3482
+ obj.ResetBumpTexture();
25583483 }
25593484
25603485 refreshContents();
25613486 } else
2562
- if (event.getSource() == pigmentBumpItem)
3487
+ if (source == pigmentBumpItem)
25633488 {
25643489 Object3D obj;
25653490 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2570,158 +3495,262 @@
25703495
25713496 refreshContents();
25723497 } else
2573
- if (event.getSource() == flashSelectionButton)
3498
+ if (source == embedTexturesItem)
3499
+ {
3500
+ Object3D obj;
3501
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3502
+ {
3503
+ obj = (Object3D)e.nextElement();
3504
+ obj.EmbedTextures(true);
3505
+ }
3506
+
3507
+ refreshContents();
3508
+ } else
3509
+ if (source == deEmbedTexturesItem)
3510
+ {
3511
+ Object3D obj;
3512
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3513
+ {
3514
+ obj = (Object3D)e.nextElement();
3515
+ obj.EmbedTextures(false);
3516
+ }
3517
+
3518
+ CameraPane.texturepigment.clear();
3519
+ CameraPane.texturebump.clear();
3520
+
3521
+ refreshContents();
3522
+ } else
3523
+ if (source == flashSelectionButton)
25743524 {
25753525 CameraPane.flash = true;
25763526 refreshContents();
25773527 } else
2578
- if (event.getSource() == oneButton)
3528
+ if (source == oneButton)
25793529 {
25803530 } else
2581
- if (event.getSource() == twoButton)
3531
+ if (source == twoButton)
25823532 {
25833533 radio.layout = twoButton;
3534
+
3535
+ if (CameraPane.FULLSCREEN)
3536
+ fullscreenLayout = radio.layout;
3537
+
25843538 // bug
25853539 //gridPanel.setDividerLocation(1.0);
25863540 //bigPanel.setDividerLocation(0.0);
2587
- bigThree.remove(jtp);
2588
- bigThree.remove(cameraPanel);
2589
- bigThree.remove(XYZPanel);
2590
- aWindowConstraints.gridx = 0;
2591
- aWindowConstraints.gridy = 0;
2592
- aWindowConstraints.gridwidth = 1;
2593
- // aConstraints.gridheight = 3;
2594
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595
- aWindowConstraints.weightx = 0;
2596
- aWindowConstraints.weighty = 1;
2597
- //bigThree.add(jtp, aWindowConstraints);
2598
- aWindowConstraints.weightx = 1;
2599
- aWindowConstraints.gridwidth = 3;
2600
- // aConstraints.gridheight = 3;
2601
- aWindowConstraints.gridx = 1;
2602
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603
- bigThree.add(cameraPanel, aWindowConstraints);
2604
- aWindowConstraints.weightx = 0;
2605
- aWindowConstraints.gridx = 4;
2606
- aWindowConstraints.gridwidth = 1;
2607
- // aConstraints.gridheight = 3;
2608
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609
- //bigThree.add(XYZPanel, aWindowConstraints);
2610
- bigThree.revalidate();
3541
+// bigThree.remove(scenePanel);
3542
+// bigThree.remove(centralPanel);
3543
+// bigThree.remove(XYZPanel);
3544
+// aWindowConstraints.gridx = 0;
3545
+// aWindowConstraints.gridy = 0;
3546
+// aWindowConstraints.gridwidth = 1;
3547
+// // aConstraints.gridheight = 3;
3548
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3549
+// aWindowConstraints.weightx = 0;
3550
+// aWindowConstraints.weighty = 1;
3551
+// //bigThree.add(jtp, aWindowConstraints);
3552
+// aWindowConstraints.weightx = 1;
3553
+// aWindowConstraints.gridwidth = 3;
3554
+// // aConstraints.gridheight = 3;
3555
+// aWindowConstraints.gridx = 1;
3556
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3557
+// bigThree.add(centralPanel, aWindowConstraints);
3558
+// aWindowConstraints.weightx = 0;
3559
+// aWindowConstraints.gridx = 4;
3560
+// aWindowConstraints.gridwidth = 1;
3561
+// // aConstraints.gridheight = 3;
3562
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3563
+// //bigThree.add(XYZPanel, aWindowConstraints);
3564
+// scenePanel.setVisible(false);
3565
+// centralPanel.setVisible(true);
3566
+// XYZPanel.setVisible(false);
3567
+ bigThree.ClearUI();
3568
+ bigThree.add(centralPanel);
3569
+ bigThree.FlushUI();
3570
+
3571
+ cameraView.requestFocusInWindow();
3572
+
3573
+// refreshContents(true);
3574
+//
3575
+// try
3576
+// {
3577
+// java.awt.Robot bot = new java.awt.Robot();
3578
+// int mask = InputEvent.BUTTON1_MASK;
3579
+// bot.mouseMove(100, 100);
3580
+// bot.mousePress(mask);
3581
+// bot.mouseRelease(mask);
3582
+// }
3583
+// catch (Exception e)
3584
+// {
3585
+//
3586
+// }
3587
+
26113588 } else
2612
- if (event.getSource() == threeButton)
3589
+ if (source == threeButton)
26133590 {
26143591 radio.layout = threeButton;
2615
- bigThree.remove(jtp);
2616
- bigThree.remove(cameraPanel);
2617
- bigThree.remove(XYZPanel);
2618
- aWindowConstraints.gridx = 0;
2619
- aWindowConstraints.gridy = 0;
2620
- aWindowConstraints.gridwidth = 1;
2621
- // aConstraints.gridheight = 3;
2622
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623
- aWindowConstraints.weightx = 0;
2624
- aWindowConstraints.weighty = 1;
2625
- //bigThree.add(jtp, aWindowConstraints);
2626
- aWindowConstraints.weightx = 1;
2627
- aWindowConstraints.gridwidth = 3;
2628
- // aConstraints.gridheight = 3;
2629
- aWindowConstraints.gridx = 1;
2630
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631
- bigThree.add(cameraPanel, aWindowConstraints);
2632
- aWindowConstraints.weightx = 0;
2633
- aWindowConstraints.gridx = 4;
2634
- aWindowConstraints.gridwidth = 1;
2635
- // aConstraints.gridheight = 3;
2636
- aConstraints.fill = GridBagConstraints.VERTICAL;
2637
- bigThree.add(XYZPanel, aWindowConstraints);
2638
- bigThree.revalidate();
3592
+
3593
+ if (CameraPane.FULLSCREEN)
3594
+ fullscreenLayout = radio.layout;
3595
+
3596
+// bigThree.remove(scenePanel);
3597
+// bigThree.remove(centralPanel);
3598
+// bigThree.remove(XYZPanel);
3599
+// aWindowConstraints.gridx = 0;
3600
+// aWindowConstraints.gridy = 0;
3601
+// aWindowConstraints.gridwidth = 1;
3602
+// // aConstraints.gridheight = 3;
3603
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3604
+// aWindowConstraints.weightx = 0;
3605
+// aWindowConstraints.weighty = 1;
3606
+// //bigThree.add(jtp, aWindowConstraints);
3607
+// aWindowConstraints.weightx = 1;
3608
+// aWindowConstraints.gridwidth = 3;
3609
+// // aConstraints.gridheight = 3;
3610
+// aWindowConstraints.gridx = 1;
3611
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3612
+// bigThree.add(centralPanel, aWindowConstraints);
3613
+// aWindowConstraints.weightx = 0;
3614
+// aWindowConstraints.gridx = 4;
3615
+// aWindowConstraints.gridwidth = 1;
3616
+// // aConstraints.gridheight = 3;
3617
+// aConstraints.fill = GridBagConstraints.VERTICAL;
3618
+// bigThree.add(XYZPanel, aWindowConstraints);
3619
+// bigThree.validate();
3620
+// scenePanel.setVisible(false);
3621
+// centralPanel.setVisible(true);
3622
+// XYZPanel.setVisible(true);
3623
+ bigThree.ClearUI();
3624
+ bigThree.add(scenePanel);
3625
+ bigThree.add(centralPanel);
3626
+ bigThree.FlushUI();
3627
+
3628
+ cameraView.requestFocusInWindow();
26393629 } else
2640
- if (event.getSource() == fourButton)
3630
+ if (source == fourButton)
26413631 {
26423632 radio.layout = fourButton;
2643
- bigThree.remove(jtp);
2644
- bigThree.remove(cameraPanel);
2645
- bigThree.remove(XYZPanel);
2646
- aWindowConstraints.gridx = 0;
2647
- aWindowConstraints.gridy = 0;
2648
- aWindowConstraints.gridwidth = 1;
2649
- // aWindowConstraints.gridheight = 3;
2650
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651
- aWindowConstraints.weightx = 1;
2652
- aWindowConstraints.weighty = 1;
2653
- bigThree.add(jtp, aWindowConstraints);
2654
- aWindowConstraints.weightx = 1;
2655
- aWindowConstraints.gridwidth = 3;
2656
- // aConstraints.gridheight = 3;
2657
- aWindowConstraints.gridx = 1;
2658
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659
- //bigThree.add(cameraPanel, aWindowConstraints);
2660
- aWindowConstraints.weightx = 0;
2661
- aWindowConstraints.gridx = 4;
2662
- aWindowConstraints.gridwidth = 1;
2663
- // aWindowConstraints.gridheight = 3;
2664
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665
- //bigThree.add(XYZPanel, aWindowConstraints);
2666
- bigThree.revalidate();
3633
+
3634
+ if (CameraPane.FULLSCREEN)
3635
+ fullscreenLayout = radio.layout;
3636
+
3637
+// bigThree.remove(scenePanel);
3638
+// bigThree.remove(centralPanel);
3639
+// bigThree.remove(XYZPanel);
3640
+// aWindowConstraints.gridx = 0;
3641
+// aWindowConstraints.gridy = 0;
3642
+// aWindowConstraints.gridwidth = 1;
3643
+// // aWindowConstraints.gridheight = 3;
3644
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3645
+// aWindowConstraints.weightx = 1;
3646
+// aWindowConstraints.weighty = 1;
3647
+// bigThree.add(scenePanel, aWindowConstraints);
3648
+// aWindowConstraints.weightx = 1;
3649
+// aWindowConstraints.gridwidth = 3;
3650
+// // aConstraints.gridheight = 3;
3651
+// aWindowConstraints.gridx = 1;
3652
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3653
+// //bigThree.add(cameraPanel, aWindowConstraints);
3654
+// aWindowConstraints.weightx = 0;
3655
+// aWindowConstraints.gridx = 4;
3656
+// aWindowConstraints.gridwidth = 1;
3657
+// // aWindowConstraints.gridheight = 3;
3658
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3659
+// //bigThree.add(XYZPanel, aWindowConstraints);
3660
+// bigThree.validate();
3661
+// scenePanel.setVisible(true);
3662
+// centralPanel.setVisible(false);
3663
+// XYZPanel.setVisible(false);
3664
+ bigThree.ClearUI();
3665
+ bigThree.add(scenePanel);
3666
+ bigThree.FlushUI();
3667
+
3668
+ cameraView.requestFocusInWindow();
26673669 } else
2668
- if (event.getSource() == sixButton)
3670
+ if (source == sixButton)
26693671 {
26703672 radio.layout = sixButton;
2671
- bigThree.remove(jtp);
2672
- bigThree.remove(cameraPanel);
2673
- bigThree.remove(XYZPanel);
2674
- aWindowConstraints.gridx = 0;
2675
- aWindowConstraints.gridy = 0;
2676
- aWindowConstraints.gridwidth = 1;
2677
- // aConstraints.gridheight = 3;
2678
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679
- aWindowConstraints.weightx = 0;
2680
- aWindowConstraints.weighty = 1;
2681
- bigThree.add(jtp, aWindowConstraints);
2682
- aWindowConstraints.weightx = 1;
2683
- aWindowConstraints.gridwidth = 3;
2684
- // aWindowConstraints.gridheight = 3;
2685
- aWindowConstraints.gridx = 1;
2686
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687
- bigThree.add(cameraPanel, aWindowConstraints);
2688
- aWindowConstraints.weightx = 0;
2689
- aWindowConstraints.gridx = 4;
2690
- aWindowConstraints.gridwidth = 1;
2691
- // aWindowConstraints.gridheight = 3;
2692
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693
- //bigThree.add(XYZPanel, aConstraints);
2694
- bigThree.revalidate();
3673
+
3674
+ if (CameraPane.FULLSCREEN)
3675
+ fullscreenLayout = radio.layout;
3676
+
3677
+// bigThree.remove(scenePanel);
3678
+// bigThree.remove(centralPanel);
3679
+// bigThree.remove(XYZPanel);
3680
+// aWindowConstraints.gridx = 0;
3681
+// aWindowConstraints.gridy = 0;
3682
+// aWindowConstraints.gridwidth = 1;
3683
+// // aConstraints.gridheight = 3;
3684
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3685
+// aWindowConstraints.weightx = 0;
3686
+// aWindowConstraints.weighty = 1;
3687
+// bigThree.add(scenePanel, aWindowConstraints);
3688
+// aWindowConstraints.weightx = 1;
3689
+// aWindowConstraints.gridwidth = 3;
3690
+// // aWindowConstraints.gridheight = 3;
3691
+// aWindowConstraints.gridx = 1;
3692
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3693
+// bigThree.add(centralPanel, aWindowConstraints);
3694
+// aWindowConstraints.weightx = 0;
3695
+// aWindowConstraints.gridx = 4;
3696
+// aWindowConstraints.gridwidth = 1;
3697
+// // aWindowConstraints.gridheight = 3;
3698
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3699
+// //bigThree.add(XYZPanel, aConstraints);
3700
+// bigThree.validate();
3701
+// scenePanel.setVisible(true);
3702
+// centralPanel.setVisible(true);
3703
+// XYZPanel.setVisible(false);
3704
+ bigThree.ClearUI();
3705
+ bigThree.add(centralPanel);
3706
+ bigThree.add(scenePanel);
3707
+ bigThree.FlushUI();
3708
+
3709
+ cameraView.requestFocusInWindow();
26953710 } else
2696
- if (event.getSource() == sevenButton)
3711
+ if (source == sevenButton)
26973712 {
26983713 radio.layout = sevenButton;
2699
- bigThree.remove(jtp);
2700
- bigThree.remove(cameraPanel);
2701
- bigThree.remove(XYZPanel);
2702
- aWindowConstraints.gridx = 0;
2703
- aWindowConstraints.gridy = 0;
2704
- aWindowConstraints.gridwidth = 1;
2705
- // aWindowConstraints.gridheight = 3;
2706
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707
- aWindowConstraints.weightx = 0;
2708
- aWindowConstraints.weighty = 1;
2709
- bigThree.add(jtp, aWindowConstraints);
2710
- aWindowConstraints.weightx = 1;
2711
- aWindowConstraints.gridwidth = 3;
2712
- // aWindowConstraints.gridheight = 3;
2713
- aWindowConstraints.gridx = 1;
2714
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715
- bigThree.add(cameraPanel, aWindowConstraints);
2716
- aWindowConstraints.weightx = 0;
2717
- aWindowConstraints.gridx = 4;
2718
- aWindowConstraints.gridwidth = 1;
2719
- // aConstraints.gridheight = 3;
2720
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721
- bigThree.add(XYZPanel, aWindowConstraints);
2722
- bigThree.revalidate();
3714
+
3715
+ if (CameraPane.FULLSCREEN)
3716
+ fullscreenLayout = radio.layout;
3717
+
3718
+// bigThree.remove(scenePanel);
3719
+// bigThree.remove(centralPanel);
3720
+// bigThree.remove(XYZPanel);
3721
+// aWindowConstraints.gridx = 0;
3722
+// aWindowConstraints.gridy = 0;
3723
+// aWindowConstraints.gridwidth = 1;
3724
+// // aWindowConstraints.gridheight = 3;
3725
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3726
+// aWindowConstraints.weightx = 0;
3727
+// aWindowConstraints.weighty = 1;
3728
+// bigThree.add(scenePanel, aWindowConstraints);
3729
+// aWindowConstraints.weightx = 1;
3730
+// aWindowConstraints.gridwidth = 3;
3731
+// // aWindowConstraints.gridheight = 3;
3732
+// aWindowConstraints.gridx = 1;
3733
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3734
+// bigThree.add(centralPanel, aWindowConstraints);
3735
+// aWindowConstraints.weightx = 0;
3736
+// aWindowConstraints.gridx = 4;
3737
+// aWindowConstraints.gridwidth = 1;
3738
+// // aConstraints.gridheight = 3;
3739
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3740
+// bigThree.add(XYZPanel, aWindowConstraints);
3741
+// bigThree.validate();
3742
+// scenePanel.setVisible(true);
3743
+// centralPanel.setVisible(true);
3744
+// XYZPanel.setVisible(true);
3745
+ bigThree.ClearUI();
3746
+ bigThree.add(scenePanel);
3747
+ bigThree.add(centralPanel);
3748
+ bigThree.add(XYZPanel);
3749
+ bigThree.FlushUI();
3750
+
3751
+ cameraView.requestFocusInWindow();
27233752 } else
2724
- if (event.getSource() == rootButton)
3753
+ if (source == rootButton)
27253754 {
27263755 Object3D obj;
27273756 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2731,66 +3760,84 @@
27313760 EditObject(obj);
27323761 }
27333762
3763
+ cameraView.requestFocusInWindow();
27343764 refreshContents(true);
27353765 } else
2736
- if (event.getSource() == closeButton)
3766
+ if (source == closeButton)
27373767 {
27383768 //System.out.println("CLOSE: " + buttonGroup.getSelection());
27393769 cRadio ab;
27403770 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
27413771 {
27423772 ab = (cRadio)e.nextElement();
2743
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3773
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
27443774 {
3775
+ // Patch to avoid bug with transparency.
3776
+ if (!ab.hadMaterial)
3777
+ {
3778
+ ab.object.material = null;
3779
+ }
3780
+
27453781 buttonGroup.remove(ab);
27463782 radioPanel.remove(ab);
27473783
2748
- ab.GetObject().editWindow = null;
3784
+ //ab.GetObject().editWindow = null;
3785
+ ab.GetObject().manipWindow = null;
27493786 // ab.GetObject().objectUI = null; // ?????????
27503787
27513788 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
27523789 break;
27533790 }
27543791 }
3792
+
3793
+ cameraView.requestFocusInWindow();
27553794 refreshContents(true);
27563795 } else
2757
- if (event.getSource() == editItem || event.getSource() == editButton)
3796
+ if (source == editItem || source == editButton)
27583797 {
3798
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3799
+ {
3800
+ Object3D child = (Object3D)e.nextElement();
3801
+ child.pinned = true;
3802
+ }
3803
+
27593804 EditSelection(false);
27603805 } else
2761
- if (event.getSource() == uneditButton)
3806
+ if (source == uneditButton)
27623807 {
27633808 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
27643809 {
27653810 Object3D child = (Object3D)e.nextElement();
27663811 if(child.editWindow != null)
27673812 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3813
+ child.pinned = false;
27683814 child.CloseUI();
27693815 listUI.remove(child);
27703816
2771
- child.editWindow = null; // ???????????
3817
+ //child.editWindow = null; // ???????????
27723818 }
2773
- objEditor.ctrlPanel.revalidate();
3819
+ objEditor.ctrlPanel.FlushUI();
27743820 //objEditor.jTree.clearSelection();
27753821 //objEditor.ResetSliders();
27763822 refreshContents(true);
27773823 } else
2778
- if (event.getSource() == clearPanelButton)
3824
+ if (source == clearPanelButton)
27793825 {
27803826 assert(copy == group);
27813827 //copy.ClearUI();
27823828 for (Object3D obj : listUI)
27833829 {
3830
+ obj.pinned = false;
27843831 obj.CloseUI();
27853832 }
27863833 listUI.clear();
27873834 refreshContents(true);
27883835 } else
2789
- if (event.getSource() == allParamsButton)
3836
+ if (source == allParamsButton)
27903837 {
27913838 assert(copy == group);
27923839
2793
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3840
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
27943841
27953842 for (Object3D obj : listUI)
27963843 {
....@@ -2807,19 +3854,19 @@
28073854
28083855 refreshContents(true);
28093856 } else
2810
- if (event.getSource() == unselectButton)
3857
+ if (source == unselectButton)
28113858 {
28123859 objEditor.jTree.clearSelection();
28133860 // ?? oct 2012 GrafreeD.clipboard.clear();
28143861 objEditor.ResetSliders();
28153862 refreshContents(true);
28163863 } else
2817
- if(event.getSource() instanceof cRadio)
3864
+ if(source instanceof cRadio)
28183865 {
28193866 group.parent = keepparent;
28203867 group.attributes = 0;
28213868 //group.editWindow = null;
2822
- /*cRadio*/ radio = (cRadio)event.getSource();
3869
+ /*cRadio*/ radio = (cRadio)source;
28233870 Object3D obj = radio.GetObject();
28243871 System.out.println("Edit " + obj);
28253872 if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
....@@ -2839,7 +3886,10 @@
28393886 }
28403887
28413888 copy = group;
2842
- //CameraPane.theRenderer.object = group;
3889
+
3890
+ SetUndoStates();
3891
+
3892
+ //Globals.theRenderer.object = group;
28433893 if(!useclient)
28443894 {
28453895 cameraView.renderCamera = radio.camera;
....@@ -2848,25 +3898,52 @@
28483898 cameraView.cameras[cameraView.cameracount] = radio.camera;
28493899 cameraView.targetLookAt.set(radio.camera.lookAt);
28503900 cameraView.object = group;
2851
- cameraView.lighttouched = true;
3901
+ //cameraView.lighttouched = true;
3902
+ Globals.lighttouched = true;
28523903 topView.object = group;
28533904 frontView.object = group;
28543905 sideView.object = group;
28553906 }
2856
- group.editWindow = this;
3907
+
3908
+// fix "+" issue
3909
+ //group.editWindow = this;
3910
+ group.manipWindow = this;
3911
+
28573912 /*
28583913 currentLayout = radio.layout;
28593914 if (currentLayout == null)
28603915 currentLayout = sevenButton;
28613916 */
28623917 radio.layout.doClick();
3918
+
3919
+ ClearUnpinned();
3920
+ //Grafreed.Assert(group != null);
3921
+ //Grafreed.Assert(group.selection != null);
3922
+ SetPinStates(group.selection == null || group.selection.size() > 0);
3923
+ if (group.selection == null || group.selection.size() == 1)
3924
+ EditSelection(false);
28633925 keepparent = group.parent;
28643926 // PARENT = NULL or not???
28653927 //group.parent = null; // ROOT
28663928 //group.attributes = -1;
28673929 ResetModel();
3930
+
3931
+ cameraView.requestFocusInWindow();
28683932 refreshContents(true);
2869
- }
3933
+ } else if (event.getSource() == editCameraItem)
3934
+ {
3935
+ cameraView.ProtectCamera();
3936
+ cameraView.repaint();
3937
+ return;
3938
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3939
+ {
3940
+ cameraView.RevertCamera();
3941
+ cameraView.repaint();
3942
+ return;
3943
+ // } else if (event.getSource() == textureButton)
3944
+ // {
3945
+ // return; // true;
3946
+ }
28703947 else
28713948 {
28723949 //return super.action(event, arg);
....@@ -2875,7 +3952,6 @@
28753952 }
28763953
28773954 boolean useclient = false;
2878
- cRadio radio;
28793955
28803956 void ToggleRoot()
28813957 {
....@@ -2884,7 +3960,7 @@
28843960 if (useclient)
28853961 {
28863962 cameraView.object = client;
2887
- cameraView.lighttouched = true;
3963
+ Globals.lighttouched = true;
28883964 //topView.object = client;
28893965 //frontView.object = client;
28903966 //sideView.object = client;
....@@ -2892,7 +3968,7 @@
28923968 else
28933969 {
28943970 cameraView.object = group;
2895
- cameraView.lighttouched = true;
3971
+ Globals.lighttouched = true;
28963972 //topView.object = group;
28973973 //frontView.object = group;
28983974 //sideView.object = group;
....@@ -2927,6 +4003,28 @@
29274003 refreshContents();
29284004 }
29294005
4006
+ void TransformChildren()
4007
+ {
4008
+ Object3D obj;
4009
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4010
+ {
4011
+ obj = (Object3D)e.nextElement();
4012
+ obj.KeepTextureMatrices();
4013
+ obj.TransformChildren();
4014
+ obj.RestoreTextureMatrices();
4015
+
4016
+// if (obj.parent == null)
4017
+// {
4018
+// System.out.println("NULL PARENT!");
4019
+// new Exception().printStackTrace();
4020
+// }
4021
+// else
4022
+// TouchTransform(obj);
4023
+// //obj.parent.Touch();
4024
+ }
4025
+
4026
+ refreshContents();
4027
+ }
29304028
29314029 void ResetTransform()
29324030 {
....@@ -3039,7 +4137,7 @@
30394137 refreshContents();
30404138 }
30414139
3042
- void ResetCentroid()
4140
+ void ResetCentroid(boolean full)
30434141 {
30444142 Object3D obj;
30454143 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3054,12 +4152,16 @@
30544152 LA.matIdentity(Object3D.mat);
30554153 obj.getBounds(minima, maxima, false);
30564154 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3057
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4155
+ if (full)
4156
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
30584157 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
30594158 obj.TransformMesh(Object3D.mat);
4159
+
30604160 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3061
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4161
+ if (full)
4162
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
30624163 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4164
+
30634165 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
30644166 //Object3D.mat[3][0] = -Object3D.mat[3][0];
30654167 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3088,7 +4190,8 @@
30884190
30894191 int size = obj.MemorySize();
30904192
3091
- System.err.println((size/1024) + " KB is the size of " + obj);
4193
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4194
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
30924195 }
30934196 }
30944197 catch (Exception e)
....@@ -3125,9 +4228,9 @@
31254228 obj = (Object3D)e.nextElement();
31264229
31274230 System.out.println("Object is: " + obj);
3128
- GrafreeD.AnalyzeObject(obj);
4231
+ Grafreed.AnalyzeObject(obj);
31294232 System.out.println("Boundary rep: " + obj.bRep);
3130
- GrafreeD.AnalyzeObject(obj.bRep);
4233
+ Grafreed.AnalyzeObject(obj.bRep);
31314234
31324235 // System.err.println((size/1024) + " KB is the size of " + obj);
31334236 }
....@@ -3169,6 +4272,20 @@
31694272 void GenNormals(boolean crease)
31704273 {
31714274 group.GenNormalsS(crease);
4275
+
4276
+ refreshContents();
4277
+ }
4278
+
4279
+ void GenNormalsMESH()
4280
+ {
4281
+ group.GenNormalsMeshS();
4282
+
4283
+ refreshContents();
4284
+ }
4285
+
4286
+ void GenNormalsMINE()
4287
+ {
4288
+ group.selection.GenNormalsMINE();
31724289
31734290 refreshContents();
31744291 }
....@@ -3334,8 +4451,8 @@
33344451
33354452 void ParseVertices()
33364453 {
3337
- boolean epsequal = GrafreeD.epsequal;
3338
- GrafreeD.epsequal = true;
4454
+ boolean epsequal = Grafreed.epsequal;
4455
+ Grafreed.epsequal = true;
33394456
33404457 for (int i=0; i<group.selection.size(); i++)
33414458 {
....@@ -3360,7 +4477,7 @@
33604477 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
33614478 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
33624479
3363
- g.add(GrafreeD.clipboard);
4480
+ g.add(Grafreed.clipboard);
33644481
33654482 buffer.add(g);
33664483 }
....@@ -3375,7 +4492,7 @@
33754492 makeSomething(buffer, i==group.selection.size()-1);
33764493 }
33774494
3378
- GrafreeD.epsequal = epsequal;
4495
+ Grafreed.epsequal = epsequal;
33794496
33804497 refreshContents();
33814498 }
....@@ -3393,7 +4510,16 @@
33934510 String pigment = Object3D.GetPigment(tex);
33944511 //String bump = Object3D.GetBump(tex);
33954512
3396
- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
4513
+ com.sun.opengl.util.texture.TextureData texturedata = null;
4514
+
4515
+ try
4516
+ {
4517
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4518
+ }
4519
+ catch (Exception e)
4520
+ {
4521
+ System.err.println("FAIL: " + node);
4522
+ }
33974523
33984524 double s = v.s;
33994525
....@@ -3441,12 +4567,26 @@
34414567
34424568 void Align()
34434569 {
4570
+ if (group.selection.size() == 0)
4571
+ return;
4572
+
4573
+ cVector bbmin = new cVector();
4574
+ cVector bbmax = new cVector();
4575
+
4576
+ group.selection.get(0).getBounds(bbmin, bbmax, true);
4577
+
4578
+ double dx = bbmax.x - bbmin.x;
4579
+ double dy = bbmax.y - bbmin.y;
4580
+ double dz = bbmax.z - bbmin.z;
4581
+
4582
+ double scale = Math.sqrt(dx*dx + dy*dy + dz*dz);
4583
+
34444584 for (int i=0; i<group.selection.size(); i++)
34454585 {
34464586 Object3D obj = group.selection.get(i);
34474587
3448
- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449
- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
4588
+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
4589
+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
34504590 }
34514591
34524592 refreshContents();
....@@ -3467,11 +4607,11 @@
34674607
34684608 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
34694609
3470
- boolean random = CameraPane.RANDOM;
3471
- CameraPane.RANDOM = false; // parse all random nodes
4610
+ boolean random = CameraPane.SWITCH;
4611
+ CameraPane.SWITCH = false; // parse all random nodes
34724612 lowres.linkVerticesThis(null);
34734613 lowres.linkVerticesThis(sn);
3474
- CameraPane.RANDOM = random;
4614
+ CameraPane.SWITCH = random;
34754615
34764616 System.err.flush();
34774617
....@@ -3511,7 +4651,7 @@
35114651 return;
35124652
35134653 Object3D poses = group.selection.get(0);
3514
- Object3D ref = GrafreeD.clipboard.get(0);
4654
+ Object3D ref = Grafreed.clipboard.get(0);
35154655
35164656 Object3D newgroup = new Object3D("Po:" + poses.name);
35174657
....@@ -3680,7 +4820,7 @@
36804820 group.selection.RelinkToSupport(); // july 2014
36814821 System.out.println("DONE.");
36824822 refreshContents();
3683
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
4823
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
36844824 }
36854825
36864826 void ReduceMesh(boolean reduction34)
....@@ -3705,9 +4845,9 @@
37054845
37064846 void ClipMesh()
37074847 {
3708
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4848
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
37094849 {
3710
- Object3D content = GrafreeD.clipboard.get(0);
4850
+ Object3D content = Grafreed.clipboard.get(0);
37114851
37124852 if (content instanceof cGroup && ((cGroup)content).transientlink )
37134853 content = ((cGroup)content).get(0);
....@@ -3716,7 +4856,7 @@
37164856 // {
37174857 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
37184858 // }
3719
- group.selection.ClipMesh(GrafreeD.clipboard);
4859
+ group.selection.ClipMesh(Grafreed.clipboard);
37204860 }
37214861 // group.selection.ClipMesh(GrafreeD.clipboard);
37224862 System.out.println("DONE.");
....@@ -3763,6 +4903,18 @@
37634903 void MarkLeaves(boolean hide)
37644904 {
37654905 group.selection.MarkLeaves(hide);
4906
+ refreshContents();
4907
+ }
4908
+
4909
+ void RewindLeaves(boolean hide)
4910
+ {
4911
+ group.selection.RewindLeaves(hide);
4912
+ refreshContents();
4913
+ }
4914
+
4915
+ void RandomLeaves(boolean hide)
4916
+ {
4917
+ group.selection.RandomLeaves(hide);
37664918 refreshContents();
37674919 }
37684920
....@@ -3837,28 +4989,25 @@
38374989 // }
38384990 // }
38394991
3840
- static boolean allparams = true;
3841
-
3842
- static Vector<Object3D> listUI = new Vector<Object3D>();
3843
-
38444992 void EditSelection(boolean newWindow)
38454993 {
4994
+ if (group.selection == null)
4995
+ {
4996
+ EditElement(group, newWindow); // ? new
4997
+ return;
4998
+ }
4999
+
38465000 // aConstraints.gridy = 0;
38475001 for (int i=0; i<group.selection.size(); i++)
38485002 {
38495003 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
38505004 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3851
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5005
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
38525006
38535007 Object3D elem = (Object3D)group.selection.elementAt(i);
3854
- if(elem != group)
5008
+ if(elem != group || !newWindow)
38555009 {
3856
- // if (!(elem instanceof Composite))
3857
- // newWindow = false;
3858
- listUI.add(elem);
3859
- elem.openEditWindow(this, newWindow); //, false);
3860
- System.out.println("edit : " + elem);
3861
- elem.editWindow.refreshContents(true); // ? new
5010
+ EditElement(elem, newWindow); // ? new
38625011 }
38635012 }
38645013 }
....@@ -3933,7 +5082,8 @@
39335082 //new Exception().printStackTrace();
39345083
39355084 freezemodel = true;
3936
-
5085
+ ClearUnpinned();
5086
+
39375087 /**/
39385088 //switch (event.id)
39395089 {
....@@ -3941,7 +5091,6 @@
39415091 //case 702: // Event.LIST_DESELECT
39425092 group.deselectAll();
39435093 TreePath tps[] = objEditor.jTree.getSelectionPaths();
3944
- objEditor.ClearInfo(); // .GetMaterial());
39455094 if (tps != null)
39465095 {
39475096 for (int i=0; i < tps.length; i++)
....@@ -3950,33 +5099,39 @@
39505099
39515100 //if (child.parent != null)
39525101 //child.parent.addSelectee(child);
5102
+ objEditor.SetMaterial(child);
39535103 group.addSelectee(child);
3954
- objEditor.SetMaterial(child); // .GetMaterial());
3955
- objEditor.AddInfo(child, this, true); // .GetMaterial());
3956
- System.err.println("info : " + child.GetPath());
39575104 }
39585105 }
3959
- else
3960
- {
3961
- objEditor.SetMaterial(group); // .GetMaterial());
3962
- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963
- System.err.println("info : " + group.GetPath());
3964
- }
5106
+// else
5107
+// {
5108
+// objEditor.SetMaterial(group); // .GetMaterial());
5109
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
5110
+// System.err.println("info : " + group.GetPath());
5111
+// }
39655112
3966
- objEditor.SetText(); // jan 2014
3967
-
3968
- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5113
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
39695114 CameraPane.flash = true;
39705115
3971
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5116
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
39725117 // a camera
39735118 {
3974
- CameraPane.camerachangeframe = 0; // don't refuse it
3975
- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976
- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977
- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
5119
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5120
+ {
5121
+ CameraPane.camerachangeframe = 0; // don't refuse it
5122
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5123
+ }
5124
+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5125
+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
39785126 }
39795127
5128
+ if (tps != null && tps.length == 1)
5129
+ {
5130
+ EditSelection(false);
5131
+ }
5132
+
5133
+ SetPinStates(tps != null && tps.length > 0);
5134
+
39805135 refreshContents();
39815136 //return true;
39825137 }
....@@ -3985,6 +5140,35 @@
39855140
39865141 freezemodel = false;
39875142 }
5143
+
5144
+ void SetPinStates(boolean enabled)
5145
+ {
5146
+ editButton.setEnabled(enabled);
5147
+ uneditButton.setEnabled(enabled);
5148
+ unselectButton.setEnabled(enabled);
5149
+ flashSelectionButton.setEnabled(enabled);
5150
+ }
5151
+
5152
+ void refreshContents(boolean cp)
5153
+ {
5154
+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5155
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5156
+ {
5157
+ objEditor.ClearInfo(); // .GetMaterial());
5158
+
5159
+ for (int i=0; i < group.selection.Size(); i++)
5160
+ {
5161
+ Object3D child = (Object3D) group.selection.get(i);
5162
+
5163
+ objEditor.AddInfo(child, this, true);
5164
+ System.err.println("info : " + child.GetPath());
5165
+ }
5166
+
5167
+ objEditor.SetText(); // jan 2014
5168
+ }
5169
+
5170
+ super.refreshContents(cp);
5171
+ }
39885172
39895173 void linkSomething(Object3D thing)
39905174 {
....@@ -4056,16 +5240,19 @@
40565240 {
40575241 if (group.selection.isEmpty())
40585242 return;
4059
- GrafreeD.clipboardIsTempGroup = false;
5243
+
5244
+ Grafreed.clipboardIsTempGroup = false;
40605245 Composite tGroup = null;
40615246 if (group.selection.size() > 0) // 1)
40625247 {
40635248 tGroup = new cGroup();
4064
- GrafreeD.clipboardIsTempGroup = true;
5249
+ Grafreed.clipboardIsTempGroup = true;
40655250 }
40665251
40675252 if (cut)
40685253 {
5254
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5255
+// Save();
40695256 //int indices[] = jList.getSelectedIndices();
40705257 //for (int i = indices.length - 1; i >= 0; i--)
40715258 //jList.remove(indices[i]);
....@@ -4101,16 +5288,16 @@
41015288 //System.out.println("cut " + child);
41025289 //System.out.println("parent = " + child.parent);
41035290 // tmp.addChild(child);
4104
- if (GrafreeD.clipboardIsTempGroup)
5291
+ if (Grafreed.clipboardIsTempGroup)
41055292 tGroup.add/*Child*/(tmp);
41065293 else
4107
- GrafreeD.clipboard = tmp;
5294
+ Grafreed.clipboard = tmp;
41085295 }
41095296 else
4110
- if (GrafreeD.clipboardIsTempGroup)
5297
+ if (Grafreed.clipboardIsTempGroup)
41115298 tGroup.add/*Child*/(child);
41125299 else
4113
- GrafreeD.clipboard = child;
5300
+ Grafreed.clipboard = child;
41145301 }
41155302
41165303 //ResetModel();
....@@ -4142,21 +5329,23 @@
41425329 //System.out.println("cut " + elem);
41435330 //System.out.println("parent = " + elem.parent);
41445331 // tmp.addChild(elem);
4145
- if (GrafreeD.clipboardIsTempGroup)
5332
+ if (Grafreed.clipboardIsTempGroup)
41465333 tGroup.add/*Child*/(tmp);
41475334 else
4148
- GrafreeD.clipboard = tmp;
5335
+ Grafreed.clipboard = tmp;
41495336 }
41505337 else
4151
- if (GrafreeD.clipboardIsTempGroup)
5338
+ if (Grafreed.clipboardIsTempGroup)
41525339 tGroup.add/*Child*/(child);
41535340 else
4154
- GrafreeD.clipboard = child;
5341
+ Grafreed.clipboard = child;
41555342 }
41565343
41575344 }
4158
- if (GrafreeD.clipboardIsTempGroup)
4159
- GrafreeD.clipboard = tGroup;
5345
+
5346
+ if (Grafreed.clipboardIsTempGroup)
5347
+ Grafreed.clipboard = tGroup;
5348
+
41605349 if (cut)
41615350 {
41625351 ResetModel();
....@@ -4166,11 +5355,15 @@
41665355
41675356 void paste(boolean expand)
41685357 {
5358
+ if (Globals.REPLACEONMAKE)
5359
+ Save();
5360
+ boolean keep = Globals.REPLACEONMAKE;
5361
+ Globals.REPLACEONMAKE = false;
41695362 // if (GrafreeD.clipboard == null)
41705363 // return;
41715364 boolean first = true;
41725365
4173
- if (GrafreeD.clipboardIsTempGroup)
5366
+ if (Grafreed.clipboardIsTempGroup)
41745367 {
41755368 Composite temp;
41765369
....@@ -4181,7 +5374,7 @@
41815374 temp = (Composite)Applet3D.clipboard.deepCopy();
41825375 */
41835376 Object3D elem;
4184
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
5377
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
41855378 {
41865379 Object3D child = (Object3D)e.nextElement();
41875380
....@@ -4215,21 +5408,22 @@
42155408 //Object3D cb = Applet3D.clipboard;
42165409 //temp.addChild(cb);
42175410 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4218
- assert(GrafreeD.clipboard.parent == null);
4219
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4220
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4221
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4222
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
5411
+ assert(Grafreed.clipboard.parent == null);
5412
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
5413
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
5414
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
5415
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
42235416 else
4224
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4225
- GrafreeD.clipboard.get(0).parent = keepparent;
5417
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5418
+ Grafreed.clipboard.get(0).parent = keepparent;
42265419 }
42275420
5421
+ Globals.REPLACEONMAKE = keep;
42285422 ResetModel();
42295423 refreshContents();
42305424 }
42315425
4232
- void pasteInto(boolean copyit)
5426
+ void pasteInto(boolean copyit, boolean clone)
42335427 {
42345428 // if (GrafreeD.clipboard == null)
42355429 // return;
....@@ -4258,15 +5452,22 @@
42585452 if (copyit)
42595453 {
42605454 // paste(false);
4261
- CloneClipboard(false); // sept 2014
5455
+ if (clone)
5456
+ {
5457
+ CloneClipboard(false); // sept 2014
5458
+ }
5459
+ else
5460
+ {
5461
+ paste(false);
5462
+ }
42625463 }
42635464 else
42645465 {
42655466 boolean first = true;
42665467
4267
- if (GrafreeD.clipboardIsTempGroup)
5468
+ if (Grafreed.clipboardIsTempGroup)
42685469 {
4269
- Composite temp = (Composite)GrafreeD.clipboard;
5470
+ Composite temp = (Composite)Grafreed.clipboard;
42705471 Object3D copy;
42715472 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
42725473 {
....@@ -4276,7 +5477,7 @@
42765477 }
42775478 } else
42785479 {
4279
- linkSomething(GrafreeD.clipboard); //.get(0));
5480
+ linkSomething(Grafreed.clipboard); //.get(0));
42805481 }
42815482 }
42825483 }
....@@ -4353,6 +5554,10 @@
43535554
43545555 void group(Object3D csg, boolean grab)
43555556 {
5557
+ if (Globals.REPLACEONMAKE)
5558
+ Save();
5559
+ boolean keep = Globals.REPLACEONMAKE;
5560
+ Globals.REPLACEONMAKE = false;
43565561 if (//false) // why??
43575562 !group.selection.isEmpty())
43585563 {
....@@ -4466,8 +5671,34 @@
44665671 //node.add(csg);
44675672 //makeSomething(node);
44685673 makeSomething(csg);
5674
+ Globals.REPLACEONMAKE = keep;
44695675 }
44705676
5677
+ void Ungroup(Object3D g)
5678
+ {
5679
+ if (Globals.REPLACEONMAKE)
5680
+ Save();
5681
+ boolean keep = Globals.REPLACEONMAKE;
5682
+ Globals.REPLACEONMAKE = false;
5683
+ if (g instanceof HiddenObject)
5684
+ {
5685
+ HiddenObject h = (HiddenObject) g;
5686
+
5687
+ for (int i=0; i<h.ActualSize(); i++)
5688
+ {
5689
+ objEditor.makeSomething(h.get(i), false);
5690
+ }
5691
+ }
5692
+ else
5693
+ {
5694
+ for (int i=0; i<g.Size(); i++)
5695
+ {
5696
+ objEditor.makeSomething(g.get(i), false);
5697
+ }
5698
+ }
5699
+ Globals.REPLACEONMAKE = keep;
5700
+ }
5701
+
44715702 void ungroup()
44725703 {
44735704 /*
....@@ -4661,21 +5892,6 @@
46615892 }
46625893 */
46635894
4664
- void ImportGFD()
4665
- {
4666
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4667
- browser.show();
4668
- String filename = browser.getFile();
4669
- if (filename != null && filename.length() > 0)
4670
- {
4671
- String fullname = browser.getDirectory() + filename;
4672
-
4673
- //Object3D readobj =
4674
- objEditor.ReadGFD(fullname, objEditor);
4675
- //makeSomething(readobj);
4676
- }
4677
- }
4678
-
46795895 /*
46805896 public void Callback(Object obj)
46815897 {
....@@ -4699,26 +5915,9 @@
46995915 }
47005916 */
47015917
4702
- void ImportVRMLX3D()
4703
- {
4704
- if (GrafreeD.standAlone)
4705
- {
4706
- /**/
4707
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4708
- browser.show();
4709
- String filename = browser.getFile();
4710
- if (filename != null && filename.length() > 0)
4711
- {
4712
- String fullname = browser.getDirectory() + filename;
4713
- LoadVRMLX3D(fullname);
4714
- }
4715
- /**/
4716
- }
4717
- }
4718
-
47195918 String GetFile(String dialogName)
47205919 {
4721
- if (GrafreeD.standAlone)
5920
+ if (Grafreed.standAlone)
47225921 {
47235922 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
47245923 browser.show();
....@@ -4782,10 +5981,49 @@
47825981 cButton flashSelectionButton;
47835982 cButton editButton;
47845983 cButton uneditButton;
5984
+ JCheckBox allParamsButton;
47855985 cButton clearpanelButton;
4786
- cButton allParamsButton;
47875986 cButton unselectButton;
47885987
5988
+ cButton restoreCameraButton;
5989
+
5990
+ cButton saveButton;
5991
+ cButton oneStepButton;
5992
+
5993
+ cButton groupButton;
5994
+ cButton ungroupButton;
5995
+ cButton compositeButton;
5996
+ cButton switchButton;
5997
+ cButton loopButton;
5998
+ cButton textureButton;
5999
+
6000
+ cButton skybox1Button;
6001
+ cButton skybox2Button;
6002
+ cButton skybox3Button;
6003
+ cButton skybox4Button;
6004
+ cButton skybox5Button;
6005
+ cButton skybox6Button;
6006
+ cButton skybox7Button;
6007
+
6008
+ cButton skybox11Button;
6009
+ cButton skybox12Button;
6010
+ cButton skybox13Button;
6011
+ cButton skybox14Button;
6012
+ cButton skybox15Button;
6013
+ cButton skybox16Button;
6014
+ cButton skybox17Button;
6015
+
6016
+ cButton gridButton;
6017
+ cButton boxButton;
6018
+ cButton sphereButton;
6019
+ cButton coneButton;
6020
+ cButton torusButton;
6021
+ cButton superButton;
6022
+ cButton kleinButton;
6023
+ cButton particlesButton;
6024
+ cButton overlayButton;
6025
+ cButton lightButton;
6026
+
47896027 cButton screenfitButton;
47906028 cButton screenfitpointButton;
47916029 cButton snapobjectButton;
....@@ -4797,14 +6035,6 @@
47976035
47986036 cButton setsupportButton;
47996037
4800
- cButton twoButton;
4801
- cButton sixButton;
4802
- cButton threeButton;
4803
- cButton sevenButton;
4804
- cButton fourButton; // full panel
4805
- cButton oneButton; // full XYZ
4806
- //cButton currentLayout;
4807
-
48086038 //
48096039 //Composite
48106040 Object3D // to do !!
....@@ -4814,9 +6044,11 @@
48146044 //JTree jTree;
48156045 private MenuItem lookAtItem;
48166046 private MenuItem lookFromItem;
4817
- private MenuItem switchItem;
6047
+ private MenuItem switchViewItem;
48186048 private MenuItem cutItem;
4819
- private MenuItem duplicateItem;
6049
+ private MenuItem undoItem;
6050
+ private MenuItem redoItem;
6051
+ private JMenuItem duplicateItem;
48206052 private MenuItem cloneItem;
48216053 private MenuItem cloneSupportItem;
48226054 private MenuItem overwriteGeoItem;
....@@ -4827,8 +6059,9 @@
48276059 private MenuItem resetsupportItem;
48286060 private MenuItem resetreferencesItem;
48296061 private MenuItem linkverticesItem;
6062
+ private MenuItem relinkverticesItem;
48306063 private MenuItem setMasterItem;
4831
- private MenuItem resetMeshItem;
6064
+ private MenuItem resetAllItem;
48326065 private MenuItem stepAllItem;
48336066 private MenuItem revertMeshItem;
48346067 private MenuItem poseMeshItem;
....@@ -4839,14 +6072,17 @@
48396072 private MenuItem mergeGeometriesItem;
48406073 private MenuItem copyItem;
48416074 private MenuItem pasteItem;
6075
+ private MenuItem pasteIntoItem;
48426076 private MenuItem pasteLinkItem;
48436077 private MenuItem pasteCloneItem;
48446078 private MenuItem pasteExpandItem;
4845
- private MenuItem clearItem;
6079
+ private MenuItem deleteItem;
48466080 private MenuItem clearAllItem;
48476081 private MenuItem genUVItem;
6082
+ private MenuItem genNormalsMESHItem;
48486083 private MenuItem genNormalsCADItem;
48496084 private MenuItem genNormalsORGANItem;
6085
+ private MenuItem genNormalsMINEItem;
48506086 private MenuItem stripifyItem;
48516087 private MenuItem unstripifyItem;
48526088 private MenuItem trimItem;
....@@ -4875,6 +6111,10 @@
48756111 private MenuItem showleavesItem;
48766112 private MenuItem markleavesItem;
48776113 private MenuItem unmarkleavesItem;
6114
+ private MenuItem rewindleavesItem;
6115
+ private MenuItem unrewindleavesItem;
6116
+ private MenuItem randomleavesItem;
6117
+ private MenuItem unrandomleavesItem;
48786118
48796119 private MenuItem flipVItem;
48806120 private MenuItem unflipVItem;
....@@ -4886,14 +6126,17 @@
48866126 private MenuItem panoTexturesItem;
48876127
48886128 private MenuItem resetCentroidItem;
4889
- private MenuItem transformgeometryItem;
6129
+ private MenuItem resetCentroidXZItem;
48906130 private MenuItem resetTransformItem;
6131
+ private MenuItem transformGeometryItem;
6132
+ private MenuItem transformChildrenItem;
6133
+ private MenuItem hideItem;
48916134 private MenuItem grabItem;
48926135 private MenuItem backItem;
48936136 private MenuItem frontItem;
48946137 private MenuItem cameraItem;
48956138 private MenuItem compositeItem;
4896
- private MenuItem randomItem;
6139
+ private MenuItem switchItem;
48976140 private MenuItem physicsItem;
48986141 private MenuItem frameselectorItem;
48996142 private MenuItem scriptNodeItem;
....@@ -4908,6 +6151,7 @@
49086151
49096152 private MenuItem resetParentItem;
49106153 private MenuItem repairParentItem;
6154
+ private MenuItem repairShadowItem;
49116155 private MenuItem sortbysizeItem;
49126156 private MenuItem sortbynameItem;
49136157
....@@ -4916,6 +6160,8 @@
49166160 private MenuItem attachBumpItem;
49176161 private MenuItem detachBumpItem;
49186162 private MenuItem pigmentBumpItem;
6163
+ private MenuItem embedTexturesItem;
6164
+ private MenuItem deEmbedTexturesItem;
49196165
49206166 private MenuItem particleItem;
49216167 private MenuItem ragdollItem;
....@@ -4928,10 +6174,11 @@
49286174 private MenuItem coneItem;
49296175 private MenuItem torusItem;
49306176 private MenuItem superItem;
6177
+ private MenuItem kleinItem;
49316178 private MenuItem blobItem;
49326179 private MenuItem latheItem;
49336180 private MenuItem bezierItem;
4934
- private MenuItem checkerItem;
6181
+ private MenuItem overlayItem;
49356182 private MenuItem meshItem;
49366183 // private MenuItem meshGroupItem;
49376184 private MenuItem springItem;
....@@ -4940,6 +6187,7 @@
49406187 private MenuItem csgItem;
49416188 private MenuItem templateItem;
49426189 private MenuItem textureItem;
6190
+ private MenuItem billboardItem;
49436191 private MenuItem shadowXItem;
49446192 private MenuItem shadowYItem;
49456193 private MenuItem shadowZItem;
....@@ -4952,11 +6200,6 @@
49526200 private MenuItem doubleItem;
49536201 private MenuItem tripleItem;
49546202
4955
- private MenuItem importGFDItem;
4956
- private MenuItem importVRMLX3DItem;
4957
- private MenuItem import3DSItem;
4958
- private MenuItem importOBJItem;
4959
-
49606203 private MenuItem computeAOItem;
49616204 private MenuItem recompileItem;
49626205 private MenuItem editScriptItem;
....@@ -4966,4 +6209,8 @@
49666209 private MenuItem analyzeItem;
49676210 private MenuItem dumpItem;
49686211 //boolean freezemodel = false;
6212
+
6213
+ Menu cameraMenu;
6214
+ MenuItem editCameraItem;
6215
+ MenuItem restoreCameraItem;
49696216 }