Normand Briere
2019-08-06 ae8dc339f59e972a932b9097d47271e245e4ca9a
GroupEditor.java
....@@ -16,6 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1920 ObjectUI,
2021 Runnable,
2122 ActionListener,
....@@ -23,6 +24,314 @@
2324 DragGestureListener, DragSourceListener, DropTargetListener,
2425 ItemListener // ListSelectionListener
2526 {
27
+
28
+ public void AddSkyboxButton(String f, String s, cGridBag row)
29
+ {
30
+ cButton skyboxButton;
31
+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+ skyboxButton.setToolTipText(s);
35
+ skyboxButton.addActionListener(new ActionListener()
36
+ {
37
+ @Override
38
+ public void actionPerformed(ActionEvent e)
39
+ {
40
+ ChangeSkybox(path);
41
+ }
42
+ });
43
+ }
44
+
45
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
46
+ {
47
+ cGridBag tab0 = new cGridBag().setVertical(true);
48
+
49
+ tab0.setName("Urban");
50
+ skyboxpanel.add(tab0);
51
+
52
+ cGridBag row0 = new cGridBag();
53
+ cGridBag row1 = new cGridBag();
54
+ cGridBag row2 = new cGridBag();
55
+ cGridBag row3 = new cGridBag();
56
+ cGridBag row4 = new cGridBag();
57
+ cGridBag row5 = new cGridBag();
58
+ cGridBag row6 = new cGridBag();
59
+
60
+ AddSkyboxButton("default", "rgb", row0);
61
+ //AddSkyboxButton("default", "cornell", row0);
62
+ AddSkyboxButton("penguins", "dust", row0);
63
+ AddSkyboxButton("penguins", "tropic", row0);
64
+ AddSkyboxButton("penguins", "yonder", row0);
65
+
66
+ AddSkyboxButton("default", "uffizi", row1);
67
+ AddSkyboxButton("bridge", "Bridge", row1);
68
+ AddSkyboxButton("bridge", "Bridge2", row1);
69
+ AddSkyboxButton("urban", "GamlaStan2", row1);
70
+
71
+ AddSkyboxButton("urban", "Parliament", row2);
72
+ AddSkyboxButton("urban", "Roundabout", row2);
73
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
74
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
75
+
76
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
77
+ AddSkyboxButton("urban", "UnionSquare", row3);
78
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
79
+ AddSkyboxButton("park", "BerzeliiPark", row3);
80
+
81
+ AddSkyboxButton("park", "Buddha", row4);
82
+ AddSkyboxButton("park", "CNTower2", row4);
83
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
84
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
85
+
86
+ AddSkyboxButton("park", "Park", row5);
87
+ AddSkyboxButton("park", "Pond", row5);
88
+ AddSkyboxButton("park", "Skansen", row5);
89
+ AddSkyboxButton("park", "Skansen2", row5);
90
+
91
+ AddSkyboxButton("park", "Skansen3", row6);
92
+ AddSkyboxButton("park", "Skansen4", row6);
93
+ AddSkyboxButton("park", "Skansen5", row6);
94
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
95
+
96
+ tab0.add(row0);
97
+ tab0.add(row1);
98
+ tab0.add(row2);
99
+ tab0.add(row3);
100
+ tab0.add(row4);
101
+ tab0.add(row5);
102
+ tab0.add(row6);
103
+
104
+ for (int i=5; --i>=0;)
105
+ {
106
+ //oe.toolboxPanel.Return();
107
+ //tab0.add(new cGridBag());
108
+ }
109
+ }
110
+
111
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
112
+ {
113
+ cGridBag tab0 = new cGridBag().setVertical(true);
114
+
115
+ tab0.setName("Nature");
116
+ skyboxpanel.add(tab0);
117
+
118
+ cGridBag row0 = new cGridBag();
119
+ cGridBag row1 = new cGridBag();
120
+ cGridBag row2 = new cGridBag();
121
+ cGridBag row3 = new cGridBag();
122
+ cGridBag row4 = new cGridBag();
123
+ cGridBag row5 = new cGridBag();
124
+ cGridBag row6 = new cGridBag();
125
+
126
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
127
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
128
+ AddSkyboxButton("beach", "PalmTrees", row0);
129
+ AddSkyboxButton("beach", "Tenerife", row0);
130
+
131
+ AddSkyboxButton("beach", "Tenerife2", row1);
132
+ AddSkyboxButton("beach", "Tenerife3", row1);
133
+ AddSkyboxButton("field", "FishPond", row1);
134
+ AddSkyboxButton("field", "Footballfield", row1);
135
+
136
+ AddSkyboxButton("field", "Meadow", row2);
137
+ AddSkyboxButton("field", "Sorsele", row2);
138
+ AddSkyboxButton("field", "Sorsele2", row2);
139
+ AddSkyboxButton("field", "Sorsele3", row2);
140
+
141
+ AddSkyboxButton("forest", "Brudslojan", row3);
142
+ AddSkyboxButton("forest", "Langholmen2", row3);
143
+ AddSkyboxButton("forest", "Plants", row3);
144
+ AddSkyboxButton("mountain", "Maskonaive", row3);
145
+
146
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
147
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
148
+ AddSkyboxButton("mountain", "Teide", row4);
149
+ AddSkyboxButton("park", "Tantolunden4", row4);
150
+
151
+ AddSkyboxButton("park", "Stairs", row5);
152
+ AddSkyboxButton("default", "skycube", row6);
153
+ AddSkyboxButton("rocky", "Langholmen", row5);
154
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155
+
156
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
157
+ AddSkyboxButton("default", "CloudyHills", row6);
158
+ AddSkyboxButton("daz", "Autumn", row6);
159
+ AddSkyboxButton("daz", "MountainTrail", row6);
160
+ /*
161
+Autumn
162
+Greenlands
163
+MountainTrail
164
+Oasis
165
+TheRock
166
+TopOfTheWorld
167
+Winter
168
+ */
169
+
170
+ tab0.add(row0);
171
+ tab0.add(row1);
172
+ tab0.add(row2);
173
+ tab0.add(row3);
174
+ tab0.add(row4);
175
+ tab0.add(row5);
176
+ tab0.add(row6);
177
+
178
+ for (int i=5; --i>=0;)
179
+ {
180
+ //oe.toolboxPanel.Return();
181
+ //tab0.add(new cGridBag());
182
+ }
183
+ }
184
+
185
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
186
+ {
187
+ cGridBag tab0 = new cGridBag().setVertical(true);
188
+
189
+ tab0.setName("Night");
190
+ skyboxpanel.add(tab0);
191
+
192
+ cGridBag row0 = new cGridBag();
193
+ cGridBag row1 = new cGridBag();
194
+ cGridBag row2 = new cGridBag();
195
+ cGridBag row3 = new cGridBag();
196
+ cGridBag row4 = new cGridBag();
197
+ cGridBag row5 = new cGridBag();
198
+ cGridBag row6 = new cGridBag();
199
+
200
+ AddSkyboxButton("night", "NightPath", row0);
201
+ AddSkyboxButton("night", "PondNight", row0);
202
+ AddSkyboxButton("night", "Powerlines", row0);
203
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
204
+
205
+ AddSkyboxButton("urban", "CNTower", row1);
206
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
207
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
208
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
209
+
210
+ AddSkyboxButton("penguins", "kenon_star", row2);
211
+ AddSkyboxButton("persson", "corona", row2);
212
+ AddSkyboxButton("persson", "spaceskybox", row2);
213
+ AddSkyboxButton("indoors", "Vasa", row2);
214
+
215
+ AddSkyboxButton("winter", "Backyard", row3);
216
+ AddSkyboxButton("winter", "Creek", row3);
217
+ AddSkyboxButton("winter", "FootballField3", row3);
218
+ AddSkyboxButton("winter", "Forest", row3);
219
+
220
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
221
+ AddSkyboxButton("winter", "House", row4);
222
+ AddSkyboxButton("winter", "IceLake", row4);
223
+ AddSkyboxButton("winter", "IceRiver", row4);
224
+
225
+ AddSkyboxButton("winter", "Park3", row5);
226
+ AddSkyboxButton("winter", "PondWinter", row5);
227
+ AddSkyboxButton("winter", "Tantolunden5", row5);
228
+ AddSkyboxButton("winter", "Vindelalven", row5);
229
+
230
+ AddSkyboxButton("daz", "TheRock", row6);
231
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
232
+ AddSkyboxButton("daz", "Winter", row6);
233
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
234
+
235
+ tab0.add(row0);
236
+ tab0.add(row1);
237
+ tab0.add(row2);
238
+ tab0.add(row3);
239
+ tab0.add(row4);
240
+ tab0.add(row5);
241
+ tab0.add(row6);
242
+
243
+ for (int i=5; --i>=0;)
244
+ {
245
+ //oe.toolboxPanel.Return();
246
+ //tab0.add(new cGridBag());
247
+ }
248
+ }
249
+
250
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
251
+ {
252
+ cGridBag tab0 = new cGridBag().setVertical(true);
253
+
254
+ tab0.setName("Others");
255
+ skyboxpanel.add(tab0);
256
+
257
+ cGridBag row0 = new cGridBag();
258
+ cGridBag row1 = new cGridBag();
259
+ cGridBag row2 = new cGridBag();
260
+ cGridBag row3 = new cGridBag();
261
+ cGridBag row4 = new cGridBag();
262
+ cGridBag row5 = new cGridBag();
263
+ cGridBag row6 = new cGridBag();
264
+
265
+ AddSkyboxButton("mayhem", "afterrain", row0);
266
+ AddSkyboxButton("mayhem", "aqua4", row0);
267
+ AddSkyboxButton("mayhem", "aqua9", row0);
268
+ AddSkyboxButton("mayhem", "flame", row0);
269
+
270
+ AddSkyboxButton("mayhem", "h2s", row1);
271
+ AddSkyboxButton("mayhem", "prehistoric", row1);
272
+ AddSkyboxButton("mayhem", "scorched", row1);
273
+ AddSkyboxButton("penguins", "desertdawn", row1);
274
+
275
+ AddSkyboxButton("persson", "Citadella", row2);
276
+ AddSkyboxButton("persson", "Citadella2", row2);
277
+ AddSkyboxButton("persson", "clouds1", row2);
278
+ AddSkyboxButton("penguins", "wrath", row2);
279
+
280
+ AddSkyboxButton("persson", "FishermansBastion", row3);
281
+ AddSkyboxButton("persson", "HeroesSquare", row3);
282
+ AddSkyboxButton("indoors", "DallasW", row3);
283
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
284
+
285
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
286
+ AddSkyboxButton("persson", "PereaBeach1", row4);
287
+ AddSkyboxButton("persson", "PereaBeach2", row4);
288
+ AddSkyboxButton("persson", "redeclipse", row4);
289
+
290
+ AddSkyboxButton("daz", "Greenlands", row5);
291
+ AddSkyboxButton("daz", "Oasis", row5);
292
+ AddSkyboxButton("elyvisions", "arch3", row5);
293
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
294
+
295
+ AddSkyboxButton("elyvisions", "rainbow", row6);
296
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
297
+ AddSkyboxButton("elyvisions", "heaven", row6);
298
+ AddSkyboxButton("elyvisions", "hot", row6);
299
+
300
+ tab0.add(row0);
301
+ tab0.add(row1);
302
+ tab0.add(row2);
303
+ tab0.add(row3);
304
+ tab0.add(row4);
305
+ tab0.add(row5);
306
+ tab0.add(row6);
307
+
308
+ for (int i=5; --i>=0;)
309
+ {
310
+ //oe.toolboxPanel.Return();
311
+ //tab0.add(new cGridBag());
312
+ }
313
+ }
314
+
315
+ public void CallBack(String[] path)
316
+ {
317
+ for (int i = 0; i < path.length; i++)
318
+ {
319
+ System.out.print(path[i] + "/");
320
+ }
321
+
322
+ System.out.println();
323
+ }
324
+
325
+ public void ChangeSkybox(String skybox)
326
+ {
327
+ //cameraView.envyoff = false;
328
+ group.skyboxname = skybox;
329
+ group.skyboxext = "jpg";
330
+ cameraView.repaint();
331
+
332
+ Grafreed.ParseResources("textures", this);
333
+ }
334
+
26335 //ObjEditor objEditor;
27336 public void closeUI2()
28337 {
....@@ -60,6 +369,12 @@
60369 this.copy = this.group = group;
61370 //selectees = this.group.selectees;
62371
372
+ if (copy.versionlist == null)
373
+ {
374
+ copy.versionlist = new Object3D[100];
375
+ copy.versionindex = -1;
376
+ }
377
+
63378 if(ui)
64379 SetupUI(objEditor);
65380 }
....@@ -80,10 +395,22 @@
80395 SetupViews(objEditor);
81396
82397 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
398
+
399
+ if (copy.versionlist == null)
400
+ {
401
+ copy.versionlist = new Object3D[100];
402
+ copy.versionindex = -1;
403
+
404
+ Save(true);
405
+ }
83406 }
84407
85408 void CloneSelection(boolean supports)
86409 {
410
+ if (Globals.REPLACEONMAKE)
411
+ Save();
412
+ boolean keep = Globals.REPLACEONMAKE;
413
+ Globals.REPLACEONMAKE = false;
87414 // Object3D keep = GrafreeD.clipboard;
88415 //Object3D obj;
89416 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,6 +421,7 @@
94421
95422 makeSomething(clone, i==group.selection.size()-1);
96423 }
424
+ Globals.REPLACEONMAKE = keep;
97425 }
98426
99427 void CloneClipboard(boolean supports)
....@@ -150,11 +478,19 @@
150478
151479 void SetupMenu2(GroupEditor oe)
152480 {
481
+ oe.jTree = new cTree();
482
+
153483 Menu menu;
154484 oe.menuBar.add(menu = new Menu("Edit"));
155485 //editItem = menu.add(new MenuItem("Edit"));
156486 //editItem.addActionListener(this);
157
- duplicateItem = menu.add(new MenuItem("Duplicate"));
487
+
488
+// undoItem = menu.add(new MenuItem("Undo"));
489
+// undoItem.addActionListener(this);
490
+// redoItem = menu.add(new MenuItem("Redo"));
491
+// redoItem.addActionListener(this);
492
+// menu.add("-");
493
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158494 duplicateItem.addActionListener(this);
159495 cloneItem = menu.add(new MenuItem("Clone"));
160496 cloneItem.addActionListener(this);
....@@ -170,7 +506,6 @@
170506 copyItem.addActionListener(this);
171507 pasteItem = menu.add(new MenuItem("Paste"));
172508 pasteItem.addActionListener(this);
173
- menu.add("-");
174509
175510 menu.add("-");
176511 pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -182,8 +517,8 @@
182517 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183518 // pasteExpandItem.addActionListener(this);
184519 menu.add("-");
185
- clearItem = menu.add(new MenuItem("Clear"));
186
- clearItem.addActionListener(this);
520
+ deleteItem = menu.add(new MenuItem("Delete"));
521
+ deleteItem.addActionListener(this);
187522
188523 if (Globals.ADVANCED)
189524 {
....@@ -197,23 +532,23 @@
197532 //zBufferItem.addActionListener(this);
198533 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199534 //normalLensItem.addActionListener(this);
200
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201
- revertCameraItem.addActionListener(this);
535
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
536
+ restoreCameraItem.addActionListener(this);
202537
203
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204
- toggleFullScreenItem.addItemListener(this);
205
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206
- cameraMenu.add("-");
538
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
539
+// toggleFullScreenItem.addItemListener(this);
540
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
541
+// cameraMenu.add("-");
542
+//
543
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
544
+// toggleTextureItem.addItemListener(this);
545
+// toggleTextureItem.setState(CameraPane.textureon);
546
+//
547
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
548
+// toggleSwitchItem.addItemListener(this);
549
+// toggleSwitchItem.setState(CameraPane.SWITCH);
207550
208
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209
- toggleTextureItem.addItemListener(this);
210
- toggleTextureItem.setState(CameraPane.textureon);
211
-
212
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213
- toggleSwitchItem.addItemListener(this);
214
- toggleSwitchItem.setState(CameraPane.SWITCH);
215
-
216
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
551
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217552 toggleHandleItem.addItemListener(this);
218553 toggleHandleItem.setState(CameraPane.HANDLES);
219554
....@@ -240,7 +575,7 @@
240575
241576 cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242577 toggleDebugItem.addItemListener(this);
243
- toggleDebugItem.setState(CameraPane.DEBUG);
578
+ toggleDebugItem.setState(Globals.DEBUG);
244579
245580 cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246581 toggleFrustumItem.addItemListener(this);
....@@ -261,14 +596,14 @@
261596 // animationItem.addItemListener(this);
262597 // animationItem.setState(CameraPane.ANIMATION);
263598 cameraMenu.add("-");
264
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
599
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265600 editCameraItem.addActionListener(this);
266601
267602 if (Globals.ADVANCED)
268603 {
269604 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270605 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
606
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272607 editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273608 oe.cameraMenu.add("-");
274609 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
....@@ -276,7 +611,7 @@
276611 editLeafItem.addActionListener(this);
277612 lookAtItem.addActionListener(this);
278613 //lookFromItem.addActinoListener(this);
279
- //switchItem.addActionListener(this);
614
+ //switchViewItem.addActionListener(this);
280615 }
281616
282617 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -321,21 +656,29 @@
321656 }
322657
323658 oe.menuBar.add(menu = new Menu("Group"));
324
- grabItem = menu.add(new MenuItem("Grab"));
325
- grabItem.addActionListener(this);
659
+// grabItem = menu.add(new MenuItem("Grab"));
660
+// grabItem.addActionListener(this);
326661 backItem = menu.add(new MenuItem("Back"));
327662 backItem.addActionListener(this);
328663 frontItem = menu.add(new MenuItem("Front"));
329664 frontItem.addActionListener(this);
330
- compositeItem = menu.add(new MenuItem("Composite"));
331
- compositeItem.addActionListener(this);
665
+// compositeItem = menu.add(new MenuItem("Composite"));
666
+// compositeItem.addActionListener(this);
667
+
668
+ if (Globals.ADVANCED)
669
+ {
332670 hideItem = menu.add(new MenuItem("Hidden Group"));
333671 hideItem.addActionListener(this);
672
+ }
334673 ungroupItem = menu.add(new MenuItem("Ungroup"));
335674 ungroupItem.addActionListener(this);
336
- menu.add("-");
337
- randomItem = menu.add(new MenuItem("Switch node"));
338
- randomItem.addActionListener(this);
675
+
676
+// menu.add("-");
677
+//
678
+// switchItem = menu.add(new MenuItem("Switch node"));
679
+// switchItem.addActionListener(this);
680
+ if (Globals.ADVANCED)
681
+ {
339682 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340683 switchGeoItem.addActionListener(this);
341684 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -343,8 +686,6 @@
343686 morphItem = menu.add(new MenuItem("Morph Group"));
344687 morphItem.addActionListener(this);
345688
346
- if (Globals.ADVANCED)
347
- {
348689 menu.add("-");
349690 physicsItem = menu.add(new MenuItem("Physics"));
350691 physicsItem.addActionListener(this);
....@@ -352,30 +693,29 @@
352693 frameselectorItem.addActionListener(this);
353694 scriptNodeItem = menu.add(new MenuItem("Script Node"));
354695 scriptNodeItem.addActionListener(this);
355
- cameraItem = menu.add(new MenuItem("Camera"));
356
- cameraItem.addActionListener(this);
357696 }
358697
359698 oe.menuBar.add(menu = new Menu("Object"));
360
- textureItem = menu.add(new MenuItem("Texture"));
361
- textureItem.addActionListener(this);
699
+// textureItem = menu.add(new MenuItem("Texture"));
700
+// textureItem.addActionListener(this);
362701 billboardItem = menu.add(new MenuItem("Billboard"));
363702 billboardItem.addActionListener(this);
364703 csgItem = menu.add(new MenuItem("CSG"));
365704 csgItem.addActionListener(this);
366
- shadowXItem = menu.add(new MenuItem("Shadow X"));
705
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367706 shadowXItem.addActionListener(this);
368
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
707
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369708 shadowYItem.addActionListener(this);
370
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
709
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371710 shadowZItem.addActionListener(this);
711
+ attributeItem = menu.add(new MenuItem("Attribute"));
712
+ attributeItem.addActionListener(this);
713
+
372714 if (Globals.ADVANCED)
373715 {
374716 menu.add("-");
375717 linkerItem = menu.add(new MenuItem("Linker"));
376718 linkerItem.addActionListener(this);
377
- attributeItem = menu.add(new MenuItem("Attribute"));
378
- attributeItem.addActionListener(this);
379719 templateItem = menu.add(new MenuItem("Template"));
380720 templateItem.addActionListener(this);
381721 pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -404,7 +744,7 @@
404744 genNormalsMESHItem.addActionListener(this);
405745 if (Globals.ADVANCED)
406746 {
407
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
747
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408748 genNormalsMINEItem.addActionListener(this);
409749 }
410750 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -464,6 +804,14 @@
464804 markleavesItem.addActionListener(this);
465805 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466806 unmarkleavesItem.addActionListener(this);
807
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
808
+ rewindleavesItem.addActionListener(this);
809
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
810
+ unrewindleavesItem.addActionListener(this);
811
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
812
+ randomleavesItem.addActionListener(this);
813
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
814
+ unrandomleavesItem.addActionListener(this);
467815 menu.add("-");
468816 flipVItem = menu.add(new MenuItem("Flip V"));
469817 flipVItem.addActionListener(this);
....@@ -489,10 +837,15 @@
489837 attachBumpItem.addActionListener(this);
490838 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491839 pigmentBumpItem.addActionListener(this);
840
+ //embedTexturesItem
492841 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493842 detachPigmentItem.addActionListener(this);
494843 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495844 detachBumpItem.addActionListener(this);
845
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
846
+ embedTexturesItem.addActionListener(this);
847
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
848
+ deEmbedTexturesItem.addActionListener(this);
496849 menu.add("-");
497850 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498851 sortbysizeItem.addActionListener(this);
....@@ -519,8 +872,21 @@
519872 buildToolsMenu(menu);
520873 }
521874
875
+
522876 void SetupUI2(ObjEditor oe)
523877 {
878
+ // June 2019
879
+ if (oe == null)
880
+ {
881
+ //super.SetupUI2(this);
882
+ //return;
883
+ }
884
+
885
+ if (copy != group)
886
+ {
887
+ //super.SetupUI2(this);
888
+ }
889
+
524890 //new Exception().printStackTrace();
525891
526892 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -549,27 +915,83 @@
549915 oe.radioPanel.add(dummyButton);
550916 oe.buttonGroup.add(dummyButton);
551917 */
918
+ cGridBag copyOptionsPanel = new cGridBag();
919
+
920
+ copyOptionsPanel.preferredHeight = 2;
921
+
552922 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553923
554
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
924
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
925
+ //minButton.setToolTipText("Minimize window");
926
+ //minButton.addActionListener(this);
927
+
928
+ if (Globals.ADVANCED)
929
+ {
930
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
+ maxButton.setToolTipText("Maximize window");
932
+ maxButton.addActionListener(this);
933
+ }
934
+
935
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
936
+ fullButton.setToolTipText("Full-screen window");
937
+ fullButton.addActionListener(this);
938
+
939
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
940
+ screenfitButton.setToolTipText("Screen fit");
941
+ screenfitButton.addActionListener(this);
942
+
943
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
944
+ restoreCameraButton.setToolTipText("Restore viewpoint");
945
+ restoreCameraButton.addActionListener(this);
946
+
947
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
948
+ saveVersionButton.setToolTipText("Duplicate current version");
949
+ saveVersionButton.addActionListener(this);
950
+
951
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
952
+ deleteVersionButton.setToolTipText("Delete current version");
953
+ deleteVersionButton.addActionListener(this);
954
+
955
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
956
+ previousVersionButton.setToolTipText("Previous version");
957
+ previousVersionButton.addActionListener(this);
958
+ previousVersionButton.setEnabled(false);
959
+
960
+ cGridBag updown = new cGridBag().setVertical(true);
961
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
962
+ restoreButton.setToolTipText("Undo (restore current version)");
963
+ restoreButton.addActionListener(this);
964
+ //restoreButton.setEnabled(false);
965
+
966
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
967
+ replaceButton.setToolTipText("Save (replace current version)");
968
+ replaceButton.addActionListener(this);
969
+ //replaceButton.setEnabled(false);
970
+
971
+ copyOptionsPanel.add(updown);
972
+
973
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
974
+ nextVersionButton.setToolTipText("Next version");
975
+ nextVersionButton.addActionListener(this);
976
+ nextVersionButton.setEnabled(false);
977
+
978
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
555979 liveCB.setToolTipText("Enable animation");
556980 liveCB.addItemListener(this);
557981
558
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
982
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559983 oneStepButton.setToolTipText("Animate one step forward");
560984 oneStepButton.addActionListener(this);
561985
562
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
986
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563987 fastCB.setToolTipText("Fast mode");
564988 fastCB.addItemListener(this);
565989
566
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567
- trackCB.setToolTipText("Enable tracking");
568
- trackCB.addItemListener(this);
569
-
570
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571
- screenfitButton.setToolTipText("Screen fit");
572
- screenfitButton.addActionListener(this);
990
+ //oe.toolboxPanel.Return();
991
+
992
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
993
+// trackCB.setToolTipText("Enable tracking");
994
+// trackCB.addItemListener(this);
573995
574996 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575997 // screenfitpointButton.addActionListener(this);
....@@ -579,67 +1001,156 @@
5791001 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5801002 snapobjectButton.addActionListener(this);
5811003 snapobjectButton.setToolTipText("Snap Object");
1004
+
1005
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1006
+ fourButton.addActionListener(this);
1007
+ fourButton.setToolTipText("Show control panel only");
5821008 }
5831009
584
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585
- flashSelectionButton.setToolTipText("Show selection");
586
- flashSelectionButton.addActionListener(this);
1010
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
5871011
588
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589
-
590
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591
- twoButton.setToolTipText("Show center view only");
1012
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013
+ twoButton.setToolTipText("Show 3D view only");
5921014 twoButton.addActionListener(this);
593
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
- fourButton.addActionListener(this);
595
- fourButton.setToolTipText("Show left panel only");
596
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597
- sixButton.setToolTipText("2-column layout left");
598
- sixButton.addActionListener(this);
599
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
- threeButton.setToolTipText("2-column layout right");
1015
+ this.fullscreenLayout = twoButton;
1016
+
1017
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018
+ threeButton.setToolTipText("Show controls and 3D view");
6011019 threeButton.addActionListener(this);
602
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603
- sevenButton.setToolTipText("3-column layout");
604
- sevenButton.addActionListener(this);
1020
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1021
+ sixButton.setToolTipText("Show 3D view and controls");
1022
+ sixButton.addActionListener(this);
1023
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1024
+// sevenButton.setToolTipText("3-column layout");
1025
+// sevenButton.addActionListener(this);
6051026 //
6061027
607
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608
- rootButton.setToolTipText("Edit selection in new tab");
1028
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1029
+ rootButton.setToolTipText("Open selection in new tab");
6091030 rootButton.addActionListener(this);
6101031
611
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1032
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6121033 closeButton.setToolTipText("Close tab");
6131034 closeButton.addActionListener(this);
6141035 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
6151036 //clearButton.addActionListener(this);
616
-
617
- cGridBag commandsPanel = new cGridBag();
1037
+
1038
+ cGridBag row1 = new cGridBag();
6181039
619
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
- editButton.setToolTipText("Edit selection");
1040
+ // INSERT
1041
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1042
+ gridButton.setToolTipText("Create grid");
1043
+ gridButton.addActionListener(this);
1044
+
1045
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1046
+ boxButton.setToolTipText("Create box");
1047
+ boxButton.addActionListener(this);
1048
+
1049
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050
+ sphereButton.setToolTipText("Create sphere");
1051
+ sphereButton.addActionListener(this);
1052
+
1053
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
+ coneButton.setToolTipText("Create cone");
1055
+ coneButton.addActionListener(this);
1056
+
1057
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
+ torusButton.setToolTipText("Create torus");
1059
+ torusButton.addActionListener(this);
1060
+
1061
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1062
+ superButton.setToolTipText("Create superellipsoid");
1063
+ superButton.addActionListener(this);
1064
+
1065
+ if (Globals.ADVANCED)
1066
+ {
1067
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+ kleinButton.setToolTipText("Create Klein bottle");
1069
+ kleinButton.addActionListener(this);
1070
+ }
1071
+
1072
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1073
+ particlesButton.setToolTipText("Create particle system");
1074
+ particlesButton.addActionListener(this);
1075
+
1076
+ oe.toolboxPanel.add(row1);
1077
+
1078
+ cGridBag row2 = new cGridBag();
1079
+
1080
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1081
+ groupButton.setToolTipText("Create group");
1082
+ groupButton.addActionListener(this);
1083
+
1084
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1085
+ compositeButton.setToolTipText("Create composite");
1086
+ compositeButton.addActionListener(this);
1087
+
1088
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1089
+ switchButton.setToolTipText("Create item switcher");
1090
+ switchButton.addActionListener(this);
1091
+
1092
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093
+ loopButton.setToolTipText("Create loop");
1094
+ loopButton.addActionListener(this);
1095
+
1096
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1097
+ textureButton.setToolTipText("Create texture");
1098
+ textureButton.addActionListener(this);
1099
+
1100
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1101
+ overlayButton.setToolTipText("Create overlay");
1102
+ overlayButton.addActionListener(this);
1103
+
1104
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+ lightButton.setToolTipText("Create light");
1106
+ lightButton.addActionListener(this);
1107
+
1108
+ oe.toolboxPanel.add(row2);
1109
+
1110
+ // ENVYMAPS
1111
+ cGridBag skyboxpane = new cGridBag();
1112
+ skyboxpane.preferredHeight = 100;
1113
+
1114
+ oe.toolboxPanel.add(skyboxpane);
1115
+
1116
+ JTabbedPane skyboxpanel = new JTabbedPane();
1117
+ skyboxpane.add(skyboxpanel);
1118
+
1119
+ AddSkyboxTab0(skyboxpanel);
1120
+ AddSkyboxTab1(skyboxpanel);
1121
+ AddSkyboxTab2(skyboxpanel);
1122
+ AddSkyboxTab3(skyboxpanel);
1123
+
1124
+ // EDIT panel
1125
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1126
+ editButton.setToolTipText("Pin selection controls");
6211127 editButton.addActionListener(this);
6221128
623
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
- uneditButton.setToolTipText("Unedit selection");
1129
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1130
+ uneditButton.setToolTipText("Unpin and remove selection controls");
6251131 uneditButton.addActionListener(this);
6261132
627
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628
- allParamsButton.setToolTipText("Edit all params");
1133
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1134
+ allParamsButton.setToolTipText("Show all controle");
6291135 allParamsButton.addActionListener(this);
6301136
631
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1137
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6321138 clearPanelButton.setToolTipText("Clear edit panel");
6331139 clearPanelButton.addActionListener(this);
6341140
635
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1141
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6361142 unselectButton.setToolTipText("Unselect");
6371143 unselectButton.addActionListener(this);
6381144
639
- commandsPanel.preferredHeight = 1;
1145
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1146
+ flashSelectionButton.setToolTipText("Highlight selection");
1147
+ flashSelectionButton.addActionListener(this);
6401148
641
- oe.treePanel.add(commandsPanel);
642
- oe.treePanel.Return();
1149
+ editCommandsPanel.preferredHeight = 1;
1150
+
1151
+ SetPinStates(false);
1152
+// oe.treePanel.add(commandsPanel);
1153
+// oe.treePanel.Return();
6431154
6441155 // oe.aConstraints.gridx += 1;
6451156 // oe.aConstraints.weighty = 0;
....@@ -656,32 +1167,20 @@
6561167
6571168 JScrollPane jSP;
6581169 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1170
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
6601171 ResetModel();
6611172
6621173 oe.treePanel.add(jSPPanel);
6631174 oe.treePanel.Return();
6641175
665
- cGridBag copyOptionsPanel = new cGridBag();
666
-
667
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668
- colorCB.setToolTipText("Copy color when dropped");
669
- colorCB.addItemListener(this);
670
-
671
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672
- materialCB.setToolTipText("Copy material when dropped");
673
- materialCB.addItemListener(this);
674
-
675
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676
- textureCB.setToolTipText("Copy texture when dropped");
677
- textureCB.addItemListener(this);
678
-
679
- copyOptionsPanel.preferredHeight = 1;
6801176 oe.treePanel.add(copyOptionsPanel);
6811177 oe.treePanel.Return();
1178
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1179
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1180
+ sliderPane.preferredHeight = 1;
6821181
683
-// mainPanel.setDividerLocation(0.5); //1.0);
684
-// mainPanel.setResizeWeight(0.5);
1182
+// mainPanel.setDividerLocation(0.1); //1.0);
1183
+ mainPanel.setResizeWeight(0.4);
6851184
6861185 //jList.addListSelectionListener(this);
6871186 oe.jTree.addTreeSelectionListener(this);
....@@ -689,7 +1188,7 @@
6891188 //jTree.setEditable(true);
6901189 oe.jTree.setDragEnabled(true);
6911190 //jTree.setPreferredSize(new Dimension(10,10));
692
- jSP.setPreferredSize(new Dimension(100,200));
1191
+ //jSP.setPreferredSize(new Dimension(100,200));
6931192
6941193 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6951194
....@@ -701,29 +1200,49 @@
7011200 dgr.addDragGestureListener(this);
7021201 }catch(Exception e) {}
7031202 */
704
- radio.layout = sevenButton;
1203
+ radio.layout = threeButton; // sixButton;
7051204 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
7061205 }
7071206
7081207 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
7091208 {
1209
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1210
+ colorCB.setToolTipText("Copy color when dropped");
1211
+ colorCB.addItemListener(this);
1212
+
1213
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1214
+ materialCB.setToolTipText("Copy material when dropped");
1215
+ materialCB.addItemListener(this);
1216
+
1217
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1218
+ textureCB.setToolTipText("Copy texture when dropped");
1219
+ textureCB.addItemListener(this);
1220
+
1221
+ panel.Return();
1222
+
7101223 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
7111224 boxCB.setToolTipText("Display bounding boxes");
7121225 boxCB.addItemListener(this);
7131226
7141227 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1228
+ zoomBoxCB.setToolTipText("Display only for wheel");
7161229 zoomBoxCB.addItemListener(this);
7171230
7181231 if (true) // Globals.ADVANCED)
7191232 {
720
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721
- supportCB.setToolTipText("Enable rigging");
722
- supportCB.addItemListener(this);
1233
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1234
+// supportCB.setToolTipText("Enable rigging");
1235
+// supportCB.addItemListener(this);
1236
+
1237
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1238
+ freezeCB.setToolTipText("Fast moving camera");
1239
+ freezeCB.addItemListener(this);
7231240
7241241 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
7251242 // localCB.addItemListener(this);
7261243
1244
+ panel.Return();
1245
+
7271246 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
7281247 crowdCB.setToolTipText("Used for crowds");
7291248 crowdCB.addItemListener(this);
....@@ -732,14 +1251,19 @@
7321251 smoothCB.setToolTipText("Snapping delay");
7331252 smoothCB.addItemListener(this);
7341253
735
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736
- slowCB.setToolTipText("Smooth interpolation");
737
- slowCB.addItemListener(this);
1254
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1255
+// slowCB.setToolTipText("Smooth interpolation");
1256
+// slowCB.addItemListener(this);
1257
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1258
+ minshaderCB.setToolTipText("Minimal fast shader");
1259
+ minshaderCB.addItemListener(this);
7381260
7391261 // constraints.gridy += 1;
7401262 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
7411263 // speakerMocapCB.addItemListener(this);
7421264
1265
+ panel.Return();
1266
+
7431267 if (false)
7441268 {
7451269 // handled in scripts
....@@ -754,34 +1278,74 @@
7541278 //constraints.gridy += 1;
7551279 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
7561280 smoothfocusCB.addItemListener(this);
1281
+ panel.Return();
7571282 }
7581283
7591284 //constraints.gridx += 1;
7601285 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
7611286 // debugCB.addItemListener(this);
7621287
1288
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1289
+ trackCB.setToolTipText("Enable tracking target");
1290
+ trackCB.addItemListener(this);
1291
+
7631292 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1293
+ oeilCB.setToolTipText("Move camera when tracking");
7641294 oeilCB.addItemListener(this);
7651295
1296
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1297
+ shadowCB.setToolTipText("When live compute shadows");
1298
+ shadowCB.addItemListener(this);
1299
+
1300
+ panel.Return();
1301
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1302
+ toggleTextureCB.setToolTipText("Load textures");
1303
+ toggleTextureCB.addItemListener(this);
1304
+
1305
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1306
+ toggleSwitchCB.setToolTipText("Choose a single item");
1307
+ toggleSwitchCB.addItemListener(this);
1308
+
1309
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1310
+ autokeepCB.setToolTipText("On structure change");
1311
+ autokeepCB.addItemListener(this);
1312
+
1313
+ panel.Return();
1314
+ if (Globals.ADVANCED)
1315
+ {
7661316 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
7671317 lookAtCB.setToolTipText("Look-at target");
7681318 lookAtCB.addItemListener(this);
1319
+ }
7691320
7701321 }
7711322
7721323 cGridBag fill = new cGridBag();
773
-
7741324 fill.preferredHeight = 200;
1325
+ cGridBag fill2 = new cGridBag();
1326
+ fill2.preferredHeight = 200;
1327
+ cGridBag fill3 = new cGridBag();
1328
+ fill3.preferredHeight = 200;
7751329
7761330 panel.add(fill);
1331
+ panel.add(fill2);
1332
+ panel.add(fill3);
7771333
7781334 }
7791335
7801336 void EditObject(Object3D obj)
7811337 {
7821338 cRadio radioButton = new cRadio(obj.name);
1339
+
1340
+ // June 2019. Patch to avoid bug with transparency.
1341
+ radioButton.hadMaterial = obj.material != null;
1342
+ if (!radioButton.hadMaterial)
1343
+ {
1344
+ obj.material = new cMaterial();
1345
+ }
1346
+
7831347 radioButton.SetObject(obj);
784
- radioButton.layout = sevenButton;
1348
+ radioButton.layout = threeButton; // sixButton;
7851349 radioButton.SetCamera(cameraView.renderCamera, false);
7861350 radioButton.addActionListener(this);
7871351 radioPanel.add(radioButton);
....@@ -791,6 +1355,8 @@
7911355
7921356 void SetupViews(ObjEditor oe)
7931357 {
1358
+ theFrame = this;
1359
+
7941360 oe.SetupViews();
7951361
7961362 System.out.println("SetupViews");
....@@ -799,23 +1365,30 @@
7991365 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
8001366 }
8011367
802
- JCheckBox liveCB;
803
- JCheckBox supportCB;
804
- JCheckBox localCB;
805
- JCheckBox crowdCB;
806
- JCheckBox smoothCB;
807
- JCheckBox fastCB;
808
- JCheckBox slowCB;
809
- JCheckBox boxCB;
810
- JCheckBox zoomBoxCB;
811
- JCheckBox trackCB;
812
- JCheckBox smoothfocusCB;
1368
+ cToggleButton liveCB;
1369
+ cCheckBox supportCB;
1370
+ cCheckBox localCB;
1371
+ cCheckBox crowdCB;
1372
+ cCheckBox smoothCB;
1373
+ cCheckBox minshaderCB;
1374
+
1375
+ cToggleButton fastCB;
1376
+ cCheckBox slowCB;
1377
+ cCheckBox boxCB;
1378
+ cCheckBox zoomBoxCB;
1379
+ cCheckBox freezeCB;
1380
+ //cToggleButton trackCB;
1381
+ cCheckBox trackCB;
1382
+ cCheckBox smoothfocusCB;
8131383 // JCheckBox speakerMocapCB;
814
- JCheckBox speakerCameraCB;
815
- JCheckBox speakerFocusCB;
816
- JCheckBox debugCB;
817
- JCheckBox oeilCB;
818
- JCheckBox lookAtCB;
1384
+ cCheckBox speakerCameraCB;
1385
+ cCheckBox speakerFocusCB;
1386
+ cCheckBox debugCB;
1387
+
1388
+ cCheckBox oeilCB;
1389
+ cCheckBox shadowCB;
1390
+ cCheckBox autokeepCB;
1391
+ cCheckBox lookAtCB;
8191392
8201393 // static int COLOR = 1;
8211394 // static int MATERIAL = 2;
....@@ -823,9 +1396,9 @@
8231396
8241397 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
8251398
826
- JCheckBox colorCB;
827
- JCheckBox materialCB;
828
- JCheckBox textureCB;
1399
+ cCheckBox colorCB;
1400
+ cCheckBox materialCB;
1401
+ cCheckBox textureCB;
8291402
8301403 public void itemStateChanged(ItemEvent e)
8311404 {
....@@ -853,6 +1426,7 @@
8531426 } else if(e.getSource() == liveCB)
8541427 {
8551428 cameraView.ToggleLive();
1429
+ refreshContents(false);
8561430 }
8571431 else if(e.getSource() == supportCB)
8581432 {
....@@ -868,6 +1442,12 @@
8681442 {
8691443 cameraView.ToggleInertia();
8701444 cameraView.repaint();
1445
+ }
1446
+ else if(e.getSource() == minshaderCB)
1447
+ {
1448
+ Globals.MINSHADER ^= true;
1449
+ cameraView.programInitialized = false;
1450
+ cameraView.repaint();
8711451 }
8721452 else if(e.getSource() == localCB)
8731453 {
....@@ -917,6 +1497,18 @@
9171497 {
9181498 cameraView.ToggleOeil();
9191499 }
1500
+ else if(e.getSource() == shadowCB)
1501
+ {
1502
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1503
+ }
1504
+ else if(e.getSource() == freezeCB)
1505
+ {
1506
+ Globals.FREEZEONMOVE ^= true;
1507
+ }
1508
+ else if(e.getSource() == autokeepCB)
1509
+ {
1510
+ Globals.REPLACEONMAKE ^= true;
1511
+ }
9201512 else if(e.getSource() == lookAtCB)
9211513 {
9221514 cameraView.ToggleLookAt();
....@@ -933,7 +1525,8 @@
9331525
9341526 /**/
9351527 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1528
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1529
+ TreePath path = objEditor.jTree.getSelectionPath();
9371530 if ((path == null) || (path.getPathCount() <= 1)) {
9381531 // We can't move the root node or an empty selection
9391532 return;
....@@ -996,8 +1589,6 @@
9961589 }
9971590 }
9981591
999
- String string = (String) object;
1000
-
10011592 System.out.println("Transfer = " + object + "; drop : " + target);
10021593 // if( object instanceof java.io.File[])
10031594 // {
....@@ -1005,6 +1596,8 @@
10051596 // objEditor.DropFile((java.io.File[]) object, true);
10061597 // return;
10071598 // }
1599
+
1600
+ String string = object.toString();
10081601
10091602 // File path for Mac and Windows
10101603 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1050,23 +1643,33 @@
10501643
10511644 assert target == objEditor.jTree;
10521645 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1646
+ Object3D destinationLeaf;
10531647 try {
1054
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1648
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
10551649 } catch (Exception e) {
10561650 System.out.println("destinationPath : " + destinationPath);
10571651 return;
10581652 }
10591653
1060
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1654
+ for (int i=group.selection.size(); --i>=0;)
10611655 {
1656
+ Object3D child = (Object3D)group.selection.elementAt(i);
1657
+
1658
+ // Cannot move into itself
1659
+ if (child == destinationLeaf)
1660
+ return;
1661
+ }
1662
+
1663
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1664
+// {
10621665 loadClipboard(true);
10631666 objEditor.jTree.setSelectionPath(destinationPath);
10641667 pasteInto(false, false);
1065
- } else {
1066
- loadClipboard(false);
1067
- objEditor.jTree.setSelectionPath(destinationPath);
1068
- pasteInto(false, false); // true); // ???
1069
- }
1668
+// } else {
1669
+// loadClipboard(false);
1670
+// objEditor.jTree.setSelectionPath(destinationPath);
1671
+// pasteInto(false, false); // true); // ???
1672
+// }
10701673 }
10711674 public void dropActionChanged(DropTargetDragEvent dtde)
10721675 // Called if the user has modified the current drop gesture
....@@ -1171,22 +1774,30 @@
11711774 {
11721775 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11731776 //heightFieldItem.addActionListener(this);
1174
- gridItem = menu.add(new MenuItem("Grid"));
1175
- gridItem.addActionListener(this);
1176
- rectoidItem = menu.add(new MenuItem("Box"));
1177
- rectoidItem.addActionListener(this);
1178
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179
- ellipsoidItem.addActionListener(this);
1180
- coneItem = menu.add(new MenuItem("Cone"));
1181
- coneItem.addActionListener(this);
1182
- torusItem = menu.add(new MenuItem("Torus"));
1183
- torusItem.addActionListener(this);
1184
- superItem = menu.add(new MenuItem("Superellipsoid"));
1185
- superItem.addActionListener(this);
1777
+// gridItem = menu.add(new MenuItem("Grid"));
1778
+// gridItem.addActionListener(this);
1779
+// rectoidItem = menu.add(new MenuItem("Box"));
1780
+// rectoidItem.addActionListener(this);
1781
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1782
+// ellipsoidItem.addActionListener(this);
1783
+// coneItem = menu.add(new MenuItem("Cone"));
1784
+// coneItem.addActionListener(this);
1785
+// torusItem = menu.add(new MenuItem("Torus"));
1786
+// torusItem.addActionListener(this);
1787
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1788
+// superItem.addActionListener(this);
1789
+
1790
+ cameraItem = menu.add(new MenuItem("Camera"));
1791
+ cameraItem.addActionListener(this);
1792
+
1793
+ if (!Globals.ADVANCED)
1794
+ {
11861795 kleinItem = menu.add(new MenuItem("Klein Bottle"));
11871796 kleinItem.addActionListener(this);
1188
- particleItem = menu.add(new MenuItem("Particle system"));
1189
- particleItem.addActionListener(this);
1797
+ }
1798
+
1799
+// particleItem = menu.add(new MenuItem("Particle system"));
1800
+// particleItem.addActionListener(this);
11901801 if (Globals.ADVANCED)
11911802 {
11921803 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1212,15 +1823,15 @@
12121823 }
12131824 bezierItem = menu.add(new MenuItem("Bezier Patch"));
12141825 bezierItem.addActionListener(this);
1215
- overlayItem = menu.add(new MenuItem("Overlay"));
1216
- overlayItem.addActionListener(this);
1217
- lightItem = menu.add(new MenuItem("Light"));
1218
- lightItem.addActionListener(this);
1826
+// overlayItem = menu.add(new MenuItem("Overlay"));
1827
+// overlayItem.addActionListener(this);
1828
+// lightItem = menu.add(new MenuItem("Light"));
1829
+// lightItem.addActionListener(this);
12191830 menu.add("-");
12201831 //superLoopItem = menu.add(new MenuItem("Super Loop"));
12211832 //superLoopItem.addActionListener(this);
1222
- loopItem = menu.add(new MenuItem("Loop"));
1223
- loopItem.addActionListener(this);
1833
+// loopItem = menu.add(new MenuItem("Loop"));
1834
+// loopItem.addActionListener(this);
12241835 doubleItem = menu.add(new MenuItem("Fork"));
12251836 doubleItem.addActionListener(this);
12261837 if (Globals.ADVANCED)
....@@ -1236,6 +1847,9 @@
12361847 animationItem.addItemListener(this);
12371848 animationItem.setState(Globals.ANIMATION);
12381849
1850
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
1851
+ archiveItem.addActionListener(this);
1852
+
12391853 menu.add("-");
12401854 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
12411855 parseverticesItem.addActionListener(this);
....@@ -1248,6 +1862,8 @@
12481862 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
12491863 reduce34MorphItem.addActionListener(this);
12501864 menu.add("-");
1865
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
1866
+ memoryItem.addActionListener(this);
12511867 menu.add(computeAOItem = new MenuItem("Compute AO"));
12521868 computeAOItem.addActionListener(this);
12531869
....@@ -1256,11 +1872,9 @@
12561872 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
12571873 mirrorItem.addActionListener(this);
12581874 menu.add("-");
1259
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260
- memoryItem.addActionListener(this);
12611875 menu.add(analyzeItem = new MenuItem("Analyze"));
12621876 analyzeItem.addActionListener(this);
1263
- menu.add(dumpItem = new MenuItem("Dump"));
1877
+ menu.add(dumpItem = new MenuItem("Print"));
12641878 dumpItem.addActionListener(this);
12651879 // menu.add(pathItem = new MenuItem("From-to path"));
12661880 // pathItem.addActionListener(this);
....@@ -1401,9 +2015,34 @@
14012015 shadow.material = new cMaterial(obj.material);
14022016 shadow.material.diffuse = 0.0001f;
14032017 shadow.material.specular = 0.0001f;
2018
+ //shadow.projectedVertices[1].x = 300;
14042019
14052020 makeSomething(shadow);
14062021 }
2022
+
2023
+ private void ClearUnpinned()
2024
+ {
2025
+ //for (Object3D obj : listUI)
2026
+ for (int i=listUI.size(); --i>=0;)
2027
+ {
2028
+ Object3D obj = listUI.elementAt(i);
2029
+ if (!obj.pinned)
2030
+ {
2031
+ obj.CloseUI();
2032
+ listUI.remove(i);
2033
+ }
2034
+ }
2035
+ }
2036
+
2037
+ private void EditElement(Object3D elem, boolean newWindow)
2038
+ {
2039
+ // if (!(elem instanceof Composite))
2040
+ // newWindow = false;
2041
+ listUI.add(elem);
2042
+ elem.openEditWindow(this, newWindow); //, false);
2043
+ System.out.println("edit : " + elem);
2044
+ elem.editWindow.refreshContents(true); // ? new
2045
+ }
14072046
14082047 /**
14092048 * applyExample
....@@ -1648,7 +2287,7 @@
16482287 {
16492288 ScreenFit();
16502289 } else
1651
- if (source == switchItem)
2290
+ if (source == switchViewItem)
16522291 {
16532292 cVector v1 = new cVector();
16542293 cVector v2 = new cVector();
....@@ -1657,11 +2296,11 @@
16572296 objEditor.cameraView.renderCamera.setAim(v2, v1);
16582297 objEditor.cameraView.repaint();
16592298 } else
1660
- if (source == rectoidItem)
2299
+ if (source == rectoidItem || source == boxButton)
16612300 {
16622301 makeSomething(new Box());
16632302 } else
1664
- if (source == particleItem)
2303
+ if (source == particleItem || source == particlesButton)
16652304 {
16662305 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16672306 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1740,27 +2379,27 @@
17402379
17412380 makeSomething(obj);
17422381 } else
1743
- if (source == gridItem)
2382
+ if (source == gridItem || source == gridButton)
17442383 {
17452384 makeSomething(new Grid());
17462385 } else
1747
- if (source == ellipsoidItem)
2386
+ if (source == ellipsoidItem || source == sphereButton)
17482387 {
17492388 makeSomething(new Sphere());
17502389 } else
1751
- if (source == coneItem)
2390
+ if (source == coneItem || source == coneButton)
17522391 {
17532392 makeSomething(new Cone());
17542393 } else
1755
- if (source == torusItem)
2394
+ if (source == torusItem || source == torusButton)
17562395 {
17572396 makeSomething(new Torus());
17582397 } else
1759
- if (source == superItem)
2398
+ if (source == superItem || source == superButton)
17602399 {
17612400 makeSomething(new Superellipsoid());
17622401 } else
1763
- if (source == kleinItem)
2402
+ if (source == kleinItem || source == kleinButton)
17642403 {
17652404 makeSomething(new Klein());
17662405 } else
....@@ -1780,7 +2419,7 @@
17802419 {
17812420 makeSomething(new BezierSurface());
17822421 } else
1783
- if (source == overlayItem)
2422
+ if (source == overlayItem || source == overlayButton)
17842423 {
17852424 /*
17862425 Object3D obj = new BezierSurface(5,8);
....@@ -1828,10 +2467,27 @@
18282467 s.setup();
18292468 makeSomething(s);
18302469 } else
1831
- if (source == lightItem)
2470
+ if (source == lightItem || source == lightButton)
18322471 {
18332472 makeSomething(new Light());
18342473 } else
2474
+// if (source == skybox1Button ||
2475
+// source == skybox2Button ||
2476
+// source == skybox3Button ||
2477
+// source == skybox4Button ||
2478
+// source == skybox5Button ||
2479
+// source == skybox6Button ||
2480
+// source == skybox7Button ||
2481
+// source == skybox11Button ||
2482
+// source == skybox12Button ||
2483
+// source == skybox13Button ||
2484
+// source == skybox14Button ||
2485
+// source == skybox15Button ||
2486
+// source == skybox16Button ||
2487
+// source == skybox17Button)
2488
+// {
2489
+// ChangeSkybox(source);
2490
+// } else
18352491 if (source == csgItem)
18362492 {
18372493 group(new CSG());
....@@ -1878,30 +2534,30 @@
18782534
18792535 group(g);
18802536 } else
1881
- if (source == loopItem)
2537
+ if (source == loopItem || source == loopButton)
18822538 {
18832539 Composite csg = new GroupLeaf();
18842540 csg.count = 5;
18852541 group(csg);
1886
- Composite child = new cGroup();
2542
+ Composite child = new cGroup("Branch");
18872543 csg.addChild(child);
18882544 child.addChild(csg);
18892545 } else
18902546 if (source == doubleItem)
18912547 {
1892
- Composite csg = new GroupLeaf();
2548
+ Composite csg = new GroupLeaf("Fork");
18932549 csg.count = 5;
18942550 group(csg);
1895
- Composite child = new cGroup();
2551
+ Composite child = new cGroup("Branch A");
18962552 csg.addChild(child);
18972553 child.addChild(csg);
1898
- child = new cGroup();
2554
+ child = new cGroup("Branch B");
18992555 csg.addChild(child);
19002556 child.addChild(csg);
19012557 } else
19022558 if (source == tripleItem)
19032559 {
1904
- Composite csg = new GroupLeaf();
2560
+ Composite csg = new GroupLeaf("Trident");
19052561 csg.count = 4;
19062562 group(csg);
19072563 Composite child = new cGroup();
....@@ -1917,7 +2573,7 @@
19172573 if (source == computeAOItem)
19182574 {
19192575 Globals.drawMode = CameraPane.OCCLUSION;
1920
- Globals.theRenderer.repaint();
2576
+ cameraView.repaint();
19212577 } else
19222578 if (source == recompileItem)
19232579 {
....@@ -1932,7 +2588,7 @@
19322588 if (source == invariantsItem)
19332589 {
19342590 System.out.println("Invariants:");
1935
- Grafreed.grafreeD.universe.invariants();
2591
+ Grafreed.grafreed.universe.invariants();
19362592 } else
19372593 if (source == memoryItem)
19382594 {
....@@ -1951,6 +2607,53 @@
19512607 {
19522608 DumpObject();
19532609 } else
2610
+ if (source == minButton)
2611
+ {
2612
+ Minimize();
2613
+ } else
2614
+ if (source == maxButton)
2615
+ {
2616
+ Maximize();
2617
+ } else
2618
+ if (source == fullButton)
2619
+ {
2620
+ ToggleFullScreen();
2621
+ } else
2622
+ if (source == previousVersionButton)
2623
+ {
2624
+ // Go to previous version
2625
+ //if (!Undo())
2626
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2627
+ PreviousVersion();
2628
+ } else
2629
+ if (source == restoreButton)
2630
+ {
2631
+ // Restore current version
2632
+ Restore();
2633
+ //restoreButton.setEnabled(false);
2634
+ } else
2635
+ if (source == replaceButton)
2636
+ {
2637
+ // Overwrite current version
2638
+ Replace();
2639
+ //replaceButton.setEnabled(false);
2640
+ } else
2641
+ if (source == nextVersionButton)
2642
+ {
2643
+ // Go to next version
2644
+ NextVersion();
2645
+ } else
2646
+ if (source == saveVersionButton)
2647
+ {
2648
+ // Save a new version
2649
+ if (!Save(true))
2650
+ java.awt.Toolkit.getDefaultToolkit().beep();
2651
+ } else
2652
+ if (source == deleteVersionButton)
2653
+ {
2654
+ // Delete a new version
2655
+ DeleteVersion();
2656
+ } else
19542657 if (source == oneStepButton)
19552658 {
19562659 Globals.ONESTEP = true;
....@@ -1958,17 +2661,14 @@
19582661 } else
19592662 if (source == screenfitButton)
19602663 {
1961
- //Reload(lastConverter, lastFilename, true);
19622664 ScreenFit();
19632665 } else
19642666 if (source == screenfitpointButton)
19652667 {
1966
- //Reload(lastConverter, lastFilename, true);
19672668 ScreenFitPoint();
19682669 } else
19692670 if (source == snapobjectButton)
19702671 {
1971
- //Reload(lastConverter, lastFilename, true);
19722672 SnapObject();
19732673 } else
19742674 // if (event.getSource() == recompileButton)
....@@ -2004,6 +2704,14 @@
20042704 if (source == cutItem || source == clearButton)
20052705 {
20062706 loadClipboard(true);
2707
+ } else
2708
+ if (source == undoItem)
2709
+ {
2710
+ PreviousVersion();
2711
+ } else
2712
+ if (source == redoItem)
2713
+ {
2714
+ NextVersion();
20072715 } else
20082716 if (source == duplicateItem)
20092717 {
....@@ -2324,7 +3032,7 @@
23243032 {
23253033 StepAll();
23263034 } else
2327
- if (source == clearItem) // || event.getSource() == clearButton)
3035
+ if (source == deleteItem) // || event.getSource() == clearButton)
23283036 {
23293037 //int indices[] = jList.getSelectedIndices();
23303038 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2336,9 +3044,9 @@
23363044 {
23373045 ClearSelection(true);
23383046 } else
2339
- if (source == grabItem)
3047
+ if (source == grabItem || source == groupButton)
23403048 {
2341
- group(new cGroup(), true);
3049
+ group(new cGroup(), false); // true);
23423050 } else
23433051 if (source == hideItem)
23443052 {
....@@ -2356,11 +3064,11 @@
23563064 {
23573065 makeSomething(new Camera());
23583066 } else
2359
- if (source == compositeItem)
3067
+ if (source == compositeItem || source == compositeButton)
23603068 {
23613069 group(new Composite());
23623070 } else
2363
- if (source == randomItem)
3071
+ if (source == switchItem || source == switchButton)
23643072 {
23653073 RandomNode random = new RandomNode();
23663074 group(random);
....@@ -2462,7 +3170,7 @@
24623170 {
24633171 group(new cLinker());
24643172 } else
2465
- if (source == textureItem)
3173
+ if (source == textureItem || source == textureButton)
24663174 {
24673175 group(new TextureNode());
24683176 } else
....@@ -2482,17 +3190,30 @@
24823190 {
24833191 CastShadow(2);
24843192 } else
2485
- if (source == ungroupItem)
3193
+ if (source == ungroupItem || source == ungroupButton)
24863194 {
2487
- //ungroup();
3195
+ boolean hasRoot = false;
3196
+
24883197 for (int i=0; i<group.selection.size(); i++)
24893198 {
2490
- Ungroup(group.selection.get(i));
3199
+ if (group.selection.get(i) == group)
3200
+ {
3201
+ hasRoot = true;
3202
+ break;
3203
+ }
24913204 }
24923205
2493
- ClearSelection(false);
2494
-
2495
- refreshContents();
3206
+ if (!hasRoot)
3207
+ {
3208
+ for (int i=0; i<group.selection.size(); i++)
3209
+ {
3210
+ Ungroup(group.selection.get(i));
3211
+ }
3212
+
3213
+ ClearSelection(false);
3214
+
3215
+ refreshContents();
3216
+ }
24963217 } else
24973218 if (source == genUVItem)
24983219 {
....@@ -2504,7 +3225,7 @@
25043225 } else
25053226 if (source == genNormalsMESHItem)
25063227 {
2507
- GenNormals(true); // TODO
3228
+ GenNormalsMESH();
25083229 } else
25093230 if (source == genNormalsORGANItem)
25103231 {
....@@ -2569,6 +3290,22 @@
25693290 if (source == unmarkleavesItem)
25703291 {
25713292 MarkLeaves(false);
3293
+ } else
3294
+ if (source == rewindleavesItem)
3295
+ {
3296
+ RewindLeaves(true);
3297
+ } else
3298
+ if (source == unrewindleavesItem)
3299
+ {
3300
+ RewindLeaves(false);
3301
+ } else
3302
+ if (source == randomleavesItem)
3303
+ {
3304
+ RandomLeaves(true);
3305
+ } else
3306
+ if (source == unrandomleavesItem)
3307
+ {
3308
+ RandomLeaves(false);
25723309 } else
25733310 if (source == flipVItem)
25743311 {
....@@ -2777,7 +3514,7 @@
27773514 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
27783515 {
27793516 obj = (Object3D)e.nextElement();
2780
- obj.SetBumpTexture(null);
3517
+ obj.ResetBumpTexture();
27813518 }
27823519
27833520 refreshContents();
....@@ -2793,6 +3530,31 @@
27933530
27943531 refreshContents();
27953532 } else
3533
+ if (source == embedTexturesItem)
3534
+ {
3535
+ Object3D obj;
3536
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3537
+ {
3538
+ obj = (Object3D)e.nextElement();
3539
+ obj.EmbedTextures(true);
3540
+ }
3541
+
3542
+ refreshContents();
3543
+ } else
3544
+ if (source == deEmbedTexturesItem)
3545
+ {
3546
+ Object3D obj;
3547
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3548
+ {
3549
+ obj = (Object3D)e.nextElement();
3550
+ obj.EmbedTextures(false);
3551
+ }
3552
+
3553
+ CameraPane.texturepigment.clear();
3554
+ CameraPane.texturebump.clear();
3555
+
3556
+ refreshContents();
3557
+ } else
27963558 if (source == flashSelectionButton)
27973559 {
27983560 CameraPane.flash = true;
....@@ -2804,6 +3566,10 @@
28043566 if (source == twoButton)
28053567 {
28063568 radio.layout = twoButton;
3569
+
3570
+ if (CameraPane.FULLSCREEN)
3571
+ fullscreenLayout = radio.layout;
3572
+
28073573 // bug
28083574 //gridPanel.setDividerLocation(1.0);
28093575 //bigPanel.setDividerLocation(0.0);
....@@ -2836,10 +3602,31 @@
28363602 bigThree.ClearUI();
28373603 bigThree.add(centralPanel);
28383604 bigThree.FlushUI();
3605
+
3606
+ cameraView.requestFocusInWindow();
3607
+
3608
+// refreshContents(true);
3609
+//
3610
+// try
3611
+// {
3612
+// java.awt.Robot bot = new java.awt.Robot();
3613
+// int mask = InputEvent.BUTTON1_MASK;
3614
+// bot.mouseMove(100, 100);
3615
+// bot.mousePress(mask);
3616
+// bot.mouseRelease(mask);
3617
+// }
3618
+// catch (Exception e)
3619
+// {
3620
+//
3621
+// }
3622
+
28393623 } else
28403624 if (source == threeButton)
28413625 {
28423626 radio.layout = threeButton;
3627
+
3628
+ if (CameraPane.FULLSCREEN)
3629
+ fullscreenLayout = radio.layout;
28433630
28443631 // bigThree.remove(scenePanel);
28453632 // bigThree.remove(centralPanel);
....@@ -2869,13 +3656,18 @@
28693656 // centralPanel.setVisible(true);
28703657 // XYZPanel.setVisible(true);
28713658 bigThree.ClearUI();
3659
+ bigThree.add(scenePanel);
28723660 bigThree.add(centralPanel);
2873
- bigThree.add(XYZPanel);
28743661 bigThree.FlushUI();
3662
+
3663
+ cameraView.requestFocusInWindow();
28753664 } else
28763665 if (source == fourButton)
28773666 {
28783667 radio.layout = fourButton;
3668
+
3669
+ if (CameraPane.FULLSCREEN)
3670
+ fullscreenLayout = radio.layout;
28793671
28803672 // bigThree.remove(scenePanel);
28813673 // bigThree.remove(centralPanel);
....@@ -2907,10 +3699,15 @@
29073699 bigThree.ClearUI();
29083700 bigThree.add(scenePanel);
29093701 bigThree.FlushUI();
3702
+
3703
+ cameraView.requestFocusInWindow();
29103704 } else
29113705 if (source == sixButton)
29123706 {
29133707 radio.layout = sixButton;
3708
+
3709
+ if (CameraPane.FULLSCREEN)
3710
+ fullscreenLayout = radio.layout;
29143711
29153712 // bigThree.remove(scenePanel);
29163713 // bigThree.remove(centralPanel);
....@@ -2940,13 +3737,18 @@
29403737 // centralPanel.setVisible(true);
29413738 // XYZPanel.setVisible(false);
29423739 bigThree.ClearUI();
2943
- bigThree.add(scenePanel);
29443740 bigThree.add(centralPanel);
3741
+ bigThree.add(scenePanel);
29453742 bigThree.FlushUI();
3743
+
3744
+ cameraView.requestFocusInWindow();
29463745 } else
29473746 if (source == sevenButton)
29483747 {
29493748 radio.layout = sevenButton;
3749
+
3750
+ if (CameraPane.FULLSCREEN)
3751
+ fullscreenLayout = radio.layout;
29503752
29513753 // bigThree.remove(scenePanel);
29523754 // bigThree.remove(centralPanel);
....@@ -2980,6 +3782,8 @@
29803782 bigThree.add(centralPanel);
29813783 bigThree.add(XYZPanel);
29823784 bigThree.FlushUI();
3785
+
3786
+ cameraView.requestFocusInWindow();
29833787 } else
29843788 if (source == rootButton)
29853789 {
....@@ -2991,6 +3795,7 @@
29913795 EditObject(obj);
29923796 }
29933797
3798
+ cameraView.requestFocusInWindow();
29943799 refreshContents(true);
29953800 } else
29963801 if (source == closeButton)
....@@ -3000,22 +3805,37 @@
30003805 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
30013806 {
30023807 ab = (cRadio)e.nextElement();
3003
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3808
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
30043809 {
3810
+ // Patch to avoid bug with transparency.
3811
+ if (!ab.hadMaterial)
3812
+ {
3813
+ ab.object.material = null;
3814
+ }
3815
+
30053816 buttonGroup.remove(ab);
30063817 radioPanel.remove(ab);
30073818
3008
- ab.GetObject().editWindow = null;
3819
+ //ab.GetObject().editWindow = null;
3820
+ ab.GetObject().manipWindow = null;
30093821 // ab.GetObject().objectUI = null; // ?????????
30103822
30113823 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
30123824 break;
30133825 }
30143826 }
3827
+
3828
+ cameraView.requestFocusInWindow();
30153829 refreshContents(true);
30163830 } else
30173831 if (source == editItem || source == editButton)
30183832 {
3833
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3834
+ {
3835
+ Object3D child = (Object3D)e.nextElement();
3836
+ child.pinned = true;
3837
+ }
3838
+
30193839 EditSelection(false);
30203840 } else
30213841 if (source == uneditButton)
....@@ -3024,11 +3844,12 @@
30243844 {
30253845 Object3D child = (Object3D)e.nextElement();
30263846 if(child.editWindow != null)
3027
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3847
+ child.pinned = false;
30283848 child.CloseUI();
30293849 listUI.remove(child);
3850
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30303851
3031
- child.editWindow = null; // ???????????
3852
+ //child.editWindow = null; // ???????????
30323853 }
30333854 objEditor.ctrlPanel.FlushUI();
30343855 //objEditor.jTree.clearSelection();
....@@ -3041,16 +3862,18 @@
30413862 //copy.ClearUI();
30423863 for (Object3D obj : listUI)
30433864 {
3865
+ obj.pinned = false;
30443866 obj.CloseUI();
30453867 }
30463868 listUI.clear();
3869
+ SetPinStates(group.selection.size() > 0);
30473870 refreshContents(true);
30483871 } else
30493872 if (source == allParamsButton)
30503873 {
30513874 assert(copy == group);
30523875
3053
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3876
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30543877
30553878 for (Object3D obj : listUI)
30563879 {
....@@ -3099,6 +3922,9 @@
30993922 }
31003923
31013924 copy = group;
3925
+
3926
+ SetUndoStates();
3927
+
31023928 //Globals.theRenderer.object = group;
31033929 if(!useclient)
31043930 {
....@@ -3115,7 +3941,9 @@
31153941 sideView.object = group;
31163942 }
31173943
3118
-// fix "+" issue group.editWindow = this;
3944
+// fix "+" issue
3945
+ //group.editWindow = this;
3946
+ group.manipWindow = this;
31193947
31203948 /*
31213949 currentLayout = radio.layout;
....@@ -3123,20 +3951,32 @@
31233951 currentLayout = sevenButton;
31243952 */
31253953 radio.layout.doClick();
3954
+
3955
+ ClearUnpinned();
3956
+
3957
+ //Grafreed.Assert(group != null);
3958
+ //Grafreed.Assert(group.selection != null);
3959
+ SetPinStates(group.selection == null || group.selection.size() > 0);
3960
+ if (group.selection == null || group.selection.size() == 1)
3961
+ EditSelection(false);
31263962 keepparent = group.parent;
31273963 // PARENT = NULL or not???
31283964 //group.parent = null; // ROOT
31293965 //group.attributes = -1;
31303966 ResetModel();
3967
+
3968
+ cameraView.requestFocusInWindow();
31313969 refreshContents(true);
31323970 } else if (event.getSource() == editCameraItem)
31333971 {
31343972 cameraView.ProtectCamera();
3973
+ cameraView.requestFocusInWindow();
31353974 cameraView.repaint();
31363975 return;
3137
- } else if (event.getSource() == revertCameraItem)
3976
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
31383977 {
31393978 cameraView.RevertCamera();
3979
+ cameraView.requestFocusInWindow();
31403980 cameraView.repaint();
31413981 return;
31423982 // } else if (event.getSource() == textureButton)
....@@ -3151,7 +3991,6 @@
31513991 }
31523992
31533993 boolean useclient = false;
3154
- cRadio radio;
31553994
31563995 void ToggleRoot()
31573996 {
....@@ -3390,7 +4229,8 @@
33904229
33914230 int size = obj.MemorySize();
33924231
3393
- System.err.println((size/1024) + " KB is the size of " + obj);
4232
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4233
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33944234 }
33954235 }
33964236 catch (Exception e)
....@@ -3471,6 +4311,13 @@
34714311 void GenNormals(boolean crease)
34724312 {
34734313 group.GenNormalsS(crease);
4314
+
4315
+ refreshContents();
4316
+ }
4317
+
4318
+ void GenNormalsMESH()
4319
+ {
4320
+ group.GenNormalsMeshS();
34744321
34754322 refreshContents();
34764323 }
....@@ -3706,7 +4553,7 @@
37064553
37074554 try
37084555 {
3709
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4556
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
37104557 }
37114558 catch (Exception e)
37124559 {
....@@ -4098,6 +4945,18 @@
40984945 refreshContents();
40994946 }
41004947
4948
+ void RewindLeaves(boolean hide)
4949
+ {
4950
+ group.selection.RewindLeaves(hide);
4951
+ refreshContents();
4952
+ }
4953
+
4954
+ void RandomLeaves(boolean hide)
4955
+ {
4956
+ group.selection.RandomLeaves(hide);
4957
+ refreshContents();
4958
+ }
4959
+
41014960 void SetTexRes(int tr)
41024961 {
41034962 group.selection.SetTexRes(tr);
....@@ -4169,28 +5028,25 @@
41695028 // }
41705029 // }
41715030
4172
- static boolean allparams = true;
4173
-
4174
- static Vector<Object3D> listUI = new Vector<Object3D>();
4175
-
41765031 void EditSelection(boolean newWindow)
41775032 {
5033
+ if (group.selection == null)
5034
+ {
5035
+ EditElement(group, newWindow); // ? new
5036
+ return;
5037
+ }
5038
+
41785039 // aConstraints.gridy = 0;
41795040 for (int i=0; i<group.selection.size(); i++)
41805041 {
41815042 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
41825043 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5044
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41845045
41855046 Object3D elem = (Object3D)group.selection.elementAt(i);
41865047 if(elem != group || !newWindow)
41875048 {
4188
- // if (!(elem instanceof Composite))
4189
- // newWindow = false;
4190
- listUI.add(elem);
4191
- elem.openEditWindow(this, newWindow); //, false);
4192
- System.out.println("edit : " + elem);
4193
- elem.editWindow.refreshContents(true); // ? new
5049
+ EditElement(elem, newWindow); // ? new
41945050 }
41955051 }
41965052 }
....@@ -4253,9 +5109,7 @@
42535109
42545110 freezemodel = false;
42555111 }
4256
-
4257
- boolean flashIt = true;
4258
-
5112
+
42595113 public void valueChanged(TreeSelectionEvent e)
42605114 //public boolean handleEvent(Event event)
42615115 {
....@@ -4265,7 +5119,8 @@
42655119 //new Exception().printStackTrace();
42665120
42675121 freezemodel = true;
4268
-
5122
+ ClearUnpinned();
5123
+
42695124 /**/
42705125 //switch (event.id)
42715126 {
....@@ -4273,7 +5128,6 @@
42735128 //case 702: // Event.LIST_DESELECT
42745129 group.deselectAll();
42755130 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276
- objEditor.ClearInfo(); // .GetMaterial());
42775131 if (tps != null)
42785132 {
42795133 for (int i=0; i < tps.length; i++)
....@@ -4282,10 +5136,8 @@
42825136
42835137 //if (child.parent != null)
42845138 //child.parent.addSelectee(child);
5139
+ objEditor.SetMaterial(child);
42855140 group.addSelectee(child);
4286
- objEditor.SetMaterial(child); // .GetMaterial());
4287
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288
- System.err.println("info : " + child.GetPath());
42895141 }
42905142 }
42915143 // else
....@@ -4295,20 +5147,28 @@
42955147 // System.err.println("info : " + group.GetPath());
42965148 // }
42975149
4298
- objEditor.SetText(); // jan 2014
4299
-
4300
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5150
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
43015151 CameraPane.flash = true;
43025152
4303
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5153
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
43045154 // a camera
43055155 {
4306
- CameraPane.camerachangeframe = 0; // don't refuse it
4307
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5156
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5157
+ {
5158
+ CameraPane.camerachangeframe = 0; // don't refuse it
5159
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5160
+ }
43085161 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
43095162 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
43105163 }
43115164
5165
+ if (tps != null && tps.length == 1)
5166
+ {
5167
+ EditSelection(false);
5168
+ }
5169
+
5170
+ SetPinStates(tps != null && tps.length > 0);
5171
+
43125172 refreshContents();
43135173 //return true;
43145174 }
....@@ -4317,6 +5177,37 @@
43175177
43185178 freezemodel = false;
43195179 }
5180
+
5181
+ void SetPinStates(boolean enabled)
5182
+ {
5183
+ editButton.setEnabled(enabled);
5184
+ uneditButton.setEnabled(enabled);
5185
+ unselectButton.setEnabled(enabled);
5186
+ flashSelectionButton.setEnabled(enabled);
5187
+
5188
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5189
+ }
5190
+
5191
+ void refreshContents(boolean cp)
5192
+ {
5193
+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5194
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5195
+ {
5196
+ objEditor.ClearInfo(); // .GetMaterial());
5197
+
5198
+ for (int i=0; i < group.selection.Size(); i++)
5199
+ {
5200
+ Object3D child = (Object3D) group.selection.get(i);
5201
+
5202
+ objEditor.AddInfo(child, this, true);
5203
+ System.err.println("info : " + child.GetPath());
5204
+ }
5205
+
5206
+ objEditor.SetText(); // jan 2014
5207
+ }
5208
+
5209
+ super.refreshContents(cp);
5210
+ }
43205211
43215212 void linkSomething(Object3D thing)
43225213 {
....@@ -4388,6 +5279,7 @@
43885279 {
43895280 if (group.selection.isEmpty())
43905281 return;
5282
+
43915283 Grafreed.clipboardIsTempGroup = false;
43925284 Composite tGroup = null;
43935285 if (group.selection.size() > 0) // 1)
....@@ -4398,6 +5290,8 @@
43985290
43995291 if (cut)
44005292 {
5293
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5294
+// Save();
44015295 //int indices[] = jList.getSelectedIndices();
44025296 //for (int i = indices.length - 1; i >= 0; i--)
44035297 //jList.remove(indices[i]);
....@@ -4487,8 +5381,10 @@
44875381 }
44885382
44895383 }
5384
+
44905385 if (Grafreed.clipboardIsTempGroup)
44915386 Grafreed.clipboard = tGroup;
5387
+
44925388 if (cut)
44935389 {
44945390 ResetModel();
....@@ -4498,6 +5394,10 @@
44985394
44995395 void paste(boolean expand)
45005396 {
5397
+ if (Globals.REPLACEONMAKE)
5398
+ Save();
5399
+ boolean keep = Globals.REPLACEONMAKE;
5400
+ Globals.REPLACEONMAKE = false;
45015401 // if (GrafreeD.clipboard == null)
45025402 // return;
45035403 boolean first = true;
....@@ -4557,6 +5457,7 @@
45575457 Grafreed.clipboard.get(0).parent = keepparent;
45585458 }
45595459
5460
+ Globals.REPLACEONMAKE = keep;
45605461 ResetModel();
45615462 refreshContents();
45625463 }
....@@ -4692,6 +5593,10 @@
46925593
46935594 void group(Object3D csg, boolean grab)
46945595 {
5596
+ if (Globals.REPLACEONMAKE)
5597
+ Save();
5598
+ boolean keep = Globals.REPLACEONMAKE;
5599
+ Globals.REPLACEONMAKE = false;
46955600 if (//false) // why??
46965601 !group.selection.isEmpty())
46975602 {
....@@ -4805,10 +5710,15 @@
48055710 //node.add(csg);
48065711 //makeSomething(node);
48075712 makeSomething(csg);
5713
+ Globals.REPLACEONMAKE = keep;
48085714 }
48095715
48105716 void Ungroup(Object3D g)
48115717 {
5718
+ if (Globals.REPLACEONMAKE)
5719
+ Save();
5720
+ boolean keep = Globals.REPLACEONMAKE;
5721
+ Globals.REPLACEONMAKE = false;
48125722 if (g instanceof HiddenObject)
48135723 {
48145724 HiddenObject h = (HiddenObject) g;
....@@ -4825,6 +5735,7 @@
48255735 objEditor.makeSomething(g.get(i), false);
48265736 }
48275737 }
5738
+ Globals.REPLACEONMAKE = keep;
48285739 }
48295740
48305741 void ungroup()
....@@ -5113,7 +6024,43 @@
51136024 cButton clearpanelButton;
51146025 cButton unselectButton;
51156026
6027
+ cButton restoreCameraButton;
6028
+
51166029 cButton oneStepButton;
6030
+
6031
+ cButton groupButton;
6032
+ cButton ungroupButton;
6033
+ cButton compositeButton;
6034
+ cButton switchButton;
6035
+ cButton loopButton;
6036
+ cButton textureButton;
6037
+
6038
+ cButton skybox1Button;
6039
+ cButton skybox2Button;
6040
+ cButton skybox3Button;
6041
+ cButton skybox4Button;
6042
+ cButton skybox5Button;
6043
+ cButton skybox6Button;
6044
+ cButton skybox7Button;
6045
+
6046
+ cButton skybox11Button;
6047
+ cButton skybox12Button;
6048
+ cButton skybox13Button;
6049
+ cButton skybox14Button;
6050
+ cButton skybox15Button;
6051
+ cButton skybox16Button;
6052
+ cButton skybox17Button;
6053
+
6054
+ cButton gridButton;
6055
+ cButton boxButton;
6056
+ cButton sphereButton;
6057
+ cButton coneButton;
6058
+ cButton torusButton;
6059
+ cButton superButton;
6060
+ cButton kleinButton;
6061
+ cButton particlesButton;
6062
+ cButton overlayButton;
6063
+ cButton lightButton;
51176064
51186065 cButton screenfitButton;
51196066 cButton screenfitpointButton;
....@@ -5126,14 +6073,6 @@
51266073
51276074 cButton setsupportButton;
51286075
5129
- cButton twoButton;
5130
- cButton sixButton;
5131
- cButton threeButton;
5132
- cButton sevenButton;
5133
- cButton fourButton; // full panel
5134
- cButton oneButton; // full XYZ
5135
- //cButton currentLayout;
5136
-
51376076 //
51386077 //Composite
51396078 Object3D // to do !!
....@@ -5143,9 +6082,11 @@
51436082 //JTree jTree;
51446083 private MenuItem lookAtItem;
51456084 private MenuItem lookFromItem;
5146
- private MenuItem switchItem;
6085
+ private MenuItem switchViewItem;
51476086 private MenuItem cutItem;
5148
- private MenuItem duplicateItem;
6087
+ private MenuItem undoItem;
6088
+ private MenuItem redoItem;
6089
+ private JMenuItem duplicateItem;
51496090 private MenuItem cloneItem;
51506091 private MenuItem cloneSupportItem;
51516092 private MenuItem overwriteGeoItem;
....@@ -5173,7 +6114,7 @@
51736114 private MenuItem pasteLinkItem;
51746115 private MenuItem pasteCloneItem;
51756116 private MenuItem pasteExpandItem;
5176
- private MenuItem clearItem;
6117
+ private MenuItem deleteItem;
51776118 private MenuItem clearAllItem;
51786119 private MenuItem genUVItem;
51796120 private MenuItem genNormalsMESHItem;
....@@ -5208,6 +6149,10 @@
52086149 private MenuItem showleavesItem;
52096150 private MenuItem markleavesItem;
52106151 private MenuItem unmarkleavesItem;
6152
+ private MenuItem rewindleavesItem;
6153
+ private MenuItem unrewindleavesItem;
6154
+ private MenuItem randomleavesItem;
6155
+ private MenuItem unrandomleavesItem;
52116156
52126157 private MenuItem flipVItem;
52136158 private MenuItem unflipVItem;
....@@ -5229,7 +6174,7 @@
52296174 private MenuItem frontItem;
52306175 private MenuItem cameraItem;
52316176 private MenuItem compositeItem;
5232
- private MenuItem randomItem;
6177
+ private MenuItem switchItem;
52336178 private MenuItem physicsItem;
52346179 private MenuItem frameselectorItem;
52356180 private MenuItem scriptNodeItem;
....@@ -5253,6 +6198,8 @@
52536198 private MenuItem attachBumpItem;
52546199 private MenuItem detachBumpItem;
52556200 private MenuItem pigmentBumpItem;
6201
+ private MenuItem embedTexturesItem;
6202
+ private MenuItem deEmbedTexturesItem;
52566203
52576204 private MenuItem particleItem;
52586205 private MenuItem ragdollItem;
....@@ -5303,5 +6250,5 @@
53036250
53046251 Menu cameraMenu;
53056252 MenuItem editCameraItem;
5306
- MenuItem revertCameraItem;
6253
+ MenuItem restoreCameraItem;
53076254 }