Normand Briere
2019-07-28 d7fd07756f4095cb87dc25d89fcffcbda092e2cf
GroupEditor.java
....@@ -23,6 +23,237 @@
2323 DragGestureListener, DragSourceListener, DropTargetListener,
2424 ItemListener // ListSelectionListener
2525 {
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
+
26257 //ObjEditor objEditor;
27258 public void closeUI2()
28259 {
....@@ -60,6 +291,12 @@
60291 this.copy = this.group = group;
61292 //selectees = this.group.selectees;
62293
294
+ if (copy.versions == null)
295
+ {
296
+ copy.versions = new byte[100][];
297
+ copy.versionindex = -1;
298
+ }
299
+
63300 if(ui)
64301 SetupUI(objEditor);
65302 }
....@@ -74,16 +311,28 @@
74311 this.copy = this.group = copy;
75312 //selectees = this.group.selectees;
76313
77
- SetupMenu2(objEditor);
314
+ SetupMenu2(this); //objEditor);
78315 SetupUI2(objEditor);
79316 objEditor.SetupUI(true);
80317 SetupViews(objEditor);
81318
82319 ((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
+ }
83328 }
84329
85330 void CloneSelection(boolean supports)
86331 {
332
+ if (Globals.REPLACEONMAKE)
333
+ Save();
334
+ boolean keep = Globals.REPLACEONMAKE;
335
+ Globals.REPLACEONMAKE = false;
87336 // Object3D keep = GrafreeD.clipboard;
88337 //Object3D obj;
89338 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,18 +343,19 @@
94343
95344 makeSomething(clone, i==group.selection.size()-1);
96345 }
346
+ Globals.REPLACEONMAKE = keep;
97347 }
98348
99349 void CloneClipboard(boolean supports)
100350 {
101
- assert(GrafreeD.clipboard.parent == null);
102
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
103
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105
- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
351
+ assert(Grafreed.clipboard.parent == null);
352
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
353
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
354
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
355
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106356 else
107
- makeSomething(CloneObject(GrafreeD.clipboard, false));
108
- GrafreeD.clipboard.get(0).parent = keepparent;
357
+ makeSomething(CloneObject(Grafreed.clipboard, false));
358
+ Grafreed.clipboard.get(0).parent = keepparent;
109359 }
110360
111361 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -119,7 +369,7 @@
119369 // obj.support = null;
120370 if (!supports)
121371 obj.SaveSupports();
122
- Object3D clone = (Object3D)GrafreeD.clone(obj);
372
+ Object3D clone = (Object3D)Grafreed.clone(obj);
123373 obj.parent = parent;
124374 // obj.support = support;
125375 // clone.support = support; // aout 2013
....@@ -148,30 +398,29 @@
148398
149399 //JTextField nameField;
150400
151
- void SetupMenu2(ObjEditor oe)
401
+ void SetupMenu2(GroupEditor oe)
152402 {
153
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157
- oe.cameraMenu.add("-");
158
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159
- openWindowItem.addActionListener(this);
160
- editLeafItem.addActionListener(this);
161
- lookAtItem.addActionListener(this);
162
- //lookFromItem.addActinoListener(this);
163
- //switchItem.addActionListener(this);
403
+ oe.jTree = new cTree();
404
+
164405 Menu menu;
165406 oe.menuBar.add(menu = new Menu("Edit"));
166407 //editItem = menu.add(new MenuItem("Edit"));
167408 //editItem.addActionListener(this);
168
- 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"));
169416 duplicateItem.addActionListener(this);
170
- menu.add("-");
171417 cloneItem = menu.add(new MenuItem("Clone"));
172418 cloneItem.addActionListener(this);
419
+ if (Globals.ADVANCED)
420
+ {
173421 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174422 cloneSupportItem.addActionListener(this);
423
+ }
175424 menu.add("-");
176425 cutItem = menu.add(new MenuItem("Cut"));
177426 cutItem.addActionListener(this);
....@@ -179,27 +428,123 @@
179428 copyItem.addActionListener(this);
180429 pasteItem = menu.add(new MenuItem("Paste"));
181430 pasteItem.addActionListener(this);
431
+
432
+ menu.add("-");
433
+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
434
+ pasteIntoItem.addActionListener(this);
182435 pasteLinkItem = menu.add(new MenuItem("Paste link"));
183436 pasteLinkItem.addActionListener(this);
184437 pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185438 pasteCloneItem.addActionListener(this);
186439 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187440 // pasteExpandItem.addActionListener(this);
188
- clearItem = menu.add(new MenuItem("Clear"));
189
- 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...
190448 clearAllItem = menu.add(new MenuItem("Clear All"));
191449 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());
192487
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
+
193539 oe.menuBar.add(menu = new Menu("Setting"));
194
- resetMeshItem = menu.add(new MenuItem("Reset All"));
195
- resetMeshItem.addActionListener(this);
196
- stepAllItem = menu.add(new MenuItem("Step All"));
197
- stepAllItem.addActionListener(this);
540
+ if (Globals.ADVANCED)
541
+ {
198542 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199543 revertMeshItem.addActionListener(this);
200544 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201545 resetreferencesItem.addActionListener(this);
202546 menu.add("-");
547
+ }
203548 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204549 overwriteGeoItem.addActionListener(this);
205550 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -211,79 +556,104 @@
211556 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212557 overwriteUVItem.addActionListener(this);
213558 menu.add("-");
559
+ if (Globals.ADVANCED)
560
+ {
214561 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215562 generateMeshItem.addActionListener(this);
216563 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217564 poseMeshItem.addActionListener(this);
218565 menu.add("-");
566
+ }
219567 resetsupportItem = menu.add(new MenuItem("Reset support"));
220568 resetsupportItem.addActionListener(this);
221569 linkverticesItem = menu.add(new MenuItem("Link to Support"));
222570 linkverticesItem.addActionListener(this);
223571 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224572 relinkverticesItem.addActionListener(this);
573
+
574
+ if (Globals.ADVANCED)
575
+ {
225576 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226577 setMasterItem.addActionListener(this);
578
+ }
227579
228580 oe.menuBar.add(menu = new Menu("Group"));
229
- grabItem = menu.add(new MenuItem("Grab"));
230
- grabItem.addActionListener(this);
581
+// grabItem = menu.add(new MenuItem("Grab"));
582
+// grabItem.addActionListener(this);
231583 backItem = menu.add(new MenuItem("Back"));
232584 backItem.addActionListener(this);
233585 frontItem = menu.add(new MenuItem("Front"));
234586 frontItem.addActionListener(this);
235
- compositeItem = menu.add(new MenuItem("Composite"));
236
- compositeItem.addActionListener(this);
237
- hideItem = menu.add(new MenuItem("Hide"));
587
+// compositeItem = menu.add(new MenuItem("Composite"));
588
+// compositeItem.addActionListener(this);
589
+
590
+ if (Globals.ADVANCED)
591
+ {
592
+ hideItem = menu.add(new MenuItem("Hidden Group"));
238593 hideItem.addActionListener(this);
594
+ }
239595 ungroupItem = menu.add(new MenuItem("Ungroup"));
240596 ungroupItem.addActionListener(this);
241
- menu.add("-");
242
- randomItem = menu.add(new MenuItem("Random"));
243
- randomItem.addActionListener(this);
244
- physicsItem = menu.add(new MenuItem("Physics"));
245
- physicsItem.addActionListener(this);
246
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247
- frameselectorItem.addActionListener(this);
597
+
598
+// menu.add("-");
599
+//
600
+// switchItem = menu.add(new MenuItem("Switch node"));
601
+// switchItem.addActionListener(this);
602
+ if (Globals.ADVANCED)
603
+ {
248604 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249605 switchGeoItem.addActionListener(this);
250606 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251607 switchTransfoItem.addActionListener(this);
252
- morphItem = menu.add(new MenuItem("Morph"));
608
+ morphItem = menu.add(new MenuItem("Morph Group"));
253609 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);
254616 scriptNodeItem = menu.add(new MenuItem("Script Node"));
255617 scriptNodeItem.addActionListener(this);
256
- cameraItem = menu.add(new MenuItem("Camera"));
257
- cameraItem.addActionListener(this);
618
+ }
258619
259620 oe.menuBar.add(menu = new Menu("Object"));
260
- textureItem = menu.add(new MenuItem("Texture"));
261
- textureItem.addActionListener(this);
621
+// textureItem = menu.add(new MenuItem("Texture"));
622
+// textureItem.addActionListener(this);
262623 billboardItem = menu.add(new MenuItem("Billboard"));
263624 billboardItem.addActionListener(this);
264625 csgItem = menu.add(new MenuItem("CSG"));
265626 csgItem.addActionListener(this);
266
- shadowXItem = menu.add(new MenuItem("Shadow X"));
627
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267628 shadowXItem.addActionListener(this);
268
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
629
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269630 shadowYItem.addActionListener(this);
270
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
631
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271632 shadowZItem.addActionListener(this);
633
+ attributeItem = menu.add(new MenuItem("Attribute"));
634
+ attributeItem.addActionListener(this);
635
+
636
+ if (Globals.ADVANCED)
637
+ {
638
+ menu.add("-");
272639 linkerItem = menu.add(new MenuItem("Linker"));
273640 linkerItem.addActionListener(this);
274641 templateItem = menu.add(new MenuItem("Template"));
275642 templateItem.addActionListener(this);
276
- attributeItem = menu.add(new MenuItem("Attribute"));
277
- attributeItem.addActionListener(this);
278643 pointflowItem = menu.add(new MenuItem("Point Flow"));
279644 pointflowItem.addActionListener(this);
645
+ }
280646 menu.add("-");
281647 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282648 resetTransformItem.addActionListener(this);
283649 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284650 resetCentroidItem.addActionListener(this);
285
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
- transformgeometryItem.addActionListener(this);
651
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
652
+ resetCentroidXZItem.addActionListener(this);
653
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
654
+ transformGeometryItem.addActionListener(this);
655
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
656
+ transformChildrenItem.addActionListener(this);
287657
288658 oe.menuBar.add(menu = new Menu("Geometry"));
289659 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -294,8 +664,11 @@
294664 genNormalsCADItem.addActionListener(this);
295665 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296666 genNormalsMESHItem.addActionListener(this);
297
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
667
+ if (Globals.ADVANCED)
668
+ {
669
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298670 genNormalsMINEItem.addActionListener(this);
671
+ }
299672 stripifyItem = menu.add(new MenuItem("Stripify"));
300673 stripifyItem.addActionListener(this);
301674 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -317,23 +690,34 @@
317690 reduce34MeshItem.addActionListener(this);
318691 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319692 increaseMeshItem.addActionListener(this);
320
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
- smoothMeshItem.addActionListener(this);
322693 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323694 clipMeshItem.addActionListener(this);
695
+
696
+ if (Globals.ADVANCED)
697
+ {
698
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
699
+ smoothMeshItem.addActionListener(this);
700
+ }
324701
325702 oe.menuBar.add(menu = new Menu("Attributes"));
326703 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327704 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);
328709 menu.add("-");
329710 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330711 liveleavesItem.addActionListener(this);
331712 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332713 unliveleavesItem.addActionListener(this);
714
+ if (Globals.ADVANCED)
715
+ {
333716 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334717 supportleavesItem.addActionListener(this);
335718 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336719 unsupportleavesItem.addActionListener(this);
720
+ }
337721 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338722 hideleavesItem.addActionListener(this);
339723 showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -342,6 +726,14 @@
342726 markleavesItem.addActionListener(this);
343727 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344728 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);
345737 menu.add("-");
346738 flipVItem = menu.add(new MenuItem("Flip V"));
347739 flipVItem.addActionListener(this);
....@@ -367,45 +759,56 @@
367759 attachBumpItem.addActionListener(this);
368760 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369761 pigmentBumpItem.addActionListener(this);
762
+ //embedTexturesItem
370763 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371764 detachPigmentItem.addActionListener(this);
372765 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373766 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);
374771 menu.add("-");
375772 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376773 sortbysizeItem.addActionListener(this);
377774 sortbynameItem = menu.add(new MenuItem("Sort by name"));
378775 sortbynameItem.addActionListener(this);
379776 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.
380784 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381785 extractGeometriesItem.addActionListener(this);
382786 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383787 cloneGeometriesItem.addActionListener(this);
384
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385
- shareGeometriesItem.addActionListener(this);
386
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387
- mergeGeometriesItem.addActionListener(this);
788
+ }
388789
389790 oe.menuBar.add(menu = new Menu("Insert"));
390791 buildCreateMenu(menu);
391792
392
-
393
- oe.menuBar.add(menu = new Menu("Include"));
394
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395
- importGFDItem.addActionListener(this);
396
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397
- importVRMLX3DItem.addActionListener(this);
398
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399
- importOBJItem.addActionListener(this);
400
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401
- import3DSItem.addActionListener(this);
402
-
403793 oe.menuBar.add(menu = new Menu("Tools"));
404794 buildToolsMenu(menu);
405795 }
406796
797
+
407798 void SetupUI2(ObjEditor oe)
408799 {
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
+
409812 //new Exception().printStackTrace();
410813
411814 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -434,92 +837,237 @@
434837 oe.radioPanel.add(dummyButton);
435838 oe.buttonGroup.add(dummyButton);
436839 */
840
+ cGridBag copyOptionsPanel = new cGridBag();
841
+
842
+ copyOptionsPanel.preferredHeight = 2;
843
+
437844 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438845
439
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440
- liveCB.setToolTipText("Enabled animation");
441
- liveCB.addItemListener(this);
442
-
443
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444
- trackCB.setToolTipText("Enable tracking");
445
- trackCB.addItemListener(this);
446
-
447
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
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);
448862 screenfitButton.setToolTipText("Screen fit");
449863 screenfitButton.addActionListener(this);
450864
865
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
866
+ restoreCameraButton.setToolTipText("Restore viewpoint");
867
+ restoreCameraButton.addActionListener(this);
868
+
869
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870
+ saveButton.setToolTipText("New version");
871
+ saveButton.addActionListener(this);
872
+
873
+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
874
+ undoButton.setToolTipText("Previous version");
875
+ undoButton.addActionListener(this);
876
+ undoButton.setEnabled(false);
877
+
878
+ cGridBag updown = new cGridBag().setVertical(true);
879
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880
+ restoreButton.setToolTipText("Restore current");
881
+ restoreButton.addActionListener(this);
882
+ restoreButton.setEnabled(false);
883
+
884
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885
+ replaceButton.setToolTipText("Replace current");
886
+ replaceButton.addActionListener(this);
887
+ replaceButton.setEnabled(false);
888
+
889
+ copyOptionsPanel.add(updown);
890
+
891
+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
892
+ redoButton.setToolTipText("Next version");
893
+ redoButton.addActionListener(this);
894
+ redoButton.setEnabled(false);
895
+
896
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897
+ liveCB.setToolTipText("Enable animation");
898
+ liveCB.addItemListener(this);
899
+
900
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
901
+ oneStepButton.setToolTipText("Animate one step forward");
902
+ oneStepButton.addActionListener(this);
903
+
904
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
905
+ fastCB.setToolTipText("Fast mode");
906
+ fastCB.addItemListener(this);
907
+
908
+ //oe.toolboxPanel.Return();
909
+
910
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
911
+// trackCB.setToolTipText("Enable tracking");
912
+// trackCB.addItemListener(this);
913
+
451914 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452915 // screenfitpointButton.addActionListener(this);
453
-// oe.aConstraints.gridx += 1;
454
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
- snapobjectButton.addActionListener(this);
456
- snapobjectButton.setToolTipText("Snap Object");
457
- oe.aConstraints.gridx += 1;
458916
459
- //aConstraints.gridx = 0;
460
- //aConstraints.gridy += 1;
461
- oe.aConstraints.weighty = 0;
462
- oe.aConstraints.gridwidth = 1;
463
-
464
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465
- flashSelectionButton.setToolTipText("Show selection");
466
- flashSelectionButton.addActionListener(this);
467
-
468
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469
-
470
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471
- twoButton.setToolTipText("Show center view only");
472
- twoButton.addActionListener(this);
473
- oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, 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);
474924 fourButton.addActionListener(this);
475
- fourButton.setToolTipText("Show left panel only");
476
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
477
- sixButton.setToolTipText("2-column layout left");
478
- sixButton.addActionListener(this);
479
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
480
- threeButton.setToolTipText("2-column layout right");
925
+ fourButton.setToolTipText("Show control panel only");
926
+ }
927
+
928
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
929
+
930
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
+ twoButton.setToolTipText("Show 3D view only");
932
+ twoButton.addActionListener(this);
933
+ this.fullscreenLayout = twoButton;
934
+
935
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
936
+ threeButton.setToolTipText("Show controls and 3D view");
481937 threeButton.addActionListener(this);
482
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483
- sevenButton.setToolTipText("3-column layout");
484
- 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);
485944 //
486945
487
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
- rootButton.setToolTipText("Edit selection in new tab");
946
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
947
+ rootButton.setToolTipText("Open selection in new tab");
489948 rootButton.addActionListener(this);
490949
491
- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
950
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492951 closeButton.setToolTipText("Close tab");
493952 closeButton.addActionListener(this);
494953 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495954 //clearButton.addActionListener(this);
496
-
497
- cGridBag commandsPanel = new cGridBag();
955
+
956
+ cGridBag row1 = new cGridBag();
498957
499
- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
500
- editButton.setToolTipText("Edit selection");
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");
5011044 editButton.addActionListener(this);
5021045
503
- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504
- uneditButton.setToolTipText("Unedit selection");
1046
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
+ uneditButton.setToolTipText("Remove selection controls");
5051048 uneditButton.addActionListener(this);
5061049
507
- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
1050
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051
+ allParamsButton.setToolTipText("Show all controle");
1052
+ allParamsButton.addActionListener(this);
1053
+
1054
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5081055 clearPanelButton.setToolTipText("Clear edit panel");
5091056 clearPanelButton.addActionListener(this);
5101057
511
- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512
- allParamsButton.setToolTipText("All params??");
513
- allParamsButton.addActionListener(this);
514
-
515
- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
1058
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5161059 unselectButton.setToolTipText("Unselect");
5171060 unselectButton.addActionListener(this);
5181061
519
- commandsPanel.preferredHeight = 1;
1062
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
+ flashSelectionButton.setToolTipText("Highlight selection");
1064
+ flashSelectionButton.addActionListener(this);
5201065
521
- oe.treePanel.add(commandsPanel);
522
- oe.treePanel.Return();
1066
+ editCommandsPanel.preferredHeight = 1;
1067
+
1068
+ SetPinStates(false);
1069
+// oe.treePanel.add(commandsPanel);
1070
+// oe.treePanel.Return();
5231071
5241072 // oe.aConstraints.gridx += 1;
5251073 // oe.aConstraints.weighty = 0;
....@@ -536,32 +1084,20 @@
5361084
5371085 JScrollPane jSP;
5381086 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
539
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1087
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
5401088 ResetModel();
5411089
5421090 oe.treePanel.add(jSPPanel);
5431091 oe.treePanel.Return();
5441092
545
- cGridBag copyOptionsPanel = new cGridBag();
546
-
547
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
548
- colorCB.setToolTipText("Copy color when dropped");
549
- colorCB.addItemListener(this);
550
-
551
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
552
- materialCB.setToolTipText("Copy material when dropped");
553
- materialCB.addItemListener(this);
554
-
555
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
556
- textureCB.setToolTipText("Copy texture when dropped");
557
- textureCB.addItemListener(this);
558
-
559
- copyOptionsPanel.preferredHeight = 1;
5601093 oe.treePanel.add(copyOptionsPanel);
5611094 oe.treePanel.Return();
1095
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1096
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1097
+ sliderPane.preferredHeight = 1;
5621098
563
-// mainPanel.setDividerLocation(0.5); //1.0);
564
-// mainPanel.setResizeWeight(0.5);
1099
+// mainPanel.setDividerLocation(0.1); //1.0);
1100
+ mainPanel.setResizeWeight(0.4);
5651101
5661102 //jList.addListSelectionListener(this);
5671103 oe.jTree.addTreeSelectionListener(this);
....@@ -569,7 +1105,7 @@
5691105 //jTree.setEditable(true);
5701106 oe.jTree.setDragEnabled(true);
5711107 //jTree.setPreferredSize(new Dimension(10,10));
572
- jSP.setPreferredSize(new Dimension(100,200));
1108
+ //jSP.setPreferredSize(new Dimension(100,200));
5731109
5741110 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
5751111
....@@ -581,53 +1117,67 @@
5811117 dgr.addDragGestureListener(this);
5821118 }catch(Exception e) {}
5831119 */
584
- radio.layout = sevenButton;
1120
+ radio.layout = sixButton; // sevenButton;
5851121 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5861122 }
5871123
5881124 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
5891125 {
590
- //constraints.gridx = 0;
591
- //constraints.gridy = 0;
592
- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
593
- fastCB.setToolTipText("Fast mode");
594
- fastCB.addItemListener(this);
595
- //constraints.gridy += 1;
596
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
597
- supportCB.setToolTipText("Enabled rigging");
598
- supportCB.addItemListener(this);
1126
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1127
+ colorCB.setToolTipText("Copy color when dropped");
1128
+ colorCB.addItemListener(this);
5991129
600
- // constraints.gridy += 1;
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
+
6011158 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
6021159 // localCB.addItemListener(this);
6031160
604
- //constraints.gridy += 1;
1161
+ panel.Return();
1162
+
6051163 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
6061164 crowdCB.setToolTipText("Used for crowds");
6071165 crowdCB.addItemListener(this);
6081166
609
- //constraints.gridy += 1;
6101167 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
6111168 smoothCB.setToolTipText("Snapping delay");
6121169 smoothCB.addItemListener(this);
6131170
614
- //constraints.gridy += 1;
6151171 panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
6161172 slowCB.setToolTipText("Smooth interpolation");
6171173 slowCB.addItemListener(this);
618
- //constraints.gridy += 1;
619
- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620
- boxCB.setToolTipText("Display bounding boxes");
621
- boxCB.addItemListener(this);
622
- //constraints.gridy += 1;
623
- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625
- zoomBoxCB.addItemListener(this);
626
-
1174
+
6271175 // constraints.gridy += 1;
6281176 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
6291177 // speakerMocapCB.addItemListener(this);
6301178
1179
+ panel.Return();
1180
+
6311181 if (false)
6321182 {
6331183 // handled in scripts
....@@ -642,42 +1192,85 @@
6421192 //constraints.gridy += 1;
6431193 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
6441194 smoothfocusCB.addItemListener(this);
1195
+ panel.Return();
6451196 }
6461197
6471198 //constraints.gridx += 1;
6481199 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
6491200 // debugCB.addItemListener(this);
6501201
651
- //constraints.gridy += 1;
1202
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1203
+ trackCB.setToolTipText("Enable tracking target");
1204
+ trackCB.addItemListener(this);
1205
+
6521206 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1207
+ oeilCB.setToolTipText("Move camera when tracking");
6531208 oeilCB.addItemListener(this);
6541209
655
- //constraints.gridy += 1;
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
+ {
6561230 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
6571231 lookAtCB.setToolTipText("Look-at target");
6581232 lookAtCB.addItemListener(this);
1233
+ }
1234
+
1235
+ }
6591236
6601237 cGridBag fill = new cGridBag();
661
-
6621238 fill.preferredHeight = 200;
1239
+ cGridBag fill2 = new cGridBag();
1240
+ fill2.preferredHeight = 200;
1241
+ cGridBag fill3 = new cGridBag();
1242
+ fill3.preferredHeight = 200;
6631243
6641244 panel.add(fill);
1245
+ panel.add(fill2);
1246
+ panel.add(fill3);
6651247
6661248 }
6671249
6681250 void EditObject(Object3D obj)
6691251 {
6701252 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
+
6711261 radioButton.SetObject(obj);
672
- radioButton.layout = sevenButton;
1262
+ radioButton.layout = sixButton; // sevenButton;
6731263 radioButton.SetCamera(cameraView.renderCamera, false);
6741264 radioButton.addActionListener(this);
6751265 radioPanel.add(radioButton);
6761266 buttonGroup.add(radioButton);
6771267 radioButton.doClick();
6781268 }
1269
+
6791270 void SetupViews(ObjEditor oe)
6801271 {
1272
+ theFrame = this;
1273
+
6811274 oe.SetupViews();
6821275
6831276 System.out.println("SetupViews");
....@@ -686,23 +1279,28 @@
6861279 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
6871280 }
6881281
689
- JCheckBox liveCB;
690
- JCheckBox supportCB;
691
- JCheckBox localCB;
692
- JCheckBox crowdCB;
693
- JCheckBox smoothCB;
694
- JCheckBox fastCB;
695
- JCheckBox slowCB;
696
- JCheckBox boxCB;
697
- JCheckBox zoomBoxCB;
698
- JCheckBox trackCB;
699
- 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;
7001295 // JCheckBox speakerMocapCB;
701
- JCheckBox speakerCameraCB;
702
- JCheckBox speakerFocusCB;
703
- JCheckBox debugCB;
704
- JCheckBox oeilCB;
705
- JCheckBox lookAtCB;
1296
+ cCheckBox speakerCameraCB;
1297
+ cCheckBox speakerFocusCB;
1298
+ cCheckBox debugCB;
1299
+
1300
+ cCheckBox oeilCB;
1301
+ cCheckBox shadowCB;
1302
+ cCheckBox autokeepCB;
1303
+ cCheckBox lookAtCB;
7061304
7071305 // static int COLOR = 1;
7081306 // static int MATERIAL = 2;
....@@ -710,9 +1308,9 @@
7101308
7111309 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7121310
713
- JCheckBox colorCB;
714
- JCheckBox materialCB;
715
- JCheckBox textureCB;
1311
+ cCheckBox colorCB;
1312
+ cCheckBox materialCB;
1313
+ cCheckBox textureCB;
7161314
7171315 public void itemStateChanged(ItemEvent e)
7181316 {
....@@ -740,6 +1338,7 @@
7401338 } else if(e.getSource() == liveCB)
7411339 {
7421340 cameraView.ToggleLive();
1341
+ refreshContents(false);
7431342 }
7441343 else if(e.getSource() == supportCB)
7451344 {
....@@ -804,6 +1403,18 @@
8041403 {
8051404 cameraView.ToggleOeil();
8061405 }
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
+ }
8071418 else if(e.getSource() == lookAtCB)
8081419 {
8091420 cameraView.ToggleLookAt();
....@@ -820,7 +1431,8 @@
8201431
8211432 /**/
8221433 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
823
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1434
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1435
+ TreePath path = objEditor.jTree.getSelectionPath();
8241436 if ((path == null) || (path.getPathCount() <= 1)) {
8251437 // We can't move the root node or an empty selection
8261438 return;
....@@ -883,8 +1495,6 @@
8831495 }
8841496 }
8851497
886
- String string = (String) object;
887
-
8881498 System.out.println("Transfer = " + object + "; drop : " + target);
8891499 // if( object instanceof java.io.File[])
8901500 // {
....@@ -892,7 +1502,11 @@
8921502 // objEditor.DropFile((java.io.File[]) object, true);
8931503 // return;
8941504 // }
895
- 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) == ':')
8961510 {
8971511 // file(s)
8981512 String[] names = string.split("\n");
....@@ -919,7 +1533,7 @@
9191533
9201534 flashIt = false;
9211535 CameraPane pane = (CameraPane) target;
922
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1536
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
9231537 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
9241538
9251539 if (group.selection.size() == 1)
....@@ -935,23 +1549,33 @@
9351549
9361550 assert target == objEditor.jTree;
9371551 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1552
+ Object3D destinationLeaf;
9381553 try {
939
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1554
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9401555 } catch (Exception e) {
9411556 System.out.println("destinationPath : " + destinationPath);
9421557 return;
9431558 }
9441559
945
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1560
+ for (int i=group.selection.size(); --i>=0;)
9461561 {
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
+// {
9471571 loadClipboard(true);
9481572 objEditor.jTree.setSelectionPath(destinationPath);
949
- pasteInto(false);
950
- } else {
951
- loadClipboard(false);
952
- objEditor.jTree.setSelectionPath(destinationPath);
953
- pasteInto(false); // true); // ???
954
- }
1573
+ pasteInto(false, false);
1574
+// } else {
1575
+// loadClipboard(false);
1576
+// objEditor.jTree.setSelectionPath(destinationPath);
1577
+// pasteInto(false, false); // true); // ???
1578
+// }
9551579 }
9561580 public void dropActionChanged(DropTargetDragEvent dtde)
9571581 // Called if the user has modified the current drop gesture
....@@ -1056,85 +1680,107 @@
10561680 {
10571681 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10581682 //heightFieldItem.addActionListener(this);
1059
- gridItem = menu.add(new MenuItem("Grid"));
1060
- gridItem.addActionListener(this);
1061
- rectoidItem = menu.add(new MenuItem("Box"));
1062
- rectoidItem.addActionListener(this);
1063
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1064
- ellipsoidItem.addActionListener(this);
1065
- coneItem = menu.add(new MenuItem("Cone"));
1066
- coneItem.addActionListener(this);
1067
- torusItem = menu.add(new MenuItem("Torus"));
1068
- torusItem.addActionListener(this);
1069
- superItem = menu.add(new MenuItem("Superellipsoid"));
1070
- superItem.addActionListener(this);
1683
+// gridItem = menu.add(new MenuItem("Grid"));
1684
+// gridItem.addActionListener(this);
1685
+// rectoidItem = menu.add(new MenuItem("Box"));
1686
+// rectoidItem.addActionListener(this);
1687
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1688
+// ellipsoidItem.addActionListener(this);
1689
+// coneItem = menu.add(new MenuItem("Cone"));
1690
+// coneItem.addActionListener(this);
1691
+// torusItem = menu.add(new MenuItem("Torus"));
1692
+// torusItem.addActionListener(this);
1693
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1694
+// superItem.addActionListener(this);
1695
+
1696
+ cameraItem = menu.add(new MenuItem("Camera"));
1697
+ cameraItem.addActionListener(this);
1698
+
1699
+ if (!Globals.ADVANCED)
1700
+ {
10711701 kleinItem = menu.add(new MenuItem("Klein Bottle"));
10721702 kleinItem.addActionListener(this);
1073
- particleItem = menu.add(new MenuItem("Particle system"));
1074
- particleItem.addActionListener(this);
1703
+ }
1704
+
1705
+// particleItem = menu.add(new MenuItem("Particle system"));
1706
+// particleItem.addActionListener(this);
1707
+ if (Globals.ADVANCED)
1708
+ {
10751709 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10761710 ragdollItem.addActionListener(this);
10771711 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10781712 ragdoll2Item.addActionListener(this);
1713
+ }
10791714 menu.add("-");
1080
- meshItem = menu.add(new MenuItem("Mesh"));
1715
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10811716 meshItem.addActionListener(this);
10821717 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10831718 // meshGroupItem.addActionListener(this);
1719
+ if (Globals.ADVANCED)
1720
+ {
10841721 springItem = menu.add(new MenuItem("Spring"));
10851722 springItem.addActionListener(this);
10861723 flagItem = menu.add(new MenuItem("Flag"));
10871724 flagItem.addActionListener(this);
1088
- bezierItem = menu.add(new MenuItem("Patch"));
1089
- bezierItem.addActionListener(this);
1090
- checkerItem = menu.add(new MenuItem("Checker"));
1091
- checkerItem.addActionListener(this);
10921725 blobItem = menu.add(new MenuItem("Blob"));
10931726 blobItem.addActionListener(this);
10941727 latheItem = menu.add(new MenuItem("Lathe"));
10951728 latheItem.addActionListener(this);
1096
- lightItem = menu.add(new MenuItem("Light"));
1097
- 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);
10981736 menu.add("-");
10991737 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11001738 //superLoopItem.addActionListener(this);
1101
- loopItem = menu.add(new MenuItem("Loop"));
1102
- loopItem.addActionListener(this);
1739
+// loopItem = menu.add(new MenuItem("Loop"));
1740
+// loopItem.addActionListener(this);
11031741 doubleItem = menu.add(new MenuItem("Fork"));
11041742 doubleItem.addActionListener(this);
1743
+ if (Globals.ADVANCED)
1744
+ {
11051745 tripleItem = menu.add(new MenuItem("Trident"));
11061746 tripleItem.addActionListener(this);
1747
+ }
11071748 }
11081749
11091750 void buildToolsMenu(Menu menu)
11101751 {
11111752 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11121753 animationItem.addItemListener(this);
1113
- animationItem.setState(CameraPane.ANIMATION);
1754
+ animationItem.setState(Globals.ANIMATION);
1755
+
1756
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
1757
+ archiveItem.addActionListener(this);
11141758
11151759 menu.add("-");
11161760 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11171761 parseverticesItem.addActionListener(this);
11181762 textureFieldItem = menu.add(new MenuItem("Texture Field"));
11191763 textureFieldItem.addActionListener(this);
1120
- alignItem = menu.add(new MenuItem("Align"));
1764
+ alignItem = menu.add(new MenuItem("Align Objects"));
11211765 alignItem.addActionListener(this);
1122
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123
- mirrorItem.addActionListener(this);
11241766 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11251767 reduceMorphItem.addActionListener(this);
11261768 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11271769 reduce34MorphItem.addActionListener(this);
1128
-
1129
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1130
- computeAOItem.addActionListener(this);
11311770 menu.add("-");
1132
-
11331771 menu.add(memoryItem = new MenuItem("Memory Usage"));
11341772 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("-");
11351781 menu.add(analyzeItem = new MenuItem("Analyze"));
11361782 analyzeItem.addActionListener(this);
1137
- menu.add(dumpItem = new MenuItem("Dump"));
1783
+ menu.add(dumpItem = new MenuItem("Print"));
11381784 dumpItem.addActionListener(this);
11391785 // menu.add(pathItem = new MenuItem("From-to path"));
11401786 // pathItem.addActionListener(this);
....@@ -1152,6 +1798,7 @@
11521798 menu.add("-");
11531799 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11541800 editScriptItem.addActionListener(this);
1801
+ }
11551802 }
11561803
11571804 void ScreenFit()
....@@ -1274,9 +1921,34 @@
12741921 shadow.material = new cMaterial(obj.material);
12751922 shadow.material.diffuse = 0.0001f;
12761923 shadow.material.specular = 0.0001f;
1924
+ //shadow.projectedVertices[1].x = 300;
12771925
12781926 makeSomething(shadow);
12791927 }
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
+ }
12801952
12811953 /**
12821954 * applyExample
....@@ -1480,9 +2152,9 @@
14802152
14812153 void Overwrite(int mask)
14822154 {
1483
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2155
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14842156 {
1485
- Object3D content = GrafreeD.clipboard.get(0);
2157
+ Object3D content = Grafreed.clipboard.get(0);
14862158
14872159 if (content instanceof cGroup && ((cGroup)content).transientlink )
14882160 content = ((cGroup)content).get(0);
....@@ -1521,7 +2193,7 @@
15212193 {
15222194 ScreenFit();
15232195 } else
1524
- if (source == switchItem)
2196
+ if (source == switchViewItem)
15252197 {
15262198 cVector v1 = new cVector();
15272199 cVector v2 = new cVector();
....@@ -1530,11 +2202,11 @@
15302202 objEditor.cameraView.renderCamera.setAim(v2, v1);
15312203 objEditor.cameraView.repaint();
15322204 } else
1533
- if (source == rectoidItem)
2205
+ if (source == rectoidItem || source == boxButton)
15342206 {
15352207 makeSomething(new Box());
15362208 } else
1537
- if (source == particleItem)
2209
+ if (source == particleItem || source == particlesButton)
15382210 {
15392211 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15402212 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1613,27 +2285,27 @@
16132285
16142286 makeSomething(obj);
16152287 } else
1616
- if (source == gridItem)
2288
+ if (source == gridItem || source == gridButton)
16172289 {
16182290 makeSomething(new Grid());
16192291 } else
1620
- if (source == ellipsoidItem)
2292
+ if (source == ellipsoidItem || source == sphereButton)
16212293 {
16222294 makeSomething(new Sphere());
16232295 } else
1624
- if (source == coneItem)
2296
+ if (source == coneItem || source == coneButton)
16252297 {
16262298 makeSomething(new Cone());
16272299 } else
1628
- if (source == torusItem)
2300
+ if (source == torusItem || source == torusButton)
16292301 {
16302302 makeSomething(new Torus());
16312303 } else
1632
- if (source == superItem)
2304
+ if (source == superItem || source == superButton)
16332305 {
16342306 makeSomething(new Superellipsoid());
16352307 } else
1636
- if (source == kleinItem)
2308
+ if (source == kleinItem || source == kleinButton)
16372309 {
16382310 makeSomething(new Klein());
16392311 } else
....@@ -1653,7 +2325,7 @@
16532325 {
16542326 makeSomething(new BezierSurface());
16552327 } else
1656
- if (source == checkerItem)
2328
+ if (source == overlayItem || source == overlayButton)
16572329 {
16582330 /*
16592331 Object3D obj = new BezierSurface(5,8);
....@@ -1701,10 +2373,27 @@
17012373 s.setup();
17022374 makeSomething(s);
17032375 } else
1704
- if (source == lightItem)
2376
+ if (source == lightItem || source == lightButton)
17052377 {
17062378 makeSomething(new Light());
17072379 } else
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
17082397 if (source == csgItem)
17092398 {
17102399 group(new CSG());
....@@ -1751,30 +2440,30 @@
17512440
17522441 group(g);
17532442 } else
1754
- if (source == loopItem)
2443
+ if (source == loopItem || source == loopButton)
17552444 {
17562445 Composite csg = new GroupLeaf();
17572446 csg.count = 5;
17582447 group(csg);
1759
- Composite child = new cGroup();
2448
+ Composite child = new cGroup("Branch");
17602449 csg.addChild(child);
17612450 child.addChild(csg);
17622451 } else
17632452 if (source == doubleItem)
17642453 {
1765
- Composite csg = new GroupLeaf();
2454
+ Composite csg = new GroupLeaf("Fork");
17662455 csg.count = 5;
17672456 group(csg);
1768
- Composite child = new cGroup();
2457
+ Composite child = new cGroup("Branch A");
17692458 csg.addChild(child);
17702459 child.addChild(csg);
1771
- child = new cGroup();
2460
+ child = new cGroup("Branch B");
17722461 csg.addChild(child);
17732462 child.addChild(csg);
17742463 } else
17752464 if (source == tripleItem)
17762465 {
1777
- Composite csg = new GroupLeaf();
2466
+ Composite csg = new GroupLeaf("Trident");
17782467 csg.count = 4;
17792468 group(csg);
17802469 Composite child = new cGroup();
....@@ -1787,27 +2476,10 @@
17872476 csg.addChild(child);
17882477 child.addChild(csg);
17892478 } else
1790
-
1791
- if (source == importGFDItem)
1792
- {
1793
- ImportGFD();
1794
- } else
1795
- if (source == importVRMLX3DItem)
1796
- {
1797
- ImportVRMLX3D();
1798
- } else
1799
- if (source == import3DSItem)
1800
- {
1801
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1802
- } else
1803
- if (source == importOBJItem)
1804
- {
1805
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1806
- } else
18072479 if (source == computeAOItem)
18082480 {
18092481 Globals.drawMode = CameraPane.OCCLUSION;
1810
- Globals.theRenderer.repaint();
2482
+ cameraView.repaint();
18112483 } else
18122484 if (source == recompileItem)
18132485 {
....@@ -1822,7 +2494,7 @@
18222494 if (source == invariantsItem)
18232495 {
18242496 System.out.println("Invariants:");
1825
- GrafreeD.grafreeD.universe.invariants();
2497
+ Grafreed.grafreeD.universe.invariants();
18262498 } else
18272499 if (source == memoryItem)
18282500 {
....@@ -1841,19 +2513,61 @@
18412513 {
18422514 DumpObject();
18432515 } else
2516
+ if (source == minButton)
2517
+ {
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
18442561 if (source == screenfitButton)
18452562 {
1846
- //Reload(lastConverter, lastFilename, true);
18472563 ScreenFit();
18482564 } else
18492565 if (source == screenfitpointButton)
18502566 {
1851
- //Reload(lastConverter, lastFilename, true);
18522567 ScreenFitPoint();
18532568 } else
18542569 if (source == snapobjectButton)
18552570 {
1856
- //Reload(lastConverter, lastFilename, true);
18572571 SnapObject();
18582572 } else
18592573 // if (event.getSource() == recompileButton)
....@@ -1890,12 +2604,20 @@
18902604 {
18912605 loadClipboard(true);
18922606 } else
2607
+ if (source == undoItem)
2608
+ {
2609
+ Undo();
2610
+ } else
2611
+ if (source == redoItem)
2612
+ {
2613
+ Redo();
2614
+ } else
18932615 if (source == duplicateItem)
18942616 {
1895
- Object3D keep = GrafreeD.clipboard;
2617
+ Object3D keep = Grafreed.clipboard;
18962618 loadClipboard(false);
18972619 paste(false);
1898
- GrafreeD.clipboard = keep;
2620
+ Grafreed.clipboard = keep;
18992621 } else
19002622 if (source == cloneItem)
19012623 {
....@@ -1913,13 +2635,17 @@
19132635 {
19142636 paste(false);
19152637 } else
2638
+ if (source == pasteIntoItem)
2639
+ {
2640
+ pasteInto(true, false);
2641
+ } else
19162642 if (source == pasteLinkItem)
19172643 {
1918
- pasteInto(false);
2644
+ pasteInto(false, false);
19192645 } else
19202646 if (source == pasteCloneItem)
19212647 {
1922
- pasteInto(true);
2648
+ pasteInto(true, true);
19232649 } else
19242650 if (source == pasteExpandItem)
19252651 {
....@@ -2111,9 +2837,9 @@
21112837 // group.selection.get(0).setMasterThis(content); // should be identity
21122838 // refreshContents();
21132839 // }
2114
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2840
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
21152841 {
2116
- Object3D content = GrafreeD.clipboard.get(0);
2842
+ Object3D content = Grafreed.clipboard.get(0);
21172843
21182844 if (content instanceof cGroup && ((cGroup)content).transientlink )
21192845 content = ((cGroup)content).get(0);
....@@ -2121,11 +2847,11 @@
21212847 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21222848 for (int i=0; i<group.selection.size(); i++)
21232849 {
2124
- boolean random = CameraPane.RANDOM;
2125
- CameraPane.RANDOM = false; // parse all random nodes
2850
+ boolean random = CameraPane.SWITCH;
2851
+ CameraPane.SWITCH = false; // parse all random nodes
21262852 group.selection.get(i).linkVerticesThis(content);
21272853 // group.selection.get(i).setMasterThis(content); // should be identity
2128
- CameraPane.RANDOM = random;
2854
+ CameraPane.SWITCH = random;
21292855 }
21302856 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21312857 refreshContents();
....@@ -2135,20 +2861,20 @@
21352861 {
21362862 for (int i=0; i<group.selection.size(); i++)
21372863 {
2138
- boolean random = CameraPane.RANDOM;
2139
- CameraPane.RANDOM = false; // parse all random nodes
2864
+ boolean random = CameraPane.SWITCH;
2865
+ CameraPane.SWITCH = false; // parse all random nodes
21402866 group.selection.get(i).linkVerticesThis(null);
2141
- CameraPane.RANDOM = random;
2867
+ CameraPane.SWITCH = random;
21422868 }
21432869
21442870 refreshContents();
21452871 } else
21462872 if (source == relinkverticesItem)
21472873 {
2148
- boolean random = CameraPane.RANDOM;
2149
- CameraPane.RANDOM = false; // parse all random nodes
2874
+ boolean random = CameraPane.SWITCH;
2875
+ CameraPane.SWITCH = false; // parse all random nodes
21502876 group.selection.RelinkToSupport();
2151
- CameraPane.RANDOM = random;
2877
+ CameraPane.SWITCH = random;
21522878
21532879 refreshContents();
21542880 } else
....@@ -2163,9 +2889,9 @@
21632889 } else
21642890 if (source == setMasterItem)
21652891 {
2166
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2892
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21672893 {
2168
- Object3D content = GrafreeD.clipboard.get(0);
2894
+ Object3D content = Grafreed.clipboard.get(0);
21692895
21702896 if (content instanceof cGroup && ((cGroup)content).transientlink )
21712897 content = ((cGroup)content).get(0);
....@@ -2178,9 +2904,9 @@
21782904 {
21792905 if (group.selection.size() == 1)
21802906 {
2181
- if (GrafreeD.clipboard.size() == 1)
2907
+ if (Grafreed.clipboard.size() == 1)
21822908 {
2183
- Object3D content = GrafreeD.clipboard.get(0);
2909
+ Object3D content = Grafreed.clipboard.get(0);
21842910
21852911 if (content instanceof cGroup && ((cGroup)content).transientlink )
21862912 content = ((cGroup)content).get(0);
....@@ -2197,7 +2923,7 @@
21972923 {
21982924 RevertMeshes();
21992925 } else
2200
- if (source == resetMeshItem)
2926
+ if (source == resetAllItem)
22012927 {
22022928 ResetAll();
22032929 } else
....@@ -2205,7 +2931,7 @@
22052931 {
22062932 StepAll();
22072933 } else
2208
- if (source == clearItem) // || event.getSource() == clearButton)
2934
+ if (source == deleteItem) // || event.getSource() == clearButton)
22092935 {
22102936 //int indices[] = jList.getSelectedIndices();
22112937 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2217,9 +2943,9 @@
22172943 {
22182944 ClearSelection(true);
22192945 } else
2220
- if (source == grabItem)
2946
+ if (source == grabItem || source == groupButton)
22212947 {
2222
- group(new cGroup(), true);
2948
+ group(new cGroup(), false); // true);
22232949 } else
22242950 if (source == hideItem)
22252951 {
....@@ -2237,16 +2963,16 @@
22372963 {
22382964 makeSomething(new Camera());
22392965 } else
2240
- if (source == compositeItem)
2966
+ if (source == compositeItem || source == compositeButton)
22412967 {
22422968 group(new Composite());
22432969 } else
2244
- if (source == randomItem)
2970
+ if (source == switchItem || source == switchButton)
22452971 {
22462972 RandomNode random = new RandomNode();
22472973 group(random);
22482974 if (random.size() > 0)
2249
- random.name = random.get(0).name + "Rnd";
2975
+ random.name = random.get(0).name + "Switch";
22502976 } else
22512977 if (source == physicsItem)
22522978 {
....@@ -2343,7 +3069,7 @@
23433069 {
23443070 group(new cLinker());
23453071 } else
2346
- if (source == textureItem)
3072
+ if (source == textureItem || source == textureButton)
23473073 {
23483074 group(new TextureNode());
23493075 } else
....@@ -2363,17 +3089,30 @@
23633089 {
23643090 CastShadow(2);
23653091 } else
2366
- if (source == ungroupItem)
3092
+ if (source == ungroupItem || source == ungroupButton)
23673093 {
2368
- //ungroup();
3094
+ boolean hasRoot = false;
3095
+
23693096 for (int i=0; i<group.selection.size(); i++)
23703097 {
2371
- Ungroup(group.selection.get(i));
3098
+ if (group.selection.get(i) == group)
3099
+ {
3100
+ hasRoot = true;
3101
+ break;
3102
+ }
23723103 }
23733104
2374
- ClearSelection(false);
2375
-
2376
- refreshContents();
3105
+ if (!hasRoot)
3106
+ {
3107
+ for (int i=0; i<group.selection.size(); i++)
3108
+ {
3109
+ Ungroup(group.selection.get(i));
3110
+ }
3111
+
3112
+ ClearSelection(false);
3113
+
3114
+ refreshContents();
3115
+ }
23773116 } else
23783117 if (source == genUVItem)
23793118 {
....@@ -2385,7 +3124,7 @@
23853124 } else
23863125 if (source == genNormalsMESHItem)
23873126 {
2388
- GenNormals(true); // TODO
3127
+ GenNormalsMESH();
23893128 } else
23903129 if (source == genNormalsORGANItem)
23913130 {
....@@ -2450,6 +3189,22 @@
24503189 if (source == unmarkleavesItem)
24513190 {
24523191 MarkLeaves(false);
3192
+ } else
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);
24533208 } else
24543209 if (source == flipVItem)
24553210 {
....@@ -2535,9 +3290,13 @@
25353290 {
25363291 SmoothMesh();
25373292 } else
2538
- if (source == transformgeometryItem)
3293
+ if (source == transformGeometryItem)
25393294 {
25403295 TransformGeometry();
3296
+ } else
3297
+ if (source == transformChildrenItem)
3298
+ {
3299
+ TransformChildren();
25413300 } else
25423301 if (source == resetTransformItem)
25433302 {
....@@ -2545,7 +3304,11 @@
25453304 } else
25463305 if (source == resetCentroidItem)
25473306 {
2548
- ResetCentroid();
3307
+ ResetCentroid(true);
3308
+ } else
3309
+ if (source == resetCentroidXZItem)
3310
+ {
3311
+ ResetCentroid(false);
25493312 } else
25503313 if (source == resetParentItem)
25513314 {
....@@ -2650,7 +3413,7 @@
26503413 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
26513414 {
26523415 obj = (Object3D)e.nextElement();
2653
- obj.SetBumpTexture(null);
3416
+ obj.ResetBumpTexture();
26543417 }
26553418
26563419 refreshContents();
....@@ -2666,6 +3429,31 @@
26663429
26673430 refreshContents();
26683431 } else
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
26693457 if (source == flashSelectionButton)
26703458 {
26713459 CameraPane.flash = true;
....@@ -2677,6 +3465,10 @@
26773465 if (source == twoButton)
26783466 {
26793467 radio.layout = twoButton;
3468
+
3469
+ if (CameraPane.FULLSCREEN)
3470
+ fullscreenLayout = radio.layout;
3471
+
26803472 // bug
26813473 //gridPanel.setDividerLocation(1.0);
26823474 //bigPanel.setDividerLocation(0.0);
....@@ -2709,10 +3501,31 @@
27093501 bigThree.ClearUI();
27103502 bigThree.add(centralPanel);
27113503 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
+
27123522 } else
27133523 if (source == threeButton)
27143524 {
27153525 radio.layout = threeButton;
3526
+
3527
+ if (CameraPane.FULLSCREEN)
3528
+ fullscreenLayout = radio.layout;
27163529
27173530 // bigThree.remove(scenePanel);
27183531 // bigThree.remove(centralPanel);
....@@ -2742,13 +3555,18 @@
27423555 // centralPanel.setVisible(true);
27433556 // XYZPanel.setVisible(true);
27443557 bigThree.ClearUI();
3558
+ bigThree.add(scenePanel);
27453559 bigThree.add(centralPanel);
2746
- bigThree.add(XYZPanel);
27473560 bigThree.FlushUI();
3561
+
3562
+ cameraView.requestFocusInWindow();
27483563 } else
27493564 if (source == fourButton)
27503565 {
27513566 radio.layout = fourButton;
3567
+
3568
+ if (CameraPane.FULLSCREEN)
3569
+ fullscreenLayout = radio.layout;
27523570
27533571 // bigThree.remove(scenePanel);
27543572 // bigThree.remove(centralPanel);
....@@ -2780,10 +3598,15 @@
27803598 bigThree.ClearUI();
27813599 bigThree.add(scenePanel);
27823600 bigThree.FlushUI();
3601
+
3602
+ cameraView.requestFocusInWindow();
27833603 } else
27843604 if (source == sixButton)
27853605 {
27863606 radio.layout = sixButton;
3607
+
3608
+ if (CameraPane.FULLSCREEN)
3609
+ fullscreenLayout = radio.layout;
27873610
27883611 // bigThree.remove(scenePanel);
27893612 // bigThree.remove(centralPanel);
....@@ -2813,13 +3636,18 @@
28133636 // centralPanel.setVisible(true);
28143637 // XYZPanel.setVisible(false);
28153638 bigThree.ClearUI();
2816
- bigThree.add(scenePanel);
28173639 bigThree.add(centralPanel);
3640
+ bigThree.add(scenePanel);
28183641 bigThree.FlushUI();
3642
+
3643
+ cameraView.requestFocusInWindow();
28193644 } else
28203645 if (source == sevenButton)
28213646 {
28223647 radio.layout = sevenButton;
3648
+
3649
+ if (CameraPane.FULLSCREEN)
3650
+ fullscreenLayout = radio.layout;
28233651
28243652 // bigThree.remove(scenePanel);
28253653 // bigThree.remove(centralPanel);
....@@ -2853,6 +3681,8 @@
28533681 bigThree.add(centralPanel);
28543682 bigThree.add(XYZPanel);
28553683 bigThree.FlushUI();
3684
+
3685
+ cameraView.requestFocusInWindow();
28563686 } else
28573687 if (source == rootButton)
28583688 {
....@@ -2864,6 +3694,7 @@
28643694 EditObject(obj);
28653695 }
28663696
3697
+ cameraView.requestFocusInWindow();
28673698 refreshContents(true);
28683699 } else
28693700 if (source == closeButton)
....@@ -2873,22 +3704,37 @@
28733704 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
28743705 {
28753706 ab = (cRadio)e.nextElement();
2876
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3707
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
28773708 {
3709
+ // Patch to avoid bug with transparency.
3710
+ if (!ab.hadMaterial)
3711
+ {
3712
+ ab.object.material = null;
3713
+ }
3714
+
28783715 buttonGroup.remove(ab);
28793716 radioPanel.remove(ab);
28803717
2881
- ab.GetObject().editWindow = null;
3718
+ //ab.GetObject().editWindow = null;
3719
+ ab.GetObject().manipWindow = null;
28823720 // ab.GetObject().objectUI = null; // ?????????
28833721
28843722 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
28853723 break;
28863724 }
28873725 }
3726
+
3727
+ cameraView.requestFocusInWindow();
28883728 refreshContents(true);
28893729 } else
28903730 if (source == editItem || source == editButton)
28913731 {
3732
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3733
+ {
3734
+ Object3D child = (Object3D)e.nextElement();
3735
+ child.pinned = true;
3736
+ }
3737
+
28923738 EditSelection(false);
28933739 } else
28943740 if (source == uneditButton)
....@@ -2898,12 +3744,13 @@
28983744 Object3D child = (Object3D)e.nextElement();
28993745 if(child.editWindow != null)
29003746 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747
+ child.pinned = false;
29013748 child.CloseUI();
29023749 listUI.remove(child);
29033750
2904
- child.editWindow = null; // ???????????
3751
+ //child.editWindow = null; // ???????????
29053752 }
2906
- objEditor.ctrlPanel.validate();
3753
+ objEditor.ctrlPanel.FlushUI();
29073754 //objEditor.jTree.clearSelection();
29083755 //objEditor.ResetSliders();
29093756 refreshContents(true);
....@@ -2914,6 +3761,7 @@
29143761 //copy.ClearUI();
29153762 for (Object3D obj : listUI)
29163763 {
3764
+ obj.pinned = false;
29173765 obj.CloseUI();
29183766 }
29193767 listUI.clear();
....@@ -2923,7 +3771,7 @@
29233771 {
29243772 assert(copy == group);
29253773
2926
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3774
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29273775
29283776 for (Object3D obj : listUI)
29293777 {
....@@ -2972,6 +3820,9 @@
29723820 }
29733821
29743822 copy = group;
3823
+
3824
+ SetUndoStates();
3825
+
29753826 //Globals.theRenderer.object = group;
29763827 if(!useclient)
29773828 {
....@@ -2987,20 +3838,46 @@
29873838 frontView.object = group;
29883839 sideView.object = group;
29893840 }
2990
- group.editWindow = this;
3841
+
3842
+// fix "+" issue
3843
+ //group.editWindow = this;
3844
+ group.manipWindow = this;
3845
+
29913846 /*
29923847 currentLayout = radio.layout;
29933848 if (currentLayout == null)
29943849 currentLayout = sevenButton;
29953850 */
29963851 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);
29973859 keepparent = group.parent;
29983860 // PARENT = NULL or not???
29993861 //group.parent = null; // ROOT
30003862 //group.attributes = -1;
30013863 ResetModel();
3864
+
3865
+ cameraView.requestFocusInWindow();
30023866 refreshContents(true);
3003
- }
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
+ }
30043881 else
30053882 {
30063883 //return super.action(event, arg);
....@@ -3009,7 +3886,6 @@
30093886 }
30103887
30113888 boolean useclient = false;
3012
- cRadio radio;
30133889
30143890 void ToggleRoot()
30153891 {
....@@ -3061,6 +3937,28 @@
30613937 refreshContents();
30623938 }
30633939
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
+ }
30643962
30653963 void ResetTransform()
30663964 {
....@@ -3173,7 +4071,7 @@
31734071 refreshContents();
31744072 }
31754073
3176
- void ResetCentroid()
4074
+ void ResetCentroid(boolean full)
31774075 {
31784076 Object3D obj;
31794077 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3188,12 +4086,16 @@
31884086 LA.matIdentity(Object3D.mat);
31894087 obj.getBounds(minima, maxima, false);
31904088 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4089
+ if (full)
4090
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
31924091 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
31934092 obj.TransformMesh(Object3D.mat);
4093
+
31944094 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4095
+ if (full)
4096
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
31964097 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4098
+
31974099 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
31984100 //Object3D.mat[3][0] = -Object3D.mat[3][0];
31994101 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3222,7 +4124,8 @@
32224124
32234125 int size = obj.MemorySize();
32244126
3225
- 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)");
32264129 }
32274130 }
32284131 catch (Exception e)
....@@ -3259,9 +4162,9 @@
32594162 obj = (Object3D)e.nextElement();
32604163
32614164 System.out.println("Object is: " + obj);
3262
- GrafreeD.AnalyzeObject(obj);
4165
+ Grafreed.AnalyzeObject(obj);
32634166 System.out.println("Boundary rep: " + obj.bRep);
3264
- GrafreeD.AnalyzeObject(obj.bRep);
4167
+ Grafreed.AnalyzeObject(obj.bRep);
32654168
32664169 // System.err.println((size/1024) + " KB is the size of " + obj);
32674170 }
....@@ -3303,6 +4206,13 @@
33034206 void GenNormals(boolean crease)
33044207 {
33054208 group.GenNormalsS(crease);
4209
+
4210
+ refreshContents();
4211
+ }
4212
+
4213
+ void GenNormalsMESH()
4214
+ {
4215
+ group.GenNormalsMeshS();
33064216
33074217 refreshContents();
33084218 }
....@@ -3475,8 +4385,8 @@
34754385
34764386 void ParseVertices()
34774387 {
3478
- boolean epsequal = GrafreeD.epsequal;
3479
- GrafreeD.epsequal = true;
4388
+ boolean epsequal = Grafreed.epsequal;
4389
+ Grafreed.epsequal = true;
34804390
34814391 for (int i=0; i<group.selection.size(); i++)
34824392 {
....@@ -3501,7 +4411,7 @@
35014411 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
35024412 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
35034413
3504
- g.add(GrafreeD.clipboard);
4414
+ g.add(Grafreed.clipboard);
35054415
35064416 buffer.add(g);
35074417 }
....@@ -3516,7 +4426,7 @@
35164426 makeSomething(buffer, i==group.selection.size()-1);
35174427 }
35184428
3519
- GrafreeD.epsequal = epsequal;
4429
+ Grafreed.epsequal = epsequal;
35204430
35214431 refreshContents();
35224432 }
....@@ -3534,7 +4444,16 @@
35344444 String pigment = Object3D.GetPigment(tex);
35354445 //String bump = Object3D.GetBump(tex);
35364446
3537
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4447
+ com.sun.opengl.util.texture.TextureData texturedata = null;
4448
+
4449
+ try
4450
+ {
4451
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4452
+ }
4453
+ catch (Exception e)
4454
+ {
4455
+ System.err.println("FAIL: " + node);
4456
+ }
35384457
35394458 double s = v.s;
35404459
....@@ -3622,11 +4541,11 @@
36224541
36234542 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36244543
3625
- boolean random = CameraPane.RANDOM;
3626
- CameraPane.RANDOM = false; // parse all random nodes
4544
+ boolean random = CameraPane.SWITCH;
4545
+ CameraPane.SWITCH = false; // parse all random nodes
36274546 lowres.linkVerticesThis(null);
36284547 lowres.linkVerticesThis(sn);
3629
- CameraPane.RANDOM = random;
4548
+ CameraPane.SWITCH = random;
36304549
36314550 System.err.flush();
36324551
....@@ -3666,7 +4585,7 @@
36664585 return;
36674586
36684587 Object3D poses = group.selection.get(0);
3669
- Object3D ref = GrafreeD.clipboard.get(0);
4588
+ Object3D ref = Grafreed.clipboard.get(0);
36704589
36714590 Object3D newgroup = new Object3D("Po:" + poses.name);
36724591
....@@ -3860,9 +4779,9 @@
38604779
38614780 void ClipMesh()
38624781 {
3863
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4782
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
38644783 {
3865
- Object3D content = GrafreeD.clipboard.get(0);
4784
+ Object3D content = Grafreed.clipboard.get(0);
38664785
38674786 if (content instanceof cGroup && ((cGroup)content).transientlink )
38684787 content = ((cGroup)content).get(0);
....@@ -3871,7 +4790,7 @@
38714790 // {
38724791 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
38734792 // }
3874
- group.selection.ClipMesh(GrafreeD.clipboard);
4793
+ group.selection.ClipMesh(Grafreed.clipboard);
38754794 }
38764795 // group.selection.ClipMesh(GrafreeD.clipboard);
38774796 System.out.println("DONE.");
....@@ -3918,6 +4837,18 @@
39184837 void MarkLeaves(boolean hide)
39194838 {
39204839 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);
39214852 refreshContents();
39224853 }
39234854
....@@ -3992,28 +4923,25 @@
39924923 // }
39934924 // }
39944925
3995
- static boolean allparams = true;
3996
-
3997
- static Vector<Object3D> listUI = new Vector<Object3D>();
3998
-
39994926 void EditSelection(boolean newWindow)
40004927 {
4928
+ if (group.selection == null)
4929
+ {
4930
+ EditElement(group, newWindow); // ? new
4931
+ return;
4932
+ }
4933
+
40014934 // aConstraints.gridy = 0;
40024935 for (int i=0; i<group.selection.size(); i++)
40034936 {
40044937 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
40054938 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4006
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4939
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
40074940
40084941 Object3D elem = (Object3D)group.selection.elementAt(i);
4009
- if(elem != group)
4942
+ if(elem != group || !newWindow)
40104943 {
4011
- // if (!(elem instanceof Composite))
4012
- // newWindow = false;
4013
- listUI.add(elem);
4014
- elem.openEditWindow(this, newWindow); //, false);
4015
- System.out.println("edit : " + elem);
4016
- elem.editWindow.refreshContents(true); // ? new
4944
+ EditElement(elem, newWindow); // ? new
40174945 }
40184946 }
40194947 }
....@@ -4088,7 +5016,8 @@
40885016 //new Exception().printStackTrace();
40895017
40905018 freezemodel = true;
4091
-
5019
+ ClearUnpinned();
5020
+
40925021 /**/
40935022 //switch (event.id)
40945023 {
....@@ -4096,7 +5025,6 @@
40965025 //case 702: // Event.LIST_DESELECT
40975026 group.deselectAll();
40985027 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4099
- objEditor.ClearInfo(); // .GetMaterial());
41005028 if (tps != null)
41015029 {
41025030 for (int i=0; i < tps.length; i++)
....@@ -4105,10 +5033,8 @@
41055033
41065034 //if (child.parent != null)
41075035 //child.parent.addSelectee(child);
5036
+ objEditor.SetMaterial(child);
41085037 group.addSelectee(child);
4109
- objEditor.SetMaterial(child); // .GetMaterial());
4110
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4111
- System.err.println("info : " + child.GetPath());
41125038 }
41135039 }
41145040 // else
....@@ -4118,20 +5044,28 @@
41185044 // System.err.println("info : " + group.GetPath());
41195045 // }
41205046
4121
- objEditor.SetText(); // jan 2014
4122
-
4123
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5047
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
41245048 CameraPane.flash = true;
41255049
4126
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5050
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
41275051 // a camera
41285052 {
4129
- CameraPane.camerachangeframe = 0; // don't refuse it
4130
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5053
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5054
+ {
5055
+ CameraPane.camerachangeframe = 0; // don't refuse it
5056
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5057
+ }
41315058 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
41325059 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
41335060 }
41345061
5062
+ if (tps != null && tps.length == 1)
5063
+ {
5064
+ EditSelection(false);
5065
+ }
5066
+
5067
+ SetPinStates(tps != null && tps.length > 0);
5068
+
41355069 refreshContents();
41365070 //return true;
41375071 }
....@@ -4140,6 +5074,35 @@
41405074
41415075 freezemodel = false;
41425076 }
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
+ }
41435106
41445107 void linkSomething(Object3D thing)
41455108 {
....@@ -4211,16 +5174,19 @@
42115174 {
42125175 if (group.selection.isEmpty())
42135176 return;
4214
- GrafreeD.clipboardIsTempGroup = false;
5177
+
5178
+ Grafreed.clipboardIsTempGroup = false;
42155179 Composite tGroup = null;
42165180 if (group.selection.size() > 0) // 1)
42175181 {
42185182 tGroup = new cGroup();
4219
- GrafreeD.clipboardIsTempGroup = true;
5183
+ Grafreed.clipboardIsTempGroup = true;
42205184 }
42215185
42225186 if (cut)
42235187 {
5188
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5189
+// Save();
42245190 //int indices[] = jList.getSelectedIndices();
42255191 //for (int i = indices.length - 1; i >= 0; i--)
42265192 //jList.remove(indices[i]);
....@@ -4256,16 +5222,16 @@
42565222 //System.out.println("cut " + child);
42575223 //System.out.println("parent = " + child.parent);
42585224 // tmp.addChild(child);
4259
- if (GrafreeD.clipboardIsTempGroup)
5225
+ if (Grafreed.clipboardIsTempGroup)
42605226 tGroup.add/*Child*/(tmp);
42615227 else
4262
- GrafreeD.clipboard = tmp;
5228
+ Grafreed.clipboard = tmp;
42635229 }
42645230 else
4265
- if (GrafreeD.clipboardIsTempGroup)
5231
+ if (Grafreed.clipboardIsTempGroup)
42665232 tGroup.add/*Child*/(child);
42675233 else
4268
- GrafreeD.clipboard = child;
5234
+ Grafreed.clipboard = child;
42695235 }
42705236
42715237 //ResetModel();
....@@ -4297,21 +5263,23 @@
42975263 //System.out.println("cut " + elem);
42985264 //System.out.println("parent = " + elem.parent);
42995265 // tmp.addChild(elem);
4300
- if (GrafreeD.clipboardIsTempGroup)
5266
+ if (Grafreed.clipboardIsTempGroup)
43015267 tGroup.add/*Child*/(tmp);
43025268 else
4303
- GrafreeD.clipboard = tmp;
5269
+ Grafreed.clipboard = tmp;
43045270 }
43055271 else
4306
- if (GrafreeD.clipboardIsTempGroup)
5272
+ if (Grafreed.clipboardIsTempGroup)
43075273 tGroup.add/*Child*/(child);
43085274 else
4309
- GrafreeD.clipboard = child;
5275
+ Grafreed.clipboard = child;
43105276 }
43115277
43125278 }
4313
- if (GrafreeD.clipboardIsTempGroup)
4314
- GrafreeD.clipboard = tGroup;
5279
+
5280
+ if (Grafreed.clipboardIsTempGroup)
5281
+ Grafreed.clipboard = tGroup;
5282
+
43155283 if (cut)
43165284 {
43175285 ResetModel();
....@@ -4321,11 +5289,15 @@
43215289
43225290 void paste(boolean expand)
43235291 {
5292
+ if (Globals.REPLACEONMAKE)
5293
+ Save();
5294
+ boolean keep = Globals.REPLACEONMAKE;
5295
+ Globals.REPLACEONMAKE = false;
43245296 // if (GrafreeD.clipboard == null)
43255297 // return;
43265298 boolean first = true;
43275299
4328
- if (GrafreeD.clipboardIsTempGroup)
5300
+ if (Grafreed.clipboardIsTempGroup)
43295301 {
43305302 Composite temp;
43315303
....@@ -4336,7 +5308,7 @@
43365308 temp = (Composite)Applet3D.clipboard.deepCopy();
43375309 */
43385310 Object3D elem;
4339
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
5311
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
43405312 {
43415313 Object3D child = (Object3D)e.nextElement();
43425314
....@@ -4370,21 +5342,22 @@
43705342 //Object3D cb = Applet3D.clipboard;
43715343 //temp.addChild(cb);
43725344 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4373
- assert(GrafreeD.clipboard.parent == null);
4374
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4375
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4376
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4377
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
5345
+ assert(Grafreed.clipboard.parent == null);
5346
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
5347
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
5348
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
5349
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
43785350 else
4379
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380
- GrafreeD.clipboard.get(0).parent = keepparent;
5351
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5352
+ Grafreed.clipboard.get(0).parent = keepparent;
43815353 }
43825354
5355
+ Globals.REPLACEONMAKE = keep;
43835356 ResetModel();
43845357 refreshContents();
43855358 }
43865359
4387
- void pasteInto(boolean copyit)
5360
+ void pasteInto(boolean copyit, boolean clone)
43885361 {
43895362 // if (GrafreeD.clipboard == null)
43905363 // return;
....@@ -4413,15 +5386,22 @@
44135386 if (copyit)
44145387 {
44155388 // paste(false);
4416
- CloneClipboard(false); // sept 2014
5389
+ if (clone)
5390
+ {
5391
+ CloneClipboard(false); // sept 2014
5392
+ }
5393
+ else
5394
+ {
5395
+ paste(false);
5396
+ }
44175397 }
44185398 else
44195399 {
44205400 boolean first = true;
44215401
4422
- if (GrafreeD.clipboardIsTempGroup)
5402
+ if (Grafreed.clipboardIsTempGroup)
44235403 {
4424
- Composite temp = (Composite)GrafreeD.clipboard;
5404
+ Composite temp = (Composite)Grafreed.clipboard;
44255405 Object3D copy;
44265406 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
44275407 {
....@@ -4431,7 +5411,7 @@
44315411 }
44325412 } else
44335413 {
4434
- linkSomething(GrafreeD.clipboard); //.get(0));
5414
+ linkSomething(Grafreed.clipboard); //.get(0));
44355415 }
44365416 }
44375417 }
....@@ -4508,6 +5488,10 @@
45085488
45095489 void group(Object3D csg, boolean grab)
45105490 {
5491
+ if (Globals.REPLACEONMAKE)
5492
+ Save();
5493
+ boolean keep = Globals.REPLACEONMAKE;
5494
+ Globals.REPLACEONMAKE = false;
45115495 if (//false) // why??
45125496 !group.selection.isEmpty())
45135497 {
....@@ -4621,10 +5605,15 @@
46215605 //node.add(csg);
46225606 //makeSomething(node);
46235607 makeSomething(csg);
5608
+ Globals.REPLACEONMAKE = keep;
46245609 }
46255610
46265611 void Ungroup(Object3D g)
46275612 {
5613
+ if (Globals.REPLACEONMAKE)
5614
+ Save();
5615
+ boolean keep = Globals.REPLACEONMAKE;
5616
+ Globals.REPLACEONMAKE = false;
46285617 if (g instanceof HiddenObject)
46295618 {
46305619 HiddenObject h = (HiddenObject) g;
....@@ -4641,6 +5630,7 @@
46415630 objEditor.makeSomething(g.get(i), false);
46425631 }
46435632 }
5633
+ Globals.REPLACEONMAKE = keep;
46445634 }
46455635
46465636 void ungroup()
....@@ -4836,21 +5826,6 @@
48365826 }
48375827 */
48385828
4839
- void ImportGFD()
4840
- {
4841
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4842
- browser.show();
4843
- String filename = browser.getFile();
4844
- if (filename != null && filename.length() > 0)
4845
- {
4846
- String fullname = browser.getDirectory() + filename;
4847
-
4848
- //Object3D readobj =
4849
- objEditor.ReadGFD(fullname, objEditor);
4850
- //makeSomething(readobj);
4851
- }
4852
- }
4853
-
48545829 /*
48555830 public void Callback(Object obj)
48565831 {
....@@ -4874,26 +5849,9 @@
48745849 }
48755850 */
48765851
4877
- void ImportVRMLX3D()
4878
- {
4879
- if (GrafreeD.standAlone)
4880
- {
4881
- /**/
4882
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4883
- browser.show();
4884
- String filename = browser.getFile();
4885
- if (filename != null && filename.length() > 0)
4886
- {
4887
- String fullname = browser.getDirectory() + filename;
4888
- LoadVRMLX3D(fullname);
4889
- }
4890
- /**/
4891
- }
4892
- }
4893
-
48945852 String GetFile(String dialogName)
48955853 {
4896
- if (GrafreeD.standAlone)
5854
+ if (Grafreed.standAlone)
48975855 {
48985856 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
48995857 browser.show();
....@@ -4957,10 +5915,49 @@
49575915 cButton flashSelectionButton;
49585916 cButton editButton;
49595917 cButton uneditButton;
5918
+ JCheckBox allParamsButton;
49605919 cButton clearpanelButton;
4961
- cButton allParamsButton;
49625920 cButton unselectButton;
49635921
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
+
49645961 cButton screenfitButton;
49655962 cButton screenfitpointButton;
49665963 cButton snapobjectButton;
....@@ -4972,14 +5969,6 @@
49725969
49735970 cButton setsupportButton;
49745971
4975
- cButton twoButton;
4976
- cButton sixButton;
4977
- cButton threeButton;
4978
- cButton sevenButton;
4979
- cButton fourButton; // full panel
4980
- cButton oneButton; // full XYZ
4981
- //cButton currentLayout;
4982
-
49835972 //
49845973 //Composite
49855974 Object3D // to do !!
....@@ -4989,9 +5978,11 @@
49895978 //JTree jTree;
49905979 private MenuItem lookAtItem;
49915980 private MenuItem lookFromItem;
4992
- private MenuItem switchItem;
5981
+ private MenuItem switchViewItem;
49935982 private MenuItem cutItem;
4994
- private MenuItem duplicateItem;
5983
+ private MenuItem undoItem;
5984
+ private MenuItem redoItem;
5985
+ private JMenuItem duplicateItem;
49955986 private MenuItem cloneItem;
49965987 private MenuItem cloneSupportItem;
49975988 private MenuItem overwriteGeoItem;
....@@ -5004,7 +5995,7 @@
50045995 private MenuItem linkverticesItem;
50055996 private MenuItem relinkverticesItem;
50065997 private MenuItem setMasterItem;
5007
- private MenuItem resetMeshItem;
5998
+ private MenuItem resetAllItem;
50085999 private MenuItem stepAllItem;
50096000 private MenuItem revertMeshItem;
50106001 private MenuItem poseMeshItem;
....@@ -5015,10 +6006,11 @@
50156006 private MenuItem mergeGeometriesItem;
50166007 private MenuItem copyItem;
50176008 private MenuItem pasteItem;
6009
+ private MenuItem pasteIntoItem;
50186010 private MenuItem pasteLinkItem;
50196011 private MenuItem pasteCloneItem;
50206012 private MenuItem pasteExpandItem;
5021
- private MenuItem clearItem;
6013
+ private MenuItem deleteItem;
50226014 private MenuItem clearAllItem;
50236015 private MenuItem genUVItem;
50246016 private MenuItem genNormalsMESHItem;
....@@ -5053,6 +6045,10 @@
50536045 private MenuItem showleavesItem;
50546046 private MenuItem markleavesItem;
50556047 private MenuItem unmarkleavesItem;
6048
+ private MenuItem rewindleavesItem;
6049
+ private MenuItem unrewindleavesItem;
6050
+ private MenuItem randomleavesItem;
6051
+ private MenuItem unrandomleavesItem;
50566052
50576053 private MenuItem flipVItem;
50586054 private MenuItem unflipVItem;
....@@ -5064,15 +6060,17 @@
50646060 private MenuItem panoTexturesItem;
50656061
50666062 private MenuItem resetCentroidItem;
5067
- private MenuItem transformgeometryItem;
6063
+ private MenuItem resetCentroidXZItem;
50686064 private MenuItem resetTransformItem;
6065
+ private MenuItem transformGeometryItem;
6066
+ private MenuItem transformChildrenItem;
50696067 private MenuItem hideItem;
50706068 private MenuItem grabItem;
50716069 private MenuItem backItem;
50726070 private MenuItem frontItem;
50736071 private MenuItem cameraItem;
50746072 private MenuItem compositeItem;
5075
- private MenuItem randomItem;
6073
+ private MenuItem switchItem;
50766074 private MenuItem physicsItem;
50776075 private MenuItem frameselectorItem;
50786076 private MenuItem scriptNodeItem;
....@@ -5096,6 +6094,8 @@
50966094 private MenuItem attachBumpItem;
50976095 private MenuItem detachBumpItem;
50986096 private MenuItem pigmentBumpItem;
6097
+ private MenuItem embedTexturesItem;
6098
+ private MenuItem deEmbedTexturesItem;
50996099
51006100 private MenuItem particleItem;
51016101 private MenuItem ragdollItem;
....@@ -5112,7 +6112,7 @@
51126112 private MenuItem blobItem;
51136113 private MenuItem latheItem;
51146114 private MenuItem bezierItem;
5115
- private MenuItem checkerItem;
6115
+ private MenuItem overlayItem;
51166116 private MenuItem meshItem;
51176117 // private MenuItem meshGroupItem;
51186118 private MenuItem springItem;
....@@ -5134,11 +6134,6 @@
51346134 private MenuItem doubleItem;
51356135 private MenuItem tripleItem;
51366136
5137
- private MenuItem importGFDItem;
5138
- private MenuItem importVRMLX3DItem;
5139
- private MenuItem import3DSItem;
5140
- private MenuItem importOBJItem;
5141
-
51426137 private MenuItem computeAOItem;
51436138 private MenuItem recompileItem;
51446139 private MenuItem editScriptItem;
....@@ -5148,4 +6143,8 @@
51486143 private MenuItem analyzeItem;
51496144 private MenuItem dumpItem;
51506145 //boolean freezemodel = false;
6146
+
6147
+ Menu cameraMenu;
6148
+ MenuItem editCameraItem;
6149
+ MenuItem restoreCameraItem;
51516150 }