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,17 +311,29 @@
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 {
86
- // Object3D keep = GraphreeD.clipboard;
332
+ if (Globals.REPLACEONMAKE)
333
+ Save();
334
+ boolean keep = Globals.REPLACEONMAKE;
335
+ Globals.REPLACEONMAKE = false;
336
+ // Object3D keep = GrafreeD.clipboard;
87337 //Object3D obj;
88338 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89339 {
....@@ -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(GraphreeD.clipboard.parent == null);
101
- Object3D /*Composite*/ keepparent = GraphreeD.clipboard.get(0).parent;
102
- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103
- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104
- makeSomething(CloneObject(GraphreeD.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(GraphreeD.clipboard, false));
107
- GraphreeD.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)GraphreeD.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,73 +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);
571
+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
572
+ relinkverticesItem.addActionListener(this);
573
+
574
+ if (Globals.ADVANCED)
575
+ {
222576 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223577 setMasterItem.addActionListener(this);
578
+ }
224579
225580 oe.menuBar.add(menu = new Menu("Group"));
226
- grabItem = menu.add(new MenuItem("Grab"));
227
- grabItem.addActionListener(this);
228
- frontItem = menu.add(new MenuItem("Front"));
229
- frontItem.addActionListener(this);
581
+// grabItem = menu.add(new MenuItem("Grab"));
582
+// grabItem.addActionListener(this);
230583 backItem = menu.add(new MenuItem("Back"));
231584 backItem.addActionListener(this);
232
- compositeItem = menu.add(new MenuItem("Composite"));
233
- compositeItem.addActionListener(this);
234
- menu.add("-");
235
- randomItem = menu.add(new MenuItem("Random"));
236
- randomItem.addActionListener(this);
237
- physicsItem = menu.add(new MenuItem("Physics"));
238
- physicsItem.addActionListener(this);
239
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240
- frameselectorItem.addActionListener(this);
585
+ frontItem = menu.add(new MenuItem("Front"));
586
+ frontItem.addActionListener(this);
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"));
593
+ hideItem.addActionListener(this);
594
+ }
595
+ ungroupItem = menu.add(new MenuItem("Ungroup"));
596
+ ungroupItem.addActionListener(this);
597
+
598
+// menu.add("-");
599
+//
600
+// switchItem = menu.add(new MenuItem("Switch node"));
601
+// switchItem.addActionListener(this);
602
+ if (Globals.ADVANCED)
603
+ {
241604 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242605 switchGeoItem.addActionListener(this);
243606 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244607 switchTransfoItem.addActionListener(this);
245
- morphItem = menu.add(new MenuItem("Morph"));
608
+ morphItem = menu.add(new MenuItem("Morph Group"));
246609 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);
247616 scriptNodeItem = menu.add(new MenuItem("Script Node"));
248617 scriptNodeItem.addActionListener(this);
249
- cameraItem = menu.add(new MenuItem("Camera"));
250
- cameraItem.addActionListener(this);
618
+ }
251619
252620 oe.menuBar.add(menu = new Menu("Object"));
253
- textureItem = menu.add(new MenuItem("Texture"));
254
- textureItem.addActionListener(this);
621
+// textureItem = menu.add(new MenuItem("Texture"));
622
+// textureItem.addActionListener(this);
623
+ billboardItem = menu.add(new MenuItem("Billboard"));
624
+ billboardItem.addActionListener(this);
255625 csgItem = menu.add(new MenuItem("CSG"));
256626 csgItem.addActionListener(this);
257
- shadowXItem = menu.add(new MenuItem("Shadow X"));
627
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258628 shadowXItem.addActionListener(this);
259
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
629
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260630 shadowYItem.addActionListener(this);
261
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
631
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262632 shadowZItem.addActionListener(this);
633
+ attributeItem = menu.add(new MenuItem("Attribute"));
634
+ attributeItem.addActionListener(this);
635
+
636
+ if (Globals.ADVANCED)
637
+ {
638
+ menu.add("-");
263639 linkerItem = menu.add(new MenuItem("Linker"));
264640 linkerItem.addActionListener(this);
265641 templateItem = menu.add(new MenuItem("Template"));
266642 templateItem.addActionListener(this);
267
- attributeItem = menu.add(new MenuItem("Attribute"));
268
- attributeItem.addActionListener(this);
269643 pointflowItem = menu.add(new MenuItem("Point Flow"));
270644 pointflowItem.addActionListener(this);
645
+ }
271646 menu.add("-");
272
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273
- transformgeometryItem.addActionListener(this);
274647 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275648 resetTransformItem.addActionListener(this);
276649 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277650 resetCentroidItem.addActionListener(this);
278
- ungroupItem = menu.add(new MenuItem("Ungroup"));
279
- ungroupItem.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);
280657
281658 oe.menuBar.add(menu = new Menu("Geometry"));
282659 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -285,6 +662,13 @@
285662 genNormalsORGANItem.addActionListener(this);
286663 genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287664 genNormalsCADItem.addActionListener(this);
665
+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
666
+ genNormalsMESHItem.addActionListener(this);
667
+ if (Globals.ADVANCED)
668
+ {
669
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
670
+ genNormalsMINEItem.addActionListener(this);
671
+ }
288672 stripifyItem = menu.add(new MenuItem("Stripify"));
289673 stripifyItem.addActionListener(this);
290674 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -306,23 +690,34 @@
306690 reduce34MeshItem.addActionListener(this);
307691 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308692 increaseMeshItem.addActionListener(this);
309
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310
- smoothMeshItem.addActionListener(this);
311693 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312694 clipMeshItem.addActionListener(this);
695
+
696
+ if (Globals.ADVANCED)
697
+ {
698
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
699
+ smoothMeshItem.addActionListener(this);
700
+ }
313701
314702 oe.menuBar.add(menu = new Menu("Attributes"));
315703 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316704 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);
317709 menu.add("-");
318710 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319711 liveleavesItem.addActionListener(this);
320712 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321713 unliveleavesItem.addActionListener(this);
714
+ if (Globals.ADVANCED)
715
+ {
322716 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323717 supportleavesItem.addActionListener(this);
324718 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325719 unsupportleavesItem.addActionListener(this);
720
+ }
326721 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327722 hideleavesItem.addActionListener(this);
328723 showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -331,6 +726,14 @@
331726 markleavesItem.addActionListener(this);
332727 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333728 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);
334737 menu.add("-");
335738 flipVItem = menu.add(new MenuItem("Flip V"));
336739 flipVItem.addActionListener(this);
....@@ -356,45 +759,56 @@
356759 attachBumpItem.addActionListener(this);
357760 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358761 pigmentBumpItem.addActionListener(this);
762
+ //embedTexturesItem
359763 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360764 detachPigmentItem.addActionListener(this);
361765 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362766 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);
363771 menu.add("-");
364772 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365773 sortbysizeItem.addActionListener(this);
366774 sortbynameItem = menu.add(new MenuItem("Sort by name"));
367775 sortbynameItem.addActionListener(this);
368776 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.
369784 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370785 extractGeometriesItem.addActionListener(this);
371786 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372787 cloneGeometriesItem.addActionListener(this);
373
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374
- shareGeometriesItem.addActionListener(this);
375
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376
- mergeGeometriesItem.addActionListener(this);
788
+ }
377789
378790 oe.menuBar.add(menu = new Menu("Insert"));
379791 buildCreateMenu(menu);
380792
381
-
382
- oe.menuBar.add(menu = new Menu("Include"));
383
- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384
- importGFDItem.addActionListener(this);
385
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386
- importVRMLX3DItem.addActionListener(this);
387
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388
- importOBJItem.addActionListener(this);
389
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390
- import3DSItem.addActionListener(this);
391
-
392793 oe.menuBar.add(menu = new Menu("Tools"));
393794 buildToolsMenu(menu);
394795 }
395796
797
+
396798 void SetupUI2(ObjEditor oe)
397799 {
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
+
398812 //new Exception().printStackTrace();
399813
400814 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -423,150 +837,238 @@
423837 oe.radioPanel.add(dummyButton);
424838 oe.buttonGroup.add(dummyButton);
425839 */
426
- aConstraints.gridy += 1;
427
- oe.aConstraints.gridwidth = 1;
428
- oe.aConstraints.gridx = 0;
840
+ cGridBag copyOptionsPanel = new cGridBag();
841
+
842
+ copyOptionsPanel.preferredHeight = 2;
429843
430
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), 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);
862
+ screenfitButton.setToolTipText("Screen fit");
863
+ screenfitButton.addActionListener(this);
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");
431898 liveCB.addItemListener(this);
432899
433
- oe.aConstraints.gridx += 1;
434
- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435
- supportCB.addItemListener(this);
436
-
437
- // oe.aConstraints.gridx += 1;
438
- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439
- // localCB.addItemListener(this);
440
-
441
- oe.aConstraints.gridx += 1;
442
- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443
- crowdCB.addItemListener(this);
444
-
445
- oe.aConstraints.gridx += 1;
446
- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447
- smoothCB.addItemListener(this);
448
-
449
- oe.aConstraints.gridx += 1;
450
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
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");
451906 fastCB.addItemListener(this);
452
- oe.aConstraints.gridx += 1;
453
- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454
- slowCB.addItemListener(this);
455
- oe.aConstraints.gridx += 1;
456
- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457
- boxCB.addItemListener(this);
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);
458913
459
-// oe.aConstraints.gridx += 1;
460
-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461
-// speakerMocapCB.addItemListener(this);
462
-
463
- if (false)
464
- {
465
- // handled in scripts
466
- oe.aConstraints.gridx += 1;
467
- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468
- speakerCameraCB.addItemListener(this);
469
-
470
- oe.aConstraints.gridx += 1;
471
- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472
- speakerFocusCB.addItemListener(this);
473
-
474
- oe.aConstraints.gridx += 1;
475
- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476
- smoothfocusCB.addItemListener(this);
477
- }
478
-
479
-//oe.aConstraints.gridx += 1;
480
-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481
-// debugCB.addItemListener(this);
482
-
483
- oe.aConstraints.gridx += 1;
484
- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485
- oeilCB.addItemListener(this);
486
-
487
- oe.aConstraints.gridx += 1;
488
- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489
- lookAtCB.addItemListener(this);
490
-
491
- oe.aConstraints.gridx += 1;
492
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493
- trackCB.addItemListener(this);
494
-
495
- oe.aConstraints.gridx += 1;
496
- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497
- screenfitButton.addActionListener(this);
498
- oe.aConstraints.gridx += 1;
499914 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500915 // screenfitpointButton.addActionListener(this);
501
-// oe.aConstraints.gridx += 1;
502
- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503
- snapobjectButton.addActionListener(this);
504
- oe.aConstraints.gridx += 1;
505916
506
- //aConstraints.gridx = 0;
507
- //aConstraints.gridy += 1;
508
- oe.aConstraints.weighty = 0;
509
- oe.aConstraints.gridwidth = 1;
510
-
511
- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512
- flashSelectionButton.addActionListener(this);
513
- oe.aConstraints.gridx += 1;
514
- oe.aConstraints.weighty = 0;
515
- oe.aConstraints.gridwidth = 1;
516
-
517
- //
518
- oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
519
- twoButton.addActionListener(this);
520
- oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
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);
521924 fourButton.addActionListener(this);
522
- oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
523
- sixButton.addActionListener(this);
524
- oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
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");
525937 threeButton.addActionListener(this);
526
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
527
- 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);
528944 //
529945
530
- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
946
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
947
+ rootButton.setToolTipText("Open selection in new tab");
531948 rootButton.addActionListener(this);
532
- oe.aConstraints.gridx += 1;
533
- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
949
+
950
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
951
+ closeButton.setToolTipText("Close tab");
534952 closeButton.addActionListener(this);
535953 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536954 //clearButton.addActionListener(this);
537
- oe.aConstraints.gridx += 1;
538
-
539
- oe.aConstraints.gridx = 1; //
540
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541
- editButton.addActionListener(this);
542
- oe.aConstraints.gridx += 1;
543
- oe.aConstraints.weighty = 0;
544
- oe.aConstraints.gridwidth = 1;
545955
546
- 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");
5471048 uneditButton.addActionListener(this);
5481049
549
- oe.aConstraints.gridx += 1;
550
- oe.aConstraints.weighty = 0;
551
- oe.aConstraints.gridwidth = 1;
552
-
553
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554
- clearPanelButton.addActionListener(this);
555
-
556
- oe.aConstraints.gridx += 1;
557
- oe.aConstraints.weighty = 0;
558
- oe.aConstraints.gridwidth = 1;
559
-
560
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
1050
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051
+ allParamsButton.setToolTipText("Show all controle");
5611052 allParamsButton.addActionListener(this);
5621053
563
- oe.aConstraints.gridx += 1;
564
- oe.aConstraints.weighty = 0;
565
- oe.aConstraints.gridwidth = 1;
566
-
567
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
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");
5681060 unselectButton.addActionListener(this);
5691061
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
+
5701072 // oe.aConstraints.gridx += 1;
5711073 // oe.aConstraints.weighty = 0;
5721074 // oe.aConstraints.gridwidth = 1;
....@@ -578,47 +1080,32 @@
5781080 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
5791081 // gcButton.addActionListener(this);
5801082
581
- oe.aConstraints.gridx = 0;
582
- oe.aConstraints.gridy += 1;
583
-
584
- //ctrlPanel.add(objList = new List(5, true));
585
- oe.aConstraints.gridwidth = 100;
586
- // oe.aConstraints.gridheight = 100;
587
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588
- oe.aConstraints.gridheight = 1;
589
- oe.aConstraints.weighty = 0.5;
590
- oe.aConstraints.gridx = 0;
591
- JScrollPane jSP;
1083
+ cGridBag jSPPanel = new cGridBag();
1084
+
1085
+ JScrollPane jSP;
5921086 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
1087
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
5941088 ResetModel();
595
- oe.aConstraints.weighty = 0.5;
596
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597
- oe.aConstraints.gridy += 1;
598
- oe.aConstraints.gridwidth = 1;
599
-
600
- oe.aConstraints.weighty = 0;
601
- oe.aConstraints.gridwidth = 2;
602
-
603
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604
- colorCB.addItemListener(this);
605
- oe.aConstraints.gridx += 2;
606
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607
- materialCB.addItemListener(this);
608
- oe.aConstraints.gridx += 2;
609
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610
- textureCB.addItemListener(this);
611
-
612
- oe.aConstraints.gridx = 0;
613
- oe.aConstraints.gridy += 1;
6141089
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
+
6151102 //jList.addListSelectionListener(this);
6161103 oe.jTree.addTreeSelectionListener(this);
6171104 //jTree.setRootVisible(false);
6181105 //jTree.setEditable(true);
6191106 oe.jTree.setDragEnabled(true);
6201107 //jTree.setPreferredSize(new Dimension(10,10));
621
- jSP.setPreferredSize(new Dimension(100,200));
1108
+ //jSP.setPreferredSize(new Dimension(100,200));
6221109
6231110 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6241111
....@@ -630,23 +1117,160 @@
6301117 dgr.addDragGestureListener(this);
6311118 }catch(Exception e) {}
6321119 */
633
- radio.layout = sevenButton;
1120
+ radio.layout = sixButton; // sevenButton;
6341121 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6351122 }
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
+ }
6361249
6371250 void EditObject(Object3D obj)
6381251 {
639
- cRadio dummyButton = new cRadio(obj.name);
640
- dummyButton.SetObject(obj);
641
- dummyButton.layout = sevenButton;
642
- dummyButton.SetCamera(cameraView.renderCamera, false);
643
- dummyButton.addActionListener(this);
644
- radioPanel.add(dummyButton);
645
- buttonGroup.add(dummyButton);
646
- dummyButton.doClick();
1252
+ 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
+
1261
+ radioButton.SetObject(obj);
1262
+ radioButton.layout = sixButton; // sevenButton;
1263
+ radioButton.SetCamera(cameraView.renderCamera, false);
1264
+ radioButton.addActionListener(this);
1265
+ radioPanel.add(radioButton);
1266
+ buttonGroup.add(radioButton);
1267
+ radioButton.doClick();
6471268 }
1269
+
6481270 void SetupViews(ObjEditor oe)
6491271 {
1272
+ theFrame = this;
1273
+
6501274 oe.SetupViews();
6511275
6521276 System.out.println("SetupViews");
....@@ -655,22 +1279,28 @@
6551279 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
6561280 }
6571281
658
- JCheckBox liveCB;
659
- JCheckBox supportCB;
660
- JCheckBox localCB;
661
- JCheckBox crowdCB;
662
- JCheckBox smoothCB;
663
- JCheckBox fastCB;
664
- JCheckBox slowCB;
665
- JCheckBox boxCB;
666
- JCheckBox trackCB;
667
- JCheckBox smoothfocusCB;
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;
6681295 // JCheckBox speakerMocapCB;
669
- JCheckBox speakerCameraCB;
670
- JCheckBox speakerFocusCB;
671
- JCheckBox debugCB;
672
- JCheckBox oeilCB;
673
- JCheckBox lookAtCB;
1296
+ cCheckBox speakerCameraCB;
1297
+ cCheckBox speakerFocusCB;
1298
+ cCheckBox debugCB;
1299
+
1300
+ cCheckBox oeilCB;
1301
+ cCheckBox shadowCB;
1302
+ cCheckBox autokeepCB;
1303
+ cCheckBox lookAtCB;
6741304
6751305 // static int COLOR = 1;
6761306 // static int MATERIAL = 2;
....@@ -678,9 +1308,9 @@
6781308
6791309 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
6801310
681
- JCheckBox colorCB;
682
- JCheckBox materialCB;
683
- JCheckBox textureCB;
1311
+ cCheckBox colorCB;
1312
+ cCheckBox materialCB;
1313
+ cCheckBox textureCB;
6841314
6851315 public void itemStateChanged(ItemEvent e)
6861316 {
....@@ -705,10 +1335,10 @@
7051335 dropAttributes |= Object3D.TEXTURE;
7061336 else
7071337 dropAttributes &= ~Object3D.TEXTURE;
708
- }
709
- else if(e.getSource() == liveCB)
1338
+ } else if(e.getSource() == liveCB)
7101339 {
7111340 cameraView.ToggleLive();
1341
+ refreshContents(false);
7121342 }
7131343 else if(e.getSource() == supportCB)
7141344 {
....@@ -744,6 +1374,10 @@
7441374 cameraView.repaint();
7451375 // refreshContents();
7461376 }
1377
+ else if(e.getSource() == zoomBoxCB)
1378
+ {
1379
+ cameraView.ToggleZoomBoxMode();
1380
+ }
7471381 else if(e.getSource() == smoothfocusCB)
7481382 {
7491383 cameraView.ToggleSmoothFocus();
....@@ -769,6 +1403,18 @@
7691403 {
7701404 cameraView.ToggleOeil();
7711405 }
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
+ }
7721418 else if(e.getSource() == lookAtCB)
7731419 {
7741420 cameraView.ToggleLookAt();
....@@ -785,7 +1431,8 @@
7851431
7861432 /**/
7871433 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1434
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1435
+ TreePath path = objEditor.jTree.getSelectionPath();
7891436 if ((path == null) || (path.getPathCount() <= 1)) {
7901437 // We can't move the root node or an empty selection
7911438 return;
....@@ -848,8 +1495,6 @@
8481495 }
8491496 }
8501497
851
- String string = (String) object;
852
-
8531498 System.out.println("Transfer = " + object + "; drop : " + target);
8541499 // if( object instanceof java.io.File[])
8551500 // {
....@@ -857,7 +1502,11 @@
8571502 // objEditor.DropFile((java.io.File[]) object, true);
8581503 // return;
8591504 // }
860
- 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) == ':')
8611510 {
8621511 // file(s)
8631512 String[] names = string.split("\n");
....@@ -884,7 +1533,7 @@
8841533
8851534 flashIt = false;
8861535 CameraPane pane = (CameraPane) target;
887
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1536
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
8881537 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
8891538
8901539 if (group.selection.size() == 1)
....@@ -900,23 +1549,33 @@
9001549
9011550 assert target == objEditor.jTree;
9021551 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1552
+ Object3D destinationLeaf;
9031553 try {
904
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1554
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9051555 } catch (Exception e) {
9061556 System.out.println("destinationPath : " + destinationPath);
9071557 return;
9081558 }
9091559
910
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1560
+ for (int i=group.selection.size(); --i>=0;)
9111561 {
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
+// {
9121571 loadClipboard(true);
9131572 objEditor.jTree.setSelectionPath(destinationPath);
914
- pasteInto(false);
915
- } else {
916
- loadClipboard(false);
917
- objEditor.jTree.setSelectionPath(destinationPath);
918
- pasteInto(false); // true); // ???
919
- }
1573
+ pasteInto(false, false);
1574
+// } else {
1575
+// loadClipboard(false);
1576
+// objEditor.jTree.setSelectionPath(destinationPath);
1577
+// pasteInto(false, false); // true); // ???
1578
+// }
9201579 }
9211580 public void dropActionChanged(DropTargetDragEvent dtde)
9221581 // Called if the user has modified the current drop gesture
....@@ -1021,83 +1680,107 @@
10211680 {
10221681 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10231682 //heightFieldItem.addActionListener(this);
1024
- gridItem = menu.add(new MenuItem("Grid"));
1025
- gridItem.addActionListener(this);
1026
- rectoidItem = menu.add(new MenuItem("Box"));
1027
- rectoidItem.addActionListener(this);
1028
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029
- ellipsoidItem.addActionListener(this);
1030
- coneItem = menu.add(new MenuItem("Cone"));
1031
- coneItem.addActionListener(this);
1032
- torusItem = menu.add(new MenuItem("Torus"));
1033
- torusItem.addActionListener(this);
1034
- superItem = menu.add(new MenuItem("Superellipsoid"));
1035
- superItem.addActionListener(this);
1036
- particleItem = menu.add(new MenuItem("Particle system"));
1037
- particleItem.addActionListener(this);
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
+ {
1701
+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
1702
+ kleinItem.addActionListener(this);
1703
+ }
1704
+
1705
+// particleItem = menu.add(new MenuItem("Particle system"));
1706
+// particleItem.addActionListener(this);
1707
+ if (Globals.ADVANCED)
1708
+ {
10381709 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10391710 ragdollItem.addActionListener(this);
10401711 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10411712 ragdoll2Item.addActionListener(this);
1713
+ }
10421714 menu.add("-");
1043
- meshItem = menu.add(new MenuItem("Mesh"));
1715
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10441716 meshItem.addActionListener(this);
10451717 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10461718 // meshGroupItem.addActionListener(this);
1719
+ if (Globals.ADVANCED)
1720
+ {
10471721 springItem = menu.add(new MenuItem("Spring"));
10481722 springItem.addActionListener(this);
10491723 flagItem = menu.add(new MenuItem("Flag"));
10501724 flagItem.addActionListener(this);
1051
- bezierItem = menu.add(new MenuItem("Patch"));
1052
- bezierItem.addActionListener(this);
1053
- checkerItem = menu.add(new MenuItem("Checker"));
1054
- checkerItem.addActionListener(this);
10551725 blobItem = menu.add(new MenuItem("Blob"));
10561726 blobItem.addActionListener(this);
10571727 latheItem = menu.add(new MenuItem("Lathe"));
10581728 latheItem.addActionListener(this);
1059
- lightItem = menu.add(new MenuItem("Light"));
1060
- 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);
10611736 menu.add("-");
10621737 //superLoopItem = menu.add(new MenuItem("Super Loop"));
10631738 //superLoopItem.addActionListener(this);
1064
- loopItem = menu.add(new MenuItem("Loop"));
1065
- loopItem.addActionListener(this);
1739
+// loopItem = menu.add(new MenuItem("Loop"));
1740
+// loopItem.addActionListener(this);
10661741 doubleItem = menu.add(new MenuItem("Fork"));
10671742 doubleItem.addActionListener(this);
1743
+ if (Globals.ADVANCED)
1744
+ {
10681745 tripleItem = menu.add(new MenuItem("Trident"));
10691746 tripleItem.addActionListener(this);
1747
+ }
10701748 }
10711749
10721750 void buildToolsMenu(Menu menu)
10731751 {
10741752 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
10751753 animationItem.addItemListener(this);
1076
- animationItem.setState(CameraPane.ANIMATION);
1754
+ animationItem.setState(Globals.ANIMATION);
1755
+
1756
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
1757
+ archiveItem.addActionListener(this);
10771758
10781759 menu.add("-");
10791760 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
10801761 parseverticesItem.addActionListener(this);
10811762 textureFieldItem = menu.add(new MenuItem("Texture Field"));
10821763 textureFieldItem.addActionListener(this);
1083
- alignItem = menu.add(new MenuItem("Align"));
1764
+ alignItem = menu.add(new MenuItem("Align Objects"));
10841765 alignItem.addActionListener(this);
1085
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086
- mirrorItem.addActionListener(this);
10871766 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
10881767 reduceMorphItem.addActionListener(this);
10891768 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
10901769 reduce34MorphItem.addActionListener(this);
1091
-
1092
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093
- computeAOItem.addActionListener(this);
10941770 menu.add("-");
1095
-
10961771 menu.add(memoryItem = new MenuItem("Memory Usage"));
10971772 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("-");
10981781 menu.add(analyzeItem = new MenuItem("Analyze"));
10991782 analyzeItem.addActionListener(this);
1100
- menu.add(dumpItem = new MenuItem("Dump"));
1783
+ menu.add(dumpItem = new MenuItem("Print"));
11011784 dumpItem.addActionListener(this);
11021785 // menu.add(pathItem = new MenuItem("From-to path"));
11031786 // pathItem.addActionListener(this);
....@@ -1106,6 +1789,8 @@
11061789 resetParentItem.addActionListener(this);
11071790 repairParentItem = menu.add(new MenuItem("Repair Parent"));
11081791 repairParentItem.addActionListener(this);
1792
+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
1793
+ repairShadowItem.addActionListener(this);
11091794 menu.add(invariantsItem = new MenuItem("Invariants"));
11101795 invariantsItem.addActionListener(this);
11111796 menu.add(recompileItem = new MenuItem("Recompile"));
....@@ -1113,6 +1798,7 @@
11131798 menu.add("-");
11141799 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11151800 editScriptItem.addActionListener(this);
1801
+ }
11161802 }
11171803
11181804 void ScreenFit()
....@@ -1235,9 +1921,34 @@
12351921 shadow.material = new cMaterial(obj.material);
12361922 shadow.material.diffuse = 0.0001f;
12371923 shadow.material.specular = 0.0001f;
1924
+ //shadow.projectedVertices[1].x = 300;
12381925
12391926 makeSomething(shadow);
12401927 }
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
+ }
12411952
12421953 /**
12431954 * applyExample
....@@ -1441,9 +2152,9 @@
14412152
14422153 void Overwrite(int mask)
14432154 {
1444
- if (/*group.selection.size() == 1 &&*/ GraphreeD.clipboard.size() == 1)
2155
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14452156 {
1446
- Object3D content = GraphreeD.clipboard.get(0);
2157
+ Object3D content = Grafreed.clipboard.get(0);
14472158
14482159 if (content instanceof cGroup && ((cGroup)content).transientlink )
14492160 content = ((cGroup)content).get(0);
....@@ -1466,6 +2177,7 @@
14662177 //
14672178 public void actionPerformed(ActionEvent event) // , Object arg)
14682179 {
2180
+ Object source = event.getSource();
14692181 /*
14702182 if (event.getSource() == nameField)
14712183 {
....@@ -1477,11 +2189,11 @@
14772189 }
14782190 else
14792191 */
1480
- if (event.getSource() == lookAtItem || event.getSource() == lookFromItem)
2192
+ if (source == lookAtItem || source == lookFromItem)
14812193 {
14822194 ScreenFit();
14832195 } else
1484
- if (event.getSource() == switchItem)
2196
+ if (source == switchViewItem)
14852197 {
14862198 cVector v1 = new cVector();
14872199 cVector v2 = new cVector();
....@@ -1490,11 +2202,11 @@
14902202 objEditor.cameraView.renderCamera.setAim(v2, v1);
14912203 objEditor.cameraView.repaint();
14922204 } else
1493
- if (event.getSource() == rectoidItem)
2205
+ if (source == rectoidItem || source == boxButton)
14942206 {
14952207 makeSomething(new Box());
14962208 } else
1497
- if (event.getSource() == particleItem)
2209
+ if (source == particleItem || source == particlesButton)
14982210 {
14992211 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15002212 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1515,9 +2227,9 @@
15152227 applyExample(particleGeom, "SMOKE");
15162228 makeSomething(particleGeom);
15172229 } else
1518
- if (event.getSource() == ragdollItem || event.getSource() == ragdoll2Item)
2230
+ if (source == ragdollItem || source == ragdoll2Item)
15192231 {
1520
- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
2232
+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
15212233
15222234 ragdoll.toParent = LA.newMatrix();
15232235 ragdoll.fromParent = LA.newMatrix();
....@@ -1535,7 +2247,7 @@
15352247 } else
15362248 /*
15372249 */
1538
- if (event.getSource() == heightFieldItem)
2250
+ if (source == heightFieldItem)
15392251 {
15402252 Object3D obj = new Object3D();
15412253
....@@ -1573,27 +2285,31 @@
15732285
15742286 makeSomething(obj);
15752287 } else
1576
- if (event.getSource() == gridItem)
2288
+ if (source == gridItem || source == gridButton)
15772289 {
15782290 makeSomething(new Grid());
15792291 } else
1580
- if (event.getSource() == ellipsoidItem)
2292
+ if (source == ellipsoidItem || source == sphereButton)
15812293 {
15822294 makeSomething(new Sphere());
15832295 } else
1584
- if (event.getSource() == coneItem)
2296
+ if (source == coneItem || source == coneButton)
15852297 {
15862298 makeSomething(new Cone());
15872299 } else
1588
- if (event.getSource() == torusItem)
2300
+ if (source == torusItem || source == torusButton)
15892301 {
15902302 makeSomething(new Torus());
15912303 } else
1592
- if (event.getSource() == superItem)
2304
+ if (source == superItem || source == superButton)
15932305 {
15942306 makeSomething(new Superellipsoid());
15952307 } else
1596
- if (event.getSource() == blobItem)
2308
+ if (source == kleinItem || source == kleinButton)
2309
+ {
2310
+ makeSomething(new Klein());
2311
+ } else
2312
+ if (source == blobItem)
15972313 {
15982314 Blob blob = new Blob();
15992315 BlobComponent comp = new BlobComponent();
....@@ -1601,15 +2317,15 @@
16012317 //blob.retile();
16022318 makeSomething(blob);
16032319 } else
1604
- if (event.getSource() == latheItem)
2320
+ if (source == latheItem)
16052321 {
16062322 makeSomething(new Lathe());
16072323 } else
1608
- if (event.getSource() == bezierItem)
2324
+ if (source == bezierItem)
16092325 {
16102326 makeSomething(new BezierSurface());
16112327 } else
1612
- if (event.getSource() == checkerItem)
2328
+ if (source == overlayItem || source == overlayButton)
16132329 {
16142330 /*
16152331 Object3D obj = new BezierSurface(5,8);
....@@ -1624,7 +2340,7 @@
16242340 */
16252341 makeSomething(new Checker());
16262342 } else
1627
- if (event.getSource() == meshItem)
2343
+ if (source == meshItem)
16282344 {
16292345 Object3D itemtomake = new Object3D();
16302346 Object3D child;
....@@ -1645,35 +2361,52 @@
16452361 makeSomething(child);
16462362 }
16472363 } else
1648
- if (event.getSource() == springItem)
2364
+ if (source == springItem)
16492365 {
16502366 cSpring s = new cSpring();
16512367 s.setup();
16522368 makeSomething(s);
16532369 } else
1654
- if (event.getSource() == flagItem)
2370
+ if (source == flagItem)
16552371 {
16562372 cSpring s = new cFlag();
16572373 s.setup();
16582374 makeSomething(s);
16592375 } else
1660
- if (event.getSource() == lightItem)
2376
+ if (source == lightItem || source == lightButton)
16612377 {
16622378 makeSomething(new Light());
16632379 } else
1664
- 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)
16652398 {
16662399 group(new CSG());
16672400 } else
1668
- if (event.getSource() == templateItem)
2401
+ if (source == templateItem)
16692402 {
16702403 group(new cTemplate());
16712404 } else
1672
- if (event.getSource() == attributeItem)
2405
+ if (source == attributeItem)
16732406 {
16742407 makeSomething(new Attribute());
16752408 } else
1676
- if (event.getSource() == pointflowItem)
2409
+ if (source == pointflowItem)
16772410 {
16782411 makeSomething(new PointFlow());
16792412 } else
....@@ -1685,7 +2418,7 @@
16852418 } else
16862419 */
16872420
1688
- if (event.getSource() == superLoopItem)
2421
+ if (source == superLoopItem)
16892422 {
16902423 Composite g = new cGroup();
16912424 for (int i=0; i<15; i++)
....@@ -1707,30 +2440,30 @@
17072440
17082441 group(g);
17092442 } else
1710
- if (event.getSource() == loopItem)
2443
+ if (source == loopItem || source == loopButton)
17112444 {
17122445 Composite csg = new GroupLeaf();
17132446 csg.count = 5;
17142447 group(csg);
1715
- Composite child = new cGroup();
2448
+ Composite child = new cGroup("Branch");
17162449 csg.addChild(child);
17172450 child.addChild(csg);
17182451 } else
1719
- if (event.getSource() == doubleItem)
2452
+ if (source == doubleItem)
17202453 {
1721
- Composite csg = new GroupLeaf();
2454
+ Composite csg = new GroupLeaf("Fork");
17222455 csg.count = 5;
17232456 group(csg);
1724
- Composite child = new cGroup();
2457
+ Composite child = new cGroup("Branch A");
17252458 csg.addChild(child);
17262459 child.addChild(csg);
1727
- child = new cGroup();
2460
+ child = new cGroup("Branch B");
17282461 csg.addChild(child);
17292462 child.addChild(csg);
17302463 } else
1731
- if (event.getSource() == tripleItem)
2464
+ if (source == tripleItem)
17322465 {
1733
- Composite csg = new GroupLeaf();
2466
+ Composite csg = new GroupLeaf("Trident");
17342467 csg.count = 4;
17352468 group(csg);
17362469 Composite child = new cGroup();
....@@ -1743,73 +2476,98 @@
17432476 csg.addChild(child);
17442477 child.addChild(csg);
17452478 } else
1746
-
1747
- if (event.getSource() == importGFDItem)
2479
+ if (source == computeAOItem)
17482480 {
1749
- ImportGFD();
2481
+ Globals.drawMode = CameraPane.OCCLUSION;
2482
+ cameraView.repaint();
17502483 } else
1751
- if (event.getSource() == importVRMLX3DItem)
1752
- {
1753
- ImportVRMLX3D();
1754
- } else
1755
- if (event.getSource() == import3DSItem)
1756
- {
1757
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758
- } else
1759
- if (event.getSource() == importOBJItem)
1760
- {
1761
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762
- } else
1763
- if (event.getSource() == computeAOItem)
1764
- {
1765
- CameraPane.drawMode = CameraPane.OCCLUSION;
1766
- CameraPane.theRenderer.repaint();
1767
- } else
1768
- if (event.getSource() == recompileItem)
2484
+ if (source == recompileItem)
17692485 {
17702486 Recompile();
17712487 refreshContents();
17722488 } else
1773
- if (event.getSource() == editScriptItem)
2489
+ if (source == editScriptItem)
17742490 {
17752491 OpenDialog();
17762492 refreshContents();
17772493 } else
1778
- if (event.getSource() == invariantsItem)
2494
+ if (source == invariantsItem)
17792495 {
17802496 System.out.println("Invariants:");
1781
- GraphreeD.theApplet3D.universe.invariants();
2497
+ Grafreed.grafreeD.universe.invariants();
17822498 } else
1783
- if (event.getSource() == memoryItem)
2499
+ if (source == memoryItem)
17842500 {
17852501 //System.out.println("Invariants:");
17862502 PrintMemory();
17872503 } else
1788
- if (event.getSource() == pathItem)
2504
+ if (source == pathItem)
17892505 {
17902506 PrintPath();
17912507 } else
1792
- if (event.getSource() == analyzeItem)
2508
+ if (source == analyzeItem)
17932509 {
17942510 AnalyzeObject();
17952511 } else
1796
- if (event.getSource() == dumpItem)
2512
+ if (source == dumpItem)
17972513 {
17982514 DumpObject();
17992515 } else
1800
- if (event.getSource() == screenfitButton)
2516
+ if (source == minButton)
18012517 {
1802
- //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
+ {
18032563 ScreenFit();
18042564 } else
1805
- if (event.getSource() == screenfitpointButton)
2565
+ if (source == screenfitpointButton)
18062566 {
1807
- //Reload(lastConverter, lastFilename, true);
18082567 ScreenFitPoint();
18092568 } else
1810
- if (event.getSource() == snapobjectButton)
2569
+ if (source == snapobjectButton)
18112570 {
1812
- //Reload(lastConverter, lastFilename, true);
18132571 SnapObject();
18142572 } else
18152573 // if (event.getSource() == recompileButton)
....@@ -1818,13 +2576,13 @@
18182576 // Recompile();
18192577 // refreshContents();
18202578 // } else
1821
- if (event.getSource() == gcButton)
2579
+ if (source == gcButton)
18222580 {
18232581 System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18242582 System.gc();
18252583 System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18262584 } else
1827
- if (event.getSource() == editLeafItem)
2585
+ if (source == editLeafItem)
18282586 {
18292587 Object3D obj;
18302588 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -1838,65 +2596,78 @@
18382596 }
18392597 refreshContents(true);
18402598 } else
1841
- if (event.getSource() == openWindowItem)
2599
+ if (source == openWindowItem)
18422600 {
18432601 EditSelection(true);
18442602 } else
1845
- if (event.getSource() == cutItem || event.getSource() == clearButton)
2603
+ if (source == cutItem || source == clearButton)
18462604 {
18472605 loadClipboard(true);
18482606 } else
1849
- if (event.getSource() == duplicateItem)
2607
+ if (source == undoItem)
18502608 {
1851
- Object3D keep = GraphreeD.clipboard;
2609
+ Undo();
2610
+ } else
2611
+ if (source == redoItem)
2612
+ {
2613
+ Redo();
2614
+ } else
2615
+ if (source == duplicateItem)
2616
+ {
2617
+ Object3D keep = Grafreed.clipboard;
18522618 loadClipboard(false);
18532619 paste(false);
1854
- GraphreeD.clipboard = keep;
2620
+ Grafreed.clipboard = keep;
18552621 } else
1856
- if (event.getSource() == cloneItem)
2622
+ if (source == cloneItem)
18572623 {
18582624 CloneSelection(false);
18592625 } else
1860
- if (event.getSource() == cloneSupportItem)
2626
+ if (source == cloneSupportItem)
18612627 {
18622628 CloneSelection(true);
18632629 } else
1864
- if (event.getSource() == copyItem)
2630
+ if (source == copyItem)
18652631 {
18662632 loadClipboard(false);
18672633 } else
1868
- if (event.getSource() == pasteItem)
2634
+ if (source == pasteItem)
18692635 {
18702636 paste(false);
18712637 } else
1872
- if (event.getSource() == pasteLinkItem)
2638
+ if (source == pasteIntoItem)
18732639 {
1874
- pasteInto(false);
2640
+ pasteInto(true, false);
18752641 } else
1876
- if (event.getSource() == pasteCloneItem)
2642
+ if (source == pasteLinkItem)
18772643 {
1878
- pasteInto(true);
2644
+ pasteInto(false, false);
18792645 } else
1880
- if (event.getSource() == pasteExpandItem)
2646
+ if (source == pasteCloneItem)
2647
+ {
2648
+ pasteInto(true, true);
2649
+ } else
2650
+ if (source == pasteExpandItem)
18812651 {
18822652 paste(true);
18832653 } else
1884
- if (event.getSource() == synchronizeItem)
2654
+ if (source == synchronizeItem)
18852655 {
18862656 Overwrite(Object3D.TRANSFORM);
18872657 } else
1888
- if (event.getSource() == overwriteNameItem)
2658
+ if (source == overwriteNameItem)
18892659 {
18902660 Overwrite(Object3D.NAME);
18912661 } else
1892
- if (event.getSource() == overwriteUVItem)
2662
+ if (source == overwriteUVItem)
18932663 {
18942664 Overwrite(Object3D.UV);
18952665 } else
1896
- if (event.getSource() == overwriteMatItem)
2666
+ if (source == overwriteMatItem)
18972667 {
2668
+ /* july 2015
18982669 if ((dropAttributes & Object3D.TEXTURE) == 0)
1899
- Overwrite(Object3D.MATERIAL);
2670
+ Overwrite(Object3D.MATERIAL | Object3D.COLOR);
19002671 else
19012672 {
19022673 if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
....@@ -1908,13 +2679,16 @@
19082679 Overwrite(Object3D.MATERIAL | Object3D.TEXTURE);
19092680 }
19102681 }
2682
+ */
2683
+
2684
+ Overwrite(dropAttributes);
19112685 }
1912
- if (event.getSource() == overwriteGeoItem)
2686
+ if (source == overwriteGeoItem)
19132687 {
19142688 Overwrite(Object3D.GEOMETRY);
1915
-// if (/*group.selection.size() == 1 &&*/ GraphreeD.clipboard.size() == 1)
2689
+// if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
19162690 // {
1917
-// Object3D content = GraphreeD.clipboard.get(0);
2691
+// Object3D content = GrafreeD.clipboard.get(0);
19182692 //
19192693 // if (content instanceof cGroup && ((cGroup)content).transientlink )
19202694 // content = ((cGroup)content).get(0);
....@@ -1926,7 +2700,7 @@
19262700 // refreshContents();
19272701 // }
19282702 } else
1929
- if (event.getSource() == generateMeshItem)
2703
+ if (source == generateMeshItem)
19302704 {
19312705 //if (group.selection.size() == 1)
19322706 // for (int i=0; i<group.selection.size(); i++)
....@@ -1937,7 +2711,7 @@
19372711 ResetModel();
19382712 refreshContents();
19392713 } else
1940
- if (event.getSource() == extractGeometriesItem)
2714
+ if (source == extractGeometriesItem)
19412715 {
19422716 boolean one = false;
19432717
....@@ -1964,7 +2738,7 @@
19642738 ResetModel();
19652739 refreshContents();
19662740 } else
1967
- if (event.getSource() == cloneGeometriesItem)
2741
+ if (source == cloneGeometriesItem)
19682742 {
19692743 boolean one = false;
19702744
....@@ -1990,32 +2764,37 @@
19902764 ResetModel();
19912765 refreshContents();
19922766 } else
1993
- if (event.getSource() == shareGeometriesItem)
2767
+ if (source == shareGeometriesItem)
19942768 {
19952769 boolean one = false;
19962770
19972771 if (group.selection.size() == 1)
19982772 one = true;
19992773
2774
+ Object3D merge = null;
2775
+
20002776 Object3D content = new cGroup();
20012777
20022778 for (int i=0; i<group.selection.size(); i++)
20032779 {
2004
- Object3D sel = new Merge(group.selection.get(i));
2780
+ merge = new Merge(group.selection.get(i));
20052781
20062782 if (one)
2007
- makeSomething(sel, false);
2783
+ makeSomething(merge, false);
20082784 else
2009
- content.addChild(sel);
2785
+ content.addChild(merge);
20102786 }
20112787
20122788 if (!one)
2013
- makeSomething(content, false);
2014
-
2015
- ResetModel();
2016
- refreshContents();
2789
+ makeSomething(content, true);
2790
+ else
2791
+ {
2792
+ ResetModel();
2793
+ Select(merge.GetTreePath(), true, false); // unselect... false);
2794
+ refreshContents();
2795
+ }
20172796 } else
2018
- if (event.getSource() == mergeGeometriesItem)
2797
+ if (source == mergeGeometriesItem)
20192798 {
20202799 boolean one = false;
20212800
....@@ -2045,11 +2824,11 @@
20452824 ResetModel();
20462825 refreshContents();
20472826 } else
2048
- if (event.getSource() == linkverticesItem)
2827
+ if (source == linkverticesItem)
20492828 {
2050
-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
2829
+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
20512830 // {
2052
-// Object3D content = GraphreeD.clipboard.get(0);
2831
+// Object3D content = GrafreeD.clipboard.get(0);
20532832 //
20542833 // if (content instanceof cGroup && ((cGroup)content).transientlink )
20552834 // content = ((cGroup)content).get(0);
....@@ -2058,39 +2837,48 @@
20582837 // group.selection.get(0).setMasterThis(content); // should be identity
20592838 // refreshContents();
20602839 // }
2061
- if (/*group.selection.size() == 1 &&*/ GraphreeD.clipboard.size() == 1)
2840
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
20622841 {
2063
- Object3D content = GraphreeD.clipboard.get(0);
2842
+ Object3D content = Grafreed.clipboard.get(0);
20642843
20652844 if (content instanceof cGroup && ((cGroup)content).transientlink )
20662845 content = ((cGroup)content).get(0);
20672846
2068
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2847
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
20692848 for (int i=0; i<group.selection.size(); i++)
20702849 {
2071
- boolean random = CameraPane.RANDOM;
2072
- CameraPane.RANDOM = false; // parse all random nodes
2850
+ boolean random = CameraPane.SWITCH;
2851
+ CameraPane.SWITCH = false; // parse all random nodes
20732852 group.selection.get(i).linkVerticesThis(content);
20742853 // group.selection.get(i).setMasterThis(content); // should be identity
2075
- CameraPane.RANDOM = random;
2854
+ CameraPane.SWITCH = random;
20762855 }
2077
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2856
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
20782857 refreshContents();
20792858 }
20802859 } else
2081
- if (event.getSource() == resetsupportItem)
2860
+ if (source == resetsupportItem)
20822861 {
20832862 for (int i=0; i<group.selection.size(); i++)
20842863 {
2085
- boolean random = CameraPane.RANDOM;
2086
- CameraPane.RANDOM = false; // parse all random nodes
2864
+ boolean random = CameraPane.SWITCH;
2865
+ CameraPane.SWITCH = false; // parse all random nodes
20872866 group.selection.get(i).linkVerticesThis(null);
2088
- CameraPane.RANDOM = random;
2867
+ CameraPane.SWITCH = random;
20892868 }
20902869
20912870 refreshContents();
20922871 } else
2093
- if (event.getSource() == resetreferencesItem)
2872
+ if (source == relinkverticesItem)
2873
+ {
2874
+ boolean random = CameraPane.SWITCH;
2875
+ CameraPane.SWITCH = false; // parse all random nodes
2876
+ group.selection.RelinkToSupport();
2877
+ CameraPane.SWITCH = random;
2878
+
2879
+ refreshContents();
2880
+ } else
2881
+ if (source == resetreferencesItem)
20942882 {
20952883 for (int i=0; i<group.selection.size(); i++)
20962884 {
....@@ -2099,11 +2887,11 @@
20992887
21002888 refreshContents();
21012889 } else
2102
- if (event.getSource() == setMasterItem)
2890
+ if (source == setMasterItem)
21032891 {
2104
- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
2892
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21052893 {
2106
- Object3D content = GraphreeD.clipboard.get(0);
2894
+ Object3D content = Grafreed.clipboard.get(0);
21072895
21082896 if (content instanceof cGroup && ((cGroup)content).transientlink )
21092897 content = ((cGroup)content).get(0);
....@@ -2112,13 +2900,13 @@
21122900 refreshContents();
21132901 }
21142902 } else
2115
- if (event.getSource() == poseMeshItem)
2903
+ if (source == poseMeshItem)
21162904 {
21172905 if (group.selection.size() == 1)
21182906 {
2119
- if (GraphreeD.clipboard.size() == 1)
2907
+ if (Grafreed.clipboard.size() == 1)
21202908 {
2121
- Object3D content = GraphreeD.clipboard.get(0);
2909
+ Object3D content = Grafreed.clipboard.get(0);
21222910
21232911 if (content instanceof cGroup && ((cGroup)content).transientlink )
21242912 content = ((cGroup)content).get(0);
....@@ -2131,19 +2919,19 @@
21312919 }
21322920
21332921 } else
2134
- if (event.getSource() == revertMeshItem)
2922
+ if (source == revertMeshItem)
21352923 {
21362924 RevertMeshes();
21372925 } else
2138
- if (event.getSource() == resetMeshItem)
2926
+ if (source == resetAllItem)
21392927 {
21402928 ResetAll();
21412929 } else
2142
- if (event.getSource() == stepAllItem)
2930
+ if (source == stepAllItem)
21432931 {
21442932 StepAll();
21452933 } else
2146
- if (event.getSource() == clearItem) // || event.getSource() == clearButton)
2934
+ if (source == deleteItem) // || event.getSource() == clearButton)
21472935 {
21482936 //int indices[] = jList.getSelectedIndices();
21492937 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2151,42 +2939,46 @@
21512939
21522940 ClearSelection(false);
21532941 } else
2154
- if (event.getSource() == clearAllItem)
2942
+ if (source == clearAllItem)
21552943 {
21562944 ClearSelection(true);
21572945 } else
2158
- if (event.getSource() == grabItem)
2946
+ if (source == grabItem || source == groupButton)
21592947 {
2160
- group(new cGroup(), true);
2948
+ group(new cGroup(), false); // true);
21612949 } else
2162
- if (event.getSource() == frontItem)
2950
+ if (source == hideItem)
2951
+ {
2952
+ group(new HiddenObject());
2953
+ } else
2954
+ if (source == frontItem)
21632955 {
21642956 front();
21652957 } else
2166
- if (event.getSource() == backItem)
2958
+ if (source == backItem)
21672959 {
21682960 back();
21692961 } else
2170
- if (event.getSource() == cameraItem)
2962
+ if (source == cameraItem)
21712963 {
21722964 makeSomething(new Camera());
21732965 } else
2174
- if (event.getSource() == compositeItem)
2966
+ if (source == compositeItem || source == compositeButton)
21752967 {
21762968 group(new Composite());
21772969 } else
2178
- if (event.getSource() == randomItem)
2970
+ if (source == switchItem || source == switchButton)
21792971 {
21802972 RandomNode random = new RandomNode();
21812973 group(random);
21822974 if (random.size() > 0)
2183
- random.name = random.get(0).name + "Rnd";
2975
+ random.name = random.get(0).name + "Switch";
21842976 } else
2185
- if (event.getSource() == physicsItem)
2977
+ if (source == physicsItem)
21862978 {
21872979 group(new PhysicsNode());
21882980 } else
2189
- if (event.getSource() == frameselectorItem)
2981
+ if (source == frameselectorItem)
21902982 {
21912983 for (int i=0; i<group.selection.size(); i++)
21922984 {
....@@ -2198,7 +2990,7 @@
21982990 ResetModel();
21992991 refreshContents();
22002992 } else
2201
- if (event.getSource() == switchGeoItem)
2993
+ if (source == switchGeoItem)
22022994 {
22032995 for (int i=0; i<group.selection.size(); i++)
22042996 {
....@@ -2210,7 +3002,7 @@
22103002 ResetModel();
22113003 refreshContents();
22123004 } else
2213
- if (event.getSource() == switchTransfoItem)
3005
+ if (source == switchTransfoItem)
22143006 {
22153007 for (int i=0; i<group.selection.size(); i++)
22163008 {
....@@ -2222,7 +3014,7 @@
22223014 ResetModel();
22233015 refreshContents();
22243016 } else
2225
- if (event.getSource() == morphItem)
3017
+ if (source == morphItem)
22263018 {
22273019 for (int i=0; i<group.selection.size(); i++)
22283020 {
....@@ -2234,7 +3026,7 @@
22343026 ResetModel();
22353027 refreshContents();
22363028 } else
2237
- if (event.getSource() == scriptNodeItem)
3029
+ if (source == scriptNodeItem)
22383030 {
22393031 boolean atleastone = false;
22403032
....@@ -2273,195 +3065,252 @@
22733065 }
22743066 }
22753067 } else
2276
- if (event.getSource() == linkerItem)
3068
+ if (source == linkerItem)
22773069 {
22783070 group(new cLinker());
22793071 } else
2280
- if (event.getSource() == textureItem)
3072
+ if (source == textureItem || source == textureButton)
22813073 {
22823074 group(new TextureNode());
22833075 } else
2284
- if (event.getSource() == shadowXItem)
3076
+ if (source == billboardItem)
3077
+ {
3078
+ group(new BillboardNode());
3079
+ } else
3080
+ if (source == shadowXItem)
22853081 {
22863082 CastShadow(0);
22873083 } else
2288
- if (event.getSource() == shadowYItem)
3084
+ if (source == shadowYItem)
22893085 {
22903086 CastShadow(1);
22913087 } else
2292
- if (event.getSource() == shadowZItem)
3088
+ if (source == shadowZItem)
22933089 {
22943090 CastShadow(2);
22953091 } else
2296
- if (event.getSource() == ungroupItem)
3092
+ if (source == ungroupItem || source == ungroupButton)
22973093 {
2298
- ungroup();
3094
+ boolean hasRoot = false;
3095
+
3096
+ for (int i=0; i<group.selection.size(); i++)
3097
+ {
3098
+ if (group.selection.get(i) == group)
3099
+ {
3100
+ hasRoot = true;
3101
+ break;
3102
+ }
3103
+ }
3104
+
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
+ }
22993116 } else
2300
- if (event.getSource() == genUVItem)
3117
+ if (source == genUVItem)
23013118 {
23023119 GenUV();
23033120 } else
2304
- if (event.getSource() == genNormalsCADItem)
3121
+ if (source == genNormalsCADItem)
23053122 {
23063123 GenNormals(true);
23073124 } else
2308
- if (event.getSource() == genNormalsORGANItem)
3125
+ if (source == genNormalsMESHItem)
3126
+ {
3127
+ GenNormalsMESH();
3128
+ } else
3129
+ if (source == genNormalsORGANItem)
23093130 {
23103131 GenNormals(false);
23113132 } else
2312
- if (event.getSource() == stripifyItem)
3133
+ if (source == genNormalsMINEItem)
3134
+ {
3135
+ GenNormalsMINE();
3136
+ } else
3137
+ if (source == stripifyItem)
23133138 {
23143139 Stripify();
23153140 } else
2316
- if (event.getSource() == unstripifyItem)
3141
+ if (source == unstripifyItem)
23173142 {
23183143 Unstripify();
23193144 } else
2320
- if (event.getSource() == trimItem)
3145
+ if (source == trimItem)
23213146 {
23223147 Trim();
23233148 } else
2324
- if (event.getSource() == untrimItem)
3149
+ if (source == untrimItem)
23253150 {
23263151 Untrim();
23273152 } else
2328
- if (event.getSource() == clearColorsItem)
3153
+ if (source == clearColorsItem)
23293154 {
23303155 ClearColors();
23313156 } else
2332
- if (event.getSource() == clearMaterialsItem)
3157
+ if (source == clearMaterialsItem)
23333158 {
23343159 ClearMaterials();
23353160 } else
2336
- if (event.getSource() == liveleavesItem)
3161
+ if (source == liveleavesItem)
23373162 {
23383163 LiveLeaves(true);
23393164 } else
2340
- if (event.getSource() == unliveleavesItem)
3165
+ if (source == unliveleavesItem)
23413166 {
23423167 LiveLeaves(false);
23433168 } else
2344
- if (event.getSource() == supportleavesItem)
3169
+ if (source == supportleavesItem)
23453170 {
23463171 SupportLeaves(true);
23473172 } else
2348
- if (event.getSource() == unsupportleavesItem)
3173
+ if (source == unsupportleavesItem)
23493174 {
23503175 SupportLeaves(false);
23513176 } else
2352
- if (event.getSource() == hideleavesItem)
3177
+ if (source == hideleavesItem)
23533178 {
23543179 HideLeaves(true);
23553180 } else
2356
- if (event.getSource() == showleavesItem)
3181
+ if (source == showleavesItem)
23573182 {
23583183 HideLeaves(false);
23593184 } else
2360
- if (event.getSource() == markleavesItem)
3185
+ if (source == markleavesItem)
23613186 {
23623187 MarkLeaves(true);
23633188 } else
2364
- if (event.getSource() == unmarkleavesItem)
3189
+ if (source == unmarkleavesItem)
23653190 {
23663191 MarkLeaves(false);
23673192 } else
2368
- 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)
23693210 {
23703211 FlipV(true);
23713212 } else
2372
- if (event.getSource() == unflipVItem)
3213
+ if (source == unflipVItem)
23733214 {
23743215 FlipV(false);
23753216 } else
2376
- if (event.getSource() == lowTexturesItem)
3217
+ if (source == lowTexturesItem)
23773218 {
23783219 SetTexRes(0);
23793220 } else
2380
- if (event.getSource() == normalTexturesItem)
3221
+ if (source == normalTexturesItem)
23813222 {
23823223 SetTexRes(1);
23833224 } else
2384
- if (event.getSource() == highTexturesItem)
3225
+ if (source == highTexturesItem)
23853226 {
23863227 SetTexRes(2);
23873228 } else
2388
- if (event.getSource() == veryhighTexturesItem)
3229
+ if (source == veryhighTexturesItem)
23893230 {
23903231 SetTexRes(3);
23913232 } else
2392
- if (event.getSource() == maxTexturesItem)
3233
+ if (source == maxTexturesItem)
23933234 {
23943235 SetTexRes(4);
23953236 } else
2396
- if (event.getSource() == panoTexturesItem)
3237
+ if (source == panoTexturesItem)
23973238 {
23983239 SetTexRes(5);
23993240 } else
2400
- if (event.getSource() == reverseNormalsItem)
3241
+ if (source == reverseNormalsItem)
24013242 {
24023243 ReverseNormals();
24033244 } else
2404
- if (event.getSource() == parseverticesItem)
3245
+ if (source == parseverticesItem)
24053246 {
24063247 ParseVertices();
24073248 } else
2408
- if (event.getSource() == textureFieldItem)
3249
+ if (source == textureFieldItem)
24093250 {
24103251 TextureVertices();
24113252 } else
2412
- if (event.getSource() == alignItem)
3253
+ if (source == alignItem)
24133254 {
24143255 Align();
24153256 } else
2416
- if (event.getSource() == mirrorItem)
3257
+ if (source == mirrorItem)
24173258 {
24183259 MirrorPoses();
24193260 } else
2420
- if (event.getSource() == reduceMorphItem)
3261
+ if (source == reduceMorphItem)
24213262 {
24223263 MeshReduction(false);
24233264 } else
2424
- if (event.getSource() == reduce34MorphItem)
3265
+ if (source == reduce34MorphItem)
24253266 {
24263267 MeshReduction(true);
24273268 } else
2428
- if (event.getSource() == reverseTrianglesItem)
3269
+ if (source == reverseTrianglesItem)
24293270 {
24303271 ReverseTriangles();
24313272 } else
2432
- if (event.getSource() == reduceMeshItem)
3273
+ if (source == reduceMeshItem)
24333274 {
24343275 ReduceMesh(false);
24353276 } else
2436
- if (event.getSource() == reduce34MeshItem)
3277
+ if (source == reduce34MeshItem)
24373278 {
24383279 ReduceMesh(true);
24393280 } else
2440
- if (event.getSource() == increaseMeshItem)
3281
+ if (source == increaseMeshItem)
24413282 {
24423283 IncreaseMesh();
24433284 } else
2444
- if (event.getSource() == clipMeshItem)
3285
+ if (source == clipMeshItem)
24453286 {
24463287 ClipMesh();
24473288 } else
2448
- if (event.getSource() == smoothMeshItem)
3289
+ if (source == smoothMeshItem)
24493290 {
24503291 SmoothMesh();
24513292 } else
2452
- if (event.getSource() == transformgeometryItem)
3293
+ if (source == transformGeometryItem)
24533294 {
24543295 TransformGeometry();
24553296 } else
2456
- if (event.getSource() == resetTransformItem)
3297
+ if (source == transformChildrenItem)
3298
+ {
3299
+ TransformChildren();
3300
+ } else
3301
+ if (source == resetTransformItem)
24573302 {
24583303 ResetTransform();
24593304 } else
2460
- if (event.getSource() == resetCentroidItem)
3305
+ if (source == resetCentroidItem)
24613306 {
2462
- ResetCentroid();
3307
+ ResetCentroid(true);
24633308 } else
2464
- if (event.getSource() == resetParentItem)
3309
+ if (source == resetCentroidXZItem)
3310
+ {
3311
+ ResetCentroid(false);
3312
+ } else
3313
+ if (source == resetParentItem)
24653314 {
24663315 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24673316 {
....@@ -2471,7 +3320,7 @@
24713320
24723321 refreshContents();
24733322 } else
2474
- if (event.getSource() == repairParentItem)
3323
+ if (source == repairParentItem)
24753324 {
24763325 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24773326 {
....@@ -2485,7 +3334,21 @@
24853334
24863335 refreshContents();
24873336 } else
2488
- if (event.getSource() == sortbysizeItem)
3337
+ if (source == repairShadowItem)
3338
+ {
3339
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3340
+ {
3341
+ Object3D obj = (Object3D)e.nextElement();
3342
+ obj.RepairShadow();
3343
+// for (int i=0; i<obj.size(); i++)
3344
+// {
3345
+// obj.get(i).parent = obj;
3346
+// }
3347
+ }
3348
+
3349
+ refreshContents();
3350
+ } else
3351
+ if (source == sortbysizeItem)
24893352 {
24903353 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24913354 {
....@@ -2497,7 +3360,7 @@
24973360 ResetModel();
24983361 refreshContents();
24993362 } else
2500
- if (event.getSource() == sortbynameItem)
3363
+ if (source == sortbynameItem)
25013364 {
25023365 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25033366 {
....@@ -2509,7 +3372,7 @@
25093372 ResetModel();
25103373 refreshContents();
25113374 } else
2512
- if (event.getSource() == attachPigmentItem)
3375
+ if (source == attachPigmentItem)
25133376 {
25143377 String texture = GetFile("Attach pigment");
25153378 Object3D obj;
....@@ -2521,7 +3384,7 @@
25213384
25223385 refreshContents();
25233386 } else
2524
- if (event.getSource() == detachPigmentItem)
3387
+ if (source == detachPigmentItem)
25253388 {
25263389 Object3D obj;
25273390 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2532,7 +3395,7 @@
25323395
25333396 refreshContents();
25343397 } else
2535
- if (event.getSource() == attachBumpItem)
3398
+ if (source == attachBumpItem)
25363399 {
25373400 String texture = GetFile("Attach bump");
25383401 Object3D obj;
....@@ -2544,18 +3407,18 @@
25443407
25453408 refreshContents();
25463409 } else
2547
- if (event.getSource() == detachBumpItem)
3410
+ if (source == detachBumpItem)
25483411 {
25493412 Object3D obj;
25503413 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25513414 {
25523415 obj = (Object3D)e.nextElement();
2553
- obj.SetBumpTexture(null);
3416
+ obj.ResetBumpTexture();
25543417 }
25553418
25563419 refreshContents();
25573420 } else
2558
- if (event.getSource() == pigmentBumpItem)
3421
+ if (source == pigmentBumpItem)
25593422 {
25603423 Object3D obj;
25613424 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2566,158 +3429,262 @@
25663429
25673430 refreshContents();
25683431 } else
2569
- 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)
25703458 {
25713459 CameraPane.flash = true;
25723460 refreshContents();
25733461 } else
2574
- if (event.getSource() == oneButton)
3462
+ if (source == oneButton)
25753463 {
25763464 } else
2577
- if (event.getSource() == twoButton)
3465
+ if (source == twoButton)
25783466 {
25793467 radio.layout = twoButton;
3468
+
3469
+ if (CameraPane.FULLSCREEN)
3470
+ fullscreenLayout = radio.layout;
3471
+
25803472 // bug
25813473 //gridPanel.setDividerLocation(1.0);
25823474 //bigPanel.setDividerLocation(0.0);
2583
- bigThree.remove(jtp);
2584
- bigThree.remove(cameraPanel);
2585
- bigThree.remove(XYZPanel);
2586
- aWindowConstraints.gridx = 0;
2587
- aWindowConstraints.gridy = 0;
2588
- aWindowConstraints.gridwidth = 1;
2589
- // aConstraints.gridheight = 3;
2590
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591
- aWindowConstraints.weightx = 0;
2592
- aWindowConstraints.weighty = 1;
2593
- //bigThree.add(jtp, aWindowConstraints);
2594
- aWindowConstraints.weightx = 1;
2595
- aWindowConstraints.gridwidth = 3;
2596
- // aConstraints.gridheight = 3;
2597
- aWindowConstraints.gridx = 1;
2598
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599
- bigThree.add(cameraPanel, aWindowConstraints);
2600
- aWindowConstraints.weightx = 0;
2601
- aWindowConstraints.gridx = 4;
2602
- aWindowConstraints.gridwidth = 1;
2603
- // aConstraints.gridheight = 3;
2604
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605
- //bigThree.add(XYZPanel, aWindowConstraints);
2606
- 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
+
26073522 } else
2608
- if (event.getSource() == threeButton)
3523
+ if (source == threeButton)
26093524 {
26103525 radio.layout = threeButton;
2611
- bigThree.remove(jtp);
2612
- bigThree.remove(cameraPanel);
2613
- bigThree.remove(XYZPanel);
2614
- aWindowConstraints.gridx = 0;
2615
- aWindowConstraints.gridy = 0;
2616
- aWindowConstraints.gridwidth = 1;
2617
- // aConstraints.gridheight = 3;
2618
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619
- aWindowConstraints.weightx = 0;
2620
- aWindowConstraints.weighty = 1;
2621
- //bigThree.add(jtp, aWindowConstraints);
2622
- aWindowConstraints.weightx = 1;
2623
- aWindowConstraints.gridwidth = 3;
2624
- // aConstraints.gridheight = 3;
2625
- aWindowConstraints.gridx = 1;
2626
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627
- bigThree.add(cameraPanel, aWindowConstraints);
2628
- aWindowConstraints.weightx = 0;
2629
- aWindowConstraints.gridx = 4;
2630
- aWindowConstraints.gridwidth = 1;
2631
- // aConstraints.gridheight = 3;
2632
- aConstraints.fill = GridBagConstraints.VERTICAL;
2633
- bigThree.add(XYZPanel, aWindowConstraints);
2634
- 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();
26353563 } else
2636
- if (event.getSource() == fourButton)
3564
+ if (source == fourButton)
26373565 {
26383566 radio.layout = fourButton;
2639
- bigThree.remove(jtp);
2640
- bigThree.remove(cameraPanel);
2641
- bigThree.remove(XYZPanel);
2642
- aWindowConstraints.gridx = 0;
2643
- aWindowConstraints.gridy = 0;
2644
- aWindowConstraints.gridwidth = 1;
2645
- // aWindowConstraints.gridheight = 3;
2646
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647
- aWindowConstraints.weightx = 1;
2648
- aWindowConstraints.weighty = 1;
2649
- bigThree.add(jtp, aWindowConstraints);
2650
- aWindowConstraints.weightx = 1;
2651
- aWindowConstraints.gridwidth = 3;
2652
- // aConstraints.gridheight = 3;
2653
- aWindowConstraints.gridx = 1;
2654
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655
- //bigThree.add(cameraPanel, aWindowConstraints);
2656
- aWindowConstraints.weightx = 0;
2657
- aWindowConstraints.gridx = 4;
2658
- aWindowConstraints.gridwidth = 1;
2659
- // aWindowConstraints.gridheight = 3;
2660
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661
- //bigThree.add(XYZPanel, aWindowConstraints);
2662
- 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();
26633603 } else
2664
- if (event.getSource() == sixButton)
3604
+ if (source == sixButton)
26653605 {
26663606 radio.layout = sixButton;
2667
- bigThree.remove(jtp);
2668
- bigThree.remove(cameraPanel);
2669
- bigThree.remove(XYZPanel);
2670
- aWindowConstraints.gridx = 0;
2671
- aWindowConstraints.gridy = 0;
2672
- aWindowConstraints.gridwidth = 1;
2673
- // aConstraints.gridheight = 3;
2674
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675
- aWindowConstraints.weightx = 0;
2676
- aWindowConstraints.weighty = 1;
2677
- bigThree.add(jtp, aWindowConstraints);
2678
- aWindowConstraints.weightx = 1;
2679
- aWindowConstraints.gridwidth = 3;
2680
- // aWindowConstraints.gridheight = 3;
2681
- aWindowConstraints.gridx = 1;
2682
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683
- bigThree.add(cameraPanel, aWindowConstraints);
2684
- aWindowConstraints.weightx = 0;
2685
- aWindowConstraints.gridx = 4;
2686
- aWindowConstraints.gridwidth = 1;
2687
- // aWindowConstraints.gridheight = 3;
2688
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689
- //bigThree.add(XYZPanel, aConstraints);
2690
- 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();
26913644 } else
2692
- if (event.getSource() == sevenButton)
3645
+ if (source == sevenButton)
26933646 {
26943647 radio.layout = sevenButton;
2695
- bigThree.remove(jtp);
2696
- bigThree.remove(cameraPanel);
2697
- bigThree.remove(XYZPanel);
2698
- aWindowConstraints.gridx = 0;
2699
- aWindowConstraints.gridy = 0;
2700
- aWindowConstraints.gridwidth = 1;
2701
- // aWindowConstraints.gridheight = 3;
2702
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703
- aWindowConstraints.weightx = 0;
2704
- aWindowConstraints.weighty = 1;
2705
- bigThree.add(jtp, aWindowConstraints);
2706
- aWindowConstraints.weightx = 1;
2707
- aWindowConstraints.gridwidth = 3;
2708
- // aWindowConstraints.gridheight = 3;
2709
- aWindowConstraints.gridx = 1;
2710
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711
- bigThree.add(cameraPanel, aWindowConstraints);
2712
- aWindowConstraints.weightx = 0;
2713
- aWindowConstraints.gridx = 4;
2714
- aWindowConstraints.gridwidth = 1;
2715
- // aConstraints.gridheight = 3;
2716
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717
- bigThree.add(XYZPanel, aWindowConstraints);
2718
- 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();
27193686 } else
2720
- if (event.getSource() == rootButton)
3687
+ if (source == rootButton)
27213688 {
27223689 Object3D obj;
27233690 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2727,66 +3694,84 @@
27273694 EditObject(obj);
27283695 }
27293696
3697
+ cameraView.requestFocusInWindow();
27303698 refreshContents(true);
27313699 } else
2732
- if (event.getSource() == closeButton)
3700
+ if (source == closeButton)
27333701 {
27343702 //System.out.println("CLOSE: " + buttonGroup.getSelection());
27353703 cRadio ab;
27363704 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
27373705 {
27383706 ab = (cRadio)e.nextElement();
2739
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3707
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
27403708 {
3709
+ // Patch to avoid bug with transparency.
3710
+ if (!ab.hadMaterial)
3711
+ {
3712
+ ab.object.material = null;
3713
+ }
3714
+
27413715 buttonGroup.remove(ab);
27423716 radioPanel.remove(ab);
27433717
2744
- ab.GetObject().editWindow = null;
3718
+ //ab.GetObject().editWindow = null;
3719
+ ab.GetObject().manipWindow = null;
27453720 // ab.GetObject().objectUI = null; // ?????????
27463721
27473722 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
27483723 break;
27493724 }
27503725 }
3726
+
3727
+ cameraView.requestFocusInWindow();
27513728 refreshContents(true);
27523729 } else
2753
- if (event.getSource() == editItem || event.getSource() == editButton)
3730
+ if (source == editItem || source == editButton)
27543731 {
3732
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3733
+ {
3734
+ Object3D child = (Object3D)e.nextElement();
3735
+ child.pinned = true;
3736
+ }
3737
+
27553738 EditSelection(false);
27563739 } else
2757
- if (event.getSource() == uneditButton)
3740
+ if (source == uneditButton)
27583741 {
27593742 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
27603743 {
27613744 Object3D child = (Object3D)e.nextElement();
27623745 if(child.editWindow != null)
27633746 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747
+ child.pinned = false;
27643748 child.CloseUI();
27653749 listUI.remove(child);
27663750
2767
- child.editWindow = null; // ???????????
3751
+ //child.editWindow = null; // ???????????
27683752 }
2769
- objEditor.ctrlPanel.revalidate();
3753
+ objEditor.ctrlPanel.FlushUI();
27703754 //objEditor.jTree.clearSelection();
27713755 //objEditor.ResetSliders();
27723756 refreshContents(true);
27733757 } else
2774
- if (event.getSource() == clearPanelButton)
3758
+ if (source == clearPanelButton)
27753759 {
27763760 assert(copy == group);
27773761 //copy.ClearUI();
27783762 for (Object3D obj : listUI)
27793763 {
3764
+ obj.pinned = false;
27803765 obj.CloseUI();
27813766 }
27823767 listUI.clear();
27833768 refreshContents(true);
27843769 } else
2785
- if (event.getSource() == allParamsButton)
3770
+ if (source == allParamsButton)
27863771 {
27873772 assert(copy == group);
27883773
2789
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3774
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
27903775
27913776 for (Object3D obj : listUI)
27923777 {
....@@ -2803,19 +3788,19 @@
28033788
28043789 refreshContents(true);
28053790 } else
2806
- if (event.getSource() == unselectButton)
3791
+ if (source == unselectButton)
28073792 {
28083793 objEditor.jTree.clearSelection();
2809
- // ?? oct 2012 GraphreeD.clipboard.clear();
3794
+ // ?? oct 2012 GrafreeD.clipboard.clear();
28103795 objEditor.ResetSliders();
28113796 refreshContents(true);
28123797 } else
2813
- if(event.getSource() instanceof cRadio)
3798
+ if(source instanceof cRadio)
28143799 {
28153800 group.parent = keepparent;
28163801 group.attributes = 0;
28173802 //group.editWindow = null;
2818
- /*cRadio*/ radio = (cRadio)event.getSource();
3803
+ /*cRadio*/ radio = (cRadio)source;
28193804 Object3D obj = radio.GetObject();
28203805 System.out.println("Edit " + obj);
28213806 if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
....@@ -2835,7 +3820,10 @@
28353820 }
28363821
28373822 copy = group;
2838
- //CameraPane.theRenderer.object = group;
3823
+
3824
+ SetUndoStates();
3825
+
3826
+ //Globals.theRenderer.object = group;
28393827 if(!useclient)
28403828 {
28413829 cameraView.renderCamera = radio.camera;
....@@ -2844,25 +3832,52 @@
28443832 cameraView.cameras[cameraView.cameracount] = radio.camera;
28453833 cameraView.targetLookAt.set(radio.camera.lookAt);
28463834 cameraView.object = group;
2847
- cameraView.lighttouched = true;
3835
+ //cameraView.lighttouched = true;
3836
+ Globals.lighttouched = true;
28483837 topView.object = group;
28493838 frontView.object = group;
28503839 sideView.object = group;
28513840 }
2852
- group.editWindow = this;
3841
+
3842
+// fix "+" issue
3843
+ //group.editWindow = this;
3844
+ group.manipWindow = this;
3845
+
28533846 /*
28543847 currentLayout = radio.layout;
28553848 if (currentLayout == null)
28563849 currentLayout = sevenButton;
28573850 */
28583851 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);
28593859 keepparent = group.parent;
28603860 // PARENT = NULL or not???
28613861 //group.parent = null; // ROOT
28623862 //group.attributes = -1;
28633863 ResetModel();
3864
+
3865
+ cameraView.requestFocusInWindow();
28643866 refreshContents(true);
2865
- }
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
+ }
28663881 else
28673882 {
28683883 //return super.action(event, arg);
....@@ -2871,7 +3886,6 @@
28713886 }
28723887
28733888 boolean useclient = false;
2874
- cRadio radio;
28753889
28763890 void ToggleRoot()
28773891 {
....@@ -2880,7 +3894,7 @@
28803894 if (useclient)
28813895 {
28823896 cameraView.object = client;
2883
- cameraView.lighttouched = true;
3897
+ Globals.lighttouched = true;
28843898 //topView.object = client;
28853899 //frontView.object = client;
28863900 //sideView.object = client;
....@@ -2888,7 +3902,7 @@
28883902 else
28893903 {
28903904 cameraView.object = group;
2891
- cameraView.lighttouched = true;
3905
+ Globals.lighttouched = true;
28923906 //topView.object = group;
28933907 //frontView.object = group;
28943908 //sideView.object = group;
....@@ -2923,6 +3937,28 @@
29233937 refreshContents();
29243938 }
29253939
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
+ }
29263962
29273963 void ResetTransform()
29283964 {
....@@ -3035,7 +4071,7 @@
30354071 refreshContents();
30364072 }
30374073
3038
- void ResetCentroid()
4074
+ void ResetCentroid(boolean full)
30394075 {
30404076 Object3D obj;
30414077 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3050,12 +4086,16 @@
30504086 LA.matIdentity(Object3D.mat);
30514087 obj.getBounds(minima, maxima, false);
30524088 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4089
+ if (full)
4090
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
30544091 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
30554092 obj.TransformMesh(Object3D.mat);
4093
+
30564094 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4095
+ if (full)
4096
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
30584097 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4098
+
30594099 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
30604100 //Object3D.mat[3][0] = -Object3D.mat[3][0];
30614101 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3084,7 +4124,8 @@
30844124
30854125 int size = obj.MemorySize();
30864126
3087
- 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)");
30884129 }
30894130 }
30904131 catch (Exception e)
....@@ -3121,9 +4162,9 @@
31214162 obj = (Object3D)e.nextElement();
31224163
31234164 System.out.println("Object is: " + obj);
3124
- GraphreeD.AnalyzeObject(obj);
4165
+ Grafreed.AnalyzeObject(obj);
31254166 System.out.println("Boundary rep: " + obj.bRep);
3126
- GraphreeD.AnalyzeObject(obj.bRep);
4167
+ Grafreed.AnalyzeObject(obj.bRep);
31274168
31284169 // System.err.println((size/1024) + " KB is the size of " + obj);
31294170 }
....@@ -3165,6 +4206,20 @@
31654206 void GenNormals(boolean crease)
31664207 {
31674208 group.GenNormalsS(crease);
4209
+
4210
+ refreshContents();
4211
+ }
4212
+
4213
+ void GenNormalsMESH()
4214
+ {
4215
+ group.GenNormalsMeshS();
4216
+
4217
+ refreshContents();
4218
+ }
4219
+
4220
+ void GenNormalsMINE()
4221
+ {
4222
+ group.selection.GenNormalsMINE();
31684223
31694224 refreshContents();
31704225 }
....@@ -3250,7 +4305,7 @@
32504305 // LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
32514306 // LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
32524307 //
3253
-// g.add(GraphreeD.clipboard);
4308
+// g.add(GrafreeD.clipboard);
32544309 //
32554310 // buffer.add(g);
32564311 // }
....@@ -3269,8 +4324,8 @@
32694324 // nodes = new Object3D();
32704325 // vertices = new Vector<Vertex>();
32714326 //
3272
-// boolean epsequal = GraphreeD.epsequal;
3273
-// GraphreeD.epsequal = true;
4327
+// boolean epsequal = GrafreeD.epsequal;
4328
+// GrafreeD.epsequal = true;
32744329 //
32754330 // for (int i=0; i<group.selection.size(); i++)
32764331 // {
....@@ -3311,7 +4366,7 @@
33114366 // LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
33124367 // LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
33134368 //
3314
-// g.add(GraphreeD.clipboard);
4369
+// g.add(GrafreeD.clipboard);
33154370 //
33164371 // buffer.add(g);
33174372 // }
....@@ -3319,7 +4374,7 @@
33194374 // makeSomething(buffer, i==group.selection.size()-1);
33204375 // }
33214376 //
3322
-// GraphreeD.epsequal = epsequal;
4377
+// GrafreeD.epsequal = epsequal;
33234378 //
33244379 // //buffer = null;
33254380 // temprep = null;
....@@ -3330,8 +4385,8 @@
33304385
33314386 void ParseVertices()
33324387 {
3333
- boolean epsequal = GraphreeD.epsequal;
3334
- GraphreeD.epsequal = true;
4388
+ boolean epsequal = Grafreed.epsequal;
4389
+ Grafreed.epsequal = true;
33354390
33364391 for (int i=0; i<group.selection.size(); i++)
33374392 {
....@@ -3356,7 +4411,7 @@
33564411 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
33574412 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
33584413
3359
- g.add(GraphreeD.clipboard);
4414
+ g.add(Grafreed.clipboard);
33604415
33614416 buffer.add(g);
33624417 }
....@@ -3371,7 +4426,7 @@
33714426 makeSomething(buffer, i==group.selection.size()-1);
33724427 }
33734428
3374
- GraphreeD.epsequal = epsequal;
4429
+ Grafreed.epsequal = epsequal;
33754430
33764431 refreshContents();
33774432 }
....@@ -3389,7 +4444,16 @@
33894444 String pigment = Object3D.GetPigment(tex);
33904445 //String bump = Object3D.GetBump(tex);
33914446
3392
- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.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
+ }
33934457
33944458 double s = v.s;
33954459
....@@ -3416,7 +4480,7 @@
34164480 scale /= 3;
34174481
34184482 scale /= 0xFF;
3419
- scale /= 4;
4483
+ // c'est quoi ca? scale /= 4;
34204484
34214485 //v.AO = scale;
34224486
....@@ -3437,12 +4501,26 @@
34374501
34384502 void Align()
34394503 {
4504
+ if (group.selection.size() == 0)
4505
+ return;
4506
+
4507
+ cVector bbmin = new cVector();
4508
+ cVector bbmax = new cVector();
4509
+
4510
+ group.selection.get(0).getBounds(bbmin, bbmax, true);
4511
+
4512
+ double dx = bbmax.x - bbmin.x;
4513
+ double dy = bbmax.y - bbmin.y;
4514
+ double dz = bbmax.z - bbmin.z;
4515
+
4516
+ double scale = Math.sqrt(dx*dx + dy*dy + dz*dz);
4517
+
34404518 for (int i=0; i<group.selection.size(); i++)
34414519 {
34424520 Object3D obj = group.selection.get(i);
34434521
3444
- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445
- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
4522
+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
4523
+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
34464524 }
34474525
34484526 refreshContents();
....@@ -3455,7 +4533,7 @@
34554533 // ref.SaveSupports();
34564534 // Object3D par = ref.parent;
34574535 // ref.parent = null;
3458
-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
4536
+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
34594537 // ref.parent = par;
34604538 // ref.RestoreSupports();
34614539
....@@ -3463,11 +4541,11 @@
34634541
34644542 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
34654543
3466
- boolean random = CameraPane.RANDOM;
3467
- CameraPane.RANDOM = false; // parse all random nodes
4544
+ boolean random = CameraPane.SWITCH;
4545
+ CameraPane.SWITCH = false; // parse all random nodes
34684546 lowres.linkVerticesThis(null);
34694547 lowres.linkVerticesThis(sn);
3470
- CameraPane.RANDOM = random;
4548
+ CameraPane.SWITCH = random;
34714549
34724550 System.err.flush();
34734551
....@@ -3485,7 +4563,7 @@
34854563 // lowres.SaveSupports();
34864564 // par = lowres.parent;
34874565 // lowres.parent = null;
3488
-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
4566
+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
34894567 Object3D newlow = CloneObject(lowres, false);
34904568 newlow.name = sn.switchobject.get(i).name;
34914569 System.out.println(" pose#" + i + " = " + newlow);
....@@ -3507,7 +4585,7 @@
35074585 return;
35084586
35094587 Object3D poses = group.selection.get(0);
3510
- Object3D ref = GraphreeD.clipboard.get(0);
4588
+ Object3D ref = Grafreed.clipboard.get(0);
35114589
35124590 Object3D newgroup = new Object3D("Po:" + poses.name);
35134591
....@@ -3676,7 +4754,7 @@
36764754 group.selection.RelinkToSupport(); // july 2014
36774755 System.out.println("DONE.");
36784756 refreshContents();
3679
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
4757
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
36804758 }
36814759
36824760 void ReduceMesh(boolean reduction34)
....@@ -3701,20 +4779,20 @@
37014779
37024780 void ClipMesh()
37034781 {
3704
- if (/*group.selection.size() == 1 &&*/ GraphreeD.clipboard.size() == 1)
4782
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
37054783 {
3706
- Object3D content = GraphreeD.clipboard.get(0);
4784
+ Object3D content = Grafreed.clipboard.get(0);
37074785
37084786 if (content instanceof cGroup && ((cGroup)content).transientlink )
37094787 content = ((cGroup)content).get(0);
37104788
37114789 // for (int i=0; i<group.selection.size(); i++)
37124790 // {
3713
-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
4791
+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
37144792 // }
3715
- group.selection.ClipMesh(GraphreeD.clipboard);
4793
+ group.selection.ClipMesh(Grafreed.clipboard);
37164794 }
3717
-// group.selection.ClipMesh(GraphreeD.clipboard);
4795
+// group.selection.ClipMesh(GrafreeD.clipboard);
37184796 System.out.println("DONE.");
37194797 refreshContents();
37204798 }
....@@ -3759,6 +4837,18 @@
37594837 void MarkLeaves(boolean hide)
37604838 {
37614839 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);
37624852 refreshContents();
37634853 }
37644854
....@@ -3833,28 +4923,25 @@
38334923 // }
38344924 // }
38354925
3836
- static boolean allparams = true;
3837
-
3838
- static Vector<Object3D> listUI = new Vector<Object3D>();
3839
-
38404926 void EditSelection(boolean newWindow)
38414927 {
4928
+ if (group.selection == null)
4929
+ {
4930
+ EditElement(group, newWindow); // ? new
4931
+ return;
4932
+ }
4933
+
38424934 // aConstraints.gridy = 0;
38434935 for (int i=0; i<group.selection.size(); i++)
38444936 {
38454937 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
38464938 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4939
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
38484940
38494941 Object3D elem = (Object3D)group.selection.elementAt(i);
3850
- if(elem != group)
4942
+ if(elem != group || !newWindow)
38514943 {
3852
- // if (!(elem instanceof Composite))
3853
- // newWindow = false;
3854
- listUI.add(elem);
3855
- elem.openEditWindow(this, newWindow); //, false);
3856
- System.out.println("edit : " + elem);
3857
- elem.editWindow.refreshContents(true); // ? new
4944
+ EditElement(elem, newWindow); // ? new
38584945 }
38594946 }
38604947 }
....@@ -3929,7 +5016,8 @@
39295016 //new Exception().printStackTrace();
39305017
39315018 freezemodel = true;
3932
-
5019
+ ClearUnpinned();
5020
+
39335021 /**/
39345022 //switch (event.id)
39355023 {
....@@ -3937,7 +5025,6 @@
39375025 //case 702: // Event.LIST_DESELECT
39385026 group.deselectAll();
39395027 TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940
- objEditor.ClearInfo(); // .GetMaterial());
39415028 if (tps != null)
39425029 {
39435030 for (int i=0; i < tps.length; i++)
....@@ -3946,33 +5033,39 @@
39465033
39475034 //if (child.parent != null)
39485035 //child.parent.addSelectee(child);
5036
+ objEditor.SetMaterial(child);
39495037 group.addSelectee(child);
3950
- objEditor.SetMaterial(child); // .GetMaterial());
3951
- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952
- System.err.println("info : " + child.GetPath());
39535038 }
39545039 }
3955
- else
3956
- {
3957
- objEditor.SetMaterial(group); // .GetMaterial());
3958
- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959
- System.err.println("info : " + group.GetPath());
3960
- }
5040
+// else
5041
+// {
5042
+// objEditor.SetMaterial(group); // .GetMaterial());
5043
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
5044
+// System.err.println("info : " + group.GetPath());
5045
+// }
39615046
3962
- objEditor.SetText(); // jan 2014
3963
-
3964
- if (flashIt && !CameraPane.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))
39655048 CameraPane.flash = true;
39665049
3967
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5050
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
39685051 // a camera
39695052 {
3970
- CameraPane.camerachangeframe = 0; // don't refuse it
3971
- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972
- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973
- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
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
+ }
5058
+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5059
+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
39745060 }
39755061
5062
+ if (tps != null && tps.length == 1)
5063
+ {
5064
+ EditSelection(false);
5065
+ }
5066
+
5067
+ SetPinStates(tps != null && tps.length > 0);
5068
+
39765069 refreshContents();
39775070 //return true;
39785071 }
....@@ -3981,6 +5074,35 @@
39815074
39825075 freezemodel = false;
39835076 }
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
+ }
39845106
39855107 void linkSomething(Object3D thing)
39865108 {
....@@ -4052,16 +5174,19 @@
40525174 {
40535175 if (group.selection.isEmpty())
40545176 return;
4055
- GraphreeD.clipboardIsTempGroup = false;
5177
+
5178
+ Grafreed.clipboardIsTempGroup = false;
40565179 Composite tGroup = null;
40575180 if (group.selection.size() > 0) // 1)
40585181 {
40595182 tGroup = new cGroup();
4060
- GraphreeD.clipboardIsTempGroup = true;
5183
+ Grafreed.clipboardIsTempGroup = true;
40615184 }
40625185
40635186 if (cut)
40645187 {
5188
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5189
+// Save();
40655190 //int indices[] = jList.getSelectedIndices();
40665191 //for (int i = indices.length - 1; i >= 0; i--)
40675192 //jList.remove(indices[i]);
....@@ -4097,16 +5222,16 @@
40975222 //System.out.println("cut " + child);
40985223 //System.out.println("parent = " + child.parent);
40995224 // tmp.addChild(child);
4100
- if (GraphreeD.clipboardIsTempGroup)
5225
+ if (Grafreed.clipboardIsTempGroup)
41015226 tGroup.add/*Child*/(tmp);
41025227 else
4103
- GraphreeD.clipboard = tmp;
5228
+ Grafreed.clipboard = tmp;
41045229 }
41055230 else
4106
- if (GraphreeD.clipboardIsTempGroup)
5231
+ if (Grafreed.clipboardIsTempGroup)
41075232 tGroup.add/*Child*/(child);
41085233 else
4109
- GraphreeD.clipboard = child;
5234
+ Grafreed.clipboard = child;
41105235 }
41115236
41125237 //ResetModel();
....@@ -4138,21 +5263,23 @@
41385263 //System.out.println("cut " + elem);
41395264 //System.out.println("parent = " + elem.parent);
41405265 // tmp.addChild(elem);
4141
- if (GraphreeD.clipboardIsTempGroup)
5266
+ if (Grafreed.clipboardIsTempGroup)
41425267 tGroup.add/*Child*/(tmp);
41435268 else
4144
- GraphreeD.clipboard = tmp;
5269
+ Grafreed.clipboard = tmp;
41455270 }
41465271 else
4147
- if (GraphreeD.clipboardIsTempGroup)
5272
+ if (Grafreed.clipboardIsTempGroup)
41485273 tGroup.add/*Child*/(child);
41495274 else
4150
- GraphreeD.clipboard = child;
5275
+ Grafreed.clipboard = child;
41515276 }
41525277
41535278 }
4154
- if (GraphreeD.clipboardIsTempGroup)
4155
- GraphreeD.clipboard = tGroup;
5279
+
5280
+ if (Grafreed.clipboardIsTempGroup)
5281
+ Grafreed.clipboard = tGroup;
5282
+
41565283 if (cut)
41575284 {
41585285 ResetModel();
....@@ -4162,11 +5289,15 @@
41625289
41635290 void paste(boolean expand)
41645291 {
4165
- // if (GraphreeD.clipboard == null)
5292
+ if (Globals.REPLACEONMAKE)
5293
+ Save();
5294
+ boolean keep = Globals.REPLACEONMAKE;
5295
+ Globals.REPLACEONMAKE = false;
5296
+ // if (GrafreeD.clipboard == null)
41665297 // return;
41675298 boolean first = true;
41685299
4169
- if (GraphreeD.clipboardIsTempGroup)
5300
+ if (Grafreed.clipboardIsTempGroup)
41705301 {
41715302 Composite temp;
41725303
....@@ -4177,7 +5308,7 @@
41775308 temp = (Composite)Applet3D.clipboard.deepCopy();
41785309 */
41795310 Object3D elem;
4180
- for (Enumeration e = /*temp.children*/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
5311
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
41815312 {
41825313 Object3D child = (Object3D)e.nextElement();
41835314
....@@ -4191,7 +5322,7 @@
41915322 else
41925323 elem = child.deepCopy(); // ?
41935324 child.parent = keepparent;
4194
- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
5325
+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
41955326 // elem = elem.get(0);
41965327 makeSomething(elem, true); // ?? first);
41975328 //group.addChild(elem);
....@@ -4211,23 +5342,24 @@
42115342 //Object3D cb = Applet3D.clipboard;
42125343 //temp.addChild(cb);
42135344 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214
- assert(GraphreeD.clipboard.parent == null);
4215
- Object3D /*Composite*/ keepparent = GraphreeD.clipboard.get(0).parent;
4216
- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217
- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218
- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.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());
42195350 else
4220
- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221
- GraphreeD.clipboard.get(0).parent = keepparent;
5351
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5352
+ Grafreed.clipboard.get(0).parent = keepparent;
42225353 }
42235354
5355
+ Globals.REPLACEONMAKE = keep;
42245356 ResetModel();
42255357 refreshContents();
42265358 }
42275359
4228
- void pasteInto(boolean copyit)
5360
+ void pasteInto(boolean copyit, boolean clone)
42295361 {
4230
-// if (GraphreeD.clipboard == null)
5362
+// if (GrafreeD.clipboard == null)
42315363 // return;
42325364
42335365 if (group.selection.size() != 1)
....@@ -4254,15 +5386,22 @@
42545386 if (copyit)
42555387 {
42565388 // paste(false);
4257
- CloneClipboard(false); // sept 2014
5389
+ if (clone)
5390
+ {
5391
+ CloneClipboard(false); // sept 2014
5392
+ }
5393
+ else
5394
+ {
5395
+ paste(false);
5396
+ }
42585397 }
42595398 else
42605399 {
42615400 boolean first = true;
42625401
4263
- if (GraphreeD.clipboardIsTempGroup)
5402
+ if (Grafreed.clipboardIsTempGroup)
42645403 {
4265
- Composite temp = (Composite)GraphreeD.clipboard;
5404
+ Composite temp = (Composite)Grafreed.clipboard;
42665405 Object3D copy;
42675406 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
42685407 {
....@@ -4272,7 +5411,7 @@
42725411 }
42735412 } else
42745413 {
4275
- linkSomething(GraphreeD.clipboard); //.get(0));
5414
+ linkSomething(Grafreed.clipboard); //.get(0));
42765415 }
42775416 }
42785417 }
....@@ -4349,6 +5488,10 @@
43495488
43505489 void group(Object3D csg, boolean grab)
43515490 {
5491
+ if (Globals.REPLACEONMAKE)
5492
+ Save();
5493
+ boolean keep = Globals.REPLACEONMAKE;
5494
+ Globals.REPLACEONMAKE = false;
43525495 if (//false) // why??
43535496 !group.selection.isEmpty())
43545497 {
....@@ -4462,8 +5605,34 @@
44625605 //node.add(csg);
44635606 //makeSomething(node);
44645607 makeSomething(csg);
5608
+ Globals.REPLACEONMAKE = keep;
44655609 }
44665610
5611
+ void Ungroup(Object3D g)
5612
+ {
5613
+ if (Globals.REPLACEONMAKE)
5614
+ Save();
5615
+ boolean keep = Globals.REPLACEONMAKE;
5616
+ Globals.REPLACEONMAKE = false;
5617
+ if (g instanceof HiddenObject)
5618
+ {
5619
+ HiddenObject h = (HiddenObject) g;
5620
+
5621
+ for (int i=0; i<h.ActualSize(); i++)
5622
+ {
5623
+ objEditor.makeSomething(h.get(i), false);
5624
+ }
5625
+ }
5626
+ else
5627
+ {
5628
+ for (int i=0; i<g.Size(); i++)
5629
+ {
5630
+ objEditor.makeSomething(g.get(i), false);
5631
+ }
5632
+ }
5633
+ Globals.REPLACEONMAKE = keep;
5634
+ }
5635
+
44675636 void ungroup()
44685637 {
44695638 /*
....@@ -4657,21 +5826,6 @@
46575826 }
46585827 */
46595828
4660
- void ImportGFD()
4661
- {
4662
- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663
- browser.show();
4664
- String filename = browser.getFile();
4665
- if (filename != null && filename.length() > 0)
4666
- {
4667
- String fullname = browser.getDirectory() + filename;
4668
-
4669
- //Object3D readobj =
4670
- objEditor.ReadGFD(fullname, objEditor);
4671
- //makeSomething(readobj);
4672
- }
4673
- }
4674
-
46755829 /*
46765830 public void Callback(Object obj)
46775831 {
....@@ -4695,26 +5849,9 @@
46955849 }
46965850 */
46975851
4698
- void ImportVRMLX3D()
4699
- {
4700
- if (GraphreeD.standAlone)
4701
- {
4702
- /**/
4703
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704
- browser.show();
4705
- String filename = browser.getFile();
4706
- if (filename != null && filename.length() > 0)
4707
- {
4708
- String fullname = browser.getDirectory() + filename;
4709
- LoadVRMLX3D(fullname);
4710
- }
4711
- /**/
4712
- }
4713
- }
4714
-
47155852 String GetFile(String dialogName)
47165853 {
4717
- if (GraphreeD.standAlone)
5854
+ if (Grafreed.standAlone)
47185855 {
47195856 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
47205857 browser.show();
....@@ -4778,10 +5915,49 @@
47785915 cButton flashSelectionButton;
47795916 cButton editButton;
47805917 cButton uneditButton;
5918
+ JCheckBox allParamsButton;
47815919 cButton clearpanelButton;
4782
- cButton allParamsButton;
47835920 cButton unselectButton;
47845921
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
+
47855961 cButton screenfitButton;
47865962 cButton screenfitpointButton;
47875963 cButton snapobjectButton;
....@@ -4793,14 +5969,6 @@
47935969
47945970 cButton setsupportButton;
47955971
4796
- cButton twoButton;
4797
- cButton sixButton;
4798
- cButton threeButton;
4799
- cButton sevenButton;
4800
- cButton fourButton; // full panel
4801
- cButton oneButton; // full XYZ
4802
- //cButton currentLayout;
4803
-
48045972 //
48055973 //Composite
48065974 Object3D // to do !!
....@@ -4810,9 +5978,11 @@
48105978 //JTree jTree;
48115979 private MenuItem lookAtItem;
48125980 private MenuItem lookFromItem;
4813
- private MenuItem switchItem;
5981
+ private MenuItem switchViewItem;
48145982 private MenuItem cutItem;
4815
- private MenuItem duplicateItem;
5983
+ private MenuItem undoItem;
5984
+ private MenuItem redoItem;
5985
+ private JMenuItem duplicateItem;
48165986 private MenuItem cloneItem;
48175987 private MenuItem cloneSupportItem;
48185988 private MenuItem overwriteGeoItem;
....@@ -4823,8 +5993,9 @@
48235993 private MenuItem resetsupportItem;
48245994 private MenuItem resetreferencesItem;
48255995 private MenuItem linkverticesItem;
5996
+ private MenuItem relinkverticesItem;
48265997 private MenuItem setMasterItem;
4827
- private MenuItem resetMeshItem;
5998
+ private MenuItem resetAllItem;
48285999 private MenuItem stepAllItem;
48296000 private MenuItem revertMeshItem;
48306001 private MenuItem poseMeshItem;
....@@ -4835,14 +6006,17 @@
48356006 private MenuItem mergeGeometriesItem;
48366007 private MenuItem copyItem;
48376008 private MenuItem pasteItem;
6009
+ private MenuItem pasteIntoItem;
48386010 private MenuItem pasteLinkItem;
48396011 private MenuItem pasteCloneItem;
48406012 private MenuItem pasteExpandItem;
4841
- private MenuItem clearItem;
6013
+ private MenuItem deleteItem;
48426014 private MenuItem clearAllItem;
48436015 private MenuItem genUVItem;
6016
+ private MenuItem genNormalsMESHItem;
48446017 private MenuItem genNormalsCADItem;
48456018 private MenuItem genNormalsORGANItem;
6019
+ private MenuItem genNormalsMINEItem;
48466020 private MenuItem stripifyItem;
48476021 private MenuItem unstripifyItem;
48486022 private MenuItem trimItem;
....@@ -4871,6 +6045,10 @@
48716045 private MenuItem showleavesItem;
48726046 private MenuItem markleavesItem;
48736047 private MenuItem unmarkleavesItem;
6048
+ private MenuItem rewindleavesItem;
6049
+ private MenuItem unrewindleavesItem;
6050
+ private MenuItem randomleavesItem;
6051
+ private MenuItem unrandomleavesItem;
48746052
48756053 private MenuItem flipVItem;
48766054 private MenuItem unflipVItem;
....@@ -4882,14 +6060,17 @@
48826060 private MenuItem panoTexturesItem;
48836061
48846062 private MenuItem resetCentroidItem;
4885
- private MenuItem transformgeometryItem;
6063
+ private MenuItem resetCentroidXZItem;
48866064 private MenuItem resetTransformItem;
6065
+ private MenuItem transformGeometryItem;
6066
+ private MenuItem transformChildrenItem;
6067
+ private MenuItem hideItem;
48876068 private MenuItem grabItem;
48886069 private MenuItem backItem;
48896070 private MenuItem frontItem;
48906071 private MenuItem cameraItem;
48916072 private MenuItem compositeItem;
4892
- private MenuItem randomItem;
6073
+ private MenuItem switchItem;
48936074 private MenuItem physicsItem;
48946075 private MenuItem frameselectorItem;
48956076 private MenuItem scriptNodeItem;
....@@ -4904,6 +6085,7 @@
49046085
49056086 private MenuItem resetParentItem;
49066087 private MenuItem repairParentItem;
6088
+ private MenuItem repairShadowItem;
49076089 private MenuItem sortbysizeItem;
49086090 private MenuItem sortbynameItem;
49096091
....@@ -4912,6 +6094,8 @@
49126094 private MenuItem attachBumpItem;
49136095 private MenuItem detachBumpItem;
49146096 private MenuItem pigmentBumpItem;
6097
+ private MenuItem embedTexturesItem;
6098
+ private MenuItem deEmbedTexturesItem;
49156099
49166100 private MenuItem particleItem;
49176101 private MenuItem ragdollItem;
....@@ -4924,10 +6108,11 @@
49246108 private MenuItem coneItem;
49256109 private MenuItem torusItem;
49266110 private MenuItem superItem;
6111
+ private MenuItem kleinItem;
49276112 private MenuItem blobItem;
49286113 private MenuItem latheItem;
49296114 private MenuItem bezierItem;
4930
- private MenuItem checkerItem;
6115
+ private MenuItem overlayItem;
49316116 private MenuItem meshItem;
49326117 // private MenuItem meshGroupItem;
49336118 private MenuItem springItem;
....@@ -4936,6 +6121,7 @@
49366121 private MenuItem csgItem;
49376122 private MenuItem templateItem;
49386123 private MenuItem textureItem;
6124
+ private MenuItem billboardItem;
49396125 private MenuItem shadowXItem;
49406126 private MenuItem shadowYItem;
49416127 private MenuItem shadowZItem;
....@@ -4948,11 +6134,6 @@
49486134 private MenuItem doubleItem;
49496135 private MenuItem tripleItem;
49506136
4951
- private MenuItem importGFDItem;
4952
- private MenuItem importVRMLX3DItem;
4953
- private MenuItem import3DSItem;
4954
- private MenuItem importOBJItem;
4955
-
49566137 private MenuItem computeAOItem;
49576138 private MenuItem recompileItem;
49586139 private MenuItem editScriptItem;
....@@ -4962,4 +6143,8 @@
49626143 private MenuItem analyzeItem;
49636144 private MenuItem dumpItem;
49646145 //boolean freezemodel = false;
6146
+
6147
+ Menu cameraMenu;
6148
+ MenuItem editCameraItem;
6149
+ MenuItem restoreCameraItem;
49656150 }