Normand Briere
2019-07-28 d7fd07756f4095cb87dc25d89fcffcbda092e2cf
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,237 @@
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 + "/" + s + ".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("default", "uffizi", row0);
62
+ AddSkyboxButton("default", "CloudyHills", row0);
63
+
64
+ AddSkyboxButton("default", "skycube", row1);
65
+ AddSkyboxButton("bridge", "Bridge", row1);
66
+ AddSkyboxButton("bridge", "Bridge2", row1);
67
+ AddSkyboxButton("urban", "GamlaStan2", row1);
68
+
69
+ AddSkyboxButton("urban", "Parliament", row2);
70
+ AddSkyboxButton("urban", "Roundabout", row2);
71
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
72
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
73
+
74
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
75
+ AddSkyboxButton("urban", "UnionSquare", row3);
76
+ AddSkyboxButton("park", "BerzeliiPark", row3);
77
+ AddSkyboxButton("park", "Buddha", row3);
78
+
79
+ AddSkyboxButton("park", "CNTower2", row4);
80
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
81
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
82
+ AddSkyboxButton("park", "Park", row4);
83
+
84
+ AddSkyboxButton("park", "Pond", row5);
85
+ AddSkyboxButton("park", "Skansen", row5);
86
+ AddSkyboxButton("park", "Skansen2", row5);
87
+ AddSkyboxButton("park", "Skansen3", row5);
88
+
89
+ AddSkyboxButton("park", "Skansen4", row6);
90
+ AddSkyboxButton("park", "Skansen5", row6);
91
+ AddSkyboxButton("park", "Stairs", row6);
92
+ AddSkyboxButton("park", "Tantolunden4", row6);
93
+
94
+ tab0.add(row0);
95
+ tab0.add(row1);
96
+ tab0.add(row2);
97
+ tab0.add(row3);
98
+ tab0.add(row4);
99
+ tab0.add(row5);
100
+ tab0.add(row6);
101
+
102
+ for (int i=5; --i>=0;)
103
+ {
104
+ //oe.toolboxPanel.Return();
105
+ //tab0.add(new cGridBag());
106
+ }
107
+ }
108
+
109
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
110
+ {
111
+ cGridBag tab0 = new cGridBag().setVertical(true);
112
+
113
+ tab0.setName("Nature");
114
+ skyboxpanel.add(tab0);
115
+
116
+ cGridBag row0 = new cGridBag();
117
+ cGridBag row1 = new cGridBag();
118
+ cGridBag row2 = new cGridBag();
119
+ cGridBag row3 = new cGridBag();
120
+ cGridBag row4 = new cGridBag();
121
+ cGridBag row5 = new cGridBag();
122
+ cGridBag row6 = new cGridBag();
123
+
124
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
125
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
126
+ AddSkyboxButton("beach", "PalmTrees", row0);
127
+ AddSkyboxButton("beach", "Tenerife", row0);
128
+
129
+ AddSkyboxButton("beach", "Tenerife2", row1);
130
+ AddSkyboxButton("beach", "Tenerife3", row1);
131
+ AddSkyboxButton("field", "FishPond", row1);
132
+ AddSkyboxButton("field", "Footballfield", row1);
133
+
134
+ AddSkyboxButton("field", "Meadow", row2);
135
+ AddSkyboxButton("field", "Sorsele", row2);
136
+ AddSkyboxButton("field", "Sorsele2", row2);
137
+ AddSkyboxButton("field", "Sorsele3", row2);
138
+
139
+ AddSkyboxButton("forest", "Brudslojan", row3);
140
+ AddSkyboxButton("forest", "Langholmen2", row3);
141
+ AddSkyboxButton("forest", "Plants", row3);
142
+ AddSkyboxButton("mountain", "Maskonaive", row3);
143
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
144
+
145
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
146
+ AddSkyboxButton("mountain", "Ryfjallet", row4);
147
+ AddSkyboxButton("mountain", "Teide", row4);
148
+
149
+ AddSkyboxButton("rocky", "Langholmen", row5);
150
+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
151
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
152
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
153
+ /*
154
+Kastellholmen
155
+Langholmen
156
+Riddarfjarden
157
+Skinnarviksberget
158
+Tanto
159
+Tantolunden2
160
+Tantolunden6
161
+ */
162
+
163
+ tab0.add(row0);
164
+ tab0.add(row1);
165
+ tab0.add(row2);
166
+ tab0.add(row3);
167
+ tab0.add(row4);
168
+ tab0.add(row5);
169
+ tab0.add(row6);
170
+
171
+ for (int i=5; --i>=0;)
172
+ {
173
+ //oe.toolboxPanel.Return();
174
+ //tab0.add(new cGridBag());
175
+ }
176
+ }
177
+
178
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
179
+ {
180
+ cGridBag tab0 = new cGridBag().setVertical(true);
181
+
182
+ tab0.setName("Night");
183
+ skyboxpanel.add(tab0);
184
+
185
+ cGridBag row0 = new cGridBag();
186
+ cGridBag row1 = new cGridBag();
187
+ cGridBag row2 = new cGridBag();
188
+ cGridBag row3 = new cGridBag();
189
+ cGridBag row4 = new cGridBag();
190
+ cGridBag row5 = new cGridBag();
191
+ cGridBag row6 = new cGridBag();
192
+
193
+ AddSkyboxButton("night", "NightPath", row0);
194
+ AddSkyboxButton("night", "PondNight", row0);
195
+ AddSkyboxButton("night", "Powerlines", row0);
196
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
197
+
198
+ AddSkyboxButton("urban", "CNTower", row1);
199
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
200
+ AddSkyboxButton("indoors", "DallasW", row1);
201
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
202
+
203
+ AddSkyboxButton("indoors", "Vasa", row2);
204
+ AddSkyboxButton("winter", "Backyard", row2);
205
+ AddSkyboxButton("winter", "Creek", row2);
206
+ AddSkyboxButton("winter", "FootballField3", row2);
207
+
208
+ AddSkyboxButton("winter", "Forest", row3);
209
+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
210
+ AddSkyboxButton("winter", "House", row3);
211
+ AddSkyboxButton("winter", "IceLake", row3);
212
+
213
+ AddSkyboxButton("winter", "IceRiver", row4);
214
+ AddSkyboxButton("winter", "Park3", row4);
215
+ AddSkyboxButton("winter", "PondWinter", row4);
216
+
217
+ AddSkyboxButton("winter", "Tantolunden5", row5);
218
+ AddSkyboxButton("winter", "Vindelalven", row5);
219
+ /*
220
+Backyard
221
+Creek
222
+FootballField3
223
+Forest
224
+HornstullsStrand2
225
+House
226
+IceLake
227
+IceRiver
228
+Park3
229
+PondWinter
230
+Tantolunden5
231
+Vindelalven *
232
+ */
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 ChangeSkybox(String name)
250
+ {
251
+ cameraView.envyoff = false;
252
+ cameraView.skyboxname = name;
253
+ cameraView.skyboxext = "jpg";
254
+ cameraView.repaint();
255
+ }
256
+
25257 //ObjEditor objEditor;
26258 public void closeUI2()
27259 {
....@@ -59,6 +291,12 @@
59291 this.copy = this.group = group;
60292 //selectees = this.group.selectees;
61293
294
+ if (copy.versions == null)
295
+ {
296
+ copy.versions = new byte[100][];
297
+ copy.versionindex = -1;
298
+ }
299
+
62300 if(ui)
63301 SetupUI(objEditor);
64302 }
....@@ -73,16 +311,28 @@
73311 this.copy = this.group = copy;
74312 //selectees = this.group.selectees;
75313
76
- SetupMenu2(objEditor);
314
+ SetupMenu2(this); //objEditor);
77315 SetupUI2(objEditor);
78316 objEditor.SetupUI(true);
79317 SetupViews(objEditor);
80318
81319 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
320
+
321
+ if (copy.versions == null)
322
+ {
323
+ copy.versions = new byte[100][];
324
+ copy.versionindex = -1;
325
+
326
+ Save(true);
327
+ }
82328 }
83329
84330 void CloneSelection(boolean supports)
85331 {
332
+ if (Globals.REPLACEONMAKE)
333
+ Save();
334
+ boolean keep = Globals.REPLACEONMAKE;
335
+ Globals.REPLACEONMAKE = false;
86336 // Object3D keep = GrafreeD.clipboard;
87337 //Object3D obj;
88338 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -93,18 +343,19 @@
93343
94344 makeSomething(clone, i==group.selection.size()-1);
95345 }
346
+ Globals.REPLACEONMAKE = keep;
96347 }
97348
98349 void CloneClipboard(boolean supports)
99350 {
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));
351
+ assert(Grafreed.clipboard.parent == null);
352
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
353
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
354
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
355
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105356 else
106
- makeSomething(CloneObject(GrafreeD.clipboard, false));
107
- GrafreeD.clipboard.get(0).parent = keepparent;
357
+ makeSomething(CloneObject(Grafreed.clipboard, false));
358
+ Grafreed.clipboard.get(0).parent = keepparent;
108359 }
109360
110361 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -118,7 +369,7 @@
118369 // obj.support = null;
119370 if (!supports)
120371 obj.SaveSupports();
121
- Object3D clone = (Object3D)GrafreeD.clone(obj);
372
+ Object3D clone = (Object3D)Grafreed.clone(obj);
122373 obj.parent = parent;
123374 // obj.support = support;
124375 // clone.support = support; // aout 2013
....@@ -147,30 +398,29 @@
147398
148399 //JTextField nameField;
149400
150
- void SetupMenu2(ObjEditor oe)
401
+ void SetupMenu2(GroupEditor oe)
151402 {
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);
403
+ oe.jTree = new cTree();
404
+
163405 Menu menu;
164406 oe.menuBar.add(menu = new Menu("Edit"));
165407 //editItem = menu.add(new MenuItem("Edit"));
166408 //editItem.addActionListener(this);
167
- duplicateItem = menu.add(new MenuItem("Duplicate"));
409
+
410
+// undoItem = menu.add(new MenuItem("Undo"));
411
+// undoItem.addActionListener(this);
412
+// redoItem = menu.add(new MenuItem("Redo"));
413
+// redoItem.addActionListener(this);
414
+// menu.add("-");
415
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168416 duplicateItem.addActionListener(this);
169
- menu.add("-");
170417 cloneItem = menu.add(new MenuItem("Clone"));
171418 cloneItem.addActionListener(this);
419
+ if (Globals.ADVANCED)
420
+ {
172421 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173422 cloneSupportItem.addActionListener(this);
423
+ }
174424 menu.add("-");
175425 cutItem = menu.add(new MenuItem("Cut"));
176426 cutItem.addActionListener(this);
....@@ -178,27 +428,123 @@
178428 copyItem.addActionListener(this);
179429 pasteItem = menu.add(new MenuItem("Paste"));
180430 pasteItem.addActionListener(this);
431
+
432
+ menu.add("-");
433
+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
434
+ pasteIntoItem.addActionListener(this);
181435 pasteLinkItem = menu.add(new MenuItem("Paste link"));
182436 pasteLinkItem.addActionListener(this);
183437 pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184438 pasteCloneItem.addActionListener(this);
185439 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186440 // pasteExpandItem.addActionListener(this);
187
- clearItem = menu.add(new MenuItem("Clear"));
188
- clearItem.addActionListener(this);
441
+ menu.add("-");
442
+ deleteItem = menu.add(new MenuItem("Delete"));
443
+ deleteItem.addActionListener(this);
444
+
445
+ if (Globals.ADVANCED)
446
+ {
447
+ // Deletes the cameras...
189448 clearAllItem = menu.add(new MenuItem("Clear All"));
190449 clearAllItem.addActionListener(this);
450
+ }
451
+
452
+ menuBar.add(cameraMenu = new Menu("View"));
453
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
454
+ //zBufferItem.addActionListener(this);
455
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
456
+ //normalLensItem.addActionListener(this);
457
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
458
+ restoreCameraItem.addActionListener(this);
459
+
460
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
461
+// toggleFullScreenItem.addItemListener(this);
462
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
463
+// cameraMenu.add("-");
464
+//
465
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
466
+// toggleTextureItem.addItemListener(this);
467
+// toggleTextureItem.setState(CameraPane.textureon);
468
+//
469
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
470
+// toggleSwitchItem.addItemListener(this);
471
+// toggleSwitchItem.setState(CameraPane.SWITCH);
472
+
473
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
474
+ toggleHandleItem.addItemListener(this);
475
+ toggleHandleItem.setState(CameraPane.HANDLES);
476
+
477
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
478
+ togglePaintItem.addItemListener(this);
479
+ togglePaintItem.setState(CameraPane.PAINTMODE);
480
+
481
+ if (Globals.ADVANCED)
482
+ {
483
+ cameraMenu.add("-");
484
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
485
+ toggleLiveItem.addItemListener(this);
486
+ toggleLiveItem.setState(Globals.isLIVE());
191487
488
+ cameraMenu.add(stepItem = new MenuItem("Step"));
489
+ stepItem.addActionListener(this);
490
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
491
+ // toggleDLItem.addItemListener(this);
492
+ // toggleDLItem.setState(false);
493
+
494
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
495
+ toggleRenderItem.addItemListener(this);
496
+ toggleRenderItem.setState(!CameraPane.frozen);
497
+
498
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
499
+ toggleDebugItem.addItemListener(this);
500
+ toggleDebugItem.setState(Globals.DEBUG);
501
+
502
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
503
+ toggleFrustumItem.addItemListener(this);
504
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
505
+
506
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
507
+ toggleFootContactItem.addItemListener(this);
508
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
509
+
510
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
511
+ toggleTimelineItem.addItemListener(this);
512
+ }
513
+
514
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
515
+// toggleRootItem.addItemListener(this);
516
+// toggleRootItem.setState(false);
517
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
518
+// animationItem.addItemListener(this);
519
+// animationItem.setState(CameraPane.ANIMATION);
520
+ cameraMenu.add("-");
521
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
522
+ editCameraItem.addActionListener(this);
523
+
524
+ if (Globals.ADVANCED)
525
+ {
526
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
527
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
528
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
529
+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
530
+ oe.cameraMenu.add("-");
531
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
532
+ openWindowItem.addActionListener(this);
533
+ editLeafItem.addActionListener(this);
534
+ lookAtItem.addActionListener(this);
535
+ //lookFromItem.addActinoListener(this);
536
+ //switchViewItem.addActionListener(this);
537
+ }
538
+
192539 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);
540
+ if (Globals.ADVANCED)
541
+ {
197542 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198543 revertMeshItem.addActionListener(this);
199544 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200545 resetreferencesItem.addActionListener(this);
201546 menu.add("-");
547
+ }
202548 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203549 overwriteGeoItem.addActionListener(this);
204550 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -210,79 +556,104 @@
210556 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211557 overwriteUVItem.addActionListener(this);
212558 menu.add("-");
559
+ if (Globals.ADVANCED)
560
+ {
213561 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214562 generateMeshItem.addActionListener(this);
215563 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216564 poseMeshItem.addActionListener(this);
217565 menu.add("-");
566
+ }
218567 resetsupportItem = menu.add(new MenuItem("Reset support"));
219568 resetsupportItem.addActionListener(this);
220569 linkverticesItem = menu.add(new MenuItem("Link to Support"));
221570 linkverticesItem.addActionListener(this);
222571 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223572 relinkverticesItem.addActionListener(this);
573
+
574
+ if (Globals.ADVANCED)
575
+ {
224576 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225577 setMasterItem.addActionListener(this);
578
+ }
226579
227580 oe.menuBar.add(menu = new Menu("Group"));
228
- grabItem = menu.add(new MenuItem("Grab"));
229
- grabItem.addActionListener(this);
581
+// grabItem = menu.add(new MenuItem("Grab"));
582
+// grabItem.addActionListener(this);
230583 backItem = menu.add(new MenuItem("Back"));
231584 backItem.addActionListener(this);
232585 frontItem = menu.add(new MenuItem("Front"));
233586 frontItem.addActionListener(this);
234
- compositeItem = menu.add(new MenuItem("Composite"));
235
- compositeItem.addActionListener(this);
236
- hideItem = menu.add(new MenuItem("Hide"));
587
+// compositeItem = menu.add(new MenuItem("Composite"));
588
+// compositeItem.addActionListener(this);
589
+
590
+ if (Globals.ADVANCED)
591
+ {
592
+ hideItem = menu.add(new MenuItem("Hidden Group"));
237593 hideItem.addActionListener(this);
594
+ }
238595 ungroupItem = menu.add(new MenuItem("Ungroup"));
239596 ungroupItem.addActionListener(this);
240
- menu.add("-");
241
- randomItem = menu.add(new MenuItem("Random"));
242
- randomItem.addActionListener(this);
243
- physicsItem = menu.add(new MenuItem("Physics"));
244
- physicsItem.addActionListener(this);
245
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246
- frameselectorItem.addActionListener(this);
597
+
598
+// menu.add("-");
599
+//
600
+// switchItem = menu.add(new MenuItem("Switch node"));
601
+// switchItem.addActionListener(this);
602
+ if (Globals.ADVANCED)
603
+ {
247604 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248605 switchGeoItem.addActionListener(this);
249606 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250607 switchTransfoItem.addActionListener(this);
251
- morphItem = menu.add(new MenuItem("Morph"));
608
+ morphItem = menu.add(new MenuItem("Morph Group"));
252609 morphItem.addActionListener(this);
610
+
611
+ menu.add("-");
612
+ physicsItem = menu.add(new MenuItem("Physics"));
613
+ physicsItem.addActionListener(this);
614
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
615
+ frameselectorItem.addActionListener(this);
253616 scriptNodeItem = menu.add(new MenuItem("Script Node"));
254617 scriptNodeItem.addActionListener(this);
255
- cameraItem = menu.add(new MenuItem("Camera"));
256
- cameraItem.addActionListener(this);
618
+ }
257619
258620 oe.menuBar.add(menu = new Menu("Object"));
259
- textureItem = menu.add(new MenuItem("Texture"));
260
- textureItem.addActionListener(this);
621
+// textureItem = menu.add(new MenuItem("Texture"));
622
+// textureItem.addActionListener(this);
261623 billboardItem = menu.add(new MenuItem("Billboard"));
262624 billboardItem.addActionListener(this);
263625 csgItem = menu.add(new MenuItem("CSG"));
264626 csgItem.addActionListener(this);
265
- shadowXItem = menu.add(new MenuItem("Shadow X"));
627
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266628 shadowXItem.addActionListener(this);
267
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
629
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268630 shadowYItem.addActionListener(this);
269
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
631
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270632 shadowZItem.addActionListener(this);
633
+ attributeItem = menu.add(new MenuItem("Attribute"));
634
+ attributeItem.addActionListener(this);
635
+
636
+ if (Globals.ADVANCED)
637
+ {
638
+ menu.add("-");
271639 linkerItem = menu.add(new MenuItem("Linker"));
272640 linkerItem.addActionListener(this);
273641 templateItem = menu.add(new MenuItem("Template"));
274642 templateItem.addActionListener(this);
275
- attributeItem = menu.add(new MenuItem("Attribute"));
276
- attributeItem.addActionListener(this);
277643 pointflowItem = menu.add(new MenuItem("Point Flow"));
278644 pointflowItem.addActionListener(this);
645
+ }
279646 menu.add("-");
280647 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281648 resetTransformItem.addActionListener(this);
282649 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283650 resetCentroidItem.addActionListener(this);
284
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285
- transformgeometryItem.addActionListener(this);
651
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
652
+ resetCentroidXZItem.addActionListener(this);
653
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
654
+ transformGeometryItem.addActionListener(this);
655
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
656
+ transformChildrenItem.addActionListener(this);
286657
287658 oe.menuBar.add(menu = new Menu("Geometry"));
288659 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -293,8 +664,11 @@
293664 genNormalsCADItem.addActionListener(this);
294665 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295666 genNormalsMESHItem.addActionListener(this);
296
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
667
+ if (Globals.ADVANCED)
668
+ {
669
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297670 genNormalsMINEItem.addActionListener(this);
671
+ }
298672 stripifyItem = menu.add(new MenuItem("Stripify"));
299673 stripifyItem.addActionListener(this);
300674 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -316,23 +690,34 @@
316690 reduce34MeshItem.addActionListener(this);
317691 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318692 increaseMeshItem.addActionListener(this);
319
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320
- smoothMeshItem.addActionListener(this);
321693 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322694 clipMeshItem.addActionListener(this);
695
+
696
+ if (Globals.ADVANCED)
697
+ {
698
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
699
+ smoothMeshItem.addActionListener(this);
700
+ }
323701
324702 oe.menuBar.add(menu = new Menu("Attributes"));
325703 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326704 clearMaterialsItem.addActionListener(this);
705
+ resetAllItem = menu.add(new MenuItem("Reset All"));
706
+ resetAllItem.addActionListener(this);
707
+ stepAllItem = menu.add(new MenuItem("Step All"));
708
+ stepAllItem.addActionListener(this);
327709 menu.add("-");
328710 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329711 liveleavesItem.addActionListener(this);
330712 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331713 unliveleavesItem.addActionListener(this);
714
+ if (Globals.ADVANCED)
715
+ {
332716 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333717 supportleavesItem.addActionListener(this);
334718 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335719 unsupportleavesItem.addActionListener(this);
720
+ }
336721 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337722 hideleavesItem.addActionListener(this);
338723 showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -341,6 +726,14 @@
341726 markleavesItem.addActionListener(this);
342727 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343728 unmarkleavesItem.addActionListener(this);
729
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
730
+ rewindleavesItem.addActionListener(this);
731
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
732
+ unrewindleavesItem.addActionListener(this);
733
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
734
+ randomleavesItem.addActionListener(this);
735
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
736
+ unrandomleavesItem.addActionListener(this);
344737 menu.add("-");
345738 flipVItem = menu.add(new MenuItem("Flip V"));
346739 flipVItem.addActionListener(this);
....@@ -366,45 +759,56 @@
366759 attachBumpItem.addActionListener(this);
367760 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368761 pigmentBumpItem.addActionListener(this);
762
+ //embedTexturesItem
369763 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370764 detachPigmentItem.addActionListener(this);
371765 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372766 detachBumpItem.addActionListener(this);
767
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
768
+ embedTexturesItem.addActionListener(this);
769
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
770
+ deEmbedTexturesItem.addActionListener(this);
373771 menu.add("-");
374772 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375773 sortbysizeItem.addActionListener(this);
376774 sortbynameItem = menu.add(new MenuItem("Sort by name"));
377775 sortbynameItem.addActionListener(this);
378776 menu.add("-");
777
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
778
+ shareGeometriesItem.addActionListener(this);
779
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
780
+ mergeGeometriesItem.addActionListener(this);
781
+ if (Globals.ADVANCED)
782
+ {
783
+ // Pretty much the same as duplicate and clone.
379784 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380785 extractGeometriesItem.addActionListener(this);
381786 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382787 cloneGeometriesItem.addActionListener(this);
383
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384
- shareGeometriesItem.addActionListener(this);
385
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386
- mergeGeometriesItem.addActionListener(this);
788
+ }
387789
388790 oe.menuBar.add(menu = new Menu("Insert"));
389791 buildCreateMenu(menu);
390792
391
-
392
- oe.menuBar.add(menu = new Menu("Include"));
393
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394
- importGFDItem.addActionListener(this);
395
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396
- importVRMLX3DItem.addActionListener(this);
397
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398
- importOBJItem.addActionListener(this);
399
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400
- import3DSItem.addActionListener(this);
401
-
402793 oe.menuBar.add(menu = new Menu("Tools"));
403794 buildToolsMenu(menu);
404795 }
405796
797
+
406798 void SetupUI2(ObjEditor oe)
407799 {
800
+ // June 2019
801
+ if (oe == null)
802
+ {
803
+ //super.SetupUI2(this);
804
+ //return;
805
+ }
806
+
807
+ if (copy != group)
808
+ {
809
+ //super.SetupUI2(this);
810
+ }
811
+
408812 //new Exception().printStackTrace();
409813
410814 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -433,176 +837,238 @@
433837 oe.radioPanel.add(dummyButton);
434838 oe.buttonGroup.add(dummyButton);
435839 */
436
- aConstraints.gridy += 1;
437
- oe.aConstraints.gridwidth = 1;
438
- oe.aConstraints.gridx = 0;
840
+ cGridBag copyOptionsPanel = new cGridBag();
841
+
842
+ copyOptionsPanel.preferredHeight = 2;
439843
440
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441
- liveCB.setToolTipText("Enabled animation");
442
- liveCB.addItemListener(this);
443
-
444
- oe.aConstraints.gridx += 1;
445
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
446
- fastCB.setToolTipText("Fast mode");
447
- fastCB.addItemListener(this);
448
- oe.aConstraints.gridx += 1;
449
- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450
- supportCB.setToolTipText("Enabled rigging");
451
- supportCB.addItemListener(this);
452
-
453
- // oe.aConstraints.gridx += 1;
454
- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455
- // localCB.addItemListener(this);
456
-
457
- oe.aConstraints.gridx += 1;
458
- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459
- crowdCB.setToolTipText("Used for crowds");
460
- crowdCB.addItemListener(this);
461
-
462
- oe.aConstraints.gridx += 1;
463
- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464
- smoothCB.setToolTipText("Snapping delay");
465
- smoothCB.addItemListener(this);
466
-
467
- oe.aConstraints.gridx += 1;
468
- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469
- slowCB.setToolTipText("Smooth interpolation");
470
- slowCB.addItemListener(this);
471
- oe.aConstraints.gridx += 1;
472
- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473
- boxCB.setToolTipText("Display bounding boxes");
474
- boxCB.addItemListener(this);
475
- oe.aConstraints.gridx += 1;
476
- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478
- zoomBoxCB.addItemListener(this);
479
-
480
-// oe.aConstraints.gridx += 1;
481
-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482
-// speakerMocapCB.addItemListener(this);
483
-
484
- if (false)
485
- {
486
- // handled in scripts
487
- oe.aConstraints.gridx += 1;
488
- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489
- speakerCameraCB.addItemListener(this);
490
-
491
- oe.aConstraints.gridx += 1;
492
- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493
- speakerFocusCB.addItemListener(this);
494
-
495
- oe.aConstraints.gridx += 1;
496
- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497
- smoothfocusCB.addItemListener(this);
498
- }
499
-
500
-//oe.aConstraints.gridx += 1;
501
-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502
-// debugCB.addItemListener(this);
503
-
504
- oe.aConstraints.gridx += 1;
505
- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506
- oeilCB.addItemListener(this);
507
-
508
- oe.aConstraints.gridx += 1;
509
- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510
- lookAtCB.setToolTipText("Look-at target");
511
- lookAtCB.addItemListener(this);
512
-
513
- oe.aConstraints.gridx += 1;
514
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
515
- trackCB.setToolTipText("Enable tracking");
516
- trackCB.addItemListener(this);
517
-
518
- oe.aConstraints.gridx += 1;
519
- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
844
+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
845
+
846
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
847
+ //minButton.setToolTipText("Minimize window");
848
+ //minButton.addActionListener(this);
849
+
850
+ if (Globals.ADVANCED)
851
+ {
852
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
853
+ maxButton.setToolTipText("Maximize window");
854
+ maxButton.addActionListener(this);
855
+ }
856
+
857
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
858
+ fullButton.setToolTipText("Full-screen window");
859
+ fullButton.addActionListener(this);
860
+
861
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520862 screenfitButton.setToolTipText("Screen fit");
521863 screenfitButton.addActionListener(this);
522
- oe.aConstraints.gridx += 1;
864
+
865
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
866
+ restoreCameraButton.setToolTipText("Restore viewpoint");
867
+ restoreCameraButton.addActionListener(this);
868
+
869
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870
+ saveButton.setToolTipText("New version");
871
+ saveButton.addActionListener(this);
872
+
873
+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
874
+ undoButton.setToolTipText("Previous version");
875
+ undoButton.addActionListener(this);
876
+ undoButton.setEnabled(false);
877
+
878
+ cGridBag updown = new cGridBag().setVertical(true);
879
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880
+ restoreButton.setToolTipText("Restore current");
881
+ restoreButton.addActionListener(this);
882
+ restoreButton.setEnabled(false);
883
+
884
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885
+ replaceButton.setToolTipText("Replace current");
886
+ replaceButton.addActionListener(this);
887
+ replaceButton.setEnabled(false);
888
+
889
+ copyOptionsPanel.add(updown);
890
+
891
+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
892
+ redoButton.setToolTipText("Next version");
893
+ redoButton.addActionListener(this);
894
+ redoButton.setEnabled(false);
895
+
896
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897
+ liveCB.setToolTipText("Enable animation");
898
+ liveCB.addItemListener(this);
899
+
900
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
901
+ oneStepButton.setToolTipText("Animate one step forward");
902
+ oneStepButton.addActionListener(this);
903
+
904
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
905
+ fastCB.setToolTipText("Fast mode");
906
+ fastCB.addItemListener(this);
907
+
908
+ //oe.toolboxPanel.Return();
909
+
910
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
911
+// trackCB.setToolTipText("Enable tracking");
912
+// trackCB.addItemListener(this);
913
+
523914 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524915 // screenfitpointButton.addActionListener(this);
525
-// oe.aConstraints.gridx += 1;
526
- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527
- snapobjectButton.addActionListener(this);
528
- snapobjectButton.setToolTipText("Snap Object");
529
- oe.aConstraints.gridx += 1;
530916
531
- //aConstraints.gridx = 0;
532
- //aConstraints.gridy += 1;
533
- oe.aConstraints.weighty = 0;
534
- oe.aConstraints.gridwidth = 1;
535
-
536
- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
537
- flashSelectionButton.setToolTipText("Show selection");
538
- flashSelectionButton.addActionListener(this);
539
-
540
- oe.toolbarPanel.add(new cButton(" ", false));
541
-
542
- oe.aConstraints.gridx += 1;
543
- oe.aConstraints.weighty = 0;
544
- oe.aConstraints.gridwidth = 1;
545
-
546
- //
547
- oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
548
- twoButton.setToolTipText("Show center view only");
549
- twoButton.addActionListener(this);
550
- oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
917
+ if (Globals.ADVANCED)
918
+ {
919
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
920
+ snapobjectButton.addActionListener(this);
921
+ snapobjectButton.setToolTipText("Snap Object");
922
+
923
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551924 fourButton.addActionListener(this);
552
- fourButton.setToolTipText("Show left panel only");
553
- oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
554
- sixButton.setToolTipText("2-column layout left");
555
- sixButton.addActionListener(this);
556
- oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
557
- threeButton.setToolTipText("2-column layout right");
925
+ fourButton.setToolTipText("Show control panel only");
926
+ }
927
+
928
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
929
+
930
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
+ twoButton.setToolTipText("Show 3D view only");
932
+ twoButton.addActionListener(this);
933
+ this.fullscreenLayout = twoButton;
934
+
935
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
936
+ threeButton.setToolTipText("Show controls and 3D view");
558937 threeButton.addActionListener(this);
559
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
560
- sevenButton.setToolTipText("3-column layout");
561
- sevenButton.addActionListener(this);
938
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
+ sixButton.setToolTipText("Show 3D view and controls");
940
+ sixButton.addActionListener(this);
941
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942
+// sevenButton.setToolTipText("3-column layout");
943
+// sevenButton.addActionListener(this);
562944 //
563945
564
- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565
- rootButton.setToolTipText("Edit object in new tab");
946
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
947
+ rootButton.setToolTipText("Open selection in new tab");
566948 rootButton.addActionListener(this);
567
- oe.aConstraints.gridx += 1;
568
- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
949
+
950
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569951 closeButton.setToolTipText("Close tab");
570952 closeButton.addActionListener(this);
571953 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572954 //clearButton.addActionListener(this);
573
- oe.aConstraints.gridx += 1;
574
-
575
- oe.aConstraints.gridx = 1; //
576
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
577
- editButton.addActionListener(this);
578
- oe.aConstraints.gridx += 1;
579
- oe.aConstraints.weighty = 0;
580
- oe.aConstraints.gridwidth = 1;
581955
582
- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
956
+ cGridBag row1 = new cGridBag();
957
+
958
+ // INSERT
959
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
960
+ gridButton.setToolTipText("Create grid");
961
+ gridButton.addActionListener(this);
962
+
963
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
964
+ boxButton.setToolTipText("Create box");
965
+ boxButton.addActionListener(this);
966
+
967
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
968
+ sphereButton.setToolTipText("Create sphere");
969
+ sphereButton.addActionListener(this);
970
+
971
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
972
+ coneButton.setToolTipText("Create cone");
973
+ coneButton.addActionListener(this);
974
+
975
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
976
+ torusButton.setToolTipText("Create torus");
977
+ torusButton.addActionListener(this);
978
+
979
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
980
+ superButton.setToolTipText("Create superellipsoid");
981
+ superButton.addActionListener(this);
982
+
983
+ if (Globals.ADVANCED)
984
+ {
985
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
986
+ kleinButton.setToolTipText("Create Klein bottle");
987
+ kleinButton.addActionListener(this);
988
+ }
989
+
990
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
991
+ particlesButton.setToolTipText("Create particle system");
992
+ particlesButton.addActionListener(this);
993
+
994
+ oe.toolboxPanel.add(row1);
995
+
996
+ cGridBag row2 = new cGridBag();
997
+
998
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
999
+ groupButton.setToolTipText("Create group");
1000
+ groupButton.addActionListener(this);
1001
+
1002
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1003
+ compositeButton.setToolTipText("Create composite");
1004
+ compositeButton.addActionListener(this);
1005
+
1006
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1007
+ switchButton.setToolTipText("Create item switcher");
1008
+ switchButton.addActionListener(this);
1009
+
1010
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1011
+ loopButton.setToolTipText("Create loop");
1012
+ loopButton.addActionListener(this);
1013
+
1014
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1015
+ textureButton.setToolTipText("Create texture");
1016
+ textureButton.addActionListener(this);
1017
+
1018
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1019
+ overlayButton.setToolTipText("Create overlay");
1020
+ overlayButton.addActionListener(this);
1021
+
1022
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1023
+ lightButton.setToolTipText("Create light");
1024
+ lightButton.addActionListener(this);
1025
+
1026
+ oe.toolboxPanel.add(row2);
1027
+
1028
+ // ENVYMAPS
1029
+ cGridBag skyboxpane = new cGridBag();
1030
+ skyboxpane.preferredHeight = 100;
1031
+
1032
+ oe.toolboxPanel.add(skyboxpane);
1033
+
1034
+ JTabbedPane skyboxpanel = new JTabbedPane();
1035
+ skyboxpane.add(skyboxpanel);
1036
+
1037
+ AddSkyboxTab0(skyboxpanel);
1038
+ AddSkyboxTab1(skyboxpanel);
1039
+ AddSkyboxTab2(skyboxpanel);
1040
+
1041
+ // EDIT panel
1042
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1043
+ editButton.setToolTipText("Pin selection controls");
1044
+ editButton.addActionListener(this);
1045
+
1046
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
+ uneditButton.setToolTipText("Remove selection controls");
5831048 uneditButton.addActionListener(this);
5841049
585
- oe.aConstraints.gridx += 1;
586
- oe.aConstraints.weighty = 0;
587
- oe.aConstraints.gridwidth = 1;
588
-
589
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590
- clearPanelButton.addActionListener(this);
591
-
592
- oe.aConstraints.gridx += 1;
593
- oe.aConstraints.weighty = 0;
594
- oe.aConstraints.gridwidth = 1;
595
-
596
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
1050
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051
+ allParamsButton.setToolTipText("Show all controle");
5971052 allParamsButton.addActionListener(this);
5981053
599
- oe.aConstraints.gridx += 1;
600
- oe.aConstraints.weighty = 0;
601
- oe.aConstraints.gridwidth = 1;
602
-
603
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
1054
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
+ clearPanelButton.setToolTipText("Clear edit panel");
1056
+ clearPanelButton.addActionListener(this);
1057
+
1058
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+ unselectButton.setToolTipText("Unselect");
6041060 unselectButton.addActionListener(this);
6051061
1062
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
+ flashSelectionButton.setToolTipText("Highlight selection");
1064
+ flashSelectionButton.addActionListener(this);
1065
+
1066
+ editCommandsPanel.preferredHeight = 1;
1067
+
1068
+ SetPinStates(false);
1069
+// oe.treePanel.add(commandsPanel);
1070
+// oe.treePanel.Return();
1071
+
6061072 // oe.aConstraints.gridx += 1;
6071073 // oe.aConstraints.weighty = 0;
6081074 // oe.aConstraints.gridwidth = 1;
....@@ -614,47 +1080,32 @@
6141080 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
6151081 // gcButton.addActionListener(this);
6161082
617
- oe.aConstraints.gridx = 0;
618
- oe.aConstraints.gridy += 1;
619
-
620
- //ctrlPanel.add(objList = new List(5, true));
621
- oe.aConstraints.gridwidth = 100;
622
- // oe.aConstraints.gridheight = 100;
623
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624
- oe.aConstraints.gridheight = 1;
625
- oe.aConstraints.weighty = 0.5;
626
- oe.aConstraints.gridx = 0;
627
- JScrollPane jSP;
1083
+ cGridBag jSPPanel = new cGridBag();
1084
+
1085
+ JScrollPane jSP;
6281086 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
1087
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
6301088 ResetModel();
631
- oe.aConstraints.weighty = 0.5;
632
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633
- oe.aConstraints.gridy += 1;
634
- oe.aConstraints.gridwidth = 1;
635
-
636
- oe.aConstraints.weighty = 0;
637
- oe.aConstraints.gridwidth = 2;
638
-
639
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
640
- colorCB.addItemListener(this);
641
- oe.aConstraints.gridx += 2;
642
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
643
- materialCB.addItemListener(this);
644
- oe.aConstraints.gridx += 2;
645
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
646
- textureCB.addItemListener(this);
647
-
648
- oe.aConstraints.gridx = 0;
649
- oe.aConstraints.gridy += 1;
6501089
1090
+ oe.treePanel.add(jSPPanel);
1091
+ oe.treePanel.Return();
1092
+
1093
+ oe.treePanel.add(copyOptionsPanel);
1094
+ oe.treePanel.Return();
1095
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1096
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1097
+ sliderPane.preferredHeight = 1;
1098
+
1099
+// mainPanel.setDividerLocation(0.1); //1.0);
1100
+ mainPanel.setResizeWeight(0.4);
1101
+
6511102 //jList.addListSelectionListener(this);
6521103 oe.jTree.addTreeSelectionListener(this);
6531104 //jTree.setRootVisible(false);
6541105 //jTree.setEditable(true);
6551106 oe.jTree.setDragEnabled(true);
6561107 //jTree.setPreferredSize(new Dimension(10,10));
657
- jSP.setPreferredSize(new Dimension(100,200));
1108
+ //jSP.setPreferredSize(new Dimension(100,200));
6581109
6591110 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6601111
....@@ -666,23 +1117,160 @@
6661117 dgr.addDragGestureListener(this);
6671118 }catch(Exception e) {}
6681119 */
669
- radio.layout = sevenButton;
1120
+ radio.layout = sixButton; // sevenButton;
6701121 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6711122 }
1123
+
1124
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1125
+ {
1126
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1127
+ colorCB.setToolTipText("Copy color when dropped");
1128
+ colorCB.addItemListener(this);
1129
+
1130
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1131
+ materialCB.setToolTipText("Copy material when dropped");
1132
+ materialCB.addItemListener(this);
1133
+
1134
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1135
+ textureCB.setToolTipText("Copy texture when dropped");
1136
+ textureCB.addItemListener(this);
1137
+
1138
+ panel.Return();
1139
+
1140
+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
1141
+ boxCB.setToolTipText("Display bounding boxes");
1142
+ boxCB.addItemListener(this);
1143
+
1144
+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
1145
+ zoomBoxCB.setToolTipText("Display only for wheel");
1146
+ zoomBoxCB.addItemListener(this);
1147
+
1148
+ if (true) // Globals.ADVANCED)
1149
+ {
1150
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1151
+// supportCB.setToolTipText("Enable rigging");
1152
+// supportCB.addItemListener(this);
1153
+
1154
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1155
+ freezeCB.setToolTipText("Fast moving camera");
1156
+ freezeCB.addItemListener(this);
1157
+
1158
+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
1159
+ // localCB.addItemListener(this);
1160
+
1161
+ panel.Return();
1162
+
1163
+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1164
+ crowdCB.setToolTipText("Used for crowds");
1165
+ crowdCB.addItemListener(this);
1166
+
1167
+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1168
+ smoothCB.setToolTipText("Snapping delay");
1169
+ smoothCB.addItemListener(this);
1170
+
1171
+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172
+ slowCB.setToolTipText("Smooth interpolation");
1173
+ slowCB.addItemListener(this);
1174
+
1175
+// constraints.gridy += 1;
1176
+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1177
+// speakerMocapCB.addItemListener(this);
1178
+
1179
+ panel.Return();
1180
+
1181
+ if (false)
1182
+ {
1183
+ // handled in scripts
1184
+ //constraints.gridy += 1;
1185
+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1186
+ speakerCameraCB.addItemListener(this);
1187
+
1188
+ //constraints.gridy += 1;
1189
+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1190
+ speakerFocusCB.addItemListener(this);
1191
+
1192
+ //constraints.gridy += 1;
1193
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1194
+ smoothfocusCB.addItemListener(this);
1195
+ panel.Return();
1196
+ }
1197
+
1198
+//constraints.gridx += 1;
1199
+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1200
+// debugCB.addItemListener(this);
1201
+
1202
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1203
+ trackCB.setToolTipText("Enable tracking target");
1204
+ trackCB.addItemListener(this);
1205
+
1206
+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1207
+ oeilCB.setToolTipText("Move camera when tracking");
1208
+ oeilCB.addItemListener(this);
1209
+
1210
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1211
+ shadowCB.setToolTipText("When live compute shadows");
1212
+ shadowCB.addItemListener(this);
1213
+
1214
+ panel.Return();
1215
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1216
+ toggleTextureCB.setToolTipText("Load textures");
1217
+ toggleTextureCB.addItemListener(this);
1218
+
1219
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1220
+ toggleSwitchCB.setToolTipText("Choose a single item");
1221
+ toggleSwitchCB.addItemListener(this);
1222
+
1223
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1224
+ autokeepCB.setToolTipText("On structure change");
1225
+ autokeepCB.addItemListener(this);
1226
+
1227
+ panel.Return();
1228
+ if (Globals.ADVANCED)
1229
+ {
1230
+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
1231
+ lookAtCB.setToolTipText("Look-at target");
1232
+ lookAtCB.addItemListener(this);
1233
+ }
1234
+
1235
+ }
1236
+
1237
+ cGridBag fill = new cGridBag();
1238
+ fill.preferredHeight = 200;
1239
+ cGridBag fill2 = new cGridBag();
1240
+ fill2.preferredHeight = 200;
1241
+ cGridBag fill3 = new cGridBag();
1242
+ fill3.preferredHeight = 200;
1243
+
1244
+ panel.add(fill);
1245
+ panel.add(fill2);
1246
+ panel.add(fill3);
1247
+
1248
+ }
6721249
6731250 void EditObject(Object3D obj)
6741251 {
6751252 cRadio radioButton = new cRadio(obj.name);
1253
+
1254
+ // June 2019. Patch to avoid bug with transparency.
1255
+ radioButton.hadMaterial = obj.material != null;
1256
+ if (!radioButton.hadMaterial)
1257
+ {
1258
+ obj.material = new cMaterial();
1259
+ }
1260
+
6761261 radioButton.SetObject(obj);
677
- radioButton.layout = sevenButton;
1262
+ radioButton.layout = sixButton; // sevenButton;
6781263 radioButton.SetCamera(cameraView.renderCamera, false);
6791264 radioButton.addActionListener(this);
6801265 radioPanel.add(radioButton);
6811266 buttonGroup.add(radioButton);
6821267 radioButton.doClick();
6831268 }
1269
+
6841270 void SetupViews(ObjEditor oe)
6851271 {
1272
+ theFrame = this;
1273
+
6861274 oe.SetupViews();
6871275
6881276 System.out.println("SetupViews");
....@@ -691,23 +1279,28 @@
6911279 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
6921280 }
6931281
694
- JCheckBox liveCB;
695
- JCheckBox supportCB;
696
- JCheckBox localCB;
697
- JCheckBox crowdCB;
698
- JCheckBox smoothCB;
699
- JCheckBox fastCB;
700
- JCheckBox slowCB;
701
- JCheckBox boxCB;
702
- JCheckBox zoomBoxCB;
703
- JCheckBox trackCB;
704
- JCheckBox smoothfocusCB;
1282
+ cToggleButton liveCB;
1283
+ cCheckBox supportCB;
1284
+ cCheckBox localCB;
1285
+ cCheckBox crowdCB;
1286
+ cCheckBox smoothCB;
1287
+ cToggleButton fastCB;
1288
+ cCheckBox slowCB;
1289
+ cCheckBox boxCB;
1290
+ cCheckBox zoomBoxCB;
1291
+ cCheckBox freezeCB;
1292
+ //cToggleButton trackCB;
1293
+ cCheckBox trackCB;
1294
+ cCheckBox smoothfocusCB;
7051295 // JCheckBox speakerMocapCB;
706
- JCheckBox speakerCameraCB;
707
- JCheckBox speakerFocusCB;
708
- JCheckBox debugCB;
709
- JCheckBox oeilCB;
710
- JCheckBox lookAtCB;
1296
+ cCheckBox speakerCameraCB;
1297
+ cCheckBox speakerFocusCB;
1298
+ cCheckBox debugCB;
1299
+
1300
+ cCheckBox oeilCB;
1301
+ cCheckBox shadowCB;
1302
+ cCheckBox autokeepCB;
1303
+ cCheckBox lookAtCB;
7111304
7121305 // static int COLOR = 1;
7131306 // static int MATERIAL = 2;
....@@ -715,9 +1308,9 @@
7151308
7161309 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7171310
718
- JCheckBox colorCB;
719
- JCheckBox materialCB;
720
- JCheckBox textureCB;
1311
+ cCheckBox colorCB;
1312
+ cCheckBox materialCB;
1313
+ cCheckBox textureCB;
7211314
7221315 public void itemStateChanged(ItemEvent e)
7231316 {
....@@ -745,6 +1338,7 @@
7451338 } else if(e.getSource() == liveCB)
7461339 {
7471340 cameraView.ToggleLive();
1341
+ refreshContents(false);
7481342 }
7491343 else if(e.getSource() == supportCB)
7501344 {
....@@ -809,6 +1403,18 @@
8091403 {
8101404 cameraView.ToggleOeil();
8111405 }
1406
+ else if(e.getSource() == shadowCB)
1407
+ {
1408
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1409
+ }
1410
+ else if(e.getSource() == freezeCB)
1411
+ {
1412
+ Globals.FREEZEONMOVE ^= true;
1413
+ }
1414
+ else if(e.getSource() == autokeepCB)
1415
+ {
1416
+ Globals.REPLACEONMAKE ^= true;
1417
+ }
8121418 else if(e.getSource() == lookAtCB)
8131419 {
8141420 cameraView.ToggleLookAt();
....@@ -825,7 +1431,8 @@
8251431
8261432 /**/
8271433 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
828
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1434
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1435
+ TreePath path = objEditor.jTree.getSelectionPath();
8291436 if ((path == null) || (path.getPathCount() <= 1)) {
8301437 // We can't move the root node or an empty selection
8311438 return;
....@@ -888,8 +1495,6 @@
8881495 }
8891496 }
8901497
891
- String string = (String) object;
892
-
8931498 System.out.println("Transfer = " + object + "; drop : " + target);
8941499 // if( object instanceof java.io.File[])
8951500 // {
....@@ -897,7 +1502,11 @@
8971502 // objEditor.DropFile((java.io.File[]) object, true);
8981503 // return;
8991504 // }
900
- if (string.charAt(0) == '/')
1505
+
1506
+ String string = object.toString();
1507
+
1508
+ // File path for Mac and Windows
1509
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
9011510 {
9021511 // file(s)
9031512 String[] names = string.split("\n");
....@@ -924,7 +1533,7 @@
9241533
9251534 flashIt = false;
9261535 CameraPane pane = (CameraPane) target;
927
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1536
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
9281537 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
9291538
9301539 if (group.selection.size() == 1)
....@@ -940,23 +1549,33 @@
9401549
9411550 assert target == objEditor.jTree;
9421551 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1552
+ Object3D destinationLeaf;
9431553 try {
944
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1554
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9451555 } catch (Exception e) {
9461556 System.out.println("destinationPath : " + destinationPath);
9471557 return;
9481558 }
9491559
950
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1560
+ for (int i=group.selection.size(); --i>=0;)
9511561 {
1562
+ Object3D child = (Object3D)group.selection.elementAt(i);
1563
+
1564
+ // Cannot move into itself
1565
+ if (child == destinationLeaf)
1566
+ return;
1567
+ }
1568
+
1569
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1570
+// {
9521571 loadClipboard(true);
9531572 objEditor.jTree.setSelectionPath(destinationPath);
954
- pasteInto(false);
955
- } else {
956
- loadClipboard(false);
957
- objEditor.jTree.setSelectionPath(destinationPath);
958
- pasteInto(false); // true); // ???
959
- }
1573
+ pasteInto(false, false);
1574
+// } else {
1575
+// loadClipboard(false);
1576
+// objEditor.jTree.setSelectionPath(destinationPath);
1577
+// pasteInto(false, false); // true); // ???
1578
+// }
9601579 }
9611580 public void dropActionChanged(DropTargetDragEvent dtde)
9621581 // Called if the user has modified the current drop gesture
....@@ -1061,85 +1680,107 @@
10611680 {
10621681 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10631682 //heightFieldItem.addActionListener(this);
1064
- gridItem = menu.add(new MenuItem("Grid"));
1065
- gridItem.addActionListener(this);
1066
- rectoidItem = menu.add(new MenuItem("Box"));
1067
- rectoidItem.addActionListener(this);
1068
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1069
- ellipsoidItem.addActionListener(this);
1070
- coneItem = menu.add(new MenuItem("Cone"));
1071
- coneItem.addActionListener(this);
1072
- torusItem = menu.add(new MenuItem("Torus"));
1073
- torusItem.addActionListener(this);
1074
- superItem = menu.add(new MenuItem("Superellipsoid"));
1075
- superItem.addActionListener(this);
1683
+// gridItem = menu.add(new MenuItem("Grid"));
1684
+// gridItem.addActionListener(this);
1685
+// rectoidItem = menu.add(new MenuItem("Box"));
1686
+// rectoidItem.addActionListener(this);
1687
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1688
+// ellipsoidItem.addActionListener(this);
1689
+// coneItem = menu.add(new MenuItem("Cone"));
1690
+// coneItem.addActionListener(this);
1691
+// torusItem = menu.add(new MenuItem("Torus"));
1692
+// torusItem.addActionListener(this);
1693
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1694
+// superItem.addActionListener(this);
1695
+
1696
+ cameraItem = menu.add(new MenuItem("Camera"));
1697
+ cameraItem.addActionListener(this);
1698
+
1699
+ if (!Globals.ADVANCED)
1700
+ {
10761701 kleinItem = menu.add(new MenuItem("Klein Bottle"));
10771702 kleinItem.addActionListener(this);
1078
- particleItem = menu.add(new MenuItem("Particle system"));
1079
- particleItem.addActionListener(this);
1703
+ }
1704
+
1705
+// particleItem = menu.add(new MenuItem("Particle system"));
1706
+// particleItem.addActionListener(this);
1707
+ if (Globals.ADVANCED)
1708
+ {
10801709 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10811710 ragdollItem.addActionListener(this);
10821711 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10831712 ragdoll2Item.addActionListener(this);
1713
+ }
10841714 menu.add("-");
1085
- meshItem = menu.add(new MenuItem("Mesh"));
1715
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10861716 meshItem.addActionListener(this);
10871717 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10881718 // meshGroupItem.addActionListener(this);
1719
+ if (Globals.ADVANCED)
1720
+ {
10891721 springItem = menu.add(new MenuItem("Spring"));
10901722 springItem.addActionListener(this);
10911723 flagItem = menu.add(new MenuItem("Flag"));
10921724 flagItem.addActionListener(this);
1093
- bezierItem = menu.add(new MenuItem("Patch"));
1094
- bezierItem.addActionListener(this);
1095
- checkerItem = menu.add(new MenuItem("Checker"));
1096
- checkerItem.addActionListener(this);
10971725 blobItem = menu.add(new MenuItem("Blob"));
10981726 blobItem.addActionListener(this);
10991727 latheItem = menu.add(new MenuItem("Lathe"));
11001728 latheItem.addActionListener(this);
1101
- lightItem = menu.add(new MenuItem("Light"));
1102
- lightItem.addActionListener(this);
1729
+ }
1730
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
1731
+ bezierItem.addActionListener(this);
1732
+// overlayItem = menu.add(new MenuItem("Overlay"));
1733
+// overlayItem.addActionListener(this);
1734
+// lightItem = menu.add(new MenuItem("Light"));
1735
+// lightItem.addActionListener(this);
11031736 menu.add("-");
11041737 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11051738 //superLoopItem.addActionListener(this);
1106
- loopItem = menu.add(new MenuItem("Loop"));
1107
- loopItem.addActionListener(this);
1739
+// loopItem = menu.add(new MenuItem("Loop"));
1740
+// loopItem.addActionListener(this);
11081741 doubleItem = menu.add(new MenuItem("Fork"));
11091742 doubleItem.addActionListener(this);
1743
+ if (Globals.ADVANCED)
1744
+ {
11101745 tripleItem = menu.add(new MenuItem("Trident"));
11111746 tripleItem.addActionListener(this);
1747
+ }
11121748 }
11131749
11141750 void buildToolsMenu(Menu menu)
11151751 {
11161752 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11171753 animationItem.addItemListener(this);
1118
- animationItem.setState(CameraPane.ANIMATION);
1754
+ animationItem.setState(Globals.ANIMATION);
1755
+
1756
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
1757
+ archiveItem.addActionListener(this);
11191758
11201759 menu.add("-");
11211760 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11221761 parseverticesItem.addActionListener(this);
11231762 textureFieldItem = menu.add(new MenuItem("Texture Field"));
11241763 textureFieldItem.addActionListener(this);
1125
- alignItem = menu.add(new MenuItem("Align"));
1764
+ alignItem = menu.add(new MenuItem("Align Objects"));
11261765 alignItem.addActionListener(this);
1127
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128
- mirrorItem.addActionListener(this);
11291766 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11301767 reduceMorphItem.addActionListener(this);
11311768 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11321769 reduce34MorphItem.addActionListener(this);
1133
-
1134
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1135
- computeAOItem.addActionListener(this);
11361770 menu.add("-");
1137
-
11381771 menu.add(memoryItem = new MenuItem("Memory Usage"));
11391772 memoryItem.addActionListener(this);
1773
+ menu.add(computeAOItem = new MenuItem("Compute AO"));
1774
+ computeAOItem.addActionListener(this);
1775
+
1776
+ if (Globals.ADVANCED)
1777
+ {
1778
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1779
+ mirrorItem.addActionListener(this);
1780
+ menu.add("-");
11401781 menu.add(analyzeItem = new MenuItem("Analyze"));
11411782 analyzeItem.addActionListener(this);
1142
- menu.add(dumpItem = new MenuItem("Dump"));
1783
+ menu.add(dumpItem = new MenuItem("Print"));
11431784 dumpItem.addActionListener(this);
11441785 // menu.add(pathItem = new MenuItem("From-to path"));
11451786 // pathItem.addActionListener(this);
....@@ -1157,6 +1798,7 @@
11571798 menu.add("-");
11581799 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11591800 editScriptItem.addActionListener(this);
1801
+ }
11601802 }
11611803
11621804 void ScreenFit()
....@@ -1279,9 +1921,34 @@
12791921 shadow.material = new cMaterial(obj.material);
12801922 shadow.material.diffuse = 0.0001f;
12811923 shadow.material.specular = 0.0001f;
1924
+ //shadow.projectedVertices[1].x = 300;
12821925
12831926 makeSomething(shadow);
12841927 }
1928
+
1929
+ private void ClearUnpinned()
1930
+ {
1931
+ //for (Object3D obj : listUI)
1932
+ for (int i=listUI.size(); --i>=0;)
1933
+ {
1934
+ Object3D obj = listUI.elementAt(i);
1935
+ if (!obj.pinned)
1936
+ {
1937
+ obj.CloseUI();
1938
+ listUI.remove(i);
1939
+ }
1940
+ }
1941
+ }
1942
+
1943
+ private void EditElement(Object3D elem, boolean newWindow)
1944
+ {
1945
+ // if (!(elem instanceof Composite))
1946
+ // newWindow = false;
1947
+ listUI.add(elem);
1948
+ elem.openEditWindow(this, newWindow); //, false);
1949
+ System.out.println("edit : " + elem);
1950
+ elem.editWindow.refreshContents(true); // ? new
1951
+ }
12851952
12861953 /**
12871954 * applyExample
....@@ -1485,9 +2152,9 @@
14852152
14862153 void Overwrite(int mask)
14872154 {
1488
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2155
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14892156 {
1490
- Object3D content = GrafreeD.clipboard.get(0);
2157
+ Object3D content = Grafreed.clipboard.get(0);
14912158
14922159 if (content instanceof cGroup && ((cGroup)content).transientlink )
14932160 content = ((cGroup)content).get(0);
....@@ -1510,6 +2177,7 @@
15102177 //
15112178 public void actionPerformed(ActionEvent event) // , Object arg)
15122179 {
2180
+ Object source = event.getSource();
15132181 /*
15142182 if (event.getSource() == nameField)
15152183 {
....@@ -1521,11 +2189,11 @@
15212189 }
15222190 else
15232191 */
1524
- if (event.getSource() == lookAtItem || event.getSource() == lookFromItem)
2192
+ if (source == lookAtItem || source == lookFromItem)
15252193 {
15262194 ScreenFit();
15272195 } else
1528
- if (event.getSource() == switchItem)
2196
+ if (source == switchViewItem)
15292197 {
15302198 cVector v1 = new cVector();
15312199 cVector v2 = new cVector();
....@@ -1534,11 +2202,11 @@
15342202 objEditor.cameraView.renderCamera.setAim(v2, v1);
15352203 objEditor.cameraView.repaint();
15362204 } else
1537
- if (event.getSource() == rectoidItem)
2205
+ if (source == rectoidItem || source == boxButton)
15382206 {
15392207 makeSomething(new Box());
15402208 } else
1541
- if (event.getSource() == particleItem)
2209
+ if (source == particleItem || source == particlesButton)
15422210 {
15432211 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15442212 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1559,9 +2227,9 @@
15592227 applyExample(particleGeom, "SMOKE");
15602228 makeSomething(particleGeom);
15612229 } else
1562
- if (event.getSource() == ragdollItem || event.getSource() == ragdoll2Item)
2230
+ if (source == ragdollItem || source == ragdoll2Item)
15632231 {
1564
- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
2232
+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
15652233
15662234 ragdoll.toParent = LA.newMatrix();
15672235 ragdoll.fromParent = LA.newMatrix();
....@@ -1579,7 +2247,7 @@
15792247 } else
15802248 /*
15812249 */
1582
- if (event.getSource() == heightFieldItem)
2250
+ if (source == heightFieldItem)
15832251 {
15842252 Object3D obj = new Object3D();
15852253
....@@ -1617,31 +2285,31 @@
16172285
16182286 makeSomething(obj);
16192287 } else
1620
- if (event.getSource() == gridItem)
2288
+ if (source == gridItem || source == gridButton)
16212289 {
16222290 makeSomething(new Grid());
16232291 } else
1624
- if (event.getSource() == ellipsoidItem)
2292
+ if (source == ellipsoidItem || source == sphereButton)
16252293 {
16262294 makeSomething(new Sphere());
16272295 } else
1628
- if (event.getSource() == coneItem)
2296
+ if (source == coneItem || source == coneButton)
16292297 {
16302298 makeSomething(new Cone());
16312299 } else
1632
- if (event.getSource() == torusItem)
2300
+ if (source == torusItem || source == torusButton)
16332301 {
16342302 makeSomething(new Torus());
16352303 } else
1636
- if (event.getSource() == superItem)
2304
+ if (source == superItem || source == superButton)
16372305 {
16382306 makeSomething(new Superellipsoid());
16392307 } else
1640
- if (event.getSource() == kleinItem)
2308
+ if (source == kleinItem || source == kleinButton)
16412309 {
16422310 makeSomething(new Klein());
16432311 } else
1644
- if (event.getSource() == blobItem)
2312
+ if (source == blobItem)
16452313 {
16462314 Blob blob = new Blob();
16472315 BlobComponent comp = new BlobComponent();
....@@ -1649,15 +2317,15 @@
16492317 //blob.retile();
16502318 makeSomething(blob);
16512319 } else
1652
- if (event.getSource() == latheItem)
2320
+ if (source == latheItem)
16532321 {
16542322 makeSomething(new Lathe());
16552323 } else
1656
- if (event.getSource() == bezierItem)
2324
+ if (source == bezierItem)
16572325 {
16582326 makeSomething(new BezierSurface());
16592327 } else
1660
- if (event.getSource() == checkerItem)
2328
+ if (source == overlayItem || source == overlayButton)
16612329 {
16622330 /*
16632331 Object3D obj = new BezierSurface(5,8);
....@@ -1672,7 +2340,7 @@
16722340 */
16732341 makeSomething(new Checker());
16742342 } else
1675
- if (event.getSource() == meshItem)
2343
+ if (source == meshItem)
16762344 {
16772345 Object3D itemtomake = new Object3D();
16782346 Object3D child;
....@@ -1693,35 +2361,52 @@
16932361 makeSomething(child);
16942362 }
16952363 } else
1696
- if (event.getSource() == springItem)
2364
+ if (source == springItem)
16972365 {
16982366 cSpring s = new cSpring();
16992367 s.setup();
17002368 makeSomething(s);
17012369 } else
1702
- if (event.getSource() == flagItem)
2370
+ if (source == flagItem)
17032371 {
17042372 cSpring s = new cFlag();
17052373 s.setup();
17062374 makeSomething(s);
17072375 } else
1708
- if (event.getSource() == lightItem)
2376
+ if (source == lightItem || source == lightButton)
17092377 {
17102378 makeSomething(new Light());
17112379 } else
1712
- if (event.getSource() == csgItem)
2380
+// if (source == skybox1Button ||
2381
+// source == skybox2Button ||
2382
+// source == skybox3Button ||
2383
+// source == skybox4Button ||
2384
+// source == skybox5Button ||
2385
+// source == skybox6Button ||
2386
+// source == skybox7Button ||
2387
+// source == skybox11Button ||
2388
+// source == skybox12Button ||
2389
+// source == skybox13Button ||
2390
+// source == skybox14Button ||
2391
+// source == skybox15Button ||
2392
+// source == skybox16Button ||
2393
+// source == skybox17Button)
2394
+// {
2395
+// ChangeSkybox(source);
2396
+// } else
2397
+ if (source == csgItem)
17132398 {
17142399 group(new CSG());
17152400 } else
1716
- if (event.getSource() == templateItem)
2401
+ if (source == templateItem)
17172402 {
17182403 group(new cTemplate());
17192404 } else
1720
- if (event.getSource() == attributeItem)
2405
+ if (source == attributeItem)
17212406 {
17222407 makeSomething(new Attribute());
17232408 } else
1724
- if (event.getSource() == pointflowItem)
2409
+ if (source == pointflowItem)
17252410 {
17262411 makeSomething(new PointFlow());
17272412 } else
....@@ -1733,7 +2418,7 @@
17332418 } else
17342419 */
17352420
1736
- if (event.getSource() == superLoopItem)
2421
+ if (source == superLoopItem)
17372422 {
17382423 Composite g = new cGroup();
17392424 for (int i=0; i<15; i++)
....@@ -1755,30 +2440,30 @@
17552440
17562441 group(g);
17572442 } else
1758
- if (event.getSource() == loopItem)
2443
+ if (source == loopItem || source == loopButton)
17592444 {
17602445 Composite csg = new GroupLeaf();
17612446 csg.count = 5;
17622447 group(csg);
1763
- Composite child = new cGroup();
2448
+ Composite child = new cGroup("Branch");
17642449 csg.addChild(child);
17652450 child.addChild(csg);
17662451 } else
1767
- if (event.getSource() == doubleItem)
2452
+ if (source == doubleItem)
17682453 {
1769
- Composite csg = new GroupLeaf();
2454
+ Composite csg = new GroupLeaf("Fork");
17702455 csg.count = 5;
17712456 group(csg);
1772
- Composite child = new cGroup();
2457
+ Composite child = new cGroup("Branch A");
17732458 csg.addChild(child);
17742459 child.addChild(csg);
1775
- child = new cGroup();
2460
+ child = new cGroup("Branch B");
17762461 csg.addChild(child);
17772462 child.addChild(csg);
17782463 } else
1779
- if (event.getSource() == tripleItem)
2464
+ if (source == tripleItem)
17802465 {
1781
- Composite csg = new GroupLeaf();
2466
+ Composite csg = new GroupLeaf("Trident");
17822467 csg.count = 4;
17832468 group(csg);
17842469 Composite child = new cGroup();
....@@ -1791,73 +2476,98 @@
17912476 csg.addChild(child);
17922477 child.addChild(csg);
17932478 } else
1794
-
1795
- if (event.getSource() == importGFDItem)
1796
- {
1797
- ImportGFD();
1798
- } else
1799
- if (event.getSource() == importVRMLX3DItem)
1800
- {
1801
- ImportVRMLX3D();
1802
- } else
1803
- if (event.getSource() == import3DSItem)
1804
- {
1805
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806
- } else
1807
- if (event.getSource() == importOBJItem)
1808
- {
1809
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810
- } else
1811
- if (event.getSource() == computeAOItem)
2479
+ if (source == computeAOItem)
18122480 {
18132481 Globals.drawMode = CameraPane.OCCLUSION;
1814
- Globals.theRenderer.repaint();
2482
+ cameraView.repaint();
18152483 } else
1816
- if (event.getSource() == recompileItem)
2484
+ if (source == recompileItem)
18172485 {
18182486 Recompile();
18192487 refreshContents();
18202488 } else
1821
- if (event.getSource() == editScriptItem)
2489
+ if (source == editScriptItem)
18222490 {
18232491 OpenDialog();
18242492 refreshContents();
18252493 } else
1826
- if (event.getSource() == invariantsItem)
2494
+ if (source == invariantsItem)
18272495 {
18282496 System.out.println("Invariants:");
1829
- GrafreeD.grafreeD.universe.invariants();
2497
+ Grafreed.grafreeD.universe.invariants();
18302498 } else
1831
- if (event.getSource() == memoryItem)
2499
+ if (source == memoryItem)
18322500 {
18332501 //System.out.println("Invariants:");
18342502 PrintMemory();
18352503 } else
1836
- if (event.getSource() == pathItem)
2504
+ if (source == pathItem)
18372505 {
18382506 PrintPath();
18392507 } else
1840
- if (event.getSource() == analyzeItem)
2508
+ if (source == analyzeItem)
18412509 {
18422510 AnalyzeObject();
18432511 } else
1844
- if (event.getSource() == dumpItem)
2512
+ if (source == dumpItem)
18452513 {
18462514 DumpObject();
18472515 } else
1848
- if (event.getSource() == screenfitButton)
2516
+ if (source == minButton)
18492517 {
1850
- //Reload(lastConverter, lastFilename, true);
2518
+ Minimize();
2519
+ } else
2520
+ if (source == maxButton)
2521
+ {
2522
+ Maximize();
2523
+ } else
2524
+ if (source == fullButton)
2525
+ {
2526
+ ToggleFullScreen();
2527
+ } else
2528
+ if (source == undoButton)
2529
+ {
2530
+ // Go to previous version
2531
+ //if (!Undo())
2532
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2533
+ Undo();
2534
+ } else
2535
+ if (source == restoreButton)
2536
+ {
2537
+ // Restore current version
2538
+ Restore();
2539
+ } else
2540
+ if (source == replaceButton)
2541
+ {
2542
+ // Overwrite current version
2543
+ Replace();
2544
+ } else
2545
+ if (source == redoButton)
2546
+ {
2547
+ // Go to next version
2548
+ Redo();
2549
+ } else
2550
+ if (source == saveButton)
2551
+ {
2552
+ // Save a new version
2553
+ if (!Save(true))
2554
+ java.awt.Toolkit.getDefaultToolkit().beep();
2555
+ } else
2556
+ if (source == oneStepButton)
2557
+ {
2558
+ Globals.ONESTEP = true;
2559
+ cameraView.repaint();
2560
+ } else
2561
+ if (source == screenfitButton)
2562
+ {
18512563 ScreenFit();
18522564 } else
1853
- if (event.getSource() == screenfitpointButton)
2565
+ if (source == screenfitpointButton)
18542566 {
1855
- //Reload(lastConverter, lastFilename, true);
18562567 ScreenFitPoint();
18572568 } else
1858
- if (event.getSource() == snapobjectButton)
2569
+ if (source == snapobjectButton)
18592570 {
1860
- //Reload(lastConverter, lastFilename, true);
18612571 SnapObject();
18622572 } else
18632573 // if (event.getSource() == recompileButton)
....@@ -1866,13 +2576,13 @@
18662576 // Recompile();
18672577 // refreshContents();
18682578 // } else
1869
- if (event.getSource() == gcButton)
2579
+ if (source == gcButton)
18702580 {
18712581 System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18722582 System.gc();
18732583 System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18742584 } else
1875
- if (event.getSource() == editLeafItem)
2585
+ if (source == editLeafItem)
18762586 {
18772587 Object3D obj;
18782588 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -1886,62 +2596,74 @@
18862596 }
18872597 refreshContents(true);
18882598 } else
1889
- if (event.getSource() == openWindowItem)
2599
+ if (source == openWindowItem)
18902600 {
18912601 EditSelection(true);
18922602 } else
1893
- if (event.getSource() == cutItem || event.getSource() == clearButton)
2603
+ if (source == cutItem || source == clearButton)
18942604 {
18952605 loadClipboard(true);
18962606 } else
1897
- if (event.getSource() == duplicateItem)
2607
+ if (source == undoItem)
18982608 {
1899
- Object3D keep = GrafreeD.clipboard;
2609
+ Undo();
2610
+ } else
2611
+ if (source == redoItem)
2612
+ {
2613
+ Redo();
2614
+ } else
2615
+ if (source == duplicateItem)
2616
+ {
2617
+ Object3D keep = Grafreed.clipboard;
19002618 loadClipboard(false);
19012619 paste(false);
1902
- GrafreeD.clipboard = keep;
2620
+ Grafreed.clipboard = keep;
19032621 } else
1904
- if (event.getSource() == cloneItem)
2622
+ if (source == cloneItem)
19052623 {
19062624 CloneSelection(false);
19072625 } else
1908
- if (event.getSource() == cloneSupportItem)
2626
+ if (source == cloneSupportItem)
19092627 {
19102628 CloneSelection(true);
19112629 } else
1912
- if (event.getSource() == copyItem)
2630
+ if (source == copyItem)
19132631 {
19142632 loadClipboard(false);
19152633 } else
1916
- if (event.getSource() == pasteItem)
2634
+ if (source == pasteItem)
19172635 {
19182636 paste(false);
19192637 } else
1920
- if (event.getSource() == pasteLinkItem)
2638
+ if (source == pasteIntoItem)
19212639 {
1922
- pasteInto(false);
2640
+ pasteInto(true, false);
19232641 } else
1924
- if (event.getSource() == pasteCloneItem)
2642
+ if (source == pasteLinkItem)
19252643 {
1926
- pasteInto(true);
2644
+ pasteInto(false, false);
19272645 } else
1928
- if (event.getSource() == pasteExpandItem)
2646
+ if (source == pasteCloneItem)
2647
+ {
2648
+ pasteInto(true, true);
2649
+ } else
2650
+ if (source == pasteExpandItem)
19292651 {
19302652 paste(true);
19312653 } else
1932
- if (event.getSource() == synchronizeItem)
2654
+ if (source == synchronizeItem)
19332655 {
19342656 Overwrite(Object3D.TRANSFORM);
19352657 } else
1936
- if (event.getSource() == overwriteNameItem)
2658
+ if (source == overwriteNameItem)
19372659 {
19382660 Overwrite(Object3D.NAME);
19392661 } else
1940
- if (event.getSource() == overwriteUVItem)
2662
+ if (source == overwriteUVItem)
19412663 {
19422664 Overwrite(Object3D.UV);
19432665 } else
1944
- if (event.getSource() == overwriteMatItem)
2666
+ if (source == overwriteMatItem)
19452667 {
19462668 /* july 2015
19472669 if ((dropAttributes & Object3D.TEXTURE) == 0)
....@@ -1961,7 +2683,7 @@
19612683
19622684 Overwrite(dropAttributes);
19632685 }
1964
- if (event.getSource() == overwriteGeoItem)
2686
+ if (source == overwriteGeoItem)
19652687 {
19662688 Overwrite(Object3D.GEOMETRY);
19672689 // if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
....@@ -1978,7 +2700,7 @@
19782700 // refreshContents();
19792701 // }
19802702 } else
1981
- if (event.getSource() == generateMeshItem)
2703
+ if (source == generateMeshItem)
19822704 {
19832705 //if (group.selection.size() == 1)
19842706 // for (int i=0; i<group.selection.size(); i++)
....@@ -1989,7 +2711,7 @@
19892711 ResetModel();
19902712 refreshContents();
19912713 } else
1992
- if (event.getSource() == extractGeometriesItem)
2714
+ if (source == extractGeometriesItem)
19932715 {
19942716 boolean one = false;
19952717
....@@ -2016,7 +2738,7 @@
20162738 ResetModel();
20172739 refreshContents();
20182740 } else
2019
- if (event.getSource() == cloneGeometriesItem)
2741
+ if (source == cloneGeometriesItem)
20202742 {
20212743 boolean one = false;
20222744
....@@ -2042,7 +2764,7 @@
20422764 ResetModel();
20432765 refreshContents();
20442766 } else
2045
- if (event.getSource() == shareGeometriesItem)
2767
+ if (source == shareGeometriesItem)
20462768 {
20472769 boolean one = false;
20482770
....@@ -2072,7 +2794,7 @@
20722794 refreshContents();
20732795 }
20742796 } else
2075
- if (event.getSource() == mergeGeometriesItem)
2797
+ if (source == mergeGeometriesItem)
20762798 {
20772799 boolean one = false;
20782800
....@@ -2102,7 +2824,7 @@
21022824 ResetModel();
21032825 refreshContents();
21042826 } else
2105
- if (event.getSource() == linkverticesItem)
2827
+ if (source == linkverticesItem)
21062828 {
21072829 // if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
21082830 // {
....@@ -2115,9 +2837,9 @@
21152837 // group.selection.get(0).setMasterThis(content); // should be identity
21162838 // refreshContents();
21172839 // }
2118
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2840
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
21192841 {
2120
- Object3D content = GrafreeD.clipboard.get(0);
2842
+ Object3D content = Grafreed.clipboard.get(0);
21212843
21222844 if (content instanceof cGroup && ((cGroup)content).transientlink )
21232845 content = ((cGroup)content).get(0);
....@@ -2125,38 +2847,38 @@
21252847 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21262848 for (int i=0; i<group.selection.size(); i++)
21272849 {
2128
- boolean random = CameraPane.RANDOM;
2129
- CameraPane.RANDOM = false; // parse all random nodes
2850
+ boolean random = CameraPane.SWITCH;
2851
+ CameraPane.SWITCH = false; // parse all random nodes
21302852 group.selection.get(i).linkVerticesThis(content);
21312853 // group.selection.get(i).setMasterThis(content); // should be identity
2132
- CameraPane.RANDOM = random;
2854
+ CameraPane.SWITCH = random;
21332855 }
21342856 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21352857 refreshContents();
21362858 }
21372859 } else
2138
- if (event.getSource() == resetsupportItem)
2860
+ if (source == resetsupportItem)
21392861 {
21402862 for (int i=0; i<group.selection.size(); i++)
21412863 {
2142
- boolean random = CameraPane.RANDOM;
2143
- CameraPane.RANDOM = false; // parse all random nodes
2864
+ boolean random = CameraPane.SWITCH;
2865
+ CameraPane.SWITCH = false; // parse all random nodes
21442866 group.selection.get(i).linkVerticesThis(null);
2145
- CameraPane.RANDOM = random;
2867
+ CameraPane.SWITCH = random;
21462868 }
21472869
21482870 refreshContents();
21492871 } else
2150
- if (event.getSource() == relinkverticesItem)
2872
+ if (source == relinkverticesItem)
21512873 {
2152
- boolean random = CameraPane.RANDOM;
2153
- CameraPane.RANDOM = false; // parse all random nodes
2874
+ boolean random = CameraPane.SWITCH;
2875
+ CameraPane.SWITCH = false; // parse all random nodes
21542876 group.selection.RelinkToSupport();
2155
- CameraPane.RANDOM = random;
2877
+ CameraPane.SWITCH = random;
21562878
21572879 refreshContents();
21582880 } else
2159
- if (event.getSource() == resetreferencesItem)
2881
+ if (source == resetreferencesItem)
21602882 {
21612883 for (int i=0; i<group.selection.size(); i++)
21622884 {
....@@ -2165,11 +2887,11 @@
21652887
21662888 refreshContents();
21672889 } else
2168
- if (event.getSource() == setMasterItem)
2890
+ if (source == setMasterItem)
21692891 {
2170
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2892
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21712893 {
2172
- Object3D content = GrafreeD.clipboard.get(0);
2894
+ Object3D content = Grafreed.clipboard.get(0);
21732895
21742896 if (content instanceof cGroup && ((cGroup)content).transientlink )
21752897 content = ((cGroup)content).get(0);
....@@ -2178,13 +2900,13 @@
21782900 refreshContents();
21792901 }
21802902 } else
2181
- if (event.getSource() == poseMeshItem)
2903
+ if (source == poseMeshItem)
21822904 {
21832905 if (group.selection.size() == 1)
21842906 {
2185
- if (GrafreeD.clipboard.size() == 1)
2907
+ if (Grafreed.clipboard.size() == 1)
21862908 {
2187
- Object3D content = GrafreeD.clipboard.get(0);
2909
+ Object3D content = Grafreed.clipboard.get(0);
21882910
21892911 if (content instanceof cGroup && ((cGroup)content).transientlink )
21902912 content = ((cGroup)content).get(0);
....@@ -2197,19 +2919,19 @@
21972919 }
21982920
21992921 } else
2200
- if (event.getSource() == revertMeshItem)
2922
+ if (source == revertMeshItem)
22012923 {
22022924 RevertMeshes();
22032925 } else
2204
- if (event.getSource() == resetMeshItem)
2926
+ if (source == resetAllItem)
22052927 {
22062928 ResetAll();
22072929 } else
2208
- if (event.getSource() == stepAllItem)
2930
+ if (source == stepAllItem)
22092931 {
22102932 StepAll();
22112933 } else
2212
- if (event.getSource() == clearItem) // || event.getSource() == clearButton)
2934
+ if (source == deleteItem) // || event.getSource() == clearButton)
22132935 {
22142936 //int indices[] = jList.getSelectedIndices();
22152937 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2217,46 +2939,46 @@
22172939
22182940 ClearSelection(false);
22192941 } else
2220
- if (event.getSource() == clearAllItem)
2942
+ if (source == clearAllItem)
22212943 {
22222944 ClearSelection(true);
22232945 } else
2224
- if (event.getSource() == grabItem)
2946
+ if (source == grabItem || source == groupButton)
22252947 {
2226
- group(new cGroup(), true);
2948
+ group(new cGroup(), false); // true);
22272949 } else
2228
- if (event.getSource() == hideItem)
2950
+ if (source == hideItem)
22292951 {
22302952 group(new HiddenObject());
22312953 } else
2232
- if (event.getSource() == frontItem)
2954
+ if (source == frontItem)
22332955 {
22342956 front();
22352957 } else
2236
- if (event.getSource() == backItem)
2958
+ if (source == backItem)
22372959 {
22382960 back();
22392961 } else
2240
- if (event.getSource() == cameraItem)
2962
+ if (source == cameraItem)
22412963 {
22422964 makeSomething(new Camera());
22432965 } else
2244
- if (event.getSource() == compositeItem)
2966
+ if (source == compositeItem || source == compositeButton)
22452967 {
22462968 group(new Composite());
22472969 } else
2248
- if (event.getSource() == randomItem)
2970
+ if (source == switchItem || source == switchButton)
22492971 {
22502972 RandomNode random = new RandomNode();
22512973 group(random);
22522974 if (random.size() > 0)
2253
- random.name = random.get(0).name + "Rnd";
2975
+ random.name = random.get(0).name + "Switch";
22542976 } else
2255
- if (event.getSource() == physicsItem)
2977
+ if (source == physicsItem)
22562978 {
22572979 group(new PhysicsNode());
22582980 } else
2259
- if (event.getSource() == frameselectorItem)
2981
+ if (source == frameselectorItem)
22602982 {
22612983 for (int i=0; i<group.selection.size(); i++)
22622984 {
....@@ -2268,7 +2990,7 @@
22682990 ResetModel();
22692991 refreshContents();
22702992 } else
2271
- if (event.getSource() == switchGeoItem)
2993
+ if (source == switchGeoItem)
22722994 {
22732995 for (int i=0; i<group.selection.size(); i++)
22742996 {
....@@ -2280,7 +3002,7 @@
22803002 ResetModel();
22813003 refreshContents();
22823004 } else
2283
- if (event.getSource() == switchTransfoItem)
3005
+ if (source == switchTransfoItem)
22843006 {
22853007 for (int i=0; i<group.selection.size(); i++)
22863008 {
....@@ -2292,7 +3014,7 @@
22923014 ResetModel();
22933015 refreshContents();
22943016 } else
2295
- if (event.getSource() == morphItem)
3017
+ if (source == morphItem)
22963018 {
22973019 for (int i=0; i<group.selection.size(); i++)
22983020 {
....@@ -2304,7 +3026,7 @@
23043026 ResetModel();
23053027 refreshContents();
23063028 } else
2307
- if (event.getSource() == scriptNodeItem)
3029
+ if (source == scriptNodeItem)
23083030 {
23093031 boolean atleastone = false;
23103032
....@@ -2343,215 +3065,252 @@
23433065 }
23443066 }
23453067 } else
2346
- if (event.getSource() == linkerItem)
3068
+ if (source == linkerItem)
23473069 {
23483070 group(new cLinker());
23493071 } else
2350
- if (event.getSource() == textureItem)
3072
+ if (source == textureItem || source == textureButton)
23513073 {
23523074 group(new TextureNode());
23533075 } else
2354
- if (event.getSource() == billboardItem)
3076
+ if (source == billboardItem)
23553077 {
23563078 group(new BillboardNode());
23573079 } else
2358
- if (event.getSource() == shadowXItem)
3080
+ if (source == shadowXItem)
23593081 {
23603082 CastShadow(0);
23613083 } else
2362
- if (event.getSource() == shadowYItem)
3084
+ if (source == shadowYItem)
23633085 {
23643086 CastShadow(1);
23653087 } else
2366
- if (event.getSource() == shadowZItem)
3088
+ if (source == shadowZItem)
23673089 {
23683090 CastShadow(2);
23693091 } else
2370
- if (event.getSource() == ungroupItem)
3092
+ if (source == ungroupItem || source == ungroupButton)
23713093 {
2372
- //ungroup();
3094
+ boolean hasRoot = false;
3095
+
23733096 for (int i=0; i<group.selection.size(); i++)
23743097 {
2375
- Ungroup(group.selection.get(i));
3098
+ if (group.selection.get(i) == group)
3099
+ {
3100
+ hasRoot = true;
3101
+ break;
3102
+ }
23763103 }
23773104
2378
- ClearSelection(false);
2379
-
2380
- refreshContents();
3105
+ if (!hasRoot)
3106
+ {
3107
+ for (int i=0; i<group.selection.size(); i++)
3108
+ {
3109
+ Ungroup(group.selection.get(i));
3110
+ }
3111
+
3112
+ ClearSelection(false);
3113
+
3114
+ refreshContents();
3115
+ }
23813116 } else
2382
- if (event.getSource() == genUVItem)
3117
+ if (source == genUVItem)
23833118 {
23843119 GenUV();
23853120 } else
2386
- if (event.getSource() == genNormalsCADItem)
3121
+ if (source == genNormalsCADItem)
23873122 {
23883123 GenNormals(true);
23893124 } else
2390
- if (event.getSource() == genNormalsMESHItem)
3125
+ if (source == genNormalsMESHItem)
23913126 {
2392
- GenNormals(true); // TODO
3127
+ GenNormalsMESH();
23933128 } else
2394
- if (event.getSource() == genNormalsORGANItem)
3129
+ if (source == genNormalsORGANItem)
23953130 {
23963131 GenNormals(false);
23973132 } else
2398
- if (event.getSource() == genNormalsMINEItem)
3133
+ if (source == genNormalsMINEItem)
23993134 {
24003135 GenNormalsMINE();
24013136 } else
2402
- if (event.getSource() == stripifyItem)
3137
+ if (source == stripifyItem)
24033138 {
24043139 Stripify();
24053140 } else
2406
- if (event.getSource() == unstripifyItem)
3141
+ if (source == unstripifyItem)
24073142 {
24083143 Unstripify();
24093144 } else
2410
- if (event.getSource() == trimItem)
3145
+ if (source == trimItem)
24113146 {
24123147 Trim();
24133148 } else
2414
- if (event.getSource() == untrimItem)
3149
+ if (source == untrimItem)
24153150 {
24163151 Untrim();
24173152 } else
2418
- if (event.getSource() == clearColorsItem)
3153
+ if (source == clearColorsItem)
24193154 {
24203155 ClearColors();
24213156 } else
2422
- if (event.getSource() == clearMaterialsItem)
3157
+ if (source == clearMaterialsItem)
24233158 {
24243159 ClearMaterials();
24253160 } else
2426
- if (event.getSource() == liveleavesItem)
3161
+ if (source == liveleavesItem)
24273162 {
24283163 LiveLeaves(true);
24293164 } else
2430
- if (event.getSource() == unliveleavesItem)
3165
+ if (source == unliveleavesItem)
24313166 {
24323167 LiveLeaves(false);
24333168 } else
2434
- if (event.getSource() == supportleavesItem)
3169
+ if (source == supportleavesItem)
24353170 {
24363171 SupportLeaves(true);
24373172 } else
2438
- if (event.getSource() == unsupportleavesItem)
3173
+ if (source == unsupportleavesItem)
24393174 {
24403175 SupportLeaves(false);
24413176 } else
2442
- if (event.getSource() == hideleavesItem)
3177
+ if (source == hideleavesItem)
24433178 {
24443179 HideLeaves(true);
24453180 } else
2446
- if (event.getSource() == showleavesItem)
3181
+ if (source == showleavesItem)
24473182 {
24483183 HideLeaves(false);
24493184 } else
2450
- if (event.getSource() == markleavesItem)
3185
+ if (source == markleavesItem)
24513186 {
24523187 MarkLeaves(true);
24533188 } else
2454
- if (event.getSource() == unmarkleavesItem)
3189
+ if (source == unmarkleavesItem)
24553190 {
24563191 MarkLeaves(false);
24573192 } else
2458
- if (event.getSource() == flipVItem)
3193
+ if (source == rewindleavesItem)
3194
+ {
3195
+ RewindLeaves(true);
3196
+ } else
3197
+ if (source == unrewindleavesItem)
3198
+ {
3199
+ RewindLeaves(false);
3200
+ } else
3201
+ if (source == randomleavesItem)
3202
+ {
3203
+ RandomLeaves(true);
3204
+ } else
3205
+ if (source == unrandomleavesItem)
3206
+ {
3207
+ RandomLeaves(false);
3208
+ } else
3209
+ if (source == flipVItem)
24593210 {
24603211 FlipV(true);
24613212 } else
2462
- if (event.getSource() == unflipVItem)
3213
+ if (source == unflipVItem)
24633214 {
24643215 FlipV(false);
24653216 } else
2466
- if (event.getSource() == lowTexturesItem)
3217
+ if (source == lowTexturesItem)
24673218 {
24683219 SetTexRes(0);
24693220 } else
2470
- if (event.getSource() == normalTexturesItem)
3221
+ if (source == normalTexturesItem)
24713222 {
24723223 SetTexRes(1);
24733224 } else
2474
- if (event.getSource() == highTexturesItem)
3225
+ if (source == highTexturesItem)
24753226 {
24763227 SetTexRes(2);
24773228 } else
2478
- if (event.getSource() == veryhighTexturesItem)
3229
+ if (source == veryhighTexturesItem)
24793230 {
24803231 SetTexRes(3);
24813232 } else
2482
- if (event.getSource() == maxTexturesItem)
3233
+ if (source == maxTexturesItem)
24833234 {
24843235 SetTexRes(4);
24853236 } else
2486
- if (event.getSource() == panoTexturesItem)
3237
+ if (source == panoTexturesItem)
24873238 {
24883239 SetTexRes(5);
24893240 } else
2490
- if (event.getSource() == reverseNormalsItem)
3241
+ if (source == reverseNormalsItem)
24913242 {
24923243 ReverseNormals();
24933244 } else
2494
- if (event.getSource() == parseverticesItem)
3245
+ if (source == parseverticesItem)
24953246 {
24963247 ParseVertices();
24973248 } else
2498
- if (event.getSource() == textureFieldItem)
3249
+ if (source == textureFieldItem)
24993250 {
25003251 TextureVertices();
25013252 } else
2502
- if (event.getSource() == alignItem)
3253
+ if (source == alignItem)
25033254 {
25043255 Align();
25053256 } else
2506
- if (event.getSource() == mirrorItem)
3257
+ if (source == mirrorItem)
25073258 {
25083259 MirrorPoses();
25093260 } else
2510
- if (event.getSource() == reduceMorphItem)
3261
+ if (source == reduceMorphItem)
25113262 {
25123263 MeshReduction(false);
25133264 } else
2514
- if (event.getSource() == reduce34MorphItem)
3265
+ if (source == reduce34MorphItem)
25153266 {
25163267 MeshReduction(true);
25173268 } else
2518
- if (event.getSource() == reverseTrianglesItem)
3269
+ if (source == reverseTrianglesItem)
25193270 {
25203271 ReverseTriangles();
25213272 } else
2522
- if (event.getSource() == reduceMeshItem)
3273
+ if (source == reduceMeshItem)
25233274 {
25243275 ReduceMesh(false);
25253276 } else
2526
- if (event.getSource() == reduce34MeshItem)
3277
+ if (source == reduce34MeshItem)
25273278 {
25283279 ReduceMesh(true);
25293280 } else
2530
- if (event.getSource() == increaseMeshItem)
3281
+ if (source == increaseMeshItem)
25313282 {
25323283 IncreaseMesh();
25333284 } else
2534
- if (event.getSource() == clipMeshItem)
3285
+ if (source == clipMeshItem)
25353286 {
25363287 ClipMesh();
25373288 } else
2538
- if (event.getSource() == smoothMeshItem)
3289
+ if (source == smoothMeshItem)
25393290 {
25403291 SmoothMesh();
25413292 } else
2542
- if (event.getSource() == transformgeometryItem)
3293
+ if (source == transformGeometryItem)
25433294 {
25443295 TransformGeometry();
25453296 } else
2546
- if (event.getSource() == resetTransformItem)
3297
+ if (source == transformChildrenItem)
3298
+ {
3299
+ TransformChildren();
3300
+ } else
3301
+ if (source == resetTransformItem)
25473302 {
25483303 ResetTransform();
25493304 } else
2550
- if (event.getSource() == resetCentroidItem)
3305
+ if (source == resetCentroidItem)
25513306 {
2552
- ResetCentroid();
3307
+ ResetCentroid(true);
25533308 } else
2554
- if (event.getSource() == resetParentItem)
3309
+ if (source == resetCentroidXZItem)
3310
+ {
3311
+ ResetCentroid(false);
3312
+ } else
3313
+ if (source == resetParentItem)
25553314 {
25563315 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25573316 {
....@@ -2561,7 +3320,7 @@
25613320
25623321 refreshContents();
25633322 } else
2564
- if (event.getSource() == repairParentItem)
3323
+ if (source == repairParentItem)
25653324 {
25663325 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25673326 {
....@@ -2575,7 +3334,7 @@
25753334
25763335 refreshContents();
25773336 } else
2578
- if (event.getSource() == repairShadowItem)
3337
+ if (source == repairShadowItem)
25793338 {
25803339 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25813340 {
....@@ -2589,7 +3348,7 @@
25893348
25903349 refreshContents();
25913350 } else
2592
- if (event.getSource() == sortbysizeItem)
3351
+ if (source == sortbysizeItem)
25933352 {
25943353 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25953354 {
....@@ -2601,7 +3360,7 @@
26013360 ResetModel();
26023361 refreshContents();
26033362 } else
2604
- if (event.getSource() == sortbynameItem)
3363
+ if (source == sortbynameItem)
26053364 {
26063365 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
26073366 {
....@@ -2613,7 +3372,7 @@
26133372 ResetModel();
26143373 refreshContents();
26153374 } else
2616
- if (event.getSource() == attachPigmentItem)
3375
+ if (source == attachPigmentItem)
26173376 {
26183377 String texture = GetFile("Attach pigment");
26193378 Object3D obj;
....@@ -2625,7 +3384,7 @@
26253384
26263385 refreshContents();
26273386 } else
2628
- if (event.getSource() == detachPigmentItem)
3387
+ if (source == detachPigmentItem)
26293388 {
26303389 Object3D obj;
26313390 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2636,7 +3395,7 @@
26363395
26373396 refreshContents();
26383397 } else
2639
- if (event.getSource() == attachBumpItem)
3398
+ if (source == attachBumpItem)
26403399 {
26413400 String texture = GetFile("Attach bump");
26423401 Object3D obj;
....@@ -2648,18 +3407,18 @@
26483407
26493408 refreshContents();
26503409 } else
2651
- if (event.getSource() == detachBumpItem)
3410
+ if (source == detachBumpItem)
26523411 {
26533412 Object3D obj;
26543413 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
26553414 {
26563415 obj = (Object3D)e.nextElement();
2657
- obj.SetBumpTexture(null);
3416
+ obj.ResetBumpTexture();
26583417 }
26593418
26603419 refreshContents();
26613420 } else
2662
- if (event.getSource() == pigmentBumpItem)
3421
+ if (source == pigmentBumpItem)
26633422 {
26643423 Object3D obj;
26653424 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2670,158 +3429,262 @@
26703429
26713430 refreshContents();
26723431 } else
2673
- if (event.getSource() == flashSelectionButton)
3432
+ if (source == embedTexturesItem)
3433
+ {
3434
+ Object3D obj;
3435
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3436
+ {
3437
+ obj = (Object3D)e.nextElement();
3438
+ obj.EmbedTextures(true);
3439
+ }
3440
+
3441
+ refreshContents();
3442
+ } else
3443
+ if (source == deEmbedTexturesItem)
3444
+ {
3445
+ Object3D obj;
3446
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3447
+ {
3448
+ obj = (Object3D)e.nextElement();
3449
+ obj.EmbedTextures(false);
3450
+ }
3451
+
3452
+ CameraPane.texturepigment.clear();
3453
+ CameraPane.texturebump.clear();
3454
+
3455
+ refreshContents();
3456
+ } else
3457
+ if (source == flashSelectionButton)
26743458 {
26753459 CameraPane.flash = true;
26763460 refreshContents();
26773461 } else
2678
- if (event.getSource() == oneButton)
3462
+ if (source == oneButton)
26793463 {
26803464 } else
2681
- if (event.getSource() == twoButton)
3465
+ if (source == twoButton)
26823466 {
26833467 radio.layout = twoButton;
3468
+
3469
+ if (CameraPane.FULLSCREEN)
3470
+ fullscreenLayout = radio.layout;
3471
+
26843472 // bug
26853473 //gridPanel.setDividerLocation(1.0);
26863474 //bigPanel.setDividerLocation(0.0);
2687
- bigThree.remove(scenePanel);
2688
- bigThree.remove(centralPanel);
2689
- bigThree.remove(XYZPanel);
2690
- aWindowConstraints.gridx = 0;
2691
- aWindowConstraints.gridy = 0;
2692
- aWindowConstraints.gridwidth = 1;
2693
- // aConstraints.gridheight = 3;
2694
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695
- aWindowConstraints.weightx = 0;
2696
- aWindowConstraints.weighty = 1;
2697
- //bigThree.add(jtp, aWindowConstraints);
2698
- aWindowConstraints.weightx = 1;
2699
- aWindowConstraints.gridwidth = 3;
2700
- // aConstraints.gridheight = 3;
2701
- aWindowConstraints.gridx = 1;
2702
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703
- bigThree.add(centralPanel, aWindowConstraints);
2704
- aWindowConstraints.weightx = 0;
2705
- aWindowConstraints.gridx = 4;
2706
- aWindowConstraints.gridwidth = 1;
2707
- // aConstraints.gridheight = 3;
2708
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709
- //bigThree.add(XYZPanel, aWindowConstraints);
2710
- bigThree.revalidate();
3475
+// bigThree.remove(scenePanel);
3476
+// bigThree.remove(centralPanel);
3477
+// bigThree.remove(XYZPanel);
3478
+// aWindowConstraints.gridx = 0;
3479
+// aWindowConstraints.gridy = 0;
3480
+// aWindowConstraints.gridwidth = 1;
3481
+// // aConstraints.gridheight = 3;
3482
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3483
+// aWindowConstraints.weightx = 0;
3484
+// aWindowConstraints.weighty = 1;
3485
+// //bigThree.add(jtp, aWindowConstraints);
3486
+// aWindowConstraints.weightx = 1;
3487
+// aWindowConstraints.gridwidth = 3;
3488
+// // aConstraints.gridheight = 3;
3489
+// aWindowConstraints.gridx = 1;
3490
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3491
+// bigThree.add(centralPanel, aWindowConstraints);
3492
+// aWindowConstraints.weightx = 0;
3493
+// aWindowConstraints.gridx = 4;
3494
+// aWindowConstraints.gridwidth = 1;
3495
+// // aConstraints.gridheight = 3;
3496
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3497
+// //bigThree.add(XYZPanel, aWindowConstraints);
3498
+// scenePanel.setVisible(false);
3499
+// centralPanel.setVisible(true);
3500
+// XYZPanel.setVisible(false);
3501
+ bigThree.ClearUI();
3502
+ bigThree.add(centralPanel);
3503
+ bigThree.FlushUI();
3504
+
3505
+ cameraView.requestFocusInWindow();
3506
+
3507
+// refreshContents(true);
3508
+//
3509
+// try
3510
+// {
3511
+// java.awt.Robot bot = new java.awt.Robot();
3512
+// int mask = InputEvent.BUTTON1_MASK;
3513
+// bot.mouseMove(100, 100);
3514
+// bot.mousePress(mask);
3515
+// bot.mouseRelease(mask);
3516
+// }
3517
+// catch (Exception e)
3518
+// {
3519
+//
3520
+// }
3521
+
27113522 } else
2712
- if (event.getSource() == threeButton)
3523
+ if (source == threeButton)
27133524 {
27143525 radio.layout = threeButton;
2715
- bigThree.remove(scenePanel);
2716
- bigThree.remove(centralPanel);
2717
- bigThree.remove(XYZPanel);
2718
- aWindowConstraints.gridx = 0;
2719
- aWindowConstraints.gridy = 0;
2720
- aWindowConstraints.gridwidth = 1;
2721
- // aConstraints.gridheight = 3;
2722
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723
- aWindowConstraints.weightx = 0;
2724
- aWindowConstraints.weighty = 1;
2725
- //bigThree.add(jtp, aWindowConstraints);
2726
- aWindowConstraints.weightx = 1;
2727
- aWindowConstraints.gridwidth = 3;
2728
- // aConstraints.gridheight = 3;
2729
- aWindowConstraints.gridx = 1;
2730
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731
- bigThree.add(centralPanel, aWindowConstraints);
2732
- aWindowConstraints.weightx = 0;
2733
- aWindowConstraints.gridx = 4;
2734
- aWindowConstraints.gridwidth = 1;
2735
- // aConstraints.gridheight = 3;
2736
- aConstraints.fill = GridBagConstraints.VERTICAL;
2737
- bigThree.add(XYZPanel, aWindowConstraints);
2738
- bigThree.revalidate();
3526
+
3527
+ if (CameraPane.FULLSCREEN)
3528
+ fullscreenLayout = radio.layout;
3529
+
3530
+// bigThree.remove(scenePanel);
3531
+// bigThree.remove(centralPanel);
3532
+// bigThree.remove(XYZPanel);
3533
+// aWindowConstraints.gridx = 0;
3534
+// aWindowConstraints.gridy = 0;
3535
+// aWindowConstraints.gridwidth = 1;
3536
+// // aConstraints.gridheight = 3;
3537
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3538
+// aWindowConstraints.weightx = 0;
3539
+// aWindowConstraints.weighty = 1;
3540
+// //bigThree.add(jtp, aWindowConstraints);
3541
+// aWindowConstraints.weightx = 1;
3542
+// aWindowConstraints.gridwidth = 3;
3543
+// // aConstraints.gridheight = 3;
3544
+// aWindowConstraints.gridx = 1;
3545
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3546
+// bigThree.add(centralPanel, aWindowConstraints);
3547
+// aWindowConstraints.weightx = 0;
3548
+// aWindowConstraints.gridx = 4;
3549
+// aWindowConstraints.gridwidth = 1;
3550
+// // aConstraints.gridheight = 3;
3551
+// aConstraints.fill = GridBagConstraints.VERTICAL;
3552
+// bigThree.add(XYZPanel, aWindowConstraints);
3553
+// bigThree.validate();
3554
+// scenePanel.setVisible(false);
3555
+// centralPanel.setVisible(true);
3556
+// XYZPanel.setVisible(true);
3557
+ bigThree.ClearUI();
3558
+ bigThree.add(scenePanel);
3559
+ bigThree.add(centralPanel);
3560
+ bigThree.FlushUI();
3561
+
3562
+ cameraView.requestFocusInWindow();
27393563 } else
2740
- if (event.getSource() == fourButton)
3564
+ if (source == fourButton)
27413565 {
27423566 radio.layout = fourButton;
2743
- bigThree.remove(scenePanel);
2744
- bigThree.remove(centralPanel);
2745
- bigThree.remove(XYZPanel);
2746
- aWindowConstraints.gridx = 0;
2747
- aWindowConstraints.gridy = 0;
2748
- aWindowConstraints.gridwidth = 1;
2749
- // aWindowConstraints.gridheight = 3;
2750
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751
- aWindowConstraints.weightx = 1;
2752
- aWindowConstraints.weighty = 1;
2753
- bigThree.add(scenePanel, aWindowConstraints);
2754
- aWindowConstraints.weightx = 1;
2755
- aWindowConstraints.gridwidth = 3;
2756
- // aConstraints.gridheight = 3;
2757
- aWindowConstraints.gridx = 1;
2758
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759
- //bigThree.add(cameraPanel, aWindowConstraints);
2760
- aWindowConstraints.weightx = 0;
2761
- aWindowConstraints.gridx = 4;
2762
- aWindowConstraints.gridwidth = 1;
2763
- // aWindowConstraints.gridheight = 3;
2764
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765
- //bigThree.add(XYZPanel, aWindowConstraints);
2766
- bigThree.revalidate();
3567
+
3568
+ if (CameraPane.FULLSCREEN)
3569
+ fullscreenLayout = radio.layout;
3570
+
3571
+// bigThree.remove(scenePanel);
3572
+// bigThree.remove(centralPanel);
3573
+// bigThree.remove(XYZPanel);
3574
+// aWindowConstraints.gridx = 0;
3575
+// aWindowConstraints.gridy = 0;
3576
+// aWindowConstraints.gridwidth = 1;
3577
+// // aWindowConstraints.gridheight = 3;
3578
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3579
+// aWindowConstraints.weightx = 1;
3580
+// aWindowConstraints.weighty = 1;
3581
+// bigThree.add(scenePanel, aWindowConstraints);
3582
+// aWindowConstraints.weightx = 1;
3583
+// aWindowConstraints.gridwidth = 3;
3584
+// // aConstraints.gridheight = 3;
3585
+// aWindowConstraints.gridx = 1;
3586
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3587
+// //bigThree.add(cameraPanel, aWindowConstraints);
3588
+// aWindowConstraints.weightx = 0;
3589
+// aWindowConstraints.gridx = 4;
3590
+// aWindowConstraints.gridwidth = 1;
3591
+// // aWindowConstraints.gridheight = 3;
3592
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3593
+// //bigThree.add(XYZPanel, aWindowConstraints);
3594
+// bigThree.validate();
3595
+// scenePanel.setVisible(true);
3596
+// centralPanel.setVisible(false);
3597
+// XYZPanel.setVisible(false);
3598
+ bigThree.ClearUI();
3599
+ bigThree.add(scenePanel);
3600
+ bigThree.FlushUI();
3601
+
3602
+ cameraView.requestFocusInWindow();
27673603 } else
2768
- if (event.getSource() == sixButton)
3604
+ if (source == sixButton)
27693605 {
27703606 radio.layout = sixButton;
2771
- bigThree.remove(scenePanel);
2772
- bigThree.remove(centralPanel);
2773
- bigThree.remove(XYZPanel);
2774
- aWindowConstraints.gridx = 0;
2775
- aWindowConstraints.gridy = 0;
2776
- aWindowConstraints.gridwidth = 1;
2777
- // aConstraints.gridheight = 3;
2778
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779
- aWindowConstraints.weightx = 0;
2780
- aWindowConstraints.weighty = 1;
2781
- bigThree.add(scenePanel, aWindowConstraints);
2782
- aWindowConstraints.weightx = 1;
2783
- aWindowConstraints.gridwidth = 3;
2784
- // aWindowConstraints.gridheight = 3;
2785
- aWindowConstraints.gridx = 1;
2786
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787
- bigThree.add(centralPanel, aWindowConstraints);
2788
- aWindowConstraints.weightx = 0;
2789
- aWindowConstraints.gridx = 4;
2790
- aWindowConstraints.gridwidth = 1;
2791
- // aWindowConstraints.gridheight = 3;
2792
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793
- //bigThree.add(XYZPanel, aConstraints);
2794
- bigThree.revalidate();
3607
+
3608
+ if (CameraPane.FULLSCREEN)
3609
+ fullscreenLayout = radio.layout;
3610
+
3611
+// bigThree.remove(scenePanel);
3612
+// bigThree.remove(centralPanel);
3613
+// bigThree.remove(XYZPanel);
3614
+// aWindowConstraints.gridx = 0;
3615
+// aWindowConstraints.gridy = 0;
3616
+// aWindowConstraints.gridwidth = 1;
3617
+// // aConstraints.gridheight = 3;
3618
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3619
+// aWindowConstraints.weightx = 0;
3620
+// aWindowConstraints.weighty = 1;
3621
+// bigThree.add(scenePanel, aWindowConstraints);
3622
+// aWindowConstraints.weightx = 1;
3623
+// aWindowConstraints.gridwidth = 3;
3624
+// // aWindowConstraints.gridheight = 3;
3625
+// aWindowConstraints.gridx = 1;
3626
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3627
+// bigThree.add(centralPanel, aWindowConstraints);
3628
+// aWindowConstraints.weightx = 0;
3629
+// aWindowConstraints.gridx = 4;
3630
+// aWindowConstraints.gridwidth = 1;
3631
+// // aWindowConstraints.gridheight = 3;
3632
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3633
+// //bigThree.add(XYZPanel, aConstraints);
3634
+// bigThree.validate();
3635
+// scenePanel.setVisible(true);
3636
+// centralPanel.setVisible(true);
3637
+// XYZPanel.setVisible(false);
3638
+ bigThree.ClearUI();
3639
+ bigThree.add(centralPanel);
3640
+ bigThree.add(scenePanel);
3641
+ bigThree.FlushUI();
3642
+
3643
+ cameraView.requestFocusInWindow();
27953644 } else
2796
- if (event.getSource() == sevenButton)
3645
+ if (source == sevenButton)
27973646 {
27983647 radio.layout = sevenButton;
2799
- bigThree.remove(scenePanel);
2800
- bigThree.remove(centralPanel);
2801
- bigThree.remove(XYZPanel);
2802
- aWindowConstraints.gridx = 0;
2803
- aWindowConstraints.gridy = 0;
2804
- aWindowConstraints.gridwidth = 1;
2805
- // aWindowConstraints.gridheight = 3;
2806
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807
- aWindowConstraints.weightx = 0;
2808
- aWindowConstraints.weighty = 1;
2809
- bigThree.add(scenePanel, aWindowConstraints);
2810
- aWindowConstraints.weightx = 1;
2811
- aWindowConstraints.gridwidth = 3;
2812
- // aWindowConstraints.gridheight = 3;
2813
- aWindowConstraints.gridx = 1;
2814
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815
- bigThree.add(centralPanel, aWindowConstraints);
2816
- aWindowConstraints.weightx = 0;
2817
- aWindowConstraints.gridx = 4;
2818
- aWindowConstraints.gridwidth = 1;
2819
- // aConstraints.gridheight = 3;
2820
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821
- bigThree.add(XYZPanel, aWindowConstraints);
2822
- bigThree.revalidate();
3648
+
3649
+ if (CameraPane.FULLSCREEN)
3650
+ fullscreenLayout = radio.layout;
3651
+
3652
+// bigThree.remove(scenePanel);
3653
+// bigThree.remove(centralPanel);
3654
+// bigThree.remove(XYZPanel);
3655
+// aWindowConstraints.gridx = 0;
3656
+// aWindowConstraints.gridy = 0;
3657
+// aWindowConstraints.gridwidth = 1;
3658
+// // aWindowConstraints.gridheight = 3;
3659
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3660
+// aWindowConstraints.weightx = 0;
3661
+// aWindowConstraints.weighty = 1;
3662
+// bigThree.add(scenePanel, aWindowConstraints);
3663
+// aWindowConstraints.weightx = 1;
3664
+// aWindowConstraints.gridwidth = 3;
3665
+// // aWindowConstraints.gridheight = 3;
3666
+// aWindowConstraints.gridx = 1;
3667
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3668
+// bigThree.add(centralPanel, aWindowConstraints);
3669
+// aWindowConstraints.weightx = 0;
3670
+// aWindowConstraints.gridx = 4;
3671
+// aWindowConstraints.gridwidth = 1;
3672
+// // aConstraints.gridheight = 3;
3673
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3674
+// bigThree.add(XYZPanel, aWindowConstraints);
3675
+// bigThree.validate();
3676
+// scenePanel.setVisible(true);
3677
+// centralPanel.setVisible(true);
3678
+// XYZPanel.setVisible(true);
3679
+ bigThree.ClearUI();
3680
+ bigThree.add(scenePanel);
3681
+ bigThree.add(centralPanel);
3682
+ bigThree.add(XYZPanel);
3683
+ bigThree.FlushUI();
3684
+
3685
+ cameraView.requestFocusInWindow();
28233686 } else
2824
- if (event.getSource() == rootButton)
3687
+ if (source == rootButton)
28253688 {
28263689 Object3D obj;
28273690 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2831,66 +3694,84 @@
28313694 EditObject(obj);
28323695 }
28333696
3697
+ cameraView.requestFocusInWindow();
28343698 refreshContents(true);
28353699 } else
2836
- if (event.getSource() == closeButton)
3700
+ if (source == closeButton)
28373701 {
28383702 //System.out.println("CLOSE: " + buttonGroup.getSelection());
28393703 cRadio ab;
28403704 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
28413705 {
28423706 ab = (cRadio)e.nextElement();
2843
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3707
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
28443708 {
3709
+ // Patch to avoid bug with transparency.
3710
+ if (!ab.hadMaterial)
3711
+ {
3712
+ ab.object.material = null;
3713
+ }
3714
+
28453715 buttonGroup.remove(ab);
28463716 radioPanel.remove(ab);
28473717
2848
- ab.GetObject().editWindow = null;
3718
+ //ab.GetObject().editWindow = null;
3719
+ ab.GetObject().manipWindow = null;
28493720 // ab.GetObject().objectUI = null; // ?????????
28503721
28513722 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
28523723 break;
28533724 }
28543725 }
3726
+
3727
+ cameraView.requestFocusInWindow();
28553728 refreshContents(true);
28563729 } else
2857
- if (event.getSource() == editItem || event.getSource() == editButton)
3730
+ if (source == editItem || source == editButton)
28583731 {
3732
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3733
+ {
3734
+ Object3D child = (Object3D)e.nextElement();
3735
+ child.pinned = true;
3736
+ }
3737
+
28593738 EditSelection(false);
28603739 } else
2861
- if (event.getSource() == uneditButton)
3740
+ if (source == uneditButton)
28623741 {
28633742 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28643743 {
28653744 Object3D child = (Object3D)e.nextElement();
28663745 if(child.editWindow != null)
28673746 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747
+ child.pinned = false;
28683748 child.CloseUI();
28693749 listUI.remove(child);
28703750
2871
- child.editWindow = null; // ???????????
3751
+ //child.editWindow = null; // ???????????
28723752 }
2873
- objEditor.ctrlPanel.revalidate();
3753
+ objEditor.ctrlPanel.FlushUI();
28743754 //objEditor.jTree.clearSelection();
28753755 //objEditor.ResetSliders();
28763756 refreshContents(true);
28773757 } else
2878
- if (event.getSource() == clearPanelButton)
3758
+ if (source == clearPanelButton)
28793759 {
28803760 assert(copy == group);
28813761 //copy.ClearUI();
28823762 for (Object3D obj : listUI)
28833763 {
3764
+ obj.pinned = false;
28843765 obj.CloseUI();
28853766 }
28863767 listUI.clear();
28873768 refreshContents(true);
28883769 } else
2889
- if (event.getSource() == allParamsButton)
3770
+ if (source == allParamsButton)
28903771 {
28913772 assert(copy == group);
28923773
2893
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3774
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
28943775
28953776 for (Object3D obj : listUI)
28963777 {
....@@ -2907,19 +3788,19 @@
29073788
29083789 refreshContents(true);
29093790 } else
2910
- if (event.getSource() == unselectButton)
3791
+ if (source == unselectButton)
29113792 {
29123793 objEditor.jTree.clearSelection();
29133794 // ?? oct 2012 GrafreeD.clipboard.clear();
29143795 objEditor.ResetSliders();
29153796 refreshContents(true);
29163797 } else
2917
- if(event.getSource() instanceof cRadio)
3798
+ if(source instanceof cRadio)
29183799 {
29193800 group.parent = keepparent;
29203801 group.attributes = 0;
29213802 //group.editWindow = null;
2922
- /*cRadio*/ radio = (cRadio)event.getSource();
3803
+ /*cRadio*/ radio = (cRadio)source;
29233804 Object3D obj = radio.GetObject();
29243805 System.out.println("Edit " + obj);
29253806 if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
....@@ -2939,6 +3820,9 @@
29393820 }
29403821
29413822 copy = group;
3823
+
3824
+ SetUndoStates();
3825
+
29423826 //Globals.theRenderer.object = group;
29433827 if(!useclient)
29443828 {
....@@ -2954,20 +3838,46 @@
29543838 frontView.object = group;
29553839 sideView.object = group;
29563840 }
2957
- group.editWindow = this;
3841
+
3842
+// fix "+" issue
3843
+ //group.editWindow = this;
3844
+ group.manipWindow = this;
3845
+
29583846 /*
29593847 currentLayout = radio.layout;
29603848 if (currentLayout == null)
29613849 currentLayout = sevenButton;
29623850 */
29633851 radio.layout.doClick();
3852
+
3853
+ ClearUnpinned();
3854
+ //Grafreed.Assert(group != null);
3855
+ //Grafreed.Assert(group.selection != null);
3856
+ SetPinStates(group.selection == null || group.selection.size() > 0);
3857
+ if (group.selection == null || group.selection.size() == 1)
3858
+ EditSelection(false);
29643859 keepparent = group.parent;
29653860 // PARENT = NULL or not???
29663861 //group.parent = null; // ROOT
29673862 //group.attributes = -1;
29683863 ResetModel();
3864
+
3865
+ cameraView.requestFocusInWindow();
29693866 refreshContents(true);
2970
- }
3867
+ } else if (event.getSource() == editCameraItem)
3868
+ {
3869
+ cameraView.ProtectCamera();
3870
+ cameraView.repaint();
3871
+ return;
3872
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3873
+ {
3874
+ cameraView.RevertCamera();
3875
+ cameraView.repaint();
3876
+ return;
3877
+ // } else if (event.getSource() == textureButton)
3878
+ // {
3879
+ // return; // true;
3880
+ }
29713881 else
29723882 {
29733883 //return super.action(event, arg);
....@@ -2976,7 +3886,6 @@
29763886 }
29773887
29783888 boolean useclient = false;
2979
- cRadio radio;
29803889
29813890 void ToggleRoot()
29823891 {
....@@ -3028,6 +3937,28 @@
30283937 refreshContents();
30293938 }
30303939
3940
+ void TransformChildren()
3941
+ {
3942
+ Object3D obj;
3943
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3944
+ {
3945
+ obj = (Object3D)e.nextElement();
3946
+ obj.KeepTextureMatrices();
3947
+ obj.TransformChildren();
3948
+ obj.RestoreTextureMatrices();
3949
+
3950
+// if (obj.parent == null)
3951
+// {
3952
+// System.out.println("NULL PARENT!");
3953
+// new Exception().printStackTrace();
3954
+// }
3955
+// else
3956
+// TouchTransform(obj);
3957
+// //obj.parent.Touch();
3958
+ }
3959
+
3960
+ refreshContents();
3961
+ }
30313962
30323963 void ResetTransform()
30333964 {
....@@ -3140,7 +4071,7 @@
31404071 refreshContents();
31414072 }
31424073
3143
- void ResetCentroid()
4074
+ void ResetCentroid(boolean full)
31444075 {
31454076 Object3D obj;
31464077 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3155,12 +4086,16 @@
31554086 LA.matIdentity(Object3D.mat);
31564087 obj.getBounds(minima, maxima, false);
31574088 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4089
+ if (full)
4090
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
31594091 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
31604092 obj.TransformMesh(Object3D.mat);
4093
+
31614094 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4095
+ if (full)
4096
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
31634097 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4098
+
31644099 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
31654100 //Object3D.mat[3][0] = -Object3D.mat[3][0];
31664101 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3189,7 +4124,8 @@
31894124
31904125 int size = obj.MemorySize();
31914126
3192
- System.err.println((size/1024) + " KB is the size of " + obj);
4127
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4128
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
31934129 }
31944130 }
31954131 catch (Exception e)
....@@ -3226,9 +4162,9 @@
32264162 obj = (Object3D)e.nextElement();
32274163
32284164 System.out.println("Object is: " + obj);
3229
- GrafreeD.AnalyzeObject(obj);
4165
+ Grafreed.AnalyzeObject(obj);
32304166 System.out.println("Boundary rep: " + obj.bRep);
3231
- GrafreeD.AnalyzeObject(obj.bRep);
4167
+ Grafreed.AnalyzeObject(obj.bRep);
32324168
32334169 // System.err.println((size/1024) + " KB is the size of " + obj);
32344170 }
....@@ -3270,6 +4206,13 @@
32704206 void GenNormals(boolean crease)
32714207 {
32724208 group.GenNormalsS(crease);
4209
+
4210
+ refreshContents();
4211
+ }
4212
+
4213
+ void GenNormalsMESH()
4214
+ {
4215
+ group.GenNormalsMeshS();
32734216
32744217 refreshContents();
32754218 }
....@@ -3442,8 +4385,8 @@
34424385
34434386 void ParseVertices()
34444387 {
3445
- boolean epsequal = GrafreeD.epsequal;
3446
- GrafreeD.epsequal = true;
4388
+ boolean epsequal = Grafreed.epsequal;
4389
+ Grafreed.epsequal = true;
34474390
34484391 for (int i=0; i<group.selection.size(); i++)
34494392 {
....@@ -3468,7 +4411,7 @@
34684411 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
34694412 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
34704413
3471
- g.add(GrafreeD.clipboard);
4414
+ g.add(Grafreed.clipboard);
34724415
34734416 buffer.add(g);
34744417 }
....@@ -3483,7 +4426,7 @@
34834426 makeSomething(buffer, i==group.selection.size()-1);
34844427 }
34854428
3486
- GrafreeD.epsequal = epsequal;
4429
+ Grafreed.epsequal = epsequal;
34874430
34884431 refreshContents();
34894432 }
....@@ -3501,7 +4444,16 @@
35014444 String pigment = Object3D.GetPigment(tex);
35024445 //String bump = Object3D.GetBump(tex);
35034446
3504
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4447
+ com.sun.opengl.util.texture.TextureData texturedata = null;
4448
+
4449
+ try
4450
+ {
4451
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4452
+ }
4453
+ catch (Exception e)
4454
+ {
4455
+ System.err.println("FAIL: " + node);
4456
+ }
35054457
35064458 double s = v.s;
35074459
....@@ -3589,11 +4541,11 @@
35894541
35904542 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
35914543
3592
- boolean random = CameraPane.RANDOM;
3593
- CameraPane.RANDOM = false; // parse all random nodes
4544
+ boolean random = CameraPane.SWITCH;
4545
+ CameraPane.SWITCH = false; // parse all random nodes
35944546 lowres.linkVerticesThis(null);
35954547 lowres.linkVerticesThis(sn);
3596
- CameraPane.RANDOM = random;
4548
+ CameraPane.SWITCH = random;
35974549
35984550 System.err.flush();
35994551
....@@ -3633,7 +4585,7 @@
36334585 return;
36344586
36354587 Object3D poses = group.selection.get(0);
3636
- Object3D ref = GrafreeD.clipboard.get(0);
4588
+ Object3D ref = Grafreed.clipboard.get(0);
36374589
36384590 Object3D newgroup = new Object3D("Po:" + poses.name);
36394591
....@@ -3827,9 +4779,9 @@
38274779
38284780 void ClipMesh()
38294781 {
3830
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4782
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
38314783 {
3832
- Object3D content = GrafreeD.clipboard.get(0);
4784
+ Object3D content = Grafreed.clipboard.get(0);
38334785
38344786 if (content instanceof cGroup && ((cGroup)content).transientlink )
38354787 content = ((cGroup)content).get(0);
....@@ -3838,7 +4790,7 @@
38384790 // {
38394791 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
38404792 // }
3841
- group.selection.ClipMesh(GrafreeD.clipboard);
4793
+ group.selection.ClipMesh(Grafreed.clipboard);
38424794 }
38434795 // group.selection.ClipMesh(GrafreeD.clipboard);
38444796 System.out.println("DONE.");
....@@ -3885,6 +4837,18 @@
38854837 void MarkLeaves(boolean hide)
38864838 {
38874839 group.selection.MarkLeaves(hide);
4840
+ refreshContents();
4841
+ }
4842
+
4843
+ void RewindLeaves(boolean hide)
4844
+ {
4845
+ group.selection.RewindLeaves(hide);
4846
+ refreshContents();
4847
+ }
4848
+
4849
+ void RandomLeaves(boolean hide)
4850
+ {
4851
+ group.selection.RandomLeaves(hide);
38884852 refreshContents();
38894853 }
38904854
....@@ -3959,28 +4923,25 @@
39594923 // }
39604924 // }
39614925
3962
- static boolean allparams = true;
3963
-
3964
- static Vector<Object3D> listUI = new Vector<Object3D>();
3965
-
39664926 void EditSelection(boolean newWindow)
39674927 {
4928
+ if (group.selection == null)
4929
+ {
4930
+ EditElement(group, newWindow); // ? new
4931
+ return;
4932
+ }
4933
+
39684934 // aConstraints.gridy = 0;
39694935 for (int i=0; i<group.selection.size(); i++)
39704936 {
39714937 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
39724938 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3973
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4939
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
39744940
39754941 Object3D elem = (Object3D)group.selection.elementAt(i);
3976
- if(elem != group)
4942
+ if(elem != group || !newWindow)
39774943 {
3978
- // if (!(elem instanceof Composite))
3979
- // newWindow = false;
3980
- listUI.add(elem);
3981
- elem.openEditWindow(this, newWindow); //, false);
3982
- System.out.println("edit : " + elem);
3983
- elem.editWindow.refreshContents(true); // ? new
4944
+ EditElement(elem, newWindow); // ? new
39844945 }
39854946 }
39864947 }
....@@ -4055,7 +5016,8 @@
40555016 //new Exception().printStackTrace();
40565017
40575018 freezemodel = true;
4058
-
5019
+ ClearUnpinned();
5020
+
40595021 /**/
40605022 //switch (event.id)
40615023 {
....@@ -4063,7 +5025,6 @@
40635025 //case 702: // Event.LIST_DESELECT
40645026 group.deselectAll();
40655027 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4066
- objEditor.ClearInfo(); // .GetMaterial());
40675028 if (tps != null)
40685029 {
40695030 for (int i=0; i < tps.length; i++)
....@@ -4072,33 +5033,39 @@
40725033
40735034 //if (child.parent != null)
40745035 //child.parent.addSelectee(child);
5036
+ objEditor.SetMaterial(child);
40755037 group.addSelectee(child);
4076
- objEditor.SetMaterial(child); // .GetMaterial());
4077
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4078
- System.err.println("info : " + child.GetPath());
40795038 }
40805039 }
4081
- else
4082
- {
4083
- objEditor.SetMaterial(group); // .GetMaterial());
4084
- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085
- System.err.println("info : " + group.GetPath());
4086
- }
5040
+// else
5041
+// {
5042
+// objEditor.SetMaterial(group); // .GetMaterial());
5043
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
5044
+// System.err.println("info : " + group.GetPath());
5045
+// }
40875046
4088
- objEditor.SetText(); // jan 2014
4089
-
4090
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5047
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
40915048 CameraPane.flash = true;
40925049
4093
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5050
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
40945051 // a camera
40955052 {
4096
- CameraPane.camerachangeframe = 0; // don't refuse it
4097
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5053
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5054
+ {
5055
+ CameraPane.camerachangeframe = 0; // don't refuse it
5056
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5057
+ }
40985058 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
40995059 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
41005060 }
41015061
5062
+ if (tps != null && tps.length == 1)
5063
+ {
5064
+ EditSelection(false);
5065
+ }
5066
+
5067
+ SetPinStates(tps != null && tps.length > 0);
5068
+
41025069 refreshContents();
41035070 //return true;
41045071 }
....@@ -4107,6 +5074,35 @@
41075074
41085075 freezemodel = false;
41095076 }
5077
+
5078
+ void SetPinStates(boolean enabled)
5079
+ {
5080
+ editButton.setEnabled(enabled);
5081
+ uneditButton.setEnabled(enabled);
5082
+ unselectButton.setEnabled(enabled);
5083
+ flashSelectionButton.setEnabled(enabled);
5084
+ }
5085
+
5086
+ void refreshContents(boolean cp)
5087
+ {
5088
+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5089
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5090
+ {
5091
+ objEditor.ClearInfo(); // .GetMaterial());
5092
+
5093
+ for (int i=0; i < group.selection.Size(); i++)
5094
+ {
5095
+ Object3D child = (Object3D) group.selection.get(i);
5096
+
5097
+ objEditor.AddInfo(child, this, true);
5098
+ System.err.println("info : " + child.GetPath());
5099
+ }
5100
+
5101
+ objEditor.SetText(); // jan 2014
5102
+ }
5103
+
5104
+ super.refreshContents(cp);
5105
+ }
41105106
41115107 void linkSomething(Object3D thing)
41125108 {
....@@ -4178,16 +5174,19 @@
41785174 {
41795175 if (group.selection.isEmpty())
41805176 return;
4181
- GrafreeD.clipboardIsTempGroup = false;
5177
+
5178
+ Grafreed.clipboardIsTempGroup = false;
41825179 Composite tGroup = null;
41835180 if (group.selection.size() > 0) // 1)
41845181 {
41855182 tGroup = new cGroup();
4186
- GrafreeD.clipboardIsTempGroup = true;
5183
+ Grafreed.clipboardIsTempGroup = true;
41875184 }
41885185
41895186 if (cut)
41905187 {
5188
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5189
+// Save();
41915190 //int indices[] = jList.getSelectedIndices();
41925191 //for (int i = indices.length - 1; i >= 0; i--)
41935192 //jList.remove(indices[i]);
....@@ -4223,16 +5222,16 @@
42235222 //System.out.println("cut " + child);
42245223 //System.out.println("parent = " + child.parent);
42255224 // tmp.addChild(child);
4226
- if (GrafreeD.clipboardIsTempGroup)
5225
+ if (Grafreed.clipboardIsTempGroup)
42275226 tGroup.add/*Child*/(tmp);
42285227 else
4229
- GrafreeD.clipboard = tmp;
5228
+ Grafreed.clipboard = tmp;
42305229 }
42315230 else
4232
- if (GrafreeD.clipboardIsTempGroup)
5231
+ if (Grafreed.clipboardIsTempGroup)
42335232 tGroup.add/*Child*/(child);
42345233 else
4235
- GrafreeD.clipboard = child;
5234
+ Grafreed.clipboard = child;
42365235 }
42375236
42385237 //ResetModel();
....@@ -4264,21 +5263,23 @@
42645263 //System.out.println("cut " + elem);
42655264 //System.out.println("parent = " + elem.parent);
42665265 // tmp.addChild(elem);
4267
- if (GrafreeD.clipboardIsTempGroup)
5266
+ if (Grafreed.clipboardIsTempGroup)
42685267 tGroup.add/*Child*/(tmp);
42695268 else
4270
- GrafreeD.clipboard = tmp;
5269
+ Grafreed.clipboard = tmp;
42715270 }
42725271 else
4273
- if (GrafreeD.clipboardIsTempGroup)
5272
+ if (Grafreed.clipboardIsTempGroup)
42745273 tGroup.add/*Child*/(child);
42755274 else
4276
- GrafreeD.clipboard = child;
5275
+ Grafreed.clipboard = child;
42775276 }
42785277
42795278 }
4280
- if (GrafreeD.clipboardIsTempGroup)
4281
- GrafreeD.clipboard = tGroup;
5279
+
5280
+ if (Grafreed.clipboardIsTempGroup)
5281
+ Grafreed.clipboard = tGroup;
5282
+
42825283 if (cut)
42835284 {
42845285 ResetModel();
....@@ -4288,11 +5289,15 @@
42885289
42895290 void paste(boolean expand)
42905291 {
5292
+ if (Globals.REPLACEONMAKE)
5293
+ Save();
5294
+ boolean keep = Globals.REPLACEONMAKE;
5295
+ Globals.REPLACEONMAKE = false;
42915296 // if (GrafreeD.clipboard == null)
42925297 // return;
42935298 boolean first = true;
42945299
4295
- if (GrafreeD.clipboardIsTempGroup)
5300
+ if (Grafreed.clipboardIsTempGroup)
42965301 {
42975302 Composite temp;
42985303
....@@ -4303,7 +5308,7 @@
43035308 temp = (Composite)Applet3D.clipboard.deepCopy();
43045309 */
43055310 Object3D elem;
4306
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
5311
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
43075312 {
43085313 Object3D child = (Object3D)e.nextElement();
43095314
....@@ -4337,21 +5342,22 @@
43375342 //Object3D cb = Applet3D.clipboard;
43385343 //temp.addChild(cb);
43395344 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340
- assert(GrafreeD.clipboard.parent == null);
4341
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4342
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
5345
+ assert(Grafreed.clipboard.parent == null);
5346
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
5347
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
5348
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
5349
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
43455350 else
4346
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347
- GrafreeD.clipboard.get(0).parent = keepparent;
5351
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5352
+ Grafreed.clipboard.get(0).parent = keepparent;
43485353 }
43495354
5355
+ Globals.REPLACEONMAKE = keep;
43505356 ResetModel();
43515357 refreshContents();
43525358 }
43535359
4354
- void pasteInto(boolean copyit)
5360
+ void pasteInto(boolean copyit, boolean clone)
43555361 {
43565362 // if (GrafreeD.clipboard == null)
43575363 // return;
....@@ -4380,15 +5386,22 @@
43805386 if (copyit)
43815387 {
43825388 // paste(false);
4383
- CloneClipboard(false); // sept 2014
5389
+ if (clone)
5390
+ {
5391
+ CloneClipboard(false); // sept 2014
5392
+ }
5393
+ else
5394
+ {
5395
+ paste(false);
5396
+ }
43845397 }
43855398 else
43865399 {
43875400 boolean first = true;
43885401
4389
- if (GrafreeD.clipboardIsTempGroup)
5402
+ if (Grafreed.clipboardIsTempGroup)
43905403 {
4391
- Composite temp = (Composite)GrafreeD.clipboard;
5404
+ Composite temp = (Composite)Grafreed.clipboard;
43925405 Object3D copy;
43935406 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
43945407 {
....@@ -4398,7 +5411,7 @@
43985411 }
43995412 } else
44005413 {
4401
- linkSomething(GrafreeD.clipboard); //.get(0));
5414
+ linkSomething(Grafreed.clipboard); //.get(0));
44025415 }
44035416 }
44045417 }
....@@ -4475,6 +5488,10 @@
44755488
44765489 void group(Object3D csg, boolean grab)
44775490 {
5491
+ if (Globals.REPLACEONMAKE)
5492
+ Save();
5493
+ boolean keep = Globals.REPLACEONMAKE;
5494
+ Globals.REPLACEONMAKE = false;
44785495 if (//false) // why??
44795496 !group.selection.isEmpty())
44805497 {
....@@ -4588,10 +5605,15 @@
45885605 //node.add(csg);
45895606 //makeSomething(node);
45905607 makeSomething(csg);
5608
+ Globals.REPLACEONMAKE = keep;
45915609 }
45925610
45935611 void Ungroup(Object3D g)
45945612 {
5613
+ if (Globals.REPLACEONMAKE)
5614
+ Save();
5615
+ boolean keep = Globals.REPLACEONMAKE;
5616
+ Globals.REPLACEONMAKE = false;
45955617 if (g instanceof HiddenObject)
45965618 {
45975619 HiddenObject h = (HiddenObject) g;
....@@ -4608,6 +5630,7 @@
46085630 objEditor.makeSomething(g.get(i), false);
46095631 }
46105632 }
5633
+ Globals.REPLACEONMAKE = keep;
46115634 }
46125635
46135636 void ungroup()
....@@ -4803,21 +5826,6 @@
48035826 }
48045827 */
48055828
4806
- void ImportGFD()
4807
- {
4808
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4809
- browser.show();
4810
- String filename = browser.getFile();
4811
- if (filename != null && filename.length() > 0)
4812
- {
4813
- String fullname = browser.getDirectory() + filename;
4814
-
4815
- //Object3D readobj =
4816
- objEditor.ReadGFD(fullname, objEditor);
4817
- //makeSomething(readobj);
4818
- }
4819
- }
4820
-
48215829 /*
48225830 public void Callback(Object obj)
48235831 {
....@@ -4841,26 +5849,9 @@
48415849 }
48425850 */
48435851
4844
- void ImportVRMLX3D()
4845
- {
4846
- if (GrafreeD.standAlone)
4847
- {
4848
- /**/
4849
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4850
- browser.show();
4851
- String filename = browser.getFile();
4852
- if (filename != null && filename.length() > 0)
4853
- {
4854
- String fullname = browser.getDirectory() + filename;
4855
- LoadVRMLX3D(fullname);
4856
- }
4857
- /**/
4858
- }
4859
- }
4860
-
48615852 String GetFile(String dialogName)
48625853 {
4863
- if (GrafreeD.standAlone)
5854
+ if (Grafreed.standAlone)
48645855 {
48655856 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
48665857 browser.show();
....@@ -4924,10 +5915,49 @@
49245915 cButton flashSelectionButton;
49255916 cButton editButton;
49265917 cButton uneditButton;
5918
+ JCheckBox allParamsButton;
49275919 cButton clearpanelButton;
4928
- cButton allParamsButton;
49295920 cButton unselectButton;
49305921
5922
+ cButton restoreCameraButton;
5923
+
5924
+ cButton saveButton;
5925
+ cButton oneStepButton;
5926
+
5927
+ cButton groupButton;
5928
+ cButton ungroupButton;
5929
+ cButton compositeButton;
5930
+ cButton switchButton;
5931
+ cButton loopButton;
5932
+ cButton textureButton;
5933
+
5934
+ cButton skybox1Button;
5935
+ cButton skybox2Button;
5936
+ cButton skybox3Button;
5937
+ cButton skybox4Button;
5938
+ cButton skybox5Button;
5939
+ cButton skybox6Button;
5940
+ cButton skybox7Button;
5941
+
5942
+ cButton skybox11Button;
5943
+ cButton skybox12Button;
5944
+ cButton skybox13Button;
5945
+ cButton skybox14Button;
5946
+ cButton skybox15Button;
5947
+ cButton skybox16Button;
5948
+ cButton skybox17Button;
5949
+
5950
+ cButton gridButton;
5951
+ cButton boxButton;
5952
+ cButton sphereButton;
5953
+ cButton coneButton;
5954
+ cButton torusButton;
5955
+ cButton superButton;
5956
+ cButton kleinButton;
5957
+ cButton particlesButton;
5958
+ cButton overlayButton;
5959
+ cButton lightButton;
5960
+
49315961 cButton screenfitButton;
49325962 cButton screenfitpointButton;
49335963 cButton snapobjectButton;
....@@ -4939,14 +5969,6 @@
49395969
49405970 cButton setsupportButton;
49415971
4942
- cButton twoButton;
4943
- cButton sixButton;
4944
- cButton threeButton;
4945
- cButton sevenButton;
4946
- cButton fourButton; // full panel
4947
- cButton oneButton; // full XYZ
4948
- //cButton currentLayout;
4949
-
49505972 //
49515973 //Composite
49525974 Object3D // to do !!
....@@ -4956,9 +5978,11 @@
49565978 //JTree jTree;
49575979 private MenuItem lookAtItem;
49585980 private MenuItem lookFromItem;
4959
- private MenuItem switchItem;
5981
+ private MenuItem switchViewItem;
49605982 private MenuItem cutItem;
4961
- private MenuItem duplicateItem;
5983
+ private MenuItem undoItem;
5984
+ private MenuItem redoItem;
5985
+ private JMenuItem duplicateItem;
49625986 private MenuItem cloneItem;
49635987 private MenuItem cloneSupportItem;
49645988 private MenuItem overwriteGeoItem;
....@@ -4971,7 +5995,7 @@
49715995 private MenuItem linkverticesItem;
49725996 private MenuItem relinkverticesItem;
49735997 private MenuItem setMasterItem;
4974
- private MenuItem resetMeshItem;
5998
+ private MenuItem resetAllItem;
49755999 private MenuItem stepAllItem;
49766000 private MenuItem revertMeshItem;
49776001 private MenuItem poseMeshItem;
....@@ -4982,10 +6006,11 @@
49826006 private MenuItem mergeGeometriesItem;
49836007 private MenuItem copyItem;
49846008 private MenuItem pasteItem;
6009
+ private MenuItem pasteIntoItem;
49856010 private MenuItem pasteLinkItem;
49866011 private MenuItem pasteCloneItem;
49876012 private MenuItem pasteExpandItem;
4988
- private MenuItem clearItem;
6013
+ private MenuItem deleteItem;
49896014 private MenuItem clearAllItem;
49906015 private MenuItem genUVItem;
49916016 private MenuItem genNormalsMESHItem;
....@@ -5020,6 +6045,10 @@
50206045 private MenuItem showleavesItem;
50216046 private MenuItem markleavesItem;
50226047 private MenuItem unmarkleavesItem;
6048
+ private MenuItem rewindleavesItem;
6049
+ private MenuItem unrewindleavesItem;
6050
+ private MenuItem randomleavesItem;
6051
+ private MenuItem unrandomleavesItem;
50236052
50246053 private MenuItem flipVItem;
50256054 private MenuItem unflipVItem;
....@@ -5031,15 +6060,17 @@
50316060 private MenuItem panoTexturesItem;
50326061
50336062 private MenuItem resetCentroidItem;
5034
- private MenuItem transformgeometryItem;
6063
+ private MenuItem resetCentroidXZItem;
50356064 private MenuItem resetTransformItem;
6065
+ private MenuItem transformGeometryItem;
6066
+ private MenuItem transformChildrenItem;
50366067 private MenuItem hideItem;
50376068 private MenuItem grabItem;
50386069 private MenuItem backItem;
50396070 private MenuItem frontItem;
50406071 private MenuItem cameraItem;
50416072 private MenuItem compositeItem;
5042
- private MenuItem randomItem;
6073
+ private MenuItem switchItem;
50436074 private MenuItem physicsItem;
50446075 private MenuItem frameselectorItem;
50456076 private MenuItem scriptNodeItem;
....@@ -5063,6 +6094,8 @@
50636094 private MenuItem attachBumpItem;
50646095 private MenuItem detachBumpItem;
50656096 private MenuItem pigmentBumpItem;
6097
+ private MenuItem embedTexturesItem;
6098
+ private MenuItem deEmbedTexturesItem;
50666099
50676100 private MenuItem particleItem;
50686101 private MenuItem ragdollItem;
....@@ -5079,7 +6112,7 @@
50796112 private MenuItem blobItem;
50806113 private MenuItem latheItem;
50816114 private MenuItem bezierItem;
5082
- private MenuItem checkerItem;
6115
+ private MenuItem overlayItem;
50836116 private MenuItem meshItem;
50846117 // private MenuItem meshGroupItem;
50856118 private MenuItem springItem;
....@@ -5101,11 +6134,6 @@
51016134 private MenuItem doubleItem;
51026135 private MenuItem tripleItem;
51036136
5104
- private MenuItem importGFDItem;
5105
- private MenuItem importVRMLX3DItem;
5106
- private MenuItem import3DSItem;
5107
- private MenuItem importOBJItem;
5108
-
51096137 private MenuItem computeAOItem;
51106138 private MenuItem recompileItem;
51116139 private MenuItem editScriptItem;
....@@ -5115,4 +6143,8 @@
51156143 private MenuItem analyzeItem;
51166144 private MenuItem dumpItem;
51176145 //boolean freezemodel = false;
6146
+
6147
+ Menu cameraMenu;
6148
+ MenuItem editCameraItem;
6149
+ MenuItem restoreCameraItem;
51186150 }