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,6 +343,7 @@
94343
95344 makeSomething(clone, i==group.selection.size()-1);
96345 }
346
+ Globals.REPLACEONMAKE = keep;
97347 }
98348
99349 void CloneClipboard(boolean supports)
....@@ -148,28 +398,21 @@
148398
149399 //JTextField nameField;
150400
151
- void SetupMenu2(ObjEditor oe)
401
+ void SetupMenu2(GroupEditor oe)
152402 {
153
- if (Globals.ADVANCED)
154
- {
155
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159
- oe.cameraMenu.add("-");
160
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161
- openWindowItem.addActionListener(this);
162
- editLeafItem.addActionListener(this);
163
- lookAtItem.addActionListener(this);
164
- //lookFromItem.addActinoListener(this);
165
- //switchItem.addActionListener(this);
166
- }
167
-
403
+ oe.jTree = new cTree();
404
+
168405 Menu menu;
169406 oe.menuBar.add(menu = new Menu("Edit"));
170407 //editItem = menu.add(new MenuItem("Edit"));
171408 //editItem.addActionListener(this);
172
- 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"));
173416 duplicateItem.addActionListener(this);
174417 cloneItem = menu.add(new MenuItem("Clone"));
175418 cloneItem.addActionListener(this);
....@@ -185,7 +428,6 @@
185428 copyItem.addActionListener(this);
186429 pasteItem = menu.add(new MenuItem("Paste"));
187430 pasteItem.addActionListener(this);
188
- menu.add("-");
189431
190432 menu.add("-");
191433 pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -197,8 +439,8 @@
197439 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198440 // pasteExpandItem.addActionListener(this);
199441 menu.add("-");
200
- clearItem = menu.add(new MenuItem("Clear"));
201
- clearItem.addActionListener(this);
442
+ deleteItem = menu.add(new MenuItem("Delete"));
443
+ deleteItem.addActionListener(this);
202444
203445 if (Globals.ADVANCED)
204446 {
....@@ -206,14 +448,97 @@
206448 clearAllItem = menu.add(new MenuItem("Clear All"));
207449 clearAllItem.addActionListener(this);
208450 }
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());
209487
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
+
210539 oe.menuBar.add(menu = new Menu("Setting"));
211540 if (Globals.ADVANCED)
212541 {
213
- resetMeshItem = menu.add(new MenuItem("Reset All"));
214
- resetMeshItem.addActionListener(this);
215
- stepAllItem = menu.add(new MenuItem("Step All"));
216
- stepAllItem.addActionListener(this);
217542 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218543 revertMeshItem.addActionListener(this);
219544 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
....@@ -253,21 +578,29 @@
253578 }
254579
255580 oe.menuBar.add(menu = new Menu("Group"));
256
- grabItem = menu.add(new MenuItem("Grab"));
257
- grabItem.addActionListener(this);
581
+// grabItem = menu.add(new MenuItem("Grab"));
582
+// grabItem.addActionListener(this);
258583 backItem = menu.add(new MenuItem("Back"));
259584 backItem.addActionListener(this);
260585 frontItem = menu.add(new MenuItem("Front"));
261586 frontItem.addActionListener(this);
262
- compositeItem = menu.add(new MenuItem("Composite"));
263
- compositeItem.addActionListener(this);
587
+// compositeItem = menu.add(new MenuItem("Composite"));
588
+// compositeItem.addActionListener(this);
589
+
590
+ if (Globals.ADVANCED)
591
+ {
264592 hideItem = menu.add(new MenuItem("Hidden Group"));
265593 hideItem.addActionListener(this);
594
+ }
266595 ungroupItem = menu.add(new MenuItem("Ungroup"));
267596 ungroupItem.addActionListener(this);
268
- menu.add("-");
269
- randomItem = menu.add(new MenuItem("Switch node"));
270
- randomItem.addActionListener(this);
597
+
598
+// menu.add("-");
599
+//
600
+// switchItem = menu.add(new MenuItem("Switch node"));
601
+// switchItem.addActionListener(this);
602
+ if (Globals.ADVANCED)
603
+ {
271604 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272605 switchGeoItem.addActionListener(this);
273606 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -275,8 +608,6 @@
275608 morphItem = menu.add(new MenuItem("Morph Group"));
276609 morphItem.addActionListener(this);
277610
278
- if (Globals.ADVANCED)
279
- {
280611 menu.add("-");
281612 physicsItem = menu.add(new MenuItem("Physics"));
282613 physicsItem.addActionListener(this);
....@@ -284,30 +615,29 @@
284615 frameselectorItem.addActionListener(this);
285616 scriptNodeItem = menu.add(new MenuItem("Script Node"));
286617 scriptNodeItem.addActionListener(this);
287
- cameraItem = menu.add(new MenuItem("Camera"));
288
- cameraItem.addActionListener(this);
289618 }
290619
291620 oe.menuBar.add(menu = new Menu("Object"));
292
- textureItem = menu.add(new MenuItem("Texture"));
293
- textureItem.addActionListener(this);
621
+// textureItem = menu.add(new MenuItem("Texture"));
622
+// textureItem.addActionListener(this);
294623 billboardItem = menu.add(new MenuItem("Billboard"));
295624 billboardItem.addActionListener(this);
296625 csgItem = menu.add(new MenuItem("CSG"));
297626 csgItem.addActionListener(this);
298
- shadowXItem = menu.add(new MenuItem("Shadow X"));
627
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299628 shadowXItem.addActionListener(this);
300
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
629
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301630 shadowYItem.addActionListener(this);
302
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
631
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303632 shadowZItem.addActionListener(this);
633
+ attributeItem = menu.add(new MenuItem("Attribute"));
634
+ attributeItem.addActionListener(this);
635
+
304636 if (Globals.ADVANCED)
305637 {
306638 menu.add("-");
307639 linkerItem = menu.add(new MenuItem("Linker"));
308640 linkerItem.addActionListener(this);
309
- attributeItem = menu.add(new MenuItem("Attribute"));
310
- attributeItem.addActionListener(this);
311641 templateItem = menu.add(new MenuItem("Template"));
312642 templateItem.addActionListener(this);
313643 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -318,8 +648,12 @@
318648 resetTransformItem.addActionListener(this);
319649 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320650 resetCentroidItem.addActionListener(this);
321
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322
- 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);
323657
324658 oe.menuBar.add(menu = new Menu("Geometry"));
325659 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -332,7 +666,7 @@
332666 genNormalsMESHItem.addActionListener(this);
333667 if (Globals.ADVANCED)
334668 {
335
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
669
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336670 genNormalsMINEItem.addActionListener(this);
337671 }
338672 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -368,6 +702,10 @@
368702 oe.menuBar.add(menu = new Menu("Attributes"));
369703 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370704 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);
371709 menu.add("-");
372710 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373711 liveleavesItem.addActionListener(this);
....@@ -388,6 +726,14 @@
388726 markleavesItem.addActionListener(this);
389727 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390728 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);
391737 menu.add("-");
392738 flipVItem = menu.add(new MenuItem("Flip V"));
393739 flipVItem.addActionListener(this);
....@@ -413,50 +759,56 @@
413759 attachBumpItem.addActionListener(this);
414760 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415761 pigmentBumpItem.addActionListener(this);
762
+ //embedTexturesItem
416763 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417764 detachPigmentItem.addActionListener(this);
418765 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419766 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);
420771 menu.add("-");
421772 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422773 sortbysizeItem.addActionListener(this);
423774 sortbynameItem = menu.add(new MenuItem("Sort by name"));
424775 sortbynameItem.addActionListener(this);
776
+ 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);
425781 if (Globals.ADVANCED)
426782 {
427
- menu.add("-");
783
+ // Pretty much the same as duplicate and clone.
428784 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429785 extractGeometriesItem.addActionListener(this);
430786 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431787 cloneGeometriesItem.addActionListener(this);
432
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433
- shareGeometriesItem.addActionListener(this);
434
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435
- mergeGeometriesItem.addActionListener(this);
436788 }
437789
438790 oe.menuBar.add(menu = new Menu("Insert"));
439791 buildCreateMenu(menu);
440792
441
- oe.menuBar.add(menu = new Menu("Include"));
442
- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443
- importOBJItem.addActionListener(this);
444
- menu.add("-");
445
- import3DSItem = menu.add(new MenuItem("3DS file..."));
446
- import3DSItem.addActionListener(this);
447
- menu.add("-");
448
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449
- importVRMLX3DItem.addActionListener(this);
450
- menu.add("-");
451
- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452
- importGFDItem.addActionListener(this);
453
-
454793 oe.menuBar.add(menu = new Menu("Tools"));
455794 buildToolsMenu(menu);
456795 }
457796
797
+
458798 void SetupUI2(ObjEditor oe)
459799 {
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
+
460812 //new Exception().printStackTrace();
461813
462814 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -485,27 +837,79 @@
485837 oe.radioPanel.add(dummyButton);
486838 oe.buttonGroup.add(dummyButton);
487839 */
840
+ cGridBag copyOptionsPanel = new cGridBag();
841
+
842
+ copyOptionsPanel.preferredHeight = 2;
843
+
488844 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489845
490
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491
- liveCB.setToolTipText("Enabled animation");
846
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
847
+ //minButton.setToolTipText("Minimize window");
848
+ //minButton.addActionListener(this);
849
+
850
+ if (Globals.ADVANCED)
851
+ {
852
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
853
+ maxButton.setToolTipText("Maximize window");
854
+ maxButton.addActionListener(this);
855
+ }
856
+
857
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
858
+ fullButton.setToolTipText("Full-screen window");
859
+ fullButton.addActionListener(this);
860
+
861
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
862
+ screenfitButton.setToolTipText("Screen fit");
863
+ screenfitButton.addActionListener(this);
864
+
865
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
866
+ restoreCameraButton.setToolTipText("Restore viewpoint");
867
+ restoreCameraButton.addActionListener(this);
868
+
869
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870
+ saveButton.setToolTipText("New version");
871
+ saveButton.addActionListener(this);
872
+
873
+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
874
+ undoButton.setToolTipText("Previous version");
875
+ undoButton.addActionListener(this);
876
+ undoButton.setEnabled(false);
877
+
878
+ cGridBag updown = new cGridBag().setVertical(true);
879
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880
+ restoreButton.setToolTipText("Restore current");
881
+ restoreButton.addActionListener(this);
882
+ restoreButton.setEnabled(false);
883
+
884
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885
+ replaceButton.setToolTipText("Replace current");
886
+ replaceButton.addActionListener(this);
887
+ replaceButton.setEnabled(false);
888
+
889
+ copyOptionsPanel.add(updown);
890
+
891
+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
892
+ redoButton.setToolTipText("Next version");
893
+ redoButton.addActionListener(this);
894
+ redoButton.setEnabled(false);
895
+
896
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897
+ liveCB.setToolTipText("Enable animation");
492898 liveCB.addItemListener(this);
493899
494
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
900
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495901 oneStepButton.setToolTipText("Animate one step forward");
496902 oneStepButton.addActionListener(this);
497903
498
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
904
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499905 fastCB.setToolTipText("Fast mode");
500906 fastCB.addItemListener(this);
501907
502
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503
- trackCB.setToolTipText("Enable tracking");
504
- trackCB.addItemListener(this);
505
-
506
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507
- screenfitButton.setToolTipText("Screen fit");
508
- screenfitButton.addActionListener(this);
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);
509913
510914 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511915 // screenfitpointButton.addActionListener(this);
....@@ -515,67 +919,155 @@
515919 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516920 snapobjectButton.addActionListener(this);
517921 snapobjectButton.setToolTipText("Snap Object");
922
+
923
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
924
+ fourButton.addActionListener(this);
925
+ fourButton.setToolTipText("Show control panel only");
518926 }
519927
520
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521
- flashSelectionButton.setToolTipText("Show selection");
522
- flashSelectionButton.addActionListener(this);
928
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523929
524
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525
-
526
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527
- twoButton.setToolTipText("Show center view only");
930
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
+ twoButton.setToolTipText("Show 3D view only");
528932 twoButton.addActionListener(this);
529
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530
- fourButton.addActionListener(this);
531
- fourButton.setToolTipText("Show left panel only");
532
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533
- sixButton.setToolTipText("2-column layout left");
534
- sixButton.addActionListener(this);
535
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536
- threeButton.setToolTipText("2-column layout right");
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");
537937 threeButton.addActionListener(this);
538
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539
- sevenButton.setToolTipText("3-column layout");
540
- 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);
541944 //
542945
543
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544
- 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");
545948 rootButton.addActionListener(this);
546949
547
- 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);
548951 closeButton.setToolTipText("Close tab");
549952 closeButton.addActionListener(this);
550953 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551954 //clearButton.addActionListener(this);
552
-
553
- cGridBag commandsPanel = new cGridBag();
955
+
956
+ cGridBag row1 = new cGridBag();
554957
555
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556
- 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");
5571044 editButton.addActionListener(this);
5581045
559
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560
- uneditButton.setToolTipText("Unedit selection");
1046
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
+ uneditButton.setToolTipText("Remove selection controls");
5611048 uneditButton.addActionListener(this);
5621049
563
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564
- allParamsButton.setToolTipText("Edit all params");
1050
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051
+ allParamsButton.setToolTipText("Show all controle");
5651052 allParamsButton.addActionListener(this);
5661053
567
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5681055 clearPanelButton.setToolTipText("Clear edit panel");
5691056 clearPanelButton.addActionListener(this);
5701057
571
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5721059 unselectButton.setToolTipText("Unselect");
5731060 unselectButton.addActionListener(this);
5741061
575
- 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);
5761065
577
- oe.treePanel.add(commandsPanel);
578
- oe.treePanel.Return();
1066
+ editCommandsPanel.preferredHeight = 1;
1067
+
1068
+ SetPinStates(false);
1069
+// oe.treePanel.add(commandsPanel);
1070
+// oe.treePanel.Return();
5791071
5801072 // oe.aConstraints.gridx += 1;
5811073 // oe.aConstraints.weighty = 0;
....@@ -592,32 +1084,20 @@
5921084
5931085 JScrollPane jSP;
5941086 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1087
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
5961088 ResetModel();
5971089
5981090 oe.treePanel.add(jSPPanel);
5991091 oe.treePanel.Return();
6001092
601
- cGridBag copyOptionsPanel = new cGridBag();
602
-
603
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604
- colorCB.setToolTipText("Copy color when dropped");
605
- colorCB.addItemListener(this);
606
-
607
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608
- materialCB.setToolTipText("Copy material when dropped");
609
- materialCB.addItemListener(this);
610
-
611
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612
- textureCB.setToolTipText("Copy texture when dropped");
613
- textureCB.addItemListener(this);
614
-
615
- copyOptionsPanel.preferredHeight = 1;
6161093 oe.treePanel.add(copyOptionsPanel);
6171094 oe.treePanel.Return();
1095
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1096
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1097
+ sliderPane.preferredHeight = 1;
6181098
619
-// mainPanel.setDividerLocation(0.5); //1.0);
620
-// mainPanel.setResizeWeight(0.5);
1099
+// mainPanel.setDividerLocation(0.1); //1.0);
1100
+ mainPanel.setResizeWeight(0.4);
6211101
6221102 //jList.addListSelectionListener(this);
6231103 oe.jTree.addTreeSelectionListener(this);
....@@ -625,7 +1105,7 @@
6251105 //jTree.setEditable(true);
6261106 oe.jTree.setDragEnabled(true);
6271107 //jTree.setPreferredSize(new Dimension(10,10));
628
- jSP.setPreferredSize(new Dimension(100,200));
1108
+ //jSP.setPreferredSize(new Dimension(100,200));
6291109
6301110 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6311111
....@@ -637,29 +1117,49 @@
6371117 dgr.addDragGestureListener(this);
6381118 }catch(Exception e) {}
6391119 */
640
- radio.layout = sevenButton;
1120
+ radio.layout = sixButton; // sevenButton;
6411121 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6421122 }
6431123
6441124 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
6451125 {
1126
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1127
+ colorCB.setToolTipText("Copy color when dropped");
1128
+ colorCB.addItemListener(this);
1129
+
1130
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1131
+ materialCB.setToolTipText("Copy material when dropped");
1132
+ materialCB.addItemListener(this);
1133
+
1134
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1135
+ textureCB.setToolTipText("Copy texture when dropped");
1136
+ textureCB.addItemListener(this);
1137
+
1138
+ panel.Return();
1139
+
6461140 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
6471141 boxCB.setToolTipText("Display bounding boxes");
6481142 boxCB.addItemListener(this);
6491143
6501144 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1145
+ zoomBoxCB.setToolTipText("Display only for wheel");
6521146 zoomBoxCB.addItemListener(this);
6531147
654
- if (Globals.ADVANCED)
1148
+ if (true) // Globals.ADVANCED)
6551149 {
656
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657
- supportCB.setToolTipText("Enable rigging");
658
- supportCB.addItemListener(this);
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);
6591157
6601158 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
6611159 // localCB.addItemListener(this);
6621160
1161
+ panel.Return();
1162
+
6631163 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
6641164 crowdCB.setToolTipText("Used for crowds");
6651165 crowdCB.addItemListener(this);
....@@ -676,6 +1176,8 @@
6761176 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
6771177 // speakerMocapCB.addItemListener(this);
6781178
1179
+ panel.Return();
1180
+
6791181 if (false)
6801182 {
6811183 // handled in scripts
....@@ -690,42 +1192,85 @@
6901192 //constraints.gridy += 1;
6911193 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
6921194 smoothfocusCB.addItemListener(this);
1195
+ panel.Return();
6931196 }
6941197
6951198 //constraints.gridx += 1;
6961199 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
6971200 // debugCB.addItemListener(this);
6981201
1202
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1203
+ trackCB.setToolTipText("Enable tracking target");
1204
+ trackCB.addItemListener(this);
1205
+
6991206 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1207
+ oeilCB.setToolTipText("Move camera when tracking");
7001208 oeilCB.addItemListener(this);
7011209
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
+ {
7021230 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
7031231 lookAtCB.setToolTipText("Look-at target");
7041232 lookAtCB.addItemListener(this);
1233
+ }
7051234
7061235 }
7071236
7081237 cGridBag fill = new cGridBag();
709
-
7101238 fill.preferredHeight = 200;
1239
+ cGridBag fill2 = new cGridBag();
1240
+ fill2.preferredHeight = 200;
1241
+ cGridBag fill3 = new cGridBag();
1242
+ fill3.preferredHeight = 200;
7111243
7121244 panel.add(fill);
1245
+ panel.add(fill2);
1246
+ panel.add(fill3);
7131247
7141248 }
7151249
7161250 void EditObject(Object3D obj)
7171251 {
7181252 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
+
7191261 radioButton.SetObject(obj);
720
- radioButton.layout = sevenButton;
1262
+ radioButton.layout = sixButton; // sevenButton;
7211263 radioButton.SetCamera(cameraView.renderCamera, false);
7221264 radioButton.addActionListener(this);
7231265 radioPanel.add(radioButton);
7241266 buttonGroup.add(radioButton);
7251267 radioButton.doClick();
7261268 }
1269
+
7271270 void SetupViews(ObjEditor oe)
7281271 {
1272
+ theFrame = this;
1273
+
7291274 oe.SetupViews();
7301275
7311276 System.out.println("SetupViews");
....@@ -734,23 +1279,28 @@
7341279 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
7351280 }
7361281
737
- JCheckBox liveCB;
738
- JCheckBox supportCB;
739
- JCheckBox localCB;
740
- JCheckBox crowdCB;
741
- JCheckBox smoothCB;
742
- JCheckBox fastCB;
743
- JCheckBox slowCB;
744
- JCheckBox boxCB;
745
- JCheckBox zoomBoxCB;
746
- JCheckBox trackCB;
747
- 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;
7481295 // JCheckBox speakerMocapCB;
749
- JCheckBox speakerCameraCB;
750
- JCheckBox speakerFocusCB;
751
- JCheckBox debugCB;
752
- JCheckBox oeilCB;
753
- JCheckBox lookAtCB;
1296
+ cCheckBox speakerCameraCB;
1297
+ cCheckBox speakerFocusCB;
1298
+ cCheckBox debugCB;
1299
+
1300
+ cCheckBox oeilCB;
1301
+ cCheckBox shadowCB;
1302
+ cCheckBox autokeepCB;
1303
+ cCheckBox lookAtCB;
7541304
7551305 // static int COLOR = 1;
7561306 // static int MATERIAL = 2;
....@@ -758,9 +1308,9 @@
7581308
7591309 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7601310
761
- JCheckBox colorCB;
762
- JCheckBox materialCB;
763
- JCheckBox textureCB;
1311
+ cCheckBox colorCB;
1312
+ cCheckBox materialCB;
1313
+ cCheckBox textureCB;
7641314
7651315 public void itemStateChanged(ItemEvent e)
7661316 {
....@@ -788,6 +1338,7 @@
7881338 } else if(e.getSource() == liveCB)
7891339 {
7901340 cameraView.ToggleLive();
1341
+ refreshContents(false);
7911342 }
7921343 else if(e.getSource() == supportCB)
7931344 {
....@@ -852,6 +1403,18 @@
8521403 {
8531404 cameraView.ToggleOeil();
8541405 }
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
+ }
8551418 else if(e.getSource() == lookAtCB)
8561419 {
8571420 cameraView.ToggleLookAt();
....@@ -868,7 +1431,8 @@
8681431
8691432 /**/
8701433 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1434
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1435
+ TreePath path = objEditor.jTree.getSelectionPath();
8721436 if ((path == null) || (path.getPathCount() <= 1)) {
8731437 // We can't move the root node or an empty selection
8741438 return;
....@@ -931,8 +1495,6 @@
9311495 }
9321496 }
9331497
934
- String string = (String) object;
935
-
9361498 System.out.println("Transfer = " + object + "; drop : " + target);
9371499 // if( object instanceof java.io.File[])
9381500 // {
....@@ -940,6 +1502,8 @@
9401502 // objEditor.DropFile((java.io.File[]) object, true);
9411503 // return;
9421504 // }
1505
+
1506
+ String string = object.toString();
9431507
9441508 // File path for Mac and Windows
9451509 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -985,23 +1549,33 @@
9851549
9861550 assert target == objEditor.jTree;
9871551 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1552
+ Object3D destinationLeaf;
9881553 try {
989
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1554
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9901555 } catch (Exception e) {
9911556 System.out.println("destinationPath : " + destinationPath);
9921557 return;
9931558 }
9941559
995
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1560
+ for (int i=group.selection.size(); --i>=0;)
9961561 {
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
+// {
9971571 loadClipboard(true);
9981572 objEditor.jTree.setSelectionPath(destinationPath);
9991573 pasteInto(false, false);
1000
- } else {
1001
- loadClipboard(false);
1002
- objEditor.jTree.setSelectionPath(destinationPath);
1003
- pasteInto(false, false); // true); // ???
1004
- }
1574
+// } else {
1575
+// loadClipboard(false);
1576
+// objEditor.jTree.setSelectionPath(destinationPath);
1577
+// pasteInto(false, false); // true); // ???
1578
+// }
10051579 }
10061580 public void dropActionChanged(DropTargetDragEvent dtde)
10071581 // Called if the user has modified the current drop gesture
....@@ -1106,22 +1680,30 @@
11061680 {
11071681 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11081682 //heightFieldItem.addActionListener(this);
1109
- gridItem = menu.add(new MenuItem("Grid"));
1110
- gridItem.addActionListener(this);
1111
- rectoidItem = menu.add(new MenuItem("Box"));
1112
- rectoidItem.addActionListener(this);
1113
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114
- ellipsoidItem.addActionListener(this);
1115
- coneItem = menu.add(new MenuItem("Cone"));
1116
- coneItem.addActionListener(this);
1117
- torusItem = menu.add(new MenuItem("Torus"));
1118
- torusItem.addActionListener(this);
1119
- superItem = menu.add(new MenuItem("Superellipsoid"));
1120
- 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
+ {
11211701 kleinItem = menu.add(new MenuItem("Klein Bottle"));
11221702 kleinItem.addActionListener(this);
1123
- particleItem = menu.add(new MenuItem("Particle system"));
1124
- particleItem.addActionListener(this);
1703
+ }
1704
+
1705
+// particleItem = menu.add(new MenuItem("Particle system"));
1706
+// particleItem.addActionListener(this);
11251707 if (Globals.ADVANCED)
11261708 {
11271709 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1147,15 +1729,15 @@
11471729 }
11481730 bezierItem = menu.add(new MenuItem("Bezier Patch"));
11491731 bezierItem.addActionListener(this);
1150
- overlayItem = menu.add(new MenuItem("Overlay"));
1151
- overlayItem.addActionListener(this);
1152
- lightItem = menu.add(new MenuItem("Light"));
1153
- lightItem.addActionListener(this);
1732
+// overlayItem = menu.add(new MenuItem("Overlay"));
1733
+// overlayItem.addActionListener(this);
1734
+// lightItem = menu.add(new MenuItem("Light"));
1735
+// lightItem.addActionListener(this);
11541736 menu.add("-");
11551737 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11561738 //superLoopItem.addActionListener(this);
1157
- loopItem = menu.add(new MenuItem("Loop"));
1158
- loopItem.addActionListener(this);
1739
+// loopItem = menu.add(new MenuItem("Loop"));
1740
+// loopItem.addActionListener(this);
11591741 doubleItem = menu.add(new MenuItem("Fork"));
11601742 doubleItem.addActionListener(this);
11611743 if (Globals.ADVANCED)
....@@ -1171,6 +1753,9 @@
11711753 animationItem.addItemListener(this);
11721754 animationItem.setState(Globals.ANIMATION);
11731755
1756
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
1757
+ archiveItem.addActionListener(this);
1758
+
11741759 menu.add("-");
11751760 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11761761 parseverticesItem.addActionListener(this);
....@@ -1183,6 +1768,8 @@
11831768 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11841769 reduce34MorphItem.addActionListener(this);
11851770 menu.add("-");
1771
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
1772
+ memoryItem.addActionListener(this);
11861773 menu.add(computeAOItem = new MenuItem("Compute AO"));
11871774 computeAOItem.addActionListener(this);
11881775
....@@ -1191,11 +1778,9 @@
11911778 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
11921779 mirrorItem.addActionListener(this);
11931780 menu.add("-");
1194
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1195
- memoryItem.addActionListener(this);
11961781 menu.add(analyzeItem = new MenuItem("Analyze"));
11971782 analyzeItem.addActionListener(this);
1198
- menu.add(dumpItem = new MenuItem("Dump"));
1783
+ menu.add(dumpItem = new MenuItem("Print"));
11991784 dumpItem.addActionListener(this);
12001785 // menu.add(pathItem = new MenuItem("From-to path"));
12011786 // pathItem.addActionListener(this);
....@@ -1336,9 +1921,34 @@
13361921 shadow.material = new cMaterial(obj.material);
13371922 shadow.material.diffuse = 0.0001f;
13381923 shadow.material.specular = 0.0001f;
1924
+ //shadow.projectedVertices[1].x = 300;
13391925
13401926 makeSomething(shadow);
13411927 }
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
+ }
13421952
13431953 /**
13441954 * applyExample
....@@ -1583,7 +2193,7 @@
15832193 {
15842194 ScreenFit();
15852195 } else
1586
- if (source == switchItem)
2196
+ if (source == switchViewItem)
15872197 {
15882198 cVector v1 = new cVector();
15892199 cVector v2 = new cVector();
....@@ -1592,11 +2202,11 @@
15922202 objEditor.cameraView.renderCamera.setAim(v2, v1);
15932203 objEditor.cameraView.repaint();
15942204 } else
1595
- if (source == rectoidItem)
2205
+ if (source == rectoidItem || source == boxButton)
15962206 {
15972207 makeSomething(new Box());
15982208 } else
1599
- if (source == particleItem)
2209
+ if (source == particleItem || source == particlesButton)
16002210 {
16012211 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16022212 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1675,27 +2285,27 @@
16752285
16762286 makeSomething(obj);
16772287 } else
1678
- if (source == gridItem)
2288
+ if (source == gridItem || source == gridButton)
16792289 {
16802290 makeSomething(new Grid());
16812291 } else
1682
- if (source == ellipsoidItem)
2292
+ if (source == ellipsoidItem || source == sphereButton)
16832293 {
16842294 makeSomething(new Sphere());
16852295 } else
1686
- if (source == coneItem)
2296
+ if (source == coneItem || source == coneButton)
16872297 {
16882298 makeSomething(new Cone());
16892299 } else
1690
- if (source == torusItem)
2300
+ if (source == torusItem || source == torusButton)
16912301 {
16922302 makeSomething(new Torus());
16932303 } else
1694
- if (source == superItem)
2304
+ if (source == superItem || source == superButton)
16952305 {
16962306 makeSomething(new Superellipsoid());
16972307 } else
1698
- if (source == kleinItem)
2308
+ if (source == kleinItem || source == kleinButton)
16992309 {
17002310 makeSomething(new Klein());
17012311 } else
....@@ -1715,7 +2325,7 @@
17152325 {
17162326 makeSomething(new BezierSurface());
17172327 } else
1718
- if (source == overlayItem)
2328
+ if (source == overlayItem || source == overlayButton)
17192329 {
17202330 /*
17212331 Object3D obj = new BezierSurface(5,8);
....@@ -1763,10 +2373,27 @@
17632373 s.setup();
17642374 makeSomething(s);
17652375 } else
1766
- if (source == lightItem)
2376
+ if (source == lightItem || source == lightButton)
17672377 {
17682378 makeSomething(new Light());
17692379 } 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
17702397 if (source == csgItem)
17712398 {
17722399 group(new CSG());
....@@ -1813,30 +2440,30 @@
18132440
18142441 group(g);
18152442 } else
1816
- if (source == loopItem)
2443
+ if (source == loopItem || source == loopButton)
18172444 {
18182445 Composite csg = new GroupLeaf();
18192446 csg.count = 5;
18202447 group(csg);
1821
- Composite child = new cGroup();
2448
+ Composite child = new cGroup("Branch");
18222449 csg.addChild(child);
18232450 child.addChild(csg);
18242451 } else
18252452 if (source == doubleItem)
18262453 {
1827
- Composite csg = new GroupLeaf();
2454
+ Composite csg = new GroupLeaf("Fork");
18282455 csg.count = 5;
18292456 group(csg);
1830
- Composite child = new cGroup();
2457
+ Composite child = new cGroup("Branch A");
18312458 csg.addChild(child);
18322459 child.addChild(csg);
1833
- child = new cGroup();
2460
+ child = new cGroup("Branch B");
18342461 csg.addChild(child);
18352462 child.addChild(csg);
18362463 } else
18372464 if (source == tripleItem)
18382465 {
1839
- Composite csg = new GroupLeaf();
2466
+ Composite csg = new GroupLeaf("Trident");
18402467 csg.count = 4;
18412468 group(csg);
18422469 Composite child = new cGroup();
....@@ -1849,35 +2476,10 @@
18492476 csg.addChild(child);
18502477 child.addChild(csg);
18512478 } else
1852
-
1853
- if (source == importGFDItem)
1854
- {
1855
- ImportGFD();
1856
- } else
1857
- if (source == importVRMLX3DItem)
1858
- {
1859
- ImportVRMLX3D();
1860
- } else
1861
- if (source == import3DSItem)
1862
- {
1863
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864
- } else
1865
- if (source == importOBJItem)
1866
- {
1867
- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868
- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869
- browser.setVisible(true);
1870
- String filename = browser.getFile();
1871
- if (filename != null && filename.length() > 0)
1872
- {
1873
- String fullname = browser.getDirectory() + filename;
1874
- makeSomething(ReadOBJ(fullname), true);
1875
- }
1876
- } else
18772479 if (source == computeAOItem)
18782480 {
18792481 Globals.drawMode = CameraPane.OCCLUSION;
1880
- Globals.theRenderer.repaint();
2482
+ cameraView.repaint();
18812483 } else
18822484 if (source == recompileItem)
18832485 {
....@@ -1911,6 +2513,46 @@
19112513 {
19122514 DumpObject();
19132515 } 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
19142556 if (source == oneStepButton)
19152557 {
19162558 Globals.ONESTEP = true;
....@@ -1918,17 +2560,14 @@
19182560 } else
19192561 if (source == screenfitButton)
19202562 {
1921
- //Reload(lastConverter, lastFilename, true);
19222563 ScreenFit();
19232564 } else
19242565 if (source == screenfitpointButton)
19252566 {
1926
- //Reload(lastConverter, lastFilename, true);
19272567 ScreenFitPoint();
19282568 } else
19292569 if (source == snapobjectButton)
19302570 {
1931
- //Reload(lastConverter, lastFilename, true);
19322571 SnapObject();
19332572 } else
19342573 // if (event.getSource() == recompileButton)
....@@ -1964,6 +2603,14 @@
19642603 if (source == cutItem || source == clearButton)
19652604 {
19662605 loadClipboard(true);
2606
+ } else
2607
+ if (source == undoItem)
2608
+ {
2609
+ Undo();
2610
+ } else
2611
+ if (source == redoItem)
2612
+ {
2613
+ Redo();
19672614 } else
19682615 if (source == duplicateItem)
19692616 {
....@@ -2276,7 +2923,7 @@
22762923 {
22772924 RevertMeshes();
22782925 } else
2279
- if (source == resetMeshItem)
2926
+ if (source == resetAllItem)
22802927 {
22812928 ResetAll();
22822929 } else
....@@ -2284,7 +2931,7 @@
22842931 {
22852932 StepAll();
22862933 } else
2287
- if (source == clearItem) // || event.getSource() == clearButton)
2934
+ if (source == deleteItem) // || event.getSource() == clearButton)
22882935 {
22892936 //int indices[] = jList.getSelectedIndices();
22902937 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2296,9 +2943,9 @@
22962943 {
22972944 ClearSelection(true);
22982945 } else
2299
- if (source == grabItem)
2946
+ if (source == grabItem || source == groupButton)
23002947 {
2301
- group(new cGroup(), true);
2948
+ group(new cGroup(), false); // true);
23022949 } else
23032950 if (source == hideItem)
23042951 {
....@@ -2316,11 +2963,11 @@
23162963 {
23172964 makeSomething(new Camera());
23182965 } else
2319
- if (source == compositeItem)
2966
+ if (source == compositeItem || source == compositeButton)
23202967 {
23212968 group(new Composite());
23222969 } else
2323
- if (source == randomItem)
2970
+ if (source == switchItem || source == switchButton)
23242971 {
23252972 RandomNode random = new RandomNode();
23262973 group(random);
....@@ -2422,7 +3069,7 @@
24223069 {
24233070 group(new cLinker());
24243071 } else
2425
- if (source == textureItem)
3072
+ if (source == textureItem || source == textureButton)
24263073 {
24273074 group(new TextureNode());
24283075 } else
....@@ -2442,17 +3089,30 @@
24423089 {
24433090 CastShadow(2);
24443091 } else
2445
- if (source == ungroupItem)
3092
+ if (source == ungroupItem || source == ungroupButton)
24463093 {
2447
- //ungroup();
3094
+ boolean hasRoot = false;
3095
+
24483096 for (int i=0; i<group.selection.size(); i++)
24493097 {
2450
- Ungroup(group.selection.get(i));
3098
+ if (group.selection.get(i) == group)
3099
+ {
3100
+ hasRoot = true;
3101
+ break;
3102
+ }
24513103 }
24523104
2453
- ClearSelection(false);
2454
-
2455
- 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
+ }
24563116 } else
24573117 if (source == genUVItem)
24583118 {
....@@ -2464,7 +3124,7 @@
24643124 } else
24653125 if (source == genNormalsMESHItem)
24663126 {
2467
- GenNormals(true); // TODO
3127
+ GenNormalsMESH();
24683128 } else
24693129 if (source == genNormalsORGANItem)
24703130 {
....@@ -2529,6 +3189,22 @@
25293189 if (source == unmarkleavesItem)
25303190 {
25313191 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);
25323208 } else
25333209 if (source == flipVItem)
25343210 {
....@@ -2614,9 +3290,13 @@
26143290 {
26153291 SmoothMesh();
26163292 } else
2617
- if (source == transformgeometryItem)
3293
+ if (source == transformGeometryItem)
26183294 {
26193295 TransformGeometry();
3296
+ } else
3297
+ if (source == transformChildrenItem)
3298
+ {
3299
+ TransformChildren();
26203300 } else
26213301 if (source == resetTransformItem)
26223302 {
....@@ -2624,7 +3304,11 @@
26243304 } else
26253305 if (source == resetCentroidItem)
26263306 {
2627
- ResetCentroid();
3307
+ ResetCentroid(true);
3308
+ } else
3309
+ if (source == resetCentroidXZItem)
3310
+ {
3311
+ ResetCentroid(false);
26283312 } else
26293313 if (source == resetParentItem)
26303314 {
....@@ -2729,7 +3413,7 @@
27293413 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
27303414 {
27313415 obj = (Object3D)e.nextElement();
2732
- obj.SetBumpTexture(null);
3416
+ obj.ResetBumpTexture();
27333417 }
27343418
27353419 refreshContents();
....@@ -2745,6 +3429,31 @@
27453429
27463430 refreshContents();
27473431 } 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
27483457 if (source == flashSelectionButton)
27493458 {
27503459 CameraPane.flash = true;
....@@ -2756,6 +3465,10 @@
27563465 if (source == twoButton)
27573466 {
27583467 radio.layout = twoButton;
3468
+
3469
+ if (CameraPane.FULLSCREEN)
3470
+ fullscreenLayout = radio.layout;
3471
+
27593472 // bug
27603473 //gridPanel.setDividerLocation(1.0);
27613474 //bigPanel.setDividerLocation(0.0);
....@@ -2788,10 +3501,31 @@
27883501 bigThree.ClearUI();
27893502 bigThree.add(centralPanel);
27903503 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
+
27913522 } else
27923523 if (source == threeButton)
27933524 {
27943525 radio.layout = threeButton;
3526
+
3527
+ if (CameraPane.FULLSCREEN)
3528
+ fullscreenLayout = radio.layout;
27953529
27963530 // bigThree.remove(scenePanel);
27973531 // bigThree.remove(centralPanel);
....@@ -2821,13 +3555,18 @@
28213555 // centralPanel.setVisible(true);
28223556 // XYZPanel.setVisible(true);
28233557 bigThree.ClearUI();
3558
+ bigThree.add(scenePanel);
28243559 bigThree.add(centralPanel);
2825
- bigThree.add(XYZPanel);
28263560 bigThree.FlushUI();
3561
+
3562
+ cameraView.requestFocusInWindow();
28273563 } else
28283564 if (source == fourButton)
28293565 {
28303566 radio.layout = fourButton;
3567
+
3568
+ if (CameraPane.FULLSCREEN)
3569
+ fullscreenLayout = radio.layout;
28313570
28323571 // bigThree.remove(scenePanel);
28333572 // bigThree.remove(centralPanel);
....@@ -2859,10 +3598,15 @@
28593598 bigThree.ClearUI();
28603599 bigThree.add(scenePanel);
28613600 bigThree.FlushUI();
3601
+
3602
+ cameraView.requestFocusInWindow();
28623603 } else
28633604 if (source == sixButton)
28643605 {
28653606 radio.layout = sixButton;
3607
+
3608
+ if (CameraPane.FULLSCREEN)
3609
+ fullscreenLayout = radio.layout;
28663610
28673611 // bigThree.remove(scenePanel);
28683612 // bigThree.remove(centralPanel);
....@@ -2892,13 +3636,18 @@
28923636 // centralPanel.setVisible(true);
28933637 // XYZPanel.setVisible(false);
28943638 bigThree.ClearUI();
2895
- bigThree.add(scenePanel);
28963639 bigThree.add(centralPanel);
3640
+ bigThree.add(scenePanel);
28973641 bigThree.FlushUI();
3642
+
3643
+ cameraView.requestFocusInWindow();
28983644 } else
28993645 if (source == sevenButton)
29003646 {
29013647 radio.layout = sevenButton;
3648
+
3649
+ if (CameraPane.FULLSCREEN)
3650
+ fullscreenLayout = radio.layout;
29023651
29033652 // bigThree.remove(scenePanel);
29043653 // bigThree.remove(centralPanel);
....@@ -2932,6 +3681,8 @@
29323681 bigThree.add(centralPanel);
29333682 bigThree.add(XYZPanel);
29343683 bigThree.FlushUI();
3684
+
3685
+ cameraView.requestFocusInWindow();
29353686 } else
29363687 if (source == rootButton)
29373688 {
....@@ -2943,6 +3694,7 @@
29433694 EditObject(obj);
29443695 }
29453696
3697
+ cameraView.requestFocusInWindow();
29463698 refreshContents(true);
29473699 } else
29483700 if (source == closeButton)
....@@ -2952,22 +3704,37 @@
29523704 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
29533705 {
29543706 ab = (cRadio)e.nextElement();
2955
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3707
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
29563708 {
3709
+ // Patch to avoid bug with transparency.
3710
+ if (!ab.hadMaterial)
3711
+ {
3712
+ ab.object.material = null;
3713
+ }
3714
+
29573715 buttonGroup.remove(ab);
29583716 radioPanel.remove(ab);
29593717
2960
- ab.GetObject().editWindow = null;
3718
+ //ab.GetObject().editWindow = null;
3719
+ ab.GetObject().manipWindow = null;
29613720 // ab.GetObject().objectUI = null; // ?????????
29623721
29633722 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
29643723 break;
29653724 }
29663725 }
3726
+
3727
+ cameraView.requestFocusInWindow();
29673728 refreshContents(true);
29683729 } else
29693730 if (source == editItem || source == editButton)
29703731 {
3732
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3733
+ {
3734
+ Object3D child = (Object3D)e.nextElement();
3735
+ child.pinned = true;
3736
+ }
3737
+
29713738 EditSelection(false);
29723739 } else
29733740 if (source == uneditButton)
....@@ -2977,10 +3744,11 @@
29773744 Object3D child = (Object3D)e.nextElement();
29783745 if(child.editWindow != null)
29793746 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747
+ child.pinned = false;
29803748 child.CloseUI();
29813749 listUI.remove(child);
29823750
2983
- child.editWindow = null; // ???????????
3751
+ //child.editWindow = null; // ???????????
29843752 }
29853753 objEditor.ctrlPanel.FlushUI();
29863754 //objEditor.jTree.clearSelection();
....@@ -2993,6 +3761,7 @@
29933761 //copy.ClearUI();
29943762 for (Object3D obj : listUI)
29953763 {
3764
+ obj.pinned = false;
29963765 obj.CloseUI();
29973766 }
29983767 listUI.clear();
....@@ -3002,7 +3771,7 @@
30023771 {
30033772 assert(copy == group);
30043773
3005
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3774
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30063775
30073776 for (Object3D obj : listUI)
30083777 {
....@@ -3051,6 +3820,9 @@
30513820 }
30523821
30533822 copy = group;
3823
+
3824
+ SetUndoStates();
3825
+
30543826 //Globals.theRenderer.object = group;
30553827 if(!useclient)
30563828 {
....@@ -3066,20 +3838,46 @@
30663838 frontView.object = group;
30673839 sideView.object = group;
30683840 }
3069
- group.editWindow = this;
3841
+
3842
+// fix "+" issue
3843
+ //group.editWindow = this;
3844
+ group.manipWindow = this;
3845
+
30703846 /*
30713847 currentLayout = radio.layout;
30723848 if (currentLayout == null)
30733849 currentLayout = sevenButton;
30743850 */
30753851 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);
30763859 keepparent = group.parent;
30773860 // PARENT = NULL or not???
30783861 //group.parent = null; // ROOT
30793862 //group.attributes = -1;
30803863 ResetModel();
3864
+
3865
+ cameraView.requestFocusInWindow();
30813866 refreshContents(true);
3082
- }
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
+ }
30833881 else
30843882 {
30853883 //return super.action(event, arg);
....@@ -3088,7 +3886,6 @@
30883886 }
30893887
30903888 boolean useclient = false;
3091
- cRadio radio;
30923889
30933890 void ToggleRoot()
30943891 {
....@@ -3140,6 +3937,28 @@
31403937 refreshContents();
31413938 }
31423939
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
+ }
31433962
31443963 void ResetTransform()
31453964 {
....@@ -3252,7 +4071,7 @@
32524071 refreshContents();
32534072 }
32544073
3255
- void ResetCentroid()
4074
+ void ResetCentroid(boolean full)
32564075 {
32574076 Object3D obj;
32584077 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3267,12 +4086,16 @@
32674086 LA.matIdentity(Object3D.mat);
32684087 obj.getBounds(minima, maxima, false);
32694088 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4089
+ if (full)
4090
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
32714091 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
32724092 obj.TransformMesh(Object3D.mat);
4093
+
32734094 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4095
+ if (full)
4096
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
32754097 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4098
+
32764099 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
32774100 //Object3D.mat[3][0] = -Object3D.mat[3][0];
32784101 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3301,7 +4124,8 @@
33014124
33024125 int size = obj.MemorySize();
33034126
3304
- 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)");
33054129 }
33064130 }
33074131 catch (Exception e)
....@@ -3382,6 +4206,13 @@
33824206 void GenNormals(boolean crease)
33834207 {
33844208 group.GenNormalsS(crease);
4209
+
4210
+ refreshContents();
4211
+ }
4212
+
4213
+ void GenNormalsMESH()
4214
+ {
4215
+ group.GenNormalsMeshS();
33854216
33864217 refreshContents();
33874218 }
....@@ -3613,7 +4444,16 @@
36134444 String pigment = Object3D.GetPigment(tex);
36144445 //String bump = Object3D.GetBump(tex);
36154446
3616
- 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
+ }
36174457
36184458 double s = v.s;
36194459
....@@ -4000,6 +4840,18 @@
40004840 refreshContents();
40014841 }
40024842
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);
4852
+ refreshContents();
4853
+ }
4854
+
40034855 void SetTexRes(int tr)
40044856 {
40054857 group.selection.SetTexRes(tr);
....@@ -4071,28 +4923,25 @@
40714923 // }
40724924 // }
40734925
4074
- static boolean allparams = true;
4075
-
4076
- static Vector<Object3D> listUI = new Vector<Object3D>();
4077
-
40784926 void EditSelection(boolean newWindow)
40794927 {
4928
+ if (group.selection == null)
4929
+ {
4930
+ EditElement(group, newWindow); // ? new
4931
+ return;
4932
+ }
4933
+
40804934 // aConstraints.gridy = 0;
40814935 for (int i=0; i<group.selection.size(); i++)
40824936 {
40834937 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
40844938 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4939
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
40864940
40874941 Object3D elem = (Object3D)group.selection.elementAt(i);
4088
- if(elem != group)
4942
+ if(elem != group || !newWindow)
40894943 {
4090
- // if (!(elem instanceof Composite))
4091
- // newWindow = false;
4092
- listUI.add(elem);
4093
- elem.openEditWindow(this, newWindow); //, false);
4094
- System.out.println("edit : " + elem);
4095
- elem.editWindow.refreshContents(true); // ? new
4944
+ EditElement(elem, newWindow); // ? new
40964945 }
40974946 }
40984947 }
....@@ -4167,7 +5016,8 @@
41675016 //new Exception().printStackTrace();
41685017
41695018 freezemodel = true;
4170
-
5019
+ ClearUnpinned();
5020
+
41715021 /**/
41725022 //switch (event.id)
41735023 {
....@@ -4175,7 +5025,6 @@
41755025 //case 702: // Event.LIST_DESELECT
41765026 group.deselectAll();
41775027 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178
- objEditor.ClearInfo(); // .GetMaterial());
41795028 if (tps != null)
41805029 {
41815030 for (int i=0; i < tps.length; i++)
....@@ -4184,10 +5033,8 @@
41845033
41855034 //if (child.parent != null)
41865035 //child.parent.addSelectee(child);
5036
+ objEditor.SetMaterial(child);
41875037 group.addSelectee(child);
4188
- objEditor.SetMaterial(child); // .GetMaterial());
4189
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190
- System.err.println("info : " + child.GetPath());
41915038 }
41925039 }
41935040 // else
....@@ -4197,20 +5044,28 @@
41975044 // System.err.println("info : " + group.GetPath());
41985045 // }
41995046
4200
- objEditor.SetText(); // jan 2014
4201
-
4202
- 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))
42035048 CameraPane.flash = true;
42045049
4205
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5050
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
42065051 // a camera
42075052 {
4208
- CameraPane.camerachangeframe = 0; // don't refuse it
4209
- 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
+ }
42105058 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
42115059 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
42125060 }
42135061
5062
+ if (tps != null && tps.length == 1)
5063
+ {
5064
+ EditSelection(false);
5065
+ }
5066
+
5067
+ SetPinStates(tps != null && tps.length > 0);
5068
+
42145069 refreshContents();
42155070 //return true;
42165071 }
....@@ -4219,6 +5074,35 @@
42195074
42205075 freezemodel = false;
42215076 }
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
+ }
42225106
42235107 void linkSomething(Object3D thing)
42245108 {
....@@ -4290,6 +5174,7 @@
42905174 {
42915175 if (group.selection.isEmpty())
42925176 return;
5177
+
42935178 Grafreed.clipboardIsTempGroup = false;
42945179 Composite tGroup = null;
42955180 if (group.selection.size() > 0) // 1)
....@@ -4300,6 +5185,8 @@
43005185
43015186 if (cut)
43025187 {
5188
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5189
+// Save();
43035190 //int indices[] = jList.getSelectedIndices();
43045191 //for (int i = indices.length - 1; i >= 0; i--)
43055192 //jList.remove(indices[i]);
....@@ -4389,8 +5276,10 @@
43895276 }
43905277
43915278 }
5279
+
43925280 if (Grafreed.clipboardIsTempGroup)
43935281 Grafreed.clipboard = tGroup;
5282
+
43945283 if (cut)
43955284 {
43965285 ResetModel();
....@@ -4400,6 +5289,10 @@
44005289
44015290 void paste(boolean expand)
44025291 {
5292
+ if (Globals.REPLACEONMAKE)
5293
+ Save();
5294
+ boolean keep = Globals.REPLACEONMAKE;
5295
+ Globals.REPLACEONMAKE = false;
44035296 // if (GrafreeD.clipboard == null)
44045297 // return;
44055298 boolean first = true;
....@@ -4459,6 +5352,7 @@
44595352 Grafreed.clipboard.get(0).parent = keepparent;
44605353 }
44615354
5355
+ Globals.REPLACEONMAKE = keep;
44625356 ResetModel();
44635357 refreshContents();
44645358 }
....@@ -4594,6 +5488,10 @@
45945488
45955489 void group(Object3D csg, boolean grab)
45965490 {
5491
+ if (Globals.REPLACEONMAKE)
5492
+ Save();
5493
+ boolean keep = Globals.REPLACEONMAKE;
5494
+ Globals.REPLACEONMAKE = false;
45975495 if (//false) // why??
45985496 !group.selection.isEmpty())
45995497 {
....@@ -4707,10 +5605,15 @@
47075605 //node.add(csg);
47085606 //makeSomething(node);
47095607 makeSomething(csg);
5608
+ Globals.REPLACEONMAKE = keep;
47105609 }
47115610
47125611 void Ungroup(Object3D g)
47135612 {
5613
+ if (Globals.REPLACEONMAKE)
5614
+ Save();
5615
+ boolean keep = Globals.REPLACEONMAKE;
5616
+ Globals.REPLACEONMAKE = false;
47145617 if (g instanceof HiddenObject)
47155618 {
47165619 HiddenObject h = (HiddenObject) g;
....@@ -4727,6 +5630,7 @@
47275630 objEditor.makeSomething(g.get(i), false);
47285631 }
47295632 }
5633
+ Globals.REPLACEONMAKE = keep;
47305634 }
47315635
47325636 void ungroup()
....@@ -4922,21 +5826,6 @@
49225826 }
49235827 */
49245828
4925
- void ImportGFD()
4926
- {
4927
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928
- browser.show();
4929
- String filename = browser.getFile();
4930
- if (filename != null && filename.length() > 0)
4931
- {
4932
- String fullname = browser.getDirectory() + filename;
4933
-
4934
- //Object3D readobj =
4935
- objEditor.ReadGFD(fullname, objEditor);
4936
- //makeSomething(readobj);
4937
- }
4938
- }
4939
-
49405829 /*
49415830 public void Callback(Object obj)
49425831 {
....@@ -4960,23 +5849,6 @@
49605849 }
49615850 */
49625851
4963
- void ImportVRMLX3D()
4964
- {
4965
- if (Grafreed.standAlone)
4966
- {
4967
- /**/
4968
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969
- browser.show();
4970
- String filename = browser.getFile();
4971
- if (filename != null && filename.length() > 0)
4972
- {
4973
- String fullname = browser.getDirectory() + filename;
4974
- LoadVRMLX3D(fullname);
4975
- }
4976
- /**/
4977
- }
4978
- }
4979
-
49805852 String GetFile(String dialogName)
49815853 {
49825854 if (Grafreed.standAlone)
....@@ -5047,7 +5919,44 @@
50475919 cButton clearpanelButton;
50485920 cButton unselectButton;
50495921
5922
+ cButton restoreCameraButton;
5923
+
5924
+ cButton saveButton;
50505925 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;
50515960
50525961 cButton screenfitButton;
50535962 cButton screenfitpointButton;
....@@ -5060,14 +5969,6 @@
50605969
50615970 cButton setsupportButton;
50625971
5063
- cButton twoButton;
5064
- cButton sixButton;
5065
- cButton threeButton;
5066
- cButton sevenButton;
5067
- cButton fourButton; // full panel
5068
- cButton oneButton; // full XYZ
5069
- //cButton currentLayout;
5070
-
50715972 //
50725973 //Composite
50735974 Object3D // to do !!
....@@ -5077,9 +5978,11 @@
50775978 //JTree jTree;
50785979 private MenuItem lookAtItem;
50795980 private MenuItem lookFromItem;
5080
- private MenuItem switchItem;
5981
+ private MenuItem switchViewItem;
50815982 private MenuItem cutItem;
5082
- private MenuItem duplicateItem;
5983
+ private MenuItem undoItem;
5984
+ private MenuItem redoItem;
5985
+ private JMenuItem duplicateItem;
50835986 private MenuItem cloneItem;
50845987 private MenuItem cloneSupportItem;
50855988 private MenuItem overwriteGeoItem;
....@@ -5092,7 +5995,7 @@
50925995 private MenuItem linkverticesItem;
50935996 private MenuItem relinkverticesItem;
50945997 private MenuItem setMasterItem;
5095
- private MenuItem resetMeshItem;
5998
+ private MenuItem resetAllItem;
50965999 private MenuItem stepAllItem;
50976000 private MenuItem revertMeshItem;
50986001 private MenuItem poseMeshItem;
....@@ -5107,7 +6010,7 @@
51076010 private MenuItem pasteLinkItem;
51086011 private MenuItem pasteCloneItem;
51096012 private MenuItem pasteExpandItem;
5110
- private MenuItem clearItem;
6013
+ private MenuItem deleteItem;
51116014 private MenuItem clearAllItem;
51126015 private MenuItem genUVItem;
51136016 private MenuItem genNormalsMESHItem;
....@@ -5142,6 +6045,10 @@
51426045 private MenuItem showleavesItem;
51436046 private MenuItem markleavesItem;
51446047 private MenuItem unmarkleavesItem;
6048
+ private MenuItem rewindleavesItem;
6049
+ private MenuItem unrewindleavesItem;
6050
+ private MenuItem randomleavesItem;
6051
+ private MenuItem unrandomleavesItem;
51456052
51466053 private MenuItem flipVItem;
51476054 private MenuItem unflipVItem;
....@@ -5153,15 +6060,17 @@
51536060 private MenuItem panoTexturesItem;
51546061
51556062 private MenuItem resetCentroidItem;
5156
- private MenuItem transformgeometryItem;
6063
+ private MenuItem resetCentroidXZItem;
51576064 private MenuItem resetTransformItem;
6065
+ private MenuItem transformGeometryItem;
6066
+ private MenuItem transformChildrenItem;
51586067 private MenuItem hideItem;
51596068 private MenuItem grabItem;
51606069 private MenuItem backItem;
51616070 private MenuItem frontItem;
51626071 private MenuItem cameraItem;
51636072 private MenuItem compositeItem;
5164
- private MenuItem randomItem;
6073
+ private MenuItem switchItem;
51656074 private MenuItem physicsItem;
51666075 private MenuItem frameselectorItem;
51676076 private MenuItem scriptNodeItem;
....@@ -5185,6 +6094,8 @@
51856094 private MenuItem attachBumpItem;
51866095 private MenuItem detachBumpItem;
51876096 private MenuItem pigmentBumpItem;
6097
+ private MenuItem embedTexturesItem;
6098
+ private MenuItem deEmbedTexturesItem;
51886099
51896100 private MenuItem particleItem;
51906101 private MenuItem ragdollItem;
....@@ -5223,11 +6134,6 @@
52236134 private MenuItem doubleItem;
52246135 private MenuItem tripleItem;
52256136
5226
- private MenuItem importGFDItem;
5227
- private MenuItem importVRMLX3DItem;
5228
- private MenuItem import3DSItem;
5229
- private MenuItem importOBJItem;
5230
-
52316137 private MenuItem computeAOItem;
52326138 private MenuItem recompileItem;
52336139 private MenuItem editScriptItem;
....@@ -5237,4 +6143,8 @@
52376143 private MenuItem analyzeItem;
52386144 private MenuItem dumpItem;
52396145 //boolean freezemodel = false;
6146
+
6147
+ Menu cameraMenu;
6148
+ MenuItem editCameraItem;
6149
+ MenuItem restoreCameraItem;
52406150 }