Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314
GroupEditor.java
....@@ -12,9 +12,11 @@
1212 import com.jme.math.Vector3f;
1313 import com.jme.renderer.ColorRGBA;
1414
15
+import grafeme.ui.*;
1516 //import buoy.widget.BFileChooser;
1617
17
-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
18
+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1820 ObjectUI,
1921 Runnable,
2022 ActionListener,
....@@ -22,6 +24,360 @@
2224 DragGestureListener, DragSourceListener, DropTargetListener,
2325 ItemListener // ListSelectionListener
2426 {
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", !Globals.NIMBUSLAF));
33
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : 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 AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46
+ {
47
+ cButton textureButton;
48
+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
+ textureButton.setToolTipText(c + count);
51
+ textureButton.addActionListener(new ActionListener()
52
+ {
53
+ @Override
54
+ public void actionPerformed(ActionEvent e)
55
+ {
56
+ ChangeTexture(path + t);
57
+ }
58
+ });
59
+ }
60
+
61
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
62
+ {
63
+ cGridBag tab0 = new cGridBag().setVertical(true);
64
+
65
+ tab0.setName("Urban");
66
+ skyboxpanel.add(tab0);
67
+
68
+ cGridBag row0 = new cGridBag();
69
+ cGridBag row1 = new cGridBag();
70
+ cGridBag row2 = new cGridBag();
71
+ cGridBag row3 = new cGridBag();
72
+ cGridBag row4 = new cGridBag();
73
+ cGridBag row5 = new cGridBag();
74
+ cGridBag row6 = new cGridBag();
75
+
76
+ AddSkyboxButton("default", "", row0);
77
+ //AddSkyboxButton("default", "cornell", row0);
78
+ AddSkyboxButton("penguins", "dust", row0);
79
+ AddSkyboxButton("penguins", "tropic", row0);
80
+ AddSkyboxButton("penguins", "yonder", row0);
81
+
82
+ AddSkyboxButton("default", "uffizi", row1);
83
+ AddSkyboxButton("bridge", "Bridge", row1);
84
+ AddSkyboxButton("bridge", "Bridge2", row1);
85
+ AddSkyboxButton("urban", "GamlaStan2", row1);
86
+
87
+ AddSkyboxButton("urban", "Parliament", row2);
88
+ AddSkyboxButton("urban", "Roundabout", row2);
89
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
90
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
91
+
92
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
93
+ AddSkyboxButton("urban", "UnionSquare", row3);
94
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
95
+ AddSkyboxButton("park", "BerzeliiPark", row3);
96
+
97
+ AddSkyboxButton("park", "Buddha", row4);
98
+ AddSkyboxButton("park", "CNTower2", row4);
99
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
100
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
101
+
102
+ AddSkyboxButton("park", "Park", row5);
103
+ AddSkyboxButton("park", "Pond", row5);
104
+ AddSkyboxButton("park", "Skansen", row5);
105
+ AddSkyboxButton("park", "Skansen2", row5);
106
+
107
+ AddSkyboxButton("park", "Skansen3", row6);
108
+ AddSkyboxButton("park", "Skansen4", row6);
109
+ AddSkyboxButton("park", "Skansen5", row6);
110
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
111
+
112
+ tab0.add(row0);
113
+ tab0.add(row1);
114
+ tab0.add(row2);
115
+ tab0.add(row3);
116
+ tab0.add(row4);
117
+ tab0.add(row5);
118
+ tab0.add(row6);
119
+
120
+ for (int i=5; --i>=0;)
121
+ {
122
+ //oe.toolboxPanel.Return();
123
+ //tab0.add(new cGridBag());
124
+ }
125
+ }
126
+
127
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
128
+ {
129
+ cGridBag tab0 = new cGridBag().setVertical(true);
130
+
131
+ tab0.setName("Nature");
132
+ skyboxpanel.add(tab0);
133
+
134
+ cGridBag row0 = new cGridBag();
135
+ cGridBag row1 = new cGridBag();
136
+ cGridBag row2 = new cGridBag();
137
+ cGridBag row3 = new cGridBag();
138
+ cGridBag row4 = new cGridBag();
139
+ cGridBag row5 = new cGridBag();
140
+ cGridBag row6 = new cGridBag();
141
+
142
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
143
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
144
+ AddSkyboxButton("beach", "PalmTrees", row0);
145
+ AddSkyboxButton("beach", "Tenerife", row0);
146
+
147
+ AddSkyboxButton("beach", "Tenerife2", row1);
148
+ AddSkyboxButton("beach", "Tenerife3", row1);
149
+ AddSkyboxButton("field", "FishPond", row1);
150
+ AddSkyboxButton("field", "Footballfield", row1);
151
+
152
+ AddSkyboxButton("field", "Meadow", row2);
153
+ AddSkyboxButton("field", "Sorsele", row2);
154
+ AddSkyboxButton("field", "Sorsele2", row2);
155
+ AddSkyboxButton("field", "Sorsele3", row2);
156
+
157
+ AddSkyboxButton("forest", "Brudslojan", row3);
158
+ AddSkyboxButton("forest", "Langholmen2", row3);
159
+ AddSkyboxButton("forest", "Plants", row3);
160
+ AddSkyboxButton("mountain", "Maskonaive", row3);
161
+
162
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
163
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
164
+ AddSkyboxButton("mountain", "Teide", row4);
165
+ AddSkyboxButton("park", "Tantolunden4", row4);
166
+
167
+ AddSkyboxButton("park", "Stairs", row5);
168
+ AddSkyboxButton("default", "skycube", row6);
169
+ AddSkyboxButton("rocky", "Langholmen", row5);
170
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
171
+
172
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
173
+ AddSkyboxButton("default", "CloudyHills", row6);
174
+ AddSkyboxButton("daz", "Autumn", row6);
175
+ AddSkyboxButton("daz", "MountainTrail", row6);
176
+ /*
177
+Autumn
178
+Greenlands
179
+MountainTrail
180
+Oasis
181
+TheRock
182
+TopOfTheWorld
183
+Winter
184
+ */
185
+
186
+ tab0.add(row0);
187
+ tab0.add(row1);
188
+ tab0.add(row2);
189
+ tab0.add(row3);
190
+ tab0.add(row4);
191
+ tab0.add(row5);
192
+ tab0.add(row6);
193
+
194
+ for (int i=5; --i>=0;)
195
+ {
196
+ //oe.toolboxPanel.Return();
197
+ //tab0.add(new cGridBag());
198
+ }
199
+ }
200
+
201
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
202
+ {
203
+ cGridBag tab0 = new cGridBag().setVertical(true);
204
+
205
+ tab0.setName("Night");
206
+ skyboxpanel.add(tab0);
207
+
208
+ cGridBag row0 = new cGridBag();
209
+ cGridBag row1 = new cGridBag();
210
+ cGridBag row2 = new cGridBag();
211
+ cGridBag row3 = new cGridBag();
212
+ cGridBag row4 = new cGridBag();
213
+ cGridBag row5 = new cGridBag();
214
+ cGridBag row6 = new cGridBag();
215
+
216
+ AddSkyboxButton("night", "NightPath", row0);
217
+ AddSkyboxButton("night", "PondNight", row0);
218
+ AddSkyboxButton("night", "Powerlines", row0);
219
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
220
+
221
+ AddSkyboxButton("urban", "CNTower", row1);
222
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
223
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
224
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
225
+
226
+ AddSkyboxButton("penguins", "kenon_star", row2);
227
+ AddSkyboxButton("persson", "corona", row2);
228
+ AddSkyboxButton("persson", "spaceskybox", row2);
229
+ AddSkyboxButton("indoors", "Vasa", row2);
230
+
231
+ AddSkyboxButton("winter", "Backyard", row3);
232
+ AddSkyboxButton("winter", "Creek", row3);
233
+ AddSkyboxButton("winter", "FootballField3", row3);
234
+ AddSkyboxButton("winter", "Forest", row3);
235
+
236
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
237
+ AddSkyboxButton("winter", "House", row4);
238
+ AddSkyboxButton("winter", "IceLake", row4);
239
+ AddSkyboxButton("winter", "IceRiver", row4);
240
+
241
+ AddSkyboxButton("winter", "Park3", row5);
242
+ AddSkyboxButton("winter", "PondWinter", row5);
243
+ AddSkyboxButton("winter", "Tantolunden5", row5);
244
+ AddSkyboxButton("winter", "Vindelalven", row5);
245
+
246
+ AddSkyboxButton("daz", "TheRock", row6);
247
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
248
+ AddSkyboxButton("daz", "Winter", row6);
249
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
250
+
251
+ tab0.add(row0);
252
+ tab0.add(row1);
253
+ tab0.add(row2);
254
+ tab0.add(row3);
255
+ tab0.add(row4);
256
+ tab0.add(row5);
257
+ tab0.add(row6);
258
+
259
+ for (int i=5; --i>=0;)
260
+ {
261
+ //oe.toolboxPanel.Return();
262
+ //tab0.add(new cGridBag());
263
+ }
264
+ }
265
+
266
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
267
+ {
268
+ cGridBag tab0 = new cGridBag().setVertical(true);
269
+
270
+ tab0.setName("Others");
271
+ skyboxpanel.add(tab0);
272
+
273
+ cGridBag row0 = new cGridBag();
274
+ cGridBag row1 = new cGridBag();
275
+ cGridBag row2 = new cGridBag();
276
+ cGridBag row3 = new cGridBag();
277
+ cGridBag row4 = new cGridBag();
278
+ cGridBag row5 = new cGridBag();
279
+ cGridBag row6 = new cGridBag();
280
+
281
+ AddSkyboxButton("mayhem", "afterrain", row0);
282
+ AddSkyboxButton("mayhem", "aqua4", row0);
283
+ AddSkyboxButton("mayhem", "aqua9", row0);
284
+ AddSkyboxButton("mayhem", "flame", row0);
285
+
286
+ AddSkyboxButton("mayhem", "h2s", row1);
287
+ AddSkyboxButton("mayhem", "prehistoric", row1);
288
+ AddSkyboxButton("mayhem", "scorched", row1);
289
+ AddSkyboxButton("penguins", "desertdawn", row1);
290
+
291
+ AddSkyboxButton("persson", "Citadella", row2);
292
+ AddSkyboxButton("persson", "Citadella2", row2);
293
+ AddSkyboxButton("persson", "clouds1", row2);
294
+ AddSkyboxButton("penguins", "wrath", row2);
295
+
296
+ AddSkyboxButton("persson", "FishermansBastion", row3);
297
+ AddSkyboxButton("persson", "HeroesSquare", row3);
298
+ AddSkyboxButton("indoors", "DallasW", row3);
299
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
300
+
301
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
302
+ AddSkyboxButton("persson", "PereaBeach1", row4);
303
+ AddSkyboxButton("persson", "PereaBeach2", row4);
304
+ AddSkyboxButton("persson", "redeclipse", row4);
305
+
306
+ AddSkyboxButton("daz", "Greenlands", row5);
307
+ AddSkyboxButton("daz", "Oasis", row5);
308
+ AddSkyboxButton("elyvisions", "arch3", row5);
309
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
310
+
311
+ AddSkyboxButton("elyvisions", "rainbow", row6);
312
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
313
+ AddSkyboxButton("elyvisions", "heaven", row6);
314
+ AddSkyboxButton("elyvisions", "hot", row6);
315
+
316
+ tab0.add(row0);
317
+ tab0.add(row1);
318
+ tab0.add(row2);
319
+ tab0.add(row3);
320
+ tab0.add(row4);
321
+ tab0.add(row5);
322
+ tab0.add(row6);
323
+
324
+ for (int i=5; --i>=0;)
325
+ {
326
+ //oe.toolboxPanel.Return();
327
+ //tab0.add(new cGridBag());
328
+ }
329
+ }
330
+
331
+ public void ChangeSkybox(String skybox)
332
+ {
333
+ if (skybox.endsWith("/"))
334
+ {
335
+ group.skyboxname = null;
336
+ group.skyboxext = null;
337
+ cameraView.repaint();
338
+ }
339
+ else
340
+ {
341
+ //cameraView.envyoff = false;
342
+ group.skyboxname = skybox;
343
+ group.skyboxext = "jpg";
344
+ cameraView.repaint();
345
+ }
346
+ }
347
+
348
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
+ {
350
+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
+
352
+ AddSkyboxTab0(skyboxpane);
353
+ AddSkyboxTab1(skyboxpane);
354
+ AddSkyboxTab2(skyboxpane);
355
+ AddSkyboxTab3(skyboxpane);
356
+
357
+ skyboxPanel.add(skyboxpane);
358
+ }
359
+
360
+ public void ChangeTexture(String texture)
361
+ {
362
+ for (int i=0; i<group.selection.size(); i++)
363
+ {
364
+ Object3D obj = group.selection.get(i);
365
+ obj.SetPigmentTexture("@" + texture);
366
+ }
367
+
368
+ refreshContents();
369
+ }
370
+
371
+ public void Show3DView()
372
+ {
373
+ // bug
374
+ //gridPanel.setDividerLocation(1.0);
375
+ //bigPanel.setDividerLocation(0.0);
376
+ bigThree.ClearUI();
377
+ bigThree.add(centralPanel);
378
+ bigThree.FlushUI();
379
+ }
380
+
25381 //ObjEditor objEditor;
26382 public void closeUI2()
27383 {
....@@ -59,6 +415,16 @@
59415 this.copy = this.group = group;
60416 //selectees = this.group.selectees;
61417
418
+ assert(false);
419
+
420
+// if (copy.versionlist == null)
421
+// {
422
+// copy.versionlist = new Object3D[100];
423
+// copy.versionindex = -1;
424
+//
425
+// //Save(true);
426
+// }
427
+
62428 if(ui)
63429 SetupUI(objEditor);
64430 }
....@@ -73,17 +439,29 @@
73439 this.copy = this.group = copy;
74440 //selectees = this.group.selectees;
75441
76
- SetupMenu2(objEditor);
442
+ SetupMenu2(this); //objEditor);
77443 SetupUI2(objEditor);
78444 objEditor.SetupUI(true);
79445 SetupViews(objEditor);
80446
81447 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
448
+
449
+// if (copy.versionlist == null)
450
+// {
451
+// copy.versionlist = new Object3D[100];
452
+// copy.versionindex = -1;
453
+//
454
+// //Save(true);
455
+// }
82456 }
83457
84458 void CloneSelection(boolean supports)
85459 {
86
- // Object3D keep = GraphreeD.clipboard;
460
+ if (Globals.REPLACEONMAKE)
461
+ Save();
462
+ boolean keep = Globals.REPLACEONMAKE;
463
+ Globals.REPLACEONMAKE = false;
464
+ // Object3D keep = GrafreeD.clipboard;
87465 //Object3D obj;
88466 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89467 {
....@@ -93,18 +471,19 @@
93471
94472 makeSomething(clone, i==group.selection.size()-1);
95473 }
474
+ Globals.REPLACEONMAKE = keep;
96475 }
97476
98477 void CloneClipboard(boolean supports)
99478 {
100
- assert(GraphreeD.clipboard.parent == null);
101
- Object3D /*Composite*/ keepparent = GraphreeD.clipboard.get(0).parent;
102
- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103
- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104
- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
479
+ assert(Grafreed.clipboard.parent == null);
480
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
481
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
482
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
483
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105484 else
106
- makeSomething(CloneObject(GraphreeD.clipboard, false));
107
- GraphreeD.clipboard.get(0).parent = keepparent;
485
+ makeSomething(CloneObject(Grafreed.clipboard, false));
486
+ Grafreed.clipboard.get(0).parent = keepparent;
108487 }
109488
110489 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -118,7 +497,7 @@
118497 // obj.support = null;
119498 if (!supports)
120499 obj.SaveSupports();
121
- Object3D clone = (Object3D)GraphreeD.clone(obj);
500
+ Object3D clone = (Object3D)Grafreed.clone(obj);
122501 obj.parent = parent;
123502 // obj.support = support;
124503 // clone.support = support; // aout 2013
....@@ -147,57 +526,153 @@
147526
148527 //JTextField nameField;
149528
150
- void SetupMenu2(ObjEditor oe)
529
+ void SetupMenu2(GroupEditor oe)
151530 {
152
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156
- oe.cameraMenu.add("-");
157
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158
- openWindowItem.addActionListener(this);
159
- editLeafItem.addActionListener(this);
160
- lookAtItem.addActionListener(this);
161
- //lookFromItem.addActinoListener(this);
162
- //switchItem.addActionListener(this);
531
+ oe.jTree = new cTree();
532
+
163533 Menu menu;
164534 oe.menuBar.add(menu = new Menu("Edit"));
165535 //editItem = menu.add(new MenuItem("Edit"));
166536 //editItem.addActionListener(this);
167
- duplicateItem = menu.add(new MenuItem("Duplicate"));
537
+
538
+// undoItem = menu.add(new MenuItem("Undo"));
539
+// undoItem.addActionListener(this);
540
+// redoItem = menu.add(new MenuItem("Redo"));
541
+// redoItem.addActionListener(this);
542
+// menu.add("-");
543
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168544 duplicateItem.addActionListener(this);
169
- menu.add("-");
170
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171547 cloneItem.addActionListener(this);
548
+ //if (Globals.ADVANCED)
549
+ {
172550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173551 cloneSupportItem.addActionListener(this);
552
+ }
553
+ oe.jTree.popup.addSeparator();
174554 menu.add("-");
175
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176556 cutItem.addActionListener(this);
177
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178558 copyItem.addActionListener(this);
179559 pasteItem = menu.add(new MenuItem("Paste"));
180560 pasteItem.addActionListener(this);
181
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
561
+
562
+ oe.jTree.popup.addSeparator();
563
+ //menu.add("-");
564
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
565
+ pasteIntoItem.addActionListener(this);
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182567 pasteLinkItem.addActionListener(this);
183
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184569 pasteCloneItem.addActionListener(this);
185
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186571 // pasteExpandItem.addActionListener(this);
187
- clearItem = menu.add(new MenuItem("Clear"));
188
- clearItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
574
+
575
+ if (Globals.ADVANCED)
576
+ {
577
+ // Deletes the cameras...
189578 clearAllItem = menu.add(new MenuItem("Clear All"));
190579 clearAllItem.addActionListener(this);
191
- menu.add("-");
192
- resetMeshItem = menu.add(new MenuItem("Reset All"));
193
- resetMeshItem.addActionListener(this);
194
- stepAllItem = menu.add(new MenuItem("Step All"));
195
- stepAllItem.addActionListener(this);
580
+ }
581
+
582
+ menuBar.add(cameraMenu = new Menu("View"));
583
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
584
+ //zBufferItem.addActionListener(this);
585
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
586
+ //normalLensItem.addActionListener(this);
587
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
588
+ restoreCameraItem.addActionListener(this);
589
+
590
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
591
+// toggleFullScreenItem.addItemListener(this);
592
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
593
+// cameraMenu.add("-");
594
+//
595
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
596
+// toggleTextureItem.addItemListener(this);
597
+// toggleTextureItem.setState(CameraPane.textureon);
598
+//
599
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
600
+// toggleSwitchItem.addItemListener(this);
601
+// toggleSwitchItem.setState(CameraPane.SWITCH);
602
+
603
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
604
+ toggleHandleItem.addItemListener(this);
605
+ toggleHandleItem.setState(CameraPane.HANDLES);
606
+
607
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
608
+ togglePaintItem.addItemListener(this);
609
+ togglePaintItem.setState(CameraPane.PAINTMODE);
610
+
611
+ if (Globals.ADVANCED)
612
+ {
613
+ cameraMenu.add("-");
614
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
615
+ toggleLiveItem.addItemListener(this);
616
+ toggleLiveItem.setState(Globals.isLIVE());
617
+
618
+ cameraMenu.add(stepItem = new MenuItem("Step"));
619
+ stepItem.addActionListener(this);
620
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
621
+ // toggleDLItem.addItemListener(this);
622
+ // toggleDLItem.setState(false);
623
+
624
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
625
+ toggleRenderItem.addItemListener(this);
626
+ toggleRenderItem.setState(!CameraPane.frozen);
627
+
628
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
629
+ toggleDebugItem.addItemListener(this);
630
+ toggleDebugItem.setState(Globals.DEBUG);
631
+
632
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
633
+ toggleFrustumItem.addItemListener(this);
634
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
635
+
636
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
637
+ toggleFootContactItem.addItemListener(this);
638
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
639
+
640
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
641
+ toggleTimelineItem.addItemListener(this);
642
+ }
643
+
644
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
645
+// toggleRootItem.addItemListener(this);
646
+// toggleRootItem.setState(false);
647
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
648
+// animationItem.addItemListener(this);
649
+// animationItem.setState(CameraPane.ANIMATION);
650
+ cameraMenu.add("-");
651
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
652
+ editCameraItem.addActionListener(this);
653
+
654
+ if (Globals.ADVANCED)
655
+ {
656
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
657
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
658
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
659
+ oe.cameraMenu.add("-");
660
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
661
+ openWindowItem.addActionListener(this);
662
+ lookAtItem.addActionListener(this);
663
+ //lookFromItem.addActinoListener(this);
664
+ //switchViewItem.addActionListener(this);
665
+ }
666
+
667
+ oe.menuBar.add(menu = new Menu("Setting"));
668
+ if (Globals.ADVANCED)
669
+ {
196670 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197671 revertMeshItem.addActionListener(this);
198672 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199673 resetreferencesItem.addActionListener(this);
200674 menu.add("-");
675
+ }
201676 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202677 overwriteGeoItem.addActionListener(this);
203678 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -209,72 +684,111 @@
209684 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210685 overwriteUVItem.addActionListener(this);
211686 menu.add("-");
687
+ if (Globals.ADVANCED)
688
+ {
212689 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213690 generateMeshItem.addActionListener(this);
214691 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215692 poseMeshItem.addActionListener(this);
216693 menu.add("-");
694
+ }
217695 resetsupportItem = menu.add(new MenuItem("Reset support"));
218696 resetsupportItem.addActionListener(this);
219697 linkverticesItem = menu.add(new MenuItem("Link to Support"));
220698 linkverticesItem.addActionListener(this);
699
+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
700
+ relinkverticesItem.addActionListener(this);
701
+
702
+ if (Globals.ADVANCED)
703
+ {
221704 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222705 setMasterItem.addActionListener(this);
706
+ }
223707
224
- oe.menuBar.add(menu = new Menu("Object"));
225
- grabItem = menu.add(new MenuItem("Grab"));
226
- grabItem.addActionListener(this);
227
- frontItem = menu.add(new MenuItem("Front"));
228
- frontItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
229710 backItem = menu.add(new MenuItem("Back"));
230711 backItem.addActionListener(this);
231
- compositeItem = menu.add(new MenuItem("Composite"));
232
- compositeItem.addActionListener(this);
233
- menu.add("-");
234
- randomItem = menu.add(new MenuItem("Random"));
235
- randomItem.addActionListener(this);
236
- physicsItem = menu.add(new MenuItem("Physics"));
237
- physicsItem.addActionListener(this);
238
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
239
- frameselectorItem.addActionListener(this);
712
+ frontItem = menu.add(new MenuItem("Front"));
713
+ frontItem.addActionListener(this);
714
+// compositeItem = menu.add(new MenuItem("Composite"));
715
+// compositeItem.addActionListener(this);
716
+
717
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+ grabItem.addActionListener(this);
719
+
720
+ if (Globals.ADVANCED)
721
+ {
722
+ hideItem = menu.add(new MenuItem("Hidden Group"));
723
+ hideItem.addActionListener(this);
724
+ }
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
726
+ ungroupItem.addActionListener(this);
727
+
728
+ oe.jTree.popup.addSeparator();
729
+
730
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+ deleteItem.addActionListener(this);
732
+
733
+// menu.add("-");
734
+//
735
+// switchItem = menu.add(new MenuItem("Switch node"));
736
+// switchItem.addActionListener(this);
737
+ if (Globals.ADVANCED)
738
+ {
240739 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241740 switchGeoItem.addActionListener(this);
242741 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243742 switchTransfoItem.addActionListener(this);
244
- morphItem = menu.add(new MenuItem("Morph"));
743
+ morphItem = menu.add(new MenuItem("Morph Group"));
245744 morphItem.addActionListener(this);
745
+
746
+ menu.add("-");
747
+ physicsItem = menu.add(new MenuItem("Physics"));
748
+ physicsItem.addActionListener(this);
749
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
750
+ frameselectorItem.addActionListener(this);
246751 scriptNodeItem = menu.add(new MenuItem("Script Node"));
247752 scriptNodeItem.addActionListener(this);
248
- cameraItem = menu.add(new MenuItem("Camera"));
249
- cameraItem.addActionListener(this);
250
- menu.add("-");
251
- textureItem = menu.add(new MenuItem("Texture"));
252
- textureItem.addActionListener(this);
753
+ }
754
+
755
+ oe.menuBar.add(menu = new Menu("Object"));
756
+// textureItem = menu.add(new MenuItem("Texture"));
757
+// textureItem.addActionListener(this);
758
+ billboardItem = menu.add(new MenuItem("Billboard"));
759
+ billboardItem.addActionListener(this);
253760 csgItem = menu.add(new MenuItem("CSG"));
254761 csgItem.addActionListener(this);
255
- shadowXItem = menu.add(new MenuItem("Shadow X"));
762
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
256763 shadowXItem.addActionListener(this);
257
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
764
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
258765 shadowYItem.addActionListener(this);
259
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
766
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
260767 shadowZItem.addActionListener(this);
768
+ attributeItem = menu.add(new MenuItem("Attribute"));
769
+ attributeItem.addActionListener(this);
770
+
771
+ if (Globals.ADVANCED)
772
+ {
773
+ menu.add("-");
261774 linkerItem = menu.add(new MenuItem("Linker"));
262775 linkerItem.addActionListener(this);
263776 templateItem = menu.add(new MenuItem("Template"));
264777 templateItem.addActionListener(this);
265
- attributeItem = menu.add(new MenuItem("Attribute"));
266
- attributeItem.addActionListener(this);
267778 pointflowItem = menu.add(new MenuItem("Point Flow"));
268779 pointflowItem.addActionListener(this);
780
+ }
269781 menu.add("-");
270
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271
- transformgeometryItem.addActionListener(this);
272782 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273783 resetTransformItem.addActionListener(this);
274784 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275785 resetCentroidItem.addActionListener(this);
276
- ungroupItem = menu.add(new MenuItem("Ungroup"));
277
- ungroupItem.addActionListener(this);
786
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
787
+ resetCentroidXZItem.addActionListener(this);
788
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
789
+ transformGeometryItem.addActionListener(this);
790
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
791
+ transformChildrenItem.addActionListener(this);
278792
279793 oe.menuBar.add(menu = new Menu("Geometry"));
280794 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -283,6 +797,13 @@
283797 genNormalsORGANItem.addActionListener(this);
284798 genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285799 genNormalsCADItem.addActionListener(this);
800
+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
801
+ genNormalsMESHItem.addActionListener(this);
802
+ if (Globals.ADVANCED)
803
+ {
804
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
805
+ genNormalsMINEItem.addActionListener(this);
806
+ }
286807 stripifyItem = menu.add(new MenuItem("Stripify"));
287808 stripifyItem.addActionListener(this);
288809 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -292,8 +813,6 @@
292813 untrimItem = menu.add(new MenuItem("Untrim"));
293814 untrimItem.addActionListener(this);
294815 menu.add("-");
295
- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296
- clearMaterialsItem.addActionListener(this);
297816 clearColorsItem = menu.add(new MenuItem("Clear AO"));
298817 clearColorsItem.addActionListener(this);
299818 reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
....@@ -306,53 +825,69 @@
306825 reduce34MeshItem.addActionListener(this);
307826 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308827 increaseMeshItem.addActionListener(this);
309
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310
- smoothMeshItem.addActionListener(this);
311828 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312829 clipMeshItem.addActionListener(this);
830
+
831
+ if (Globals.ADVANCED)
832
+ {
833
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
834
+ smoothMeshItem.addActionListener(this);
835
+ }
836
+
837
+ oe.menuBar.add(menu = new Menu("Attributes"));
838
+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
839
+ clearVersionsItem.addActionListener(this);
840
+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
841
+ clearMaterialsItem.addActionListener(this);
842
+ resetAllItem = menu.add(new MenuItem("Reset All"));
843
+ resetAllItem.addActionListener(this);
844
+ stepAllItem = menu.add(new MenuItem("Step All"));
845
+ stepAllItem.addActionListener(this);
313846 menu.add("-");
314847 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315848 liveleavesItem.addActionListener(this);
316849 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317850 unliveleavesItem.addActionListener(this);
851
+ if (Globals.ADVANCED)
852
+ {
318853 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319854 supportleavesItem.addActionListener(this);
320855 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321856 unsupportleavesItem.addActionListener(this);
857
+ }
322858 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323859 hideleavesItem.addActionListener(this);
324860 showleavesItem = menu.add(new MenuItem("Show Leaves"));
325861 showleavesItem.addActionListener(this);
326
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
862
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
327863 markleavesItem.addActionListener(this);
328
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
864
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
329865 unmarkleavesItem.addActionListener(this);
866
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
867
+ rewindleavesItem.addActionListener(this);
868
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
869
+ unrewindleavesItem.addActionListener(this);
870
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
871
+ randomleavesItem.addActionListener(this);
872
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
873
+ unrandomleavesItem.addActionListener(this);
330874 menu.add("-");
331875 flipVItem = menu.add(new MenuItem("Flip V"));
332876 flipVItem.addActionListener(this);
333877 unflipVItem = menu.add(new MenuItem("Unflip V"));
334878 unflipVItem.addActionListener(this);
335
- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
879
+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336880 lowTexturesItem.addActionListener(this);
337
- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
881
+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338882 normalTexturesItem.addActionListener(this);
339
- highTexturesItem = menu.add(new MenuItem("High Texture"));
883
+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340884 highTexturesItem.addActionListener(this);
341
- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
885
+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342886 veryhighTexturesItem.addActionListener(this);
343
- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
887
+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344888 maxTexturesItem.addActionListener(this);
345
- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
889
+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346890 panoTexturesItem.addActionListener(this);
347
- menu.add("-");
348
- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349
- extractGeometriesItem.addActionListener(this);
350
- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351
- cloneGeometriesItem.addActionListener(this);
352
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353
- shareGeometriesItem.addActionListener(this);
354
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355
- mergeGeometriesItem.addActionListener(this);
356891
357892 oe.menuBar.add(menu = new Menu("Selection"));
358893 attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
....@@ -361,31 +896,135 @@
361896 attachBumpItem.addActionListener(this);
362897 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
363898 pigmentBumpItem.addActionListener(this);
899
+ //embedTexturesItem
364900 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
365901 detachPigmentItem.addActionListener(this);
366902 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
367903 detachBumpItem.addActionListener(this);
904
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
905
+ embedTexturesItem.addActionListener(this);
906
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
907
+ deEmbedTexturesItem.addActionListener(this);
368908 menu.add("-");
369909 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
370910 sortbysizeItem.addActionListener(this);
371911 sortbynameItem = menu.add(new MenuItem("Sort by name"));
372912 sortbynameItem.addActionListener(this);
913
+ menu.add("-");
914
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
915
+ shareGeometriesItem.addActionListener(this);
916
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
917
+ mergeGeometriesItem.addActionListener(this);
918
+ menu.add("-");
919
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
920
+ editLeafItem.addActionListener(this);
921
+ if (Globals.ADVANCED)
922
+ {
923
+ // Pretty much the same as duplicate and clone.
924
+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
925
+ extractGeometriesItem.addActionListener(this);
926
+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
927
+ cloneGeometriesItem.addActionListener(this);
928
+ }
929
+
373930 oe.menuBar.add(menu = new Menu("Insert"));
374931 buildCreateMenu(menu);
375
- oe.menuBar.add(menu = new Menu("Tools"));
932
+
933
+ oe.menuBar.add(menu = new Menu("Tools"));
376934 buildToolsMenu(menu);
377935 }
378936
937
+ JTabbedPane resourcecontainer;
938
+ cGridBag currenttab;
939
+ //boolean added; // patch for jar
940
+
941
+ int totalcount = 0;
942
+
943
+ int tabcount = 0;
944
+ int colcount = 0;
945
+ int rowcount = 0;
946
+ int texturecount = 0;
947
+
948
+ int columns = 5;
949
+ int rows = 7;
950
+
951
+ public void ResourceCallBack(String[] path)
952
+ {
953
+// for (int i = 0; i < path.length; i++)
954
+// System.out.print(path[i] + "/");
955
+// System.out.println();
956
+
957
+ if (//rowcount == 0 ||
958
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
959
+ {
960
+ currenttab = new cGridBag();
961
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
962
+ currenttab.setName(tabname);
963
+ //added = false;
964
+ resourcecontainer.add(currenttab);
965
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
966
+ rowcount = 1;
967
+ colcount = 0;
968
+ texturecount = 0;
969
+ }
970
+
971
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
972
+ {
973
+ //if (!added)
974
+ {
975
+ //added = true;
976
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
977
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
978
+ }
979
+
980
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
981
+ totalcount++;
982
+
983
+ if (++colcount >= columns)
984
+ {
985
+ colcount = 0;
986
+ currenttab.Return();
987
+
988
+ if (rowcount++ >= rows)
989
+ {
990
+ rowcount = 0;
991
+ }
992
+ }
993
+ }
994
+ else
995
+ {
996
+// if (!path[path.length-1].equals("icons"))
997
+// resourcecontainer.Return();
998
+ }
999
+ }
1000
+
1001
+ void CreateTexturePanel(cGridBag container)
1002
+ {
1003
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1004
+ container.add(resourcecontainer);
1005
+
1006
+ Grafreed.ParseResources("textures", this);
1007
+
1008
+ // 935. System.out.println("Total = " + totalcount);
1009
+ }
1010
+
3791011 void SetupUI2(ObjEditor oe)
3801012 {
1013
+ // June 2019
1014
+ if (oe == null)
1015
+ {
1016
+ //super.SetupUI2(this);
1017
+ //return;
1018
+ }
1019
+
1020
+ if (copy != group)
1021
+ {
1022
+ //super.SetupUI2(this);
1023
+ }
1024
+
3811025 //new Exception().printStackTrace();
3821026
3831027 oe.radioPanel = new JPanel(new GridBagLayout());
384
- oe.aConstraints.weightx = 1;
385
- oe.aConstraints.weighty = 0;
386
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
387
- oe.aConstraints.gridwidth = 100;
388
- oe.aConstraints.gridheight = 1;
3891028 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
3901029
3911030 oe.buttonGroup = new ButtonGroup();
....@@ -406,150 +1045,269 @@
4061045 oe.radioPanel.add(dummyButton);
4071046 oe.buttonGroup.add(dummyButton);
4081047 */
409
- aConstraints.gridy += 1;
410
- oe.aConstraints.gridwidth = 1;
411
- oe.aConstraints.gridx = 0;
1048
+ cGridBag versionManagerPanel = new cGridBag();
1049
+
1050
+ versionManagerPanel.preferredHeight = 4;
4121051
413
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
1052
+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1053
+
1054
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
+ //minButton.setToolTipText("Minimize window");
1056
+ //minButton.addActionListener(this);
1057
+
1058
+ if (Globals.ADVANCED)
1059
+ {
1060
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// maxButton.setToolTipText("Maximize window");
1062
+// maxButton.addActionListener(this);
1063
+ }
1064
+
1065
+ cButton gcButton;
1066
+
1067
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+// gcButton.setToolTipText("Garbage collect");
1069
+// gcButton.addActionListener(new ActionListener()
1070
+// {
1071
+// public void actionPerformed(ActionEvent e)
1072
+// {
1073
+// System.gc();
1074
+// }
1075
+// });
1076
+
1077
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1078
+ collapseButton.setToolTipText("Collapse toolbar");
1079
+ collapseButton.addActionListener(this);
1080
+
1081
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
+ maximize3DButton.setToolTipText("Maximize 3D view");
1083
+ maximize3DButton.addActionListener(this);
1084
+
1085
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1086
+ twoButton.setToolTipText("Show 3D view only");
1087
+ twoButton.addActionListener(this);
1088
+ this.fullscreenLayout = twoButton;
1089
+
1090
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1091
+ threeButton.setToolTipText("Show controls and 3D view");
1092
+ threeButton.addActionListener(this);
1093
+ if (Globals.ADVANCED)
1094
+ {
1095
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096
+ sixButton.setToolTipText("Show 3D view and controls");
1097
+ sixButton.addActionListener(this);
1098
+ }
1099
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+// sevenButton.setToolTipText("3-column layout");
1101
+// sevenButton.addActionListener(this);
1102
+ //
1103
+
1104
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1105
+ fullButton.setToolTipText("Full-screen window");
1106
+ fullButton.addActionListener(this);
1107
+
1108
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1109
+ screenfitButton.setToolTipText("Screen fit");
1110
+ screenfitButton.addActionListener(this);
1111
+
1112
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1113
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1114
+ restoreCameraButton.addActionListener(this);
1115
+
1116
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
+ saveVersionButton.setToolTipText("Duplicate current version");
1118
+ saveVersionButton.addActionListener(this);
1119
+
1120
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1121
+ deleteVersionButton.setToolTipText("Delete current version");
1122
+ deleteVersionButton.addActionListener(this);
1123
+ deleteVersionButton.setEnabled(false);
1124
+
1125
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1126
+ previousVersionButton.setToolTipText("Previous version");
1127
+ previousVersionButton.addActionListener(this);
1128
+ previousVersionButton.setEnabled(false);
1129
+
1130
+ cGridBag updown = new cGridBag().setVertical(true);
1131
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1132
+ restoreButton.setToolTipText("Undo (restore current version)");
1133
+ restoreButton.addActionListener(this);
1134
+ restoreButton.setEnabled(false);
1135
+
1136
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1137
+ replaceButton.setToolTipText("Save (replace current version)");
1138
+ replaceButton.addActionListener(this);
1139
+ replaceButton.setEnabled(false);
1140
+
1141
+ versionManagerPanel.add(updown);
1142
+
1143
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144
+ nextVersionButton.setToolTipText("Next version");
1145
+ nextVersionButton.addActionListener(this);
1146
+ nextVersionButton.setEnabled(false);
1147
+
1148
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1149
+ oneStepButton.setToolTipText("Animate one step forward");
1150
+ oneStepButton.addActionListener(this);
1151
+
1152
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1153
+ liveCB.setToolTipText("Enable animation");
4141154 liveCB.addItemListener(this);
4151155
416
- oe.aConstraints.gridx += 1;
417
- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
418
- supportCB.addItemListener(this);
419
-
420
- // oe.aConstraints.gridx += 1;
421
- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
422
- // localCB.addItemListener(this);
423
-
424
- oe.aConstraints.gridx += 1;
425
- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
426
- crowdCB.addItemListener(this);
427
-
428
- oe.aConstraints.gridx += 1;
429
- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
430
- smoothCB.addItemListener(this);
431
-
432
- oe.aConstraints.gridx += 1;
433
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
1156
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1157
+ fastCB.setToolTipText("Fast mode");
4341158 fastCB.addItemListener(this);
435
- oe.aConstraints.gridx += 1;
436
- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
437
- slowCB.addItemListener(this);
438
- oe.aConstraints.gridx += 1;
439
- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
440
- boxCB.addItemListener(this);
1159
+
1160
+ //oe.toolboxPanel.Return();
1161
+
1162
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1163
+// trackCB.setToolTipText("Enable tracking");
1164
+// trackCB.addItemListener(this);
4411165
442
-// oe.aConstraints.gridx += 1;
443
-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
444
-// speakerMocapCB.addItemListener(this);
445
-
446
- if (false)
447
- {
448
- // handled in scripts
449
- oe.aConstraints.gridx += 1;
450
- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
451
- speakerCameraCB.addItemListener(this);
452
-
453
- oe.aConstraints.gridx += 1;
454
- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
455
- speakerFocusCB.addItemListener(this);
456
-
457
- oe.aConstraints.gridx += 1;
458
- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
459
- smoothfocusCB.addItemListener(this);
460
- }
461
-
462
-//oe.aConstraints.gridx += 1;
463
-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
464
-// debugCB.addItemListener(this);
465
-
466
- oe.aConstraints.gridx += 1;
467
- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
468
- oeilCB.addItemListener(this);
469
-
470
- oe.aConstraints.gridx += 1;
471
- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
472
- lookAtCB.addItemListener(this);
473
-
474
- oe.aConstraints.gridx += 1;
475
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
476
- trackCB.addItemListener(this);
477
-
478
- oe.aConstraints.gridx += 1;
479
- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
480
- screenfitButton.addActionListener(this);
481
- oe.aConstraints.gridx += 1;
4821166 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
4831167 // screenfitpointButton.addActionListener(this);
484
-// oe.aConstraints.gridx += 1;
485
- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
486
- snapobjectButton.addActionListener(this);
487
- oe.aConstraints.gridx += 1;
4881168
489
- //aConstraints.gridx = 0;
490
- //aConstraints.gridy += 1;
491
- oe.aConstraints.weighty = 0;
492
- oe.aConstraints.gridwidth = 1;
493
-
494
- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
495
- flashSelectionButton.addActionListener(this);
496
- oe.aConstraints.gridx += 1;
497
- oe.aConstraints.weighty = 0;
498
- oe.aConstraints.gridwidth = 1;
499
-
500
- //
501
- oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
502
- twoButton.addActionListener(this);
503
- oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
1169
+ if (Globals.ADVANCED)
1170
+ {
1171
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1172
+ snapobjectButton.addActionListener(this);
1173
+ snapobjectButton.setToolTipText("Snap Object");
1174
+
1175
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
5041176 fourButton.addActionListener(this);
505
- oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
506
- sixButton.addActionListener(this);
507
- oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
508
- threeButton.addActionListener(this);
509
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
510
- sevenButton.addActionListener(this);
511
- //
1177
+ fourButton.setToolTipText("Show control panel only");
1178
+ }
5121179
513
- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
1180
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1181
+
1182
+
1183
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1184
+ rootButton.setToolTipText("Open selection in new tab");
5141185 rootButton.addActionListener(this);
515
- oe.aConstraints.gridx += 1;
516
- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
1186
+
1187
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1188
+ closeButton.setToolTipText("Close tab");
5171189 closeButton.addActionListener(this);
5181190 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
5191191 //clearButton.addActionListener(this);
520
- oe.aConstraints.gridx += 1;
521
-
522
- oe.aConstraints.gridx = 1; //
523
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
524
- editButton.addActionListener(this);
525
- oe.aConstraints.gridx += 1;
526
- oe.aConstraints.weighty = 0;
527
- oe.aConstraints.gridwidth = 1;
5281192
529
- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
1193
+ cGridBag row1 = new cGridBag();
1194
+
1195
+ // INSERT
1196
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
+ gridButton.setToolTipText("Create ground");
1198
+ gridButton.addActionListener(this);
1199
+
1200
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1201
+ boxButton.setToolTipText("Create box");
1202
+ boxButton.addActionListener(this);
1203
+
1204
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1205
+ superButton.setToolTipText("Create superellipsoid");
1206
+ superButton.addActionListener(this);
1207
+
1208
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1209
+ sphereButton.setToolTipText("Create sphere");
1210
+ sphereButton.addActionListener(this);
1211
+
1212
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
+ coneButton.setToolTipText("Create cone");
1214
+ coneButton.addActionListener(this);
1215
+
1216
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1217
+ torusButton.setToolTipText("Create torus");
1218
+ torusButton.addActionListener(this);
1219
+
1220
+ if (Globals.ADVANCED)
1221
+ {
1222
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1223
+ kleinButton.setToolTipText("Create Klein bottle");
1224
+ kleinButton.addActionListener(this);
1225
+ }
1226
+
1227
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
+ particlesButton.setToolTipText("Create particle system");
1229
+ particlesButton.addActionListener(this);
1230
+
1231
+ oe.toolboxPanel.add(row1);
1232
+
1233
+ cGridBag row2 = new cGridBag();
1234
+
1235
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
+ groupButton.setToolTipText("Create group");
1237
+ groupButton.addActionListener(this);
1238
+
1239
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1240
+ compositeButton.setToolTipText("Create composite");
1241
+ compositeButton.addActionListener(this);
1242
+
1243
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1244
+ switchButton.setToolTipText("Create item switcher");
1245
+ switchButton.addActionListener(this);
1246
+
1247
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1248
+ loopButton.setToolTipText("Create loop");
1249
+ loopButton.addActionListener(this);
1250
+
1251
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1252
+ textureButton.setToolTipText("Create texture");
1253
+ textureButton.addActionListener(this);
1254
+
1255
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1256
+ overlayButton.setToolTipText("Create overlay");
1257
+ overlayButton.addActionListener(this);
1258
+
1259
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1260
+ lightButton.setToolTipText("Create light");
1261
+ lightButton.addActionListener(this);
1262
+
1263
+ oe.toolboxPanel.add(row2);
1264
+
1265
+ cGridBag textures = new cGridBag();
1266
+
1267
+ CreateTexturePanel(textures);
1268
+
1269
+ int tabCount = resourcecontainer.getTabCount();
1270
+
1271
+ if (tabCount > 0)
1272
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1273
+
1274
+ oe.toolboxPanel.add(textures);
1275
+
1276
+ textures.preferredHeight = 100;
1277
+
1278
+ CreateSkyboxPanel(oe.skyboxPanel);
1279
+
1280
+ // EDIT panel
1281
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1282
+ editButton.setToolTipText("Pin selection controls");
1283
+ editButton.addActionListener(this);
1284
+
1285
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1286
+ uneditButton.setToolTipText("Unpin and remove selection controls");
5301287 uneditButton.addActionListener(this);
5311288
532
- oe.aConstraints.gridx += 1;
533
- oe.aConstraints.weighty = 0;
534
- oe.aConstraints.gridwidth = 1;
535
-
536
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
537
- clearPanelButton.addActionListener(this);
538
-
539
- oe.aConstraints.gridx += 1;
540
- oe.aConstraints.weighty = 0;
541
- oe.aConstraints.gridwidth = 1;
542
-
543
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
1289
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1290
+ allParamsButton.setToolTipText("Show all controls");
5441291 allParamsButton.addActionListener(this);
5451292
546
- oe.aConstraints.gridx += 1;
547
- oe.aConstraints.weighty = 0;
548
- oe.aConstraints.gridwidth = 1;
549
-
550
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
551
- unselectButton.addActionListener(this);
1293
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1294
+ clearPanelButton.setToolTipText("Clear all controls");
1295
+ clearPanelButton.addActionListener(this);
5521296
1297
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1298
+ //unselectButton.setToolTipText("Unselect");
1299
+ //unselectButton.addActionListener(this);
1300
+
1301
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1302
+ flashSelectionButton.setToolTipText("Highlight selection");
1303
+ flashSelectionButton.addActionListener(this);
1304
+
1305
+ editCommandsPanel.preferredHeight = 1;
1306
+
1307
+ SetPinStates(false);
1308
+// oe.treePanel.add(commandsPanel);
1309
+// oe.treePanel.Return();
1310
+
5531311 // oe.aConstraints.gridx += 1;
5541312 // oe.aConstraints.weighty = 0;
5551313 // oe.aConstraints.gridwidth = 1;
....@@ -561,47 +1319,34 @@
5611319 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
5621320 // gcButton.addActionListener(this);
5631321
564
- oe.aConstraints.gridx = 0;
565
- oe.aConstraints.gridy += 1;
566
-
567
- //ctrlPanel.add(objList = new List(5, true));
568
- oe.aConstraints.gridwidth = 100;
569
- // oe.aConstraints.gridheight = 100;
570
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
571
- oe.aConstraints.gridheight = 1;
572
- oe.aConstraints.weighty = 0.5;
573
- oe.aConstraints.gridx = 0;
574
- JScrollPane jSP;
1322
+ cGridBag jSPPanel = new cGridBag();
1323
+
1324
+ jSPPanel.preferredHeight = 20;
1325
+
1326
+ JScrollPane jSP;
5751327 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
576
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
1328
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
5771329 ResetModel();
578
- oe.aConstraints.weighty = 0.5;
579
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580
- oe.aConstraints.gridy += 1;
581
- oe.aConstraints.gridwidth = 1;
582
-
583
- oe.aConstraints.weighty = 0;
584
- oe.aConstraints.gridwidth = 2;
585
-
586
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
587
- colorCB.addItemListener(this);
588
- oe.aConstraints.gridx += 2;
589
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
590
- materialCB.addItemListener(this);
591
- oe.aConstraints.gridx += 2;
592
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
593
- textureCB.addItemListener(this);
594
-
595
- oe.aConstraints.gridx = 0;
596
- oe.aConstraints.gridy += 1;
5971330
1331
+ oe.treePanel.add(jSPPanel);
1332
+ oe.treePanel.Return();
1333
+
1334
+ oe.treePanel.add(versionManagerPanel);
1335
+ oe.treePanel.Return();
1336
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1337
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1338
+ versionSliderPane.preferredHeight = 3;
1339
+
1340
+// mainPanel.setDividerLocation(0.1); //1.0);
1341
+ mainPanel.setResizeWeight(0.4);
1342
+
5981343 //jList.addListSelectionListener(this);
5991344 oe.jTree.addTreeSelectionListener(this);
6001345 //jTree.setRootVisible(false);
6011346 //jTree.setEditable(true);
6021347 oe.jTree.setDragEnabled(true);
6031348 //jTree.setPreferredSize(new Dimension(10,10));
604
- jSP.setPreferredSize(new Dimension(100,200));
1349
+ //jSP.setPreferredSize(new Dimension(100,200));
6051350
6061351 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
6071352
....@@ -613,47 +1358,204 @@
6131358 dgr.addDragGestureListener(this);
6141359 }catch(Exception e) {}
6151360 */
616
- radio.layout = sevenButton;
1361
+ radio.layout = threeButton; // sixButton;
6171362 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6181363 }
1364
+
1365
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1366
+ {
1367
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1368
+ colorCB.setToolTipText("Copy color when dropped");
1369
+ colorCB.addItemListener(this);
1370
+
1371
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1372
+ materialCB.setToolTipText("Copy material when dropped");
1373
+ materialCB.addItemListener(this);
1374
+
1375
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1376
+ textureCB.setToolTipText("Copy texture when dropped");
1377
+ textureCB.addItemListener(this);
1378
+
1379
+ panel.Return();
1380
+
1381
+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
1382
+ boxCB.setToolTipText("Display bounding boxes");
1383
+ boxCB.addItemListener(this);
1384
+
1385
+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
1386
+ zoomBoxCB.setToolTipText("Display only for wheel");
1387
+ zoomBoxCB.addItemListener(this);
1388
+
1389
+ if (true) // Globals.ADVANCED)
1390
+ {
1391
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1392
+// supportCB.setToolTipText("Enable rigging");
1393
+// supportCB.addItemListener(this);
1394
+
1395
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1396
+ freezeCB.setToolTipText("Fast moving camera");
1397
+ freezeCB.addItemListener(this);
1398
+
1399
+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
1400
+ // localCB.addItemListener(this);
1401
+
1402
+ panel.Return();
1403
+
1404
+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1405
+ crowdCB.setToolTipText("Used for crowds");
1406
+ crowdCB.addItemListener(this);
1407
+
1408
+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1409
+ smoothCB.setToolTipText("Snapping delay");
1410
+ smoothCB.addItemListener(this);
1411
+
1412
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1413
+// slowCB.setToolTipText("Smooth interpolation");
1414
+// slowCB.addItemListener(this);
1415
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1416
+ minshaderCB.setToolTipText("Minimal fast shader");
1417
+ minshaderCB.addItemListener(this);
1418
+
1419
+// constraints.gridy += 1;
1420
+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1421
+// speakerMocapCB.addItemListener(this);
1422
+
1423
+ panel.Return();
1424
+
1425
+ if (false)
1426
+ {
1427
+ // handled in scripts
1428
+ //constraints.gridy += 1;
1429
+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1430
+ speakerCameraCB.addItemListener(this);
1431
+
1432
+ //constraints.gridy += 1;
1433
+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1434
+ speakerFocusCB.addItemListener(this);
1435
+
1436
+ //constraints.gridy += 1;
1437
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1438
+ smoothfocusCB.addItemListener(this);
1439
+ panel.Return();
1440
+ }
1441
+
1442
+//constraints.gridx += 1;
1443
+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1444
+// debugCB.addItemListener(this);
1445
+
1446
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1447
+ trackCB.setToolTipText("Enable tracking target");
1448
+ trackCB.addItemListener(this);
1449
+
1450
+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1451
+ oeilCB.setToolTipText("Move camera when tracking");
1452
+ oeilCB.addItemListener(this);
1453
+
1454
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1455
+ shadowCB.setToolTipText("When live compute shadows");
1456
+ shadowCB.addItemListener(this);
1457
+
1458
+ panel.Return();
1459
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1460
+ toggleTextureCB.setToolTipText("Load textures");
1461
+ toggleTextureCB.addItemListener(this);
1462
+
1463
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1464
+ toggleSwitchCB.setToolTipText("Choose a single item");
1465
+ toggleSwitchCB.addItemListener(this);
1466
+
1467
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1468
+ autokeepCB.setToolTipText("On structure change");
1469
+ autokeepCB.addItemListener(this);
1470
+
1471
+ panel.Return();
1472
+ if (Globals.ADVANCED)
1473
+ {
1474
+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
1475
+ lookAtCB.setToolTipText("Look-at target");
1476
+ lookAtCB.addItemListener(this);
1477
+ }
1478
+
1479
+ }
1480
+
1481
+ cGridBag fill = new cGridBag();
1482
+ fill.preferredHeight = 200;
1483
+ cGridBag fill2 = new cGridBag();
1484
+ fill2.preferredHeight = 200;
1485
+ cGridBag fill3 = new cGridBag();
1486
+ fill3.preferredHeight = 200;
1487
+
1488
+ panel.add(fill);
1489
+ panel.add(fill2);
1490
+ panel.add(fill3);
1491
+
1492
+ }
6191493
6201494 void EditObject(Object3D obj)
6211495 {
622
- cRadio dummyButton = new cRadio(obj.name);
623
- dummyButton.SetObject(obj);
624
- dummyButton.layout = sevenButton;
625
- dummyButton.SetCamera(cameraView.renderCamera, false);
626
- dummyButton.addActionListener(this);
627
- radioPanel.add(dummyButton);
628
- buttonGroup.add(dummyButton);
629
- dummyButton.doClick();
1496
+ assert(obj instanceof Composite);
1497
+
1498
+// if (obj.versionlist == null)
1499
+// {
1500
+// obj.versionlist = new Object3D[100];
1501
+// obj.versionindex = -1;
1502
+// }
1503
+
1504
+ cRadio radioButton = new cRadio(obj.name);
1505
+
1506
+ // June 2019. Patch to avoid bug with transparency.
1507
+ radioButton.hadMaterial = obj.material != null;
1508
+ if (!radioButton.hadMaterial)
1509
+ {
1510
+ obj.material = new cMaterial();
1511
+ }
1512
+
1513
+ radioButton.SetObject(obj);
1514
+ radioButton.layout = threeButton; // sixButton;
1515
+ radioButton.SetCamera(cameraView.renderCamera, false);
1516
+ radioButton.addActionListener(this);
1517
+ radioPanel.add(radioButton);
1518
+ buttonGroup.add(radioButton);
1519
+ radioButton.doClick();
6301520 }
1521
+
6311522 void SetupViews(ObjEditor oe)
6321523 {
1524
+ theFrame = this;
1525
+
6331526 oe.SetupViews();
6341527
1528
+ if (Globals.DEBUG)
6351529 System.out.println("SetupViews");
6361530 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
6371531 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
6381532 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
6391533 }
6401534
641
- JCheckBox liveCB;
642
- JCheckBox supportCB;
643
- JCheckBox localCB;
644
- JCheckBox crowdCB;
645
- JCheckBox smoothCB;
646
- JCheckBox fastCB;
647
- JCheckBox slowCB;
648
- JCheckBox boxCB;
649
- JCheckBox trackCB;
650
- JCheckBox smoothfocusCB;
1535
+ cToggleButton liveCB;
1536
+ cCheckBox supportCB;
1537
+ cCheckBox localCB;
1538
+ cCheckBox crowdCB;
1539
+ cCheckBox smoothCB;
1540
+ cCheckBox minshaderCB;
1541
+
1542
+ cToggleButton fastCB;
1543
+ cCheckBox slowCB;
1544
+ cCheckBox boxCB;
1545
+ cCheckBox zoomBoxCB;
1546
+ cCheckBox freezeCB;
1547
+ //cToggleButton trackCB;
1548
+ cCheckBox trackCB;
1549
+ cCheckBox smoothfocusCB;
6511550 // JCheckBox speakerMocapCB;
652
- JCheckBox speakerCameraCB;
653
- JCheckBox speakerFocusCB;
654
- JCheckBox debugCB;
655
- JCheckBox oeilCB;
656
- JCheckBox lookAtCB;
1551
+ cCheckBox speakerCameraCB;
1552
+ cCheckBox speakerFocusCB;
1553
+ cCheckBox debugCB;
1554
+
1555
+ cCheckBox oeilCB;
1556
+ cCheckBox shadowCB;
1557
+ cCheckBox autokeepCB;
1558
+ cCheckBox lookAtCB;
6571559
6581560 // static int COLOR = 1;
6591561 // static int MATERIAL = 2;
....@@ -661,9 +1563,9 @@
6611563
6621564 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
6631565
664
- JCheckBox colorCB;
665
- JCheckBox materialCB;
666
- JCheckBox textureCB;
1566
+ cCheckBox colorCB;
1567
+ cCheckBox materialCB;
1568
+ cCheckBox textureCB;
6671569
6681570 public void itemStateChanged(ItemEvent e)
6691571 {
....@@ -688,10 +1590,10 @@
6881590 dropAttributes |= Object3D.TEXTURE;
6891591 else
6901592 dropAttributes &= ~Object3D.TEXTURE;
691
- }
692
- else if(e.getSource() == liveCB)
1593
+ } else if(e.getSource() == liveCB)
6931594 {
6941595 cameraView.ToggleLive();
1596
+ refreshContents(false);
6951597 }
6961598 else if(e.getSource() == supportCB)
6971599 {
....@@ -707,6 +1609,12 @@
7071609 {
7081610 cameraView.ToggleInertia();
7091611 cameraView.repaint();
1612
+ }
1613
+ else if(e.getSource() == minshaderCB)
1614
+ {
1615
+ Globals.MINSHADER ^= true;
1616
+ cameraView.programInitialized = false;
1617
+ cameraView.repaint();
7101618 }
7111619 else if(e.getSource() == localCB)
7121620 {
....@@ -726,6 +1634,10 @@
7261634 Recompile();
7271635 cameraView.repaint();
7281636 // refreshContents();
1637
+ }
1638
+ else if(e.getSource() == zoomBoxCB)
1639
+ {
1640
+ cameraView.ToggleZoomBoxMode();
7291641 }
7301642 else if(e.getSource() == smoothfocusCB)
7311643 {
....@@ -752,6 +1664,18 @@
7521664 {
7531665 cameraView.ToggleOeil();
7541666 }
1667
+ else if(e.getSource() == shadowCB)
1668
+ {
1669
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1670
+ }
1671
+ else if(e.getSource() == freezeCB)
1672
+ {
1673
+ Globals.FREEZEONMOVE ^= true;
1674
+ }
1675
+ else if(e.getSource() == autokeepCB)
1676
+ {
1677
+ Globals.REPLACEONMAKE ^= true;
1678
+ }
7551679 else if(e.getSource() == lookAtCB)
7561680 {
7571681 cameraView.ToggleLookAt();
....@@ -768,7 +1692,8 @@
7681692
7691693 /**/
7701694 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
771
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1695
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1696
+ TreePath path = objEditor.jTree.getSelectionPath();
7721697 if ((path == null) || (path.getPathCount() <= 1)) {
7731698 // We can't move the root node or an empty selection
7741699 return;
....@@ -831,8 +1756,6 @@
8311756 }
8321757 }
8331758
834
- String string = (String) object;
835
-
8361759 System.out.println("Transfer = " + object + "; drop : " + target);
8371760 // if( object instanceof java.io.File[])
8381761 // {
....@@ -840,7 +1763,11 @@
8401763 // objEditor.DropFile((java.io.File[]) object, true);
8411764 // return;
8421765 // }
843
- if (string.charAt(0) == '/')
1766
+
1767
+ String string = object.toString();
1768
+
1769
+ // File path for Mac and Windows
1770
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
8441771 {
8451772 // file(s)
8461773 String[] names = string.split("\n");
....@@ -867,7 +1794,7 @@
8671794
8681795 flashIt = false;
8691796 CameraPane pane = (CameraPane) target;
870
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1797
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
8711798 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
8721799
8731800 if (group.selection.size() == 1)
....@@ -883,23 +1810,33 @@
8831810
8841811 assert target == objEditor.jTree;
8851812 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1813
+ Object3D destinationLeaf;
8861814 try {
887
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1815
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
8881816 } catch (Exception e) {
8891817 System.out.println("destinationPath : " + destinationPath);
8901818 return;
8911819 }
8921820
893
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1821
+ for (int i=group.selection.size(); --i>=0;)
8941822 {
1823
+ Object3D child = (Object3D)group.selection.elementAt(i);
1824
+
1825
+ // Cannot move into itself
1826
+ if (child == destinationLeaf)
1827
+ return;
1828
+ }
1829
+
1830
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1831
+// {
8951832 loadClipboard(true);
8961833 objEditor.jTree.setSelectionPath(destinationPath);
897
- pasteInto(false);
898
- } else {
899
- loadClipboard(false);
900
- objEditor.jTree.setSelectionPath(destinationPath);
901
- pasteInto(false); // true); // ???
902
- }
1834
+ pasteInto(false, false);
1835
+// } else {
1836
+// loadClipboard(false);
1837
+// objEditor.jTree.setSelectionPath(destinationPath);
1838
+// pasteInto(false, false); // true); // ???
1839
+// }
9031840 }
9041841 public void dropActionChanged(DropTargetDragEvent dtde)
9051842 // Called if the user has modified the current drop gesture
....@@ -955,7 +1892,12 @@
9551892 TreePath path;
9561893
9571894 public TransferableTreePath(TreePath tp) {
958
- path = tp;
1895
+ Object[] objs = new Object[tp.getPathCount()];
1896
+ for (int i=0; i<objs.length; i++)
1897
+ {
1898
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1899
+ }
1900
+ path = new TreePath(objs);
9591901 }
9601902
9611903 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1002,90 +1944,109 @@
10021944
10031945 void buildCreateMenu(Menu menu)
10041946 {
1005
- gridItem = menu.add(new MenuItem("Grid"));
1006
- gridItem.addActionListener(this);
1007
- rectoidItem = menu.add(new MenuItem("Box"));
1008
- rectoidItem.addActionListener(this);
1009
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1010
- ellipsoidItem.addActionListener(this);
1011
- coneItem = menu.add(new MenuItem("Cone"));
1012
- coneItem.addActionListener(this);
1013
- torusItem = menu.add(new MenuItem("Torus"));
1014
- torusItem.addActionListener(this);
1015
- superItem = menu.add(new MenuItem("Superellipsoid"));
1016
- superItem.addActionListener(this);
1017
- particleItem = menu.add(new MenuItem("Particle system"));
1018
- particleItem.addActionListener(this);
1947
+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
1948
+ //heightFieldItem.addActionListener(this);
1949
+// gridItem = menu.add(new MenuItem("Grid"));
1950
+// gridItem.addActionListener(this);
1951
+// rectoidItem = menu.add(new MenuItem("Box"));
1952
+// rectoidItem.addActionListener(this);
1953
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1954
+// ellipsoidItem.addActionListener(this);
1955
+// coneItem = menu.add(new MenuItem("Cone"));
1956
+// coneItem.addActionListener(this);
1957
+// torusItem = menu.add(new MenuItem("Torus"));
1958
+// torusItem.addActionListener(this);
1959
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1960
+// superItem.addActionListener(this);
1961
+
1962
+ cameraItem = menu.add(new MenuItem("Camera"));
1963
+ cameraItem.addActionListener(this);
1964
+
1965
+ if (!Globals.ADVANCED)
1966
+ {
1967
+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
1968
+ kleinItem.addActionListener(this);
1969
+ }
1970
+
1971
+// particleItem = menu.add(new MenuItem("Particle system"));
1972
+// particleItem.addActionListener(this);
1973
+ if (Globals.ADVANCED)
1974
+ {
10191975 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10201976 ragdollItem.addActionListener(this);
10211977 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10221978 ragdoll2Item.addActionListener(this);
1979
+ }
10231980 menu.add("-");
1024
- meshItem = menu.add(new MenuItem("Mesh"));
1981
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10251982 meshItem.addActionListener(this);
10261983 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10271984 // meshGroupItem.addActionListener(this);
1985
+ if (Globals.ADVANCED)
1986
+ {
10281987 springItem = menu.add(new MenuItem("Spring"));
10291988 springItem.addActionListener(this);
10301989 flagItem = menu.add(new MenuItem("Flag"));
10311990 flagItem.addActionListener(this);
1032
- bezierItem = menu.add(new MenuItem("Patch"));
1033
- bezierItem.addActionListener(this);
1034
- checkerItem = menu.add(new MenuItem("Checker"));
1035
- checkerItem.addActionListener(this);
10361991 blobItem = menu.add(new MenuItem("Blob"));
10371992 blobItem.addActionListener(this);
10381993 latheItem = menu.add(new MenuItem("Lathe"));
10391994 latheItem.addActionListener(this);
1040
- lightItem = menu.add(new MenuItem("Light"));
1041
- lightItem.addActionListener(this);
1995
+ }
1996
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
1997
+ bezierItem.addActionListener(this);
1998
+// overlayItem = menu.add(new MenuItem("Overlay"));
1999
+// overlayItem.addActionListener(this);
2000
+// lightItem = menu.add(new MenuItem("Light"));
2001
+// lightItem.addActionListener(this);
10422002 menu.add("-");
10432003 //superLoopItem = menu.add(new MenuItem("Super Loop"));
10442004 //superLoopItem.addActionListener(this);
1045
- loopItem = menu.add(new MenuItem("Loop"));
1046
- loopItem.addActionListener(this);
2005
+// loopItem = menu.add(new MenuItem("Loop"));
2006
+// loopItem.addActionListener(this);
10472007 doubleItem = menu.add(new MenuItem("Fork"));
10482008 doubleItem.addActionListener(this);
2009
+ if (Globals.ADVANCED)
2010
+ {
10492011 tripleItem = menu.add(new MenuItem("Trident"));
10502012 tripleItem.addActionListener(this);
1051
- menu.add("-");
1052
- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
1053
- importGFDItem.addActionListener(this);
1054
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
1055
- importVRMLX3DItem.addActionListener(this);
1056
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
1057
- importOBJItem.addActionListener(this);
1058
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
1059
- import3DSItem.addActionListener(this);
2013
+ }
10602014 }
10612015
10622016 void buildToolsMenu(Menu menu)
10632017 {
10642018 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
10652019 animationItem.addItemListener(this);
1066
- animationItem.setState(CameraPane.ANIMATION);
2020
+ animationItem.setState(Globals.ANIMATION);
2021
+
2022
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2023
+ archiveItem.addActionListener(this);
10672024
10682025 menu.add("-");
10692026 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
10702027 parseverticesItem.addActionListener(this);
1071
- alignItem = menu.add(new MenuItem("Align"));
2028
+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
2029
+ textureFieldItem.addActionListener(this);
2030
+ alignItem = menu.add(new MenuItem("Align Objects"));
10722031 alignItem.addActionListener(this);
1073
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074
- mirrorItem.addActionListener(this);
10752032 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
10762033 reduceMorphItem.addActionListener(this);
10772034 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
10782035 reduce34MorphItem.addActionListener(this);
1079
-
1080
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1081
- computeAOItem.addActionListener(this);
10822036 menu.add("-");
1083
-
10842037 menu.add(memoryItem = new MenuItem("Memory Usage"));
10852038 memoryItem.addActionListener(this);
2039
+ menu.add(computeAOItem = new MenuItem("Compute AO"));
2040
+ computeAOItem.addActionListener(this);
2041
+
2042
+ if (Globals.ADVANCED)
2043
+ {
2044
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
2045
+ mirrorItem.addActionListener(this);
2046
+ menu.add("-");
10862047 menu.add(analyzeItem = new MenuItem("Analyze"));
10872048 analyzeItem.addActionListener(this);
1088
- menu.add(dumpItem = new MenuItem("Dump"));
2049
+ menu.add(dumpItem = new MenuItem("Print"));
10892050 dumpItem.addActionListener(this);
10902051 // menu.add(pathItem = new MenuItem("From-to path"));
10912052 // pathItem.addActionListener(this);
....@@ -1094,6 +2055,8 @@
10942055 resetParentItem.addActionListener(this);
10952056 repairParentItem = menu.add(new MenuItem("Repair Parent"));
10962057 repairParentItem.addActionListener(this);
2058
+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
2059
+ repairShadowItem.addActionListener(this);
10972060 menu.add(invariantsItem = new MenuItem("Invariants"));
10982061 invariantsItem.addActionListener(this);
10992062 menu.add(recompileItem = new MenuItem("Recompile"));
....@@ -1101,6 +2064,7 @@
11012064 menu.add("-");
11022065 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11032066 editScriptItem.addActionListener(this);
2067
+ }
11042068 }
11052069
11062070 void ScreenFit()
....@@ -1165,24 +2129,24 @@
11652129 switch(axis)
11662130 {
11672131 case 0 :
1168
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1169
- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1170
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1171
- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2132
+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2133
+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2134
+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2135
+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
11722136 norm = cVector.X;
11732137 break;
11742138 case 1 :
1175
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1176
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1177
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1178
- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2139
+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2140
+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2141
+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2142
+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
11792143 norm = cVector.Y;
11802144 break;
11812145 case 2 :
1182
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1183
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1184
- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1185
- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2146
+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2147
+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2148
+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2149
+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
11862150 norm = cVector.Z;
11872151 break;
11882152 }
....@@ -1223,9 +2187,38 @@
12232187 shadow.material = new cMaterial(obj.material);
12242188 shadow.material.diffuse = 0.0001f;
12252189 shadow.material.specular = 0.0001f;
2190
+ shadow.material.opacity = 0.75f;
2191
+
2192
+ AllocProjectedVertices(shadow);
2193
+
2194
+ shadow.projectedVertices[1].x = 300;
12262195
12272196 makeSomething(shadow);
12282197 }
2198
+
2199
+ private void ClearUnpinned()
2200
+ {
2201
+ //for (Object3D obj : listUI)
2202
+ for (int i=listUI.size(); --i>=0;)
2203
+ {
2204
+ Object3D obj = listUI.elementAt(i);
2205
+ if (!obj.pinned)
2206
+ {
2207
+ obj.CloseUI();
2208
+ listUI.remove(i);
2209
+ }
2210
+ }
2211
+ }
2212
+
2213
+ private void EditElement(Object3D elem, boolean newWindow)
2214
+ {
2215
+ // if (!(elem instanceof Composite))
2216
+ // newWindow = false;
2217
+ listUI.add(elem);
2218
+ elem.openEditWindow(this, newWindow); //, false);
2219
+ System.out.println("edit : " + elem);
2220
+ elem.editWindow.refreshContents(true); // ? new
2221
+ }
12292222
12302223 /**
12312224 * applyExample
....@@ -1429,9 +2422,9 @@
14292422
14302423 void Overwrite(int mask)
14312424 {
1432
- if (/*group.selection.size() == 1 &&*/ GraphreeD.clipboard.size() == 1)
2425
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14332426 {
1434
- Object3D content = GraphreeD.clipboard.get(0);
2427
+ Object3D content = Grafreed.clipboard.get(0);
14352428
14362429 if (content instanceof cGroup && ((cGroup)content).transientlink )
14372430 content = ((cGroup)content).get(0);
....@@ -1454,6 +2447,7 @@
14542447 //
14552448 public void actionPerformed(ActionEvent event) // , Object arg)
14562449 {
2450
+ Object source = event.getSource();
14572451 /*
14582452 if (event.getSource() == nameField)
14592453 {
....@@ -1465,11 +2459,11 @@
14652459 }
14662460 else
14672461 */
1468
- if (event.getSource() == lookAtItem || event.getSource() == lookFromItem)
2462
+ if (source == lookAtItem || source == lookFromItem)
14692463 {
14702464 ScreenFit();
14712465 } else
1472
- if (event.getSource() == switchItem)
2466
+ if (source == switchViewItem)
14732467 {
14742468 cVector v1 = new cVector();
14752469 cVector v2 = new cVector();
....@@ -1478,11 +2472,11 @@
14782472 objEditor.cameraView.renderCamera.setAim(v2, v1);
14792473 objEditor.cameraView.repaint();
14802474 } else
1481
- if (event.getSource() == rectoidItem)
2475
+ if (source == rectoidItem || source == boxButton)
14822476 {
14832477 makeSomething(new Box());
14842478 } else
1485
- if (event.getSource() == particleItem)
2479
+ if (source == particleItem || source == particlesButton)
14862480 {
14872481 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
14882482 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1503,9 +2497,9 @@
15032497 applyExample(particleGeom, "SMOKE");
15042498 makeSomething(particleGeom);
15052499 } else
1506
- if (event.getSource() == ragdollItem || event.getSource() == ragdoll2Item)
2500
+ if (source == ragdollItem || source == ragdoll2Item)
15072501 {
1508
- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
2502
+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
15092503
15102504 ragdoll.toParent = LA.newMatrix();
15112505 ragdoll.fromParent = LA.newMatrix();
....@@ -1521,27 +2515,71 @@
15212515 makeSomething(ragdoll);
15222516 //makeSomething(new VehicleDemo());
15232517 } else
1524
- if (event.getSource() == gridItem)
2518
+ /*
2519
+ */
2520
+ if (source == heightFieldItem)
2521
+ {
2522
+ Object3D obj = new Object3D();
2523
+
2524
+ obj.CreateMaterial();
2525
+ obj.bRep = new BoundaryRep();
2526
+
2527
+ obj.bRep.CreateMesh(new iHeightField()
2528
+ {
2529
+ public double f(double x, double y)
2530
+ {
2531
+ // The Mandelbrot set is represented by coloring
2532
+ // each point (x,y) according to the number of
2533
+ // iterations it takes before the while loop in
2534
+ // this method ends. For points that are actually
2535
+ // in the Mandelbrot set, or very close to it, the
2536
+ // count will reach the maximum value, 80. These
2537
+ // points will be colored purple. All other colors
2538
+ // represent points that are definitely NOT in the set.
2539
+ x -= 600;
2540
+ y -= 500;
2541
+ x /= 200;
2542
+ y /= 200;
2543
+ int count = 0;
2544
+ double zx = x;
2545
+ double zy = y;
2546
+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
2547
+ double new_zx = zx*zx - zy*zy + x;
2548
+ zy = 2*zx*zy + y;
2549
+ zx = new_zx;
2550
+ count++;
2551
+ }
2552
+ return count; // Math.sqrt(count);
2553
+ }
2554
+ }, 1000,1000);
2555
+
2556
+ makeSomething(obj);
2557
+ } else
2558
+ if (source == gridItem || source == gridButton)
15252559 {
15262560 makeSomething(new Grid());
15272561 } else
1528
- if (event.getSource() == ellipsoidItem)
2562
+ if (source == ellipsoidItem || source == sphereButton)
15292563 {
15302564 makeSomething(new Sphere());
15312565 } else
1532
- if (event.getSource() == coneItem)
2566
+ if (source == coneItem || source == coneButton)
15332567 {
15342568 makeSomething(new Cone());
15352569 } else
1536
- if (event.getSource() == torusItem)
2570
+ if (source == torusItem || source == torusButton)
15372571 {
15382572 makeSomething(new Torus());
15392573 } else
1540
- if (event.getSource() == superItem)
2574
+ if (source == superItem || source == superButton)
15412575 {
15422576 makeSomething(new Superellipsoid());
15432577 } else
1544
- if (event.getSource() == blobItem)
2578
+ if (source == kleinItem || source == kleinButton)
2579
+ {
2580
+ makeSomething(new Klein());
2581
+ } else
2582
+ if (source == blobItem)
15452583 {
15462584 Blob blob = new Blob();
15472585 BlobComponent comp = new BlobComponent();
....@@ -1549,15 +2587,15 @@
15492587 //blob.retile();
15502588 makeSomething(blob);
15512589 } else
1552
- if (event.getSource() == latheItem)
2590
+ if (source == latheItem)
15532591 {
15542592 makeSomething(new Lathe());
15552593 } else
1556
- if (event.getSource() == bezierItem)
2594
+ if (source == bezierItem)
15572595 {
15582596 makeSomething(new BezierSurface());
15592597 } else
1560
- if (event.getSource() == checkerItem)
2598
+ if (source == overlayItem || source == overlayButton)
15612599 {
15622600 /*
15632601 Object3D obj = new BezierSurface(5,8);
....@@ -1570,9 +2608,9 @@
15702608 LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
15712609 LA.matInvert(obj.toParent, obj.fromParent);
15722610 */
1573
- makeSomething(new CheckerIG());
2611
+ makeSomething(new Checker());
15742612 } else
1575
- if (event.getSource() == meshItem)
2613
+ if (source == meshItem)
15762614 {
15772615 Object3D itemtomake = new Object3D();
15782616 Object3D child;
....@@ -1593,35 +2631,52 @@
15932631 makeSomething(child);
15942632 }
15952633 } else
1596
- if (event.getSource() == springItem)
2634
+ if (source == springItem)
15972635 {
15982636 cSpring s = new cSpring();
15992637 s.setup();
16002638 makeSomething(s);
16012639 } else
1602
- if (event.getSource() == flagItem)
2640
+ if (source == flagItem)
16032641 {
16042642 cSpring s = new cFlag();
16052643 s.setup();
16062644 makeSomething(s);
16072645 } else
1608
- if (event.getSource() == lightItem)
2646
+ if (source == lightItem || source == lightButton)
16092647 {
16102648 makeSomething(new Light());
16112649 } else
1612
- if (event.getSource() == csgItem)
2650
+// if (source == skybox1Button ||
2651
+// source == skybox2Button ||
2652
+// source == skybox3Button ||
2653
+// source == skybox4Button ||
2654
+// source == skybox5Button ||
2655
+// source == skybox6Button ||
2656
+// source == skybox7Button ||
2657
+// source == skybox11Button ||
2658
+// source == skybox12Button ||
2659
+// source == skybox13Button ||
2660
+// source == skybox14Button ||
2661
+// source == skybox15Button ||
2662
+// source == skybox16Button ||
2663
+// source == skybox17Button)
2664
+// {
2665
+// ChangeSkybox(source);
2666
+// } else
2667
+ if (source == csgItem)
16132668 {
16142669 group(new CSG());
16152670 } else
1616
- if (event.getSource() == templateItem)
2671
+ if (source == templateItem)
16172672 {
16182673 group(new cTemplate());
16192674 } else
1620
- if (event.getSource() == attributeItem)
2675
+ if (source == attributeItem)
16212676 {
16222677 makeSomething(new Attribute());
16232678 } else
1624
- if (event.getSource() == pointflowItem)
2679
+ if (source == pointflowItem)
16252680 {
16262681 makeSomething(new PointFlow());
16272682 } else
....@@ -1633,7 +2688,7 @@
16332688 } else
16342689 */
16352690
1636
- if (event.getSource() == superLoopItem)
2691
+ if (source == superLoopItem)
16372692 {
16382693 Composite g = new cGroup();
16392694 for (int i=0; i<15; i++)
....@@ -1655,30 +2710,38 @@
16552710
16562711 group(g);
16572712 } else
1658
- if (event.getSource() == loopItem)
2713
+ if (source == loopItem || source == loopButton)
16592714 {
2715
+ if (!group.selection.isEmpty())
2716
+ {
16602717 Composite csg = new GroupLeaf();
16612718 csg.count = 5;
1662
- group(csg);
1663
- Composite child = new cGroup();
2719
+ Composite child = new cGroup("Branch");
16642720 csg.addChild(child);
16652721 child.addChild(csg);
2722
+ group(csg);
2723
+ }
16662724 } else
1667
- if (event.getSource() == doubleItem)
2725
+ if (source == doubleItem)
16682726 {
1669
- Composite csg = new GroupLeaf();
2727
+ if (!group.selection.isEmpty())
2728
+ {
2729
+ Composite csg = new GroupLeaf("Fork");
16702730 csg.count = 5;
2731
+ Composite child = new cGroup("Branch A");
2732
+ csg.addChild(child);
2733
+ child.addChild(csg);
2734
+ child = new cGroup("Branch B");
2735
+ csg.addChild(child);
2736
+ child.addChild(csg);
16712737 group(csg);
1672
- Composite child = new cGroup();
1673
- csg.addChild(child);
1674
- child.addChild(csg);
1675
- child = new cGroup();
1676
- csg.addChild(child);
1677
- child.addChild(csg);
2738
+ }
16782739 } else
1679
- if (event.getSource() == tripleItem)
2740
+ if (source == tripleItem)
16802741 {
1681
- Composite csg = new GroupLeaf();
2742
+ if (!group.selection.isEmpty())
2743
+ {
2744
+ Composite csg = new GroupLeaf("Trident");
16822745 csg.count = 4;
16832746 group(csg);
16842747 Composite child = new cGroup();
....@@ -1690,74 +2753,119 @@
16902753 child = new cGroup();
16912754 csg.addChild(child);
16922755 child.addChild(csg);
2756
+ }
16932757 } else
1694
-
1695
- if (event.getSource() == importGFDItem)
2758
+ if (source == computeAOItem)
16962759 {
1697
- ImportGFD();
2760
+ Globals.drawMode = CameraPane.OCCLUSION;
2761
+ cameraView.repaint();
16982762 } else
1699
- if (event.getSource() == importVRMLX3DItem)
1700
- {
1701
- ImportVRMLX3D();
1702
- } else
1703
- if (event.getSource() == import3DSItem)
1704
- {
1705
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706
- } else
1707
- if (event.getSource() == importOBJItem)
1708
- {
1709
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710
- } else
1711
- if (event.getSource() == computeAOItem)
1712
- {
1713
- CameraPane.drawMode = CameraPane.OCCLUSION;
1714
- CameraPane.theRenderer.repaint();
1715
- } else
1716
- if (event.getSource() == recompileItem)
2763
+ if (source == recompileItem)
17172764 {
17182765 Recompile();
17192766 refreshContents();
17202767 } else
1721
- if (event.getSource() == editScriptItem)
2768
+ if (source == editScriptItem)
17222769 {
17232770 OpenDialog();
17242771 refreshContents();
17252772 } else
1726
- if (event.getSource() == invariantsItem)
2773
+ if (source == invariantsItem)
17272774 {
17282775 System.out.println("Invariants:");
1729
- GraphreeD.theApplet3D.universe.invariants();
2776
+ Grafreed.grafreed.universe.invariants();
17302777 } else
1731
- if (event.getSource() == memoryItem)
2778
+ if (source == memoryItem)
17322779 {
17332780 //System.out.println("Invariants:");
17342781 PrintMemory();
17352782 } else
1736
- if (event.getSource() == pathItem)
2783
+ if (source == pathItem)
17372784 {
17382785 PrintPath();
17392786 } else
1740
- if (event.getSource() == analyzeItem)
2787
+ if (source == analyzeItem)
17412788 {
17422789 AnalyzeObject();
17432790 } else
1744
- if (event.getSource() == dumpItem)
2791
+ if (source == dumpItem)
17452792 {
17462793 DumpObject();
17472794 } else
1748
- if (event.getSource() == screenfitButton)
2795
+ if (source == minButton)
17492796 {
1750
- //Reload(lastConverter, lastFilename, true);
2797
+ Minimize();
2798
+ } else
2799
+ if (source == maxButton)
2800
+ {
2801
+ Maximize();
2802
+ } else
2803
+ if (source == fullButton)
2804
+ {
2805
+ ToggleFullScreen();
2806
+ } else
2807
+ if (source == collapseButton)
2808
+ {
2809
+ this.expandedLayout = radio.layout;
2810
+ CollapseToolbar();
2811
+ } else
2812
+ if (source == maximize3DButton)
2813
+ {
2814
+ this.expandedLayout = radio.layout;
2815
+ radio.layout = twoButton;
2816
+ Show3DView();
2817
+ CollapseToolbar();
2818
+ } else
2819
+ if (source == previousVersionButton)
2820
+ {
2821
+ // Go to previous version
2822
+ //if (!Undo())
2823
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2824
+ PreviousVersion();
2825
+ } else
2826
+ if (source == restoreButton)
2827
+ {
2828
+ // Restore current version
2829
+ Restore();
2830
+ //restoreButton.setEnabled(false);
2831
+ } else
2832
+ if (source == replaceButton)
2833
+ {
2834
+ // Overwrite current version
2835
+ Replace();
2836
+ //replaceButton.setEnabled(false);
2837
+ } else
2838
+ if (source == nextVersionButton)
2839
+ {
2840
+ // Go to next version
2841
+ NextVersion();
2842
+ } else
2843
+ if (source == saveVersionButton)
2844
+ {
2845
+ // Save a new version
2846
+ if (!Save(true))
2847
+ java.awt.Toolkit.getDefaultToolkit().beep();
2848
+ } else
2849
+ if (source == deleteVersionButton)
2850
+ {
2851
+ // Delete a new version
2852
+ DeleteVersion();
2853
+ } else
2854
+ if (source == oneStepButton)
2855
+ {
2856
+ Globals.ONESTEP = true;
2857
+ cameraView.repaint();
2858
+ } else
2859
+ if (source == screenfitButton)
2860
+ {
17512861 ScreenFit();
17522862 } else
1753
- if (event.getSource() == screenfitpointButton)
2863
+ if (source == screenfitpointButton)
17542864 {
1755
- //Reload(lastConverter, lastFilename, true);
17562865 ScreenFitPoint();
17572866 } else
1758
- if (event.getSource() == snapobjectButton)
2867
+ if (source == snapobjectButton)
17592868 {
1760
- //Reload(lastConverter, lastFilename, true);
17612869 SnapObject();
17622870 } else
17632871 // if (event.getSource() == recompileButton)
....@@ -1766,13 +2874,13 @@
17662874 // Recompile();
17672875 // refreshContents();
17682876 // } else
1769
- if (event.getSource() == gcButton)
2877
+ if (source == gcButton)
17702878 {
17712879 System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
17722880 System.gc();
17732881 System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
17742882 } else
1775
- if (event.getSource() == editLeafItem)
2883
+ if (source == editLeafItem)
17762884 {
17772885 Object3D obj;
17782886 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -1786,65 +2894,78 @@
17862894 }
17872895 refreshContents(true);
17882896 } else
1789
- if (event.getSource() == openWindowItem)
2897
+ if (source == openWindowItem)
17902898 {
17912899 EditSelection(true);
17922900 } else
1793
- if (event.getSource() == cutItem || event.getSource() == clearButton)
2901
+ if (source == cutItem || source == clearButton)
17942902 {
17952903 loadClipboard(true);
17962904 } else
1797
- if (event.getSource() == duplicateItem)
2905
+ if (source == undoItem)
17982906 {
1799
- Object3D keep = GraphreeD.clipboard;
2907
+ PreviousVersion();
2908
+ } else
2909
+ if (source == redoItem)
2910
+ {
2911
+ NextVersion();
2912
+ } else
2913
+ if (source == duplicateItem)
2914
+ {
2915
+ Object3D keep = Grafreed.clipboard;
18002916 loadClipboard(false);
18012917 paste(false);
1802
- GraphreeD.clipboard = keep;
2918
+ Grafreed.clipboard = keep;
18032919 } else
1804
- if (event.getSource() == cloneItem)
2920
+ if (source == cloneItem)
18052921 {
18062922 CloneSelection(false);
18072923 } else
1808
- if (event.getSource() == cloneSupportItem)
2924
+ if (source == cloneSupportItem)
18092925 {
18102926 CloneSelection(true);
18112927 } else
1812
- if (event.getSource() == copyItem)
2928
+ if (source == copyItem)
18132929 {
18142930 loadClipboard(false);
18152931 } else
1816
- if (event.getSource() == pasteItem)
2932
+ if (source == pasteItem)
18172933 {
18182934 paste(false);
18192935 } else
1820
- if (event.getSource() == pasteLinkItem)
2936
+ if (source == pasteIntoItem)
18212937 {
1822
- pasteInto(false);
2938
+ pasteInto(true, false);
18232939 } else
1824
- if (event.getSource() == pasteCloneItem)
2940
+ if (source == pasteLinkItem)
18252941 {
1826
- pasteInto(true);
2942
+ pasteInto(false, false);
18272943 } else
1828
- if (event.getSource() == pasteExpandItem)
2944
+ if (source == pasteCloneItem)
2945
+ {
2946
+ pasteInto(true, true);
2947
+ } else
2948
+ if (source == pasteExpandItem)
18292949 {
18302950 paste(true);
18312951 } else
1832
- if (event.getSource() == synchronizeItem)
2952
+ if (source == synchronizeItem)
18332953 {
18342954 Overwrite(Object3D.TRANSFORM);
18352955 } else
1836
- if (event.getSource() == overwriteNameItem)
2956
+ if (source == overwriteNameItem)
18372957 {
18382958 Overwrite(Object3D.NAME);
18392959 } else
1840
- if (event.getSource() == overwriteUVItem)
2960
+ if (source == overwriteUVItem)
18412961 {
18422962 Overwrite(Object3D.UV);
18432963 } else
1844
- if (event.getSource() == overwriteMatItem)
2964
+ if (source == overwriteMatItem)
18452965 {
2966
+ /* july 2015
18462967 if ((dropAttributes & Object3D.TEXTURE) == 0)
1847
- Overwrite(Object3D.MATERIAL);
2968
+ Overwrite(Object3D.MATERIAL | Object3D.COLOR);
18482969 else
18492970 {
18502971 if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
....@@ -1856,13 +2977,16 @@
18562977 Overwrite(Object3D.MATERIAL | Object3D.TEXTURE);
18572978 }
18582979 }
2980
+ */
2981
+
2982
+ Overwrite(dropAttributes);
18592983 }
1860
- if (event.getSource() == overwriteGeoItem)
2984
+ if (source == overwriteGeoItem)
18612985 {
18622986 Overwrite(Object3D.GEOMETRY);
1863
-// if (/*group.selection.size() == 1 &&*/ GraphreeD.clipboard.size() == 1)
2987
+// if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
18642988 // {
1865
-// Object3D content = GraphreeD.clipboard.get(0);
2989
+// Object3D content = GrafreeD.clipboard.get(0);
18662990 //
18672991 // if (content instanceof cGroup && ((cGroup)content).transientlink )
18682992 // content = ((cGroup)content).get(0);
....@@ -1874,7 +2998,7 @@
18742998 // refreshContents();
18752999 // }
18763000 } else
1877
- if (event.getSource() == generateMeshItem)
3001
+ if (source == generateMeshItem)
18783002 {
18793003 //if (group.selection.size() == 1)
18803004 // for (int i=0; i<group.selection.size(); i++)
....@@ -1885,7 +3009,7 @@
18853009 ResetModel();
18863010 refreshContents();
18873011 } else
1888
- if (event.getSource() == extractGeometriesItem)
3012
+ if (source == extractGeometriesItem)
18893013 {
18903014 boolean one = false;
18913015
....@@ -1912,7 +3036,7 @@
19123036 ResetModel();
19133037 refreshContents();
19143038 } else
1915
- if (event.getSource() == cloneGeometriesItem)
3039
+ if (source == cloneGeometriesItem)
19163040 {
19173041 boolean one = false;
19183042
....@@ -1938,32 +3062,37 @@
19383062 ResetModel();
19393063 refreshContents();
19403064 } else
1941
- if (event.getSource() == shareGeometriesItem)
3065
+ if (source == shareGeometriesItem)
19423066 {
19433067 boolean one = false;
19443068
19453069 if (group.selection.size() == 1)
19463070 one = true;
19473071
3072
+ Object3D merge = null;
3073
+
19483074 Object3D content = new cGroup();
19493075
19503076 for (int i=0; i<group.selection.size(); i++)
19513077 {
1952
- Object3D sel = new Merge(group.selection.get(i));
3078
+ merge = new Merge(group.selection.get(i));
19533079
19543080 if (one)
1955
- makeSomething(sel, false);
3081
+ makeSomething(merge, false);
19563082 else
1957
- content.addChild(sel);
3083
+ content.addChild(merge);
19583084 }
19593085
19603086 if (!one)
1961
- makeSomething(content, false);
1962
-
1963
- ResetModel();
1964
- refreshContents();
3087
+ makeSomething(content, true);
3088
+ else
3089
+ {
3090
+ ResetModel();
3091
+ Select(merge.GetTreePath(), true, false); // unselect... false);
3092
+ refreshContents();
3093
+ }
19653094 } else
1966
- if (event.getSource() == mergeGeometriesItem)
3095
+ if (source == mergeGeometriesItem)
19673096 {
19683097 boolean one = false;
19693098
....@@ -1993,11 +3122,11 @@
19933122 ResetModel();
19943123 refreshContents();
19953124 } else
1996
- if (event.getSource() == linkverticesItem)
3125
+ if (source == linkverticesItem)
19973126 {
1998
-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
3127
+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
19993128 // {
2000
-// Object3D content = GraphreeD.clipboard.get(0);
3129
+// Object3D content = GrafreeD.clipboard.get(0);
20013130 //
20023131 // if (content instanceof cGroup && ((cGroup)content).transientlink )
20033132 // content = ((cGroup)content).get(0);
....@@ -2006,39 +3135,48 @@
20063135 // group.selection.get(0).setMasterThis(content); // should be identity
20073136 // refreshContents();
20083137 // }
2009
- if (/*group.selection.size() == 1 &&*/ GraphreeD.clipboard.size() == 1)
3138
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
20103139 {
2011
- Object3D content = GraphreeD.clipboard.get(0);
3140
+ Object3D content = Grafreed.clipboard.get(0);
20123141
20133142 if (content instanceof cGroup && ((cGroup)content).transientlink )
20143143 content = ((cGroup)content).get(0);
20153144
2016
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
3145
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
20173146 for (int i=0; i<group.selection.size(); i++)
20183147 {
2019
- boolean random = CameraPane.RANDOM;
2020
- CameraPane.RANDOM = false; // parse all random nodes
3148
+ boolean random = CameraPane.SWITCH;
3149
+ CameraPane.SWITCH = false; // parse all random nodes
20213150 group.selection.get(i).linkVerticesThis(content);
20223151 // group.selection.get(i).setMasterThis(content); // should be identity
2023
- CameraPane.RANDOM = random;
3152
+ CameraPane.SWITCH = random;
20243153 }
2025
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3154
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
20263155 refreshContents();
20273156 }
20283157 } else
2029
- if (event.getSource() == resetsupportItem)
3158
+ if (source == resetsupportItem)
20303159 {
20313160 for (int i=0; i<group.selection.size(); i++)
20323161 {
2033
- boolean random = CameraPane.RANDOM;
2034
- CameraPane.RANDOM = false; // parse all random nodes
3162
+ boolean random = CameraPane.SWITCH;
3163
+ CameraPane.SWITCH = false; // parse all random nodes
20353164 group.selection.get(i).linkVerticesThis(null);
2036
- CameraPane.RANDOM = random;
3165
+ CameraPane.SWITCH = random;
20373166 }
20383167
20393168 refreshContents();
20403169 } else
2041
- if (event.getSource() == resetreferencesItem)
3170
+ if (source == relinkverticesItem)
3171
+ {
3172
+ boolean random = CameraPane.SWITCH;
3173
+ CameraPane.SWITCH = false; // parse all random nodes
3174
+ group.selection.RelinkToSupport();
3175
+ CameraPane.SWITCH = random;
3176
+
3177
+ refreshContents();
3178
+ } else
3179
+ if (source == resetreferencesItem)
20423180 {
20433181 for (int i=0; i<group.selection.size(); i++)
20443182 {
....@@ -2047,11 +3185,11 @@
20473185
20483186 refreshContents();
20493187 } else
2050
- if (event.getSource() == setMasterItem)
3188
+ if (source == setMasterItem)
20513189 {
2052
- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
3190
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
20533191 {
2054
- Object3D content = GraphreeD.clipboard.get(0);
3192
+ Object3D content = Grafreed.clipboard.get(0);
20553193
20563194 if (content instanceof cGroup && ((cGroup)content).transientlink )
20573195 content = ((cGroup)content).get(0);
....@@ -2060,13 +3198,13 @@
20603198 refreshContents();
20613199 }
20623200 } else
2063
- if (event.getSource() == poseMeshItem)
3201
+ if (source == poseMeshItem)
20643202 {
20653203 if (group.selection.size() == 1)
20663204 {
2067
- if (GraphreeD.clipboard.size() == 1)
3205
+ if (Grafreed.clipboard.size() == 1)
20683206 {
2069
- Object3D content = GraphreeD.clipboard.get(0);
3207
+ Object3D content = Grafreed.clipboard.get(0);
20703208
20713209 if (content instanceof cGroup && ((cGroup)content).transientlink )
20723210 content = ((cGroup)content).get(0);
....@@ -2079,19 +3217,19 @@
20793217 }
20803218
20813219 } else
2082
- if (event.getSource() == revertMeshItem)
3220
+ if (source == revertMeshItem)
20833221 {
20843222 RevertMeshes();
20853223 } else
2086
- if (event.getSource() == resetMeshItem)
3224
+ if (source == resetAllItem)
20873225 {
20883226 ResetAll();
20893227 } else
2090
- if (event.getSource() == stepAllItem)
3228
+ if (source == stepAllItem)
20913229 {
20923230 StepAll();
20933231 } else
2094
- if (event.getSource() == clearItem) // || event.getSource() == clearButton)
3232
+ if (source == deleteItem) // || event.getSource() == clearButton)
20953233 {
20963234 //int indices[] = jList.getSelectedIndices();
20973235 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2099,42 +3237,46 @@
20993237
21003238 ClearSelection(false);
21013239 } else
2102
- if (event.getSource() == clearAllItem)
3240
+ if (source == clearAllItem)
21033241 {
21043242 ClearSelection(true);
21053243 } else
2106
- if (event.getSource() == grabItem)
3244
+ if (source == grabItem || source == groupButton)
21073245 {
2108
- group(new cGroup(), true);
3246
+ group(new cGroup(), false); // true);
21093247 } else
2110
- if (event.getSource() == frontItem)
3248
+ if (source == hideItem)
3249
+ {
3250
+ group(new HiddenObject());
3251
+ } else
3252
+ if (source == frontItem)
21113253 {
21123254 front();
21133255 } else
2114
- if (event.getSource() == backItem)
3256
+ if (source == backItem)
21153257 {
21163258 back();
21173259 } else
2118
- if (event.getSource() == cameraItem)
3260
+ if (source == cameraItem)
21193261 {
21203262 makeSomething(new Camera());
21213263 } else
2122
- if (event.getSource() == compositeItem)
3264
+ if (source == compositeItem || source == compositeButton)
21233265 {
21243266 group(new Composite());
21253267 } else
2126
- if (event.getSource() == randomItem)
3268
+ if (source == switchItem || source == switchButton)
21273269 {
21283270 RandomNode random = new RandomNode();
21293271 group(random);
21303272 if (random.size() > 0)
2131
- random.name = random.get(0).name + "Rnd";
3273
+ random.name = random.get(0).name + "Switch";
21323274 } else
2133
- if (event.getSource() == physicsItem)
3275
+ if (source == physicsItem)
21343276 {
21353277 group(new PhysicsNode());
21363278 } else
2137
- if (event.getSource() == frameselectorItem)
3279
+ if (source == frameselectorItem)
21383280 {
21393281 for (int i=0; i<group.selection.size(); i++)
21403282 {
....@@ -2146,7 +3288,7 @@
21463288 ResetModel();
21473289 refreshContents();
21483290 } else
2149
- if (event.getSource() == switchGeoItem)
3291
+ if (source == switchGeoItem)
21503292 {
21513293 for (int i=0; i<group.selection.size(); i++)
21523294 {
....@@ -2158,7 +3300,7 @@
21583300 ResetModel();
21593301 refreshContents();
21603302 } else
2161
- if (event.getSource() == switchTransfoItem)
3303
+ if (source == switchTransfoItem)
21623304 {
21633305 for (int i=0; i<group.selection.size(); i++)
21643306 {
....@@ -2170,7 +3312,7 @@
21703312 ResetModel();
21713313 refreshContents();
21723314 } else
2173
- if (event.getSource() == morphItem)
3315
+ if (source == morphItem)
21743316 {
21753317 for (int i=0; i<group.selection.size(); i++)
21763318 {
....@@ -2182,7 +3324,7 @@
21823324 ResetModel();
21833325 refreshContents();
21843326 } else
2185
- if (event.getSource() == scriptNodeItem)
3327
+ if (source == scriptNodeItem)
21863328 {
21873329 boolean atleastone = false;
21883330
....@@ -2221,191 +3363,268 @@
22213363 }
22223364 }
22233365 } else
2224
- if (event.getSource() == linkerItem)
3366
+ if (source == linkerItem)
22253367 {
22263368 group(new cLinker());
22273369 } else
2228
- if (event.getSource() == textureItem)
3370
+ if (source == textureItem || source == textureButton)
22293371 {
22303372 group(new TextureNode());
22313373 } else
2232
- if (event.getSource() == shadowXItem)
3374
+ if (source == billboardItem)
3375
+ {
3376
+ group(new BillboardNode());
3377
+ } else
3378
+ if (source == shadowXItem)
22333379 {
22343380 CastShadow(0);
22353381 } else
2236
- if (event.getSource() == shadowYItem)
3382
+ if (source == shadowYItem)
22373383 {
22383384 CastShadow(1);
22393385 } else
2240
- if (event.getSource() == shadowZItem)
3386
+ if (source == shadowZItem)
22413387 {
22423388 CastShadow(2);
22433389 } else
2244
- if (event.getSource() == ungroupItem)
3390
+ if (source == ungroupItem || source == ungroupButton)
22453391 {
2246
- ungroup();
3392
+ boolean canUngroup = true;
3393
+
3394
+ for (int i=0; i<group.selection.size(); i++)
3395
+ {
3396
+ Object3D selectedItem = group.selection.get(i);
3397
+
3398
+ if (selectedItem.Size() == 0)
3399
+ {
3400
+ // Cannot ungroup leaves
3401
+ canUngroup = false;
3402
+ break;
3403
+ }
3404
+
3405
+ if (selectedItem == group)
3406
+ {
3407
+ // Cannot ungroup root
3408
+ canUngroup = false;
3409
+ break;
3410
+ }
3411
+ }
3412
+
3413
+ if (canUngroup)
3414
+ {
3415
+ for (int i=0; i<group.selection.size(); i++)
3416
+ {
3417
+ Object3D selectedItem = group.selection.get(i);
3418
+
3419
+ Ungroup(selectedItem);
3420
+ }
3421
+
3422
+ ClearSelection(false);
3423
+
3424
+ refreshContents();
3425
+ }
22473426 } else
2248
- if (event.getSource() == genUVItem)
3427
+ if (source == genUVItem)
22493428 {
22503429 GenUV();
22513430 } else
2252
- if (event.getSource() == genNormalsCADItem)
3431
+ if (source == genNormalsCADItem)
22533432 {
22543433 GenNormals(true);
22553434 } else
2256
- if (event.getSource() == genNormalsORGANItem)
3435
+ if (source == genNormalsMESHItem)
3436
+ {
3437
+ GenNormalsMESH();
3438
+ } else
3439
+ if (source == genNormalsORGANItem)
22573440 {
22583441 GenNormals(false);
22593442 } else
2260
- if (event.getSource() == stripifyItem)
3443
+ if (source == genNormalsMINEItem)
3444
+ {
3445
+ GenNormalsMINE();
3446
+ } else
3447
+ if (source == stripifyItem)
22613448 {
22623449 Stripify();
22633450 } else
2264
- if (event.getSource() == unstripifyItem)
3451
+ if (source == unstripifyItem)
22653452 {
22663453 Unstripify();
22673454 } else
2268
- if (event.getSource() == trimItem)
3455
+ if (source == trimItem)
22693456 {
22703457 Trim();
22713458 } else
2272
- if (event.getSource() == untrimItem)
3459
+ if (source == untrimItem)
22733460 {
22743461 Untrim();
22753462 } else
2276
- if (event.getSource() == clearColorsItem)
3463
+ if (source == clearColorsItem)
22773464 {
22783465 ClearColors();
22793466 } else
2280
- if (event.getSource() == clearMaterialsItem)
3467
+ if (source == clearMaterialsItem)
22813468 {
22823469 ClearMaterials();
22833470 } else
2284
- if (event.getSource() == liveleavesItem)
3471
+ if (source == clearVersionsItem)
3472
+ {
3473
+ ClearVersions();
3474
+ } else
3475
+ if (source == liveleavesItem)
22853476 {
22863477 LiveLeaves(true);
22873478 } else
2288
- if (event.getSource() == unliveleavesItem)
3479
+ if (source == unliveleavesItem)
22893480 {
22903481 LiveLeaves(false);
22913482 } else
2292
- if (event.getSource() == supportleavesItem)
3483
+ if (source == supportleavesItem)
22933484 {
22943485 SupportLeaves(true);
22953486 } else
2296
- if (event.getSource() == unsupportleavesItem)
3487
+ if (source == unsupportleavesItem)
22973488 {
22983489 SupportLeaves(false);
22993490 } else
2300
- if (event.getSource() == hideleavesItem)
3491
+ if (source == hideleavesItem)
23013492 {
23023493 HideLeaves(true);
23033494 } else
2304
- if (event.getSource() == showleavesItem)
3495
+ if (source == showleavesItem)
23053496 {
23063497 HideLeaves(false);
23073498 } else
2308
- if (event.getSource() == markleavesItem)
3499
+ if (source == markleavesItem)
23093500 {
23103501 MarkLeaves(true);
23113502 } else
2312
- if (event.getSource() == unmarkleavesItem)
3503
+ if (source == unmarkleavesItem)
23133504 {
23143505 MarkLeaves(false);
23153506 } else
2316
- if (event.getSource() == flipVItem)
3507
+ if (source == rewindleavesItem)
3508
+ {
3509
+ RewindLeaves(true);
3510
+ } else
3511
+ if (source == unrewindleavesItem)
3512
+ {
3513
+ RewindLeaves(false);
3514
+ } else
3515
+ if (source == randomleavesItem)
3516
+ {
3517
+ RandomLeaves(true);
3518
+ } else
3519
+ if (source == unrandomleavesItem)
3520
+ {
3521
+ RandomLeaves(false);
3522
+ } else
3523
+ if (source == flipVItem)
23173524 {
23183525 FlipV(true);
23193526 } else
2320
- if (event.getSource() == unflipVItem)
3527
+ if (source == unflipVItem)
23213528 {
23223529 FlipV(false);
23233530 } else
2324
- if (event.getSource() == lowTexturesItem)
3531
+ if (source == lowTexturesItem)
23253532 {
23263533 SetTexRes(0);
23273534 } else
2328
- if (event.getSource() == normalTexturesItem)
3535
+ if (source == normalTexturesItem)
23293536 {
23303537 SetTexRes(1);
23313538 } else
2332
- if (event.getSource() == highTexturesItem)
3539
+ if (source == highTexturesItem)
23333540 {
23343541 SetTexRes(2);
23353542 } else
2336
- if (event.getSource() == veryhighTexturesItem)
3543
+ if (source == veryhighTexturesItem)
23373544 {
23383545 SetTexRes(3);
23393546 } else
2340
- if (event.getSource() == maxTexturesItem)
3547
+ if (source == maxTexturesItem)
23413548 {
23423549 SetTexRes(4);
23433550 } else
2344
- if (event.getSource() == panoTexturesItem)
3551
+ if (source == panoTexturesItem)
23453552 {
23463553 SetTexRes(5);
23473554 } else
2348
- if (event.getSource() == reverseNormalsItem)
3555
+ if (source == reverseNormalsItem)
23493556 {
23503557 ReverseNormals();
23513558 } else
2352
- if (event.getSource() == parseverticesItem)
3559
+ if (source == parseverticesItem)
23533560 {
23543561 ParseVertices();
23553562 } else
2356
- if (event.getSource() == alignItem)
3563
+ if (source == textureFieldItem)
3564
+ {
3565
+ TextureVertices();
3566
+ } else
3567
+ if (source == alignItem)
23573568 {
23583569 Align();
23593570 } else
2360
- if (event.getSource() == mirrorItem)
3571
+ if (source == mirrorItem)
23613572 {
23623573 MirrorPoses();
23633574 } else
2364
- if (event.getSource() == reduceMorphItem)
3575
+ if (source == reduceMorphItem)
23653576 {
23663577 MeshReduction(false);
23673578 } else
2368
- if (event.getSource() == reduce34MorphItem)
3579
+ if (source == reduce34MorphItem)
23693580 {
23703581 MeshReduction(true);
23713582 } else
2372
- if (event.getSource() == reverseTrianglesItem)
3583
+ if (source == reverseTrianglesItem)
23733584 {
23743585 ReverseTriangles();
23753586 } else
2376
- if (event.getSource() == reduceMeshItem)
3587
+ if (source == reduceMeshItem)
23773588 {
23783589 ReduceMesh(false);
23793590 } else
2380
- if (event.getSource() == reduce34MeshItem)
3591
+ if (source == reduce34MeshItem)
23813592 {
23823593 ReduceMesh(true);
23833594 } else
2384
- if (event.getSource() == increaseMeshItem)
3595
+ if (source == increaseMeshItem)
23853596 {
23863597 IncreaseMesh();
23873598 } else
2388
- if (event.getSource() == clipMeshItem)
3599
+ if (source == clipMeshItem)
23893600 {
23903601 ClipMesh();
23913602 } else
2392
- if (event.getSource() == smoothMeshItem)
3603
+ if (source == smoothMeshItem)
23933604 {
23943605 SmoothMesh();
23953606 } else
2396
- if (event.getSource() == transformgeometryItem)
3607
+ if (source == transformGeometryItem)
23973608 {
23983609 TransformGeometry();
23993610 } else
2400
- if (event.getSource() == resetTransformItem)
3611
+ if (source == transformChildrenItem)
3612
+ {
3613
+ TransformChildren();
3614
+ } else
3615
+ if (source == resetTransformItem)
24013616 {
24023617 ResetTransform();
24033618 } else
2404
- if (event.getSource() == resetCentroidItem)
3619
+ if (source == resetCentroidItem)
24053620 {
2406
- ResetCentroid();
3621
+ ResetCentroid(true);
24073622 } else
2408
- if (event.getSource() == resetParentItem)
3623
+ if (source == resetCentroidXZItem)
3624
+ {
3625
+ ResetCentroid(false);
3626
+ } else
3627
+ if (source == resetParentItem)
24093628 {
24103629 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24113630 {
....@@ -2415,7 +3634,7 @@
24153634
24163635 refreshContents();
24173636 } else
2418
- if (event.getSource() == repairParentItem)
3637
+ if (source == repairParentItem)
24193638 {
24203639 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24213640 {
....@@ -2429,7 +3648,21 @@
24293648
24303649 refreshContents();
24313650 } else
2432
- if (event.getSource() == sortbysizeItem)
3651
+ if (source == repairShadowItem)
3652
+ {
3653
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3654
+ {
3655
+ Object3D obj = (Object3D)e.nextElement();
3656
+ obj.RepairShadow();
3657
+// for (int i=0; i<obj.size(); i++)
3658
+// {
3659
+// obj.get(i).parent = obj;
3660
+// }
3661
+ }
3662
+
3663
+ refreshContents();
3664
+ } else
3665
+ if (source == sortbysizeItem)
24333666 {
24343667 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24353668 {
....@@ -2441,7 +3674,7 @@
24413674 ResetModel();
24423675 refreshContents();
24433676 } else
2444
- if (event.getSource() == sortbynameItem)
3677
+ if (source == sortbynameItem)
24453678 {
24463679 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24473680 {
....@@ -2453,7 +3686,7 @@
24533686 ResetModel();
24543687 refreshContents();
24553688 } else
2456
- if (event.getSource() == attachPigmentItem)
3689
+ if (source == attachPigmentItem)
24573690 {
24583691 String texture = GetFile("Attach pigment");
24593692 Object3D obj;
....@@ -2465,7 +3698,7 @@
24653698
24663699 refreshContents();
24673700 } else
2468
- if (event.getSource() == detachPigmentItem)
3701
+ if (source == detachPigmentItem)
24693702 {
24703703 Object3D obj;
24713704 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2476,7 +3709,7 @@
24763709
24773710 refreshContents();
24783711 } else
2479
- if (event.getSource() == attachBumpItem)
3712
+ if (source == attachBumpItem)
24803713 {
24813714 String texture = GetFile("Attach bump");
24823715 Object3D obj;
....@@ -2488,18 +3721,18 @@
24883721
24893722 refreshContents();
24903723 } else
2491
- if (event.getSource() == detachBumpItem)
3724
+ if (source == detachBumpItem)
24923725 {
24933726 Object3D obj;
24943727 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
24953728 {
24963729 obj = (Object3D)e.nextElement();
2497
- obj.SetBumpTexture(null);
3730
+ obj.ResetBumpTexture();
24983731 }
24993732
25003733 refreshContents();
25013734 } else
2502
- if (event.getSource() == pigmentBumpItem)
3735
+ if (source == pigmentBumpItem)
25033736 {
25043737 Object3D obj;
25053738 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2510,159 +3743,233 @@
25103743
25113744 refreshContents();
25123745 } else
2513
- if (event.getSource() == flashSelectionButton)
3746
+ if (source == embedTexturesItem)
3747
+ {
3748
+ Object3D obj;
3749
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3750
+ {
3751
+ obj = (Object3D)e.nextElement();
3752
+ obj.EmbedTextures(true);
3753
+ }
3754
+
3755
+ refreshContents();
3756
+ } else
3757
+ if (source == deEmbedTexturesItem)
3758
+ {
3759
+ Object3D obj;
3760
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3761
+ {
3762
+ obj = (Object3D)e.nextElement();
3763
+ obj.EmbedTextures(false);
3764
+ }
3765
+
3766
+ CameraPane.texturepigment.clear();
3767
+ CameraPane.texturebump.clear();
3768
+
3769
+ refreshContents();
3770
+ } else
3771
+ if (source == flashSelectionButton)
25143772 {
25153773 CameraPane.flash = true;
25163774 refreshContents();
25173775 } else
2518
- if (event.getSource() == oneButton)
3776
+ if (source == oneButton)
25193777 {
25203778 } else
2521
- if (event.getSource() == twoButton)
3779
+ if (source == twoButton)
25223780 {
25233781 radio.layout = twoButton;
2524
- // bug
2525
- //gridPanel.setDividerLocation(1.0);
2526
- //bigPanel.setDividerLocation(0.0);
2527
- bigThree.remove(jtp);
2528
- bigThree.remove(cameraPanel);
2529
- bigThree.remove(XYZPanel);
2530
- aWindowConstraints.gridx = 0;
2531
- aWindowConstraints.gridy = 0;
2532
- aWindowConstraints.gridwidth = 1;
2533
- // aConstraints.gridheight = 3;
2534
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2535
- aWindowConstraints.weightx = 0;
2536
- aWindowConstraints.weighty = 1;
2537
- //bigThree.add(jtp, aWindowConstraints);
2538
- aWindowConstraints.weightx = 1;
2539
- aWindowConstraints.gridwidth = 3;
2540
- // aConstraints.gridheight = 3;
2541
- aWindowConstraints.gridx = 1;
2542
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2543
- bigThree.add(cameraPanel, aWindowConstraints);
2544
- aWindowConstraints.weightx = 0;
2545
- aWindowConstraints.gridx = 4;
2546
- aWindowConstraints.gridwidth = 1;
2547
- // aConstraints.gridheight = 3;
2548
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2549
- //bigThree.add(XYZPanel, aWindowConstraints);
2550
- bigThree.revalidate();
3782
+
3783
+ if (CameraPane.FULLSCREEN)
3784
+ fullscreenLayout = radio.layout;
3785
+
3786
+ Show3DView();
3787
+
3788
+ cameraView.requestFocusInWindow();
3789
+
3790
+// refreshContents(true);
3791
+//
3792
+// try
3793
+// {
3794
+// java.awt.Robot bot = new java.awt.Robot();
3795
+// int mask = InputEvent.BUTTON1_MASK;
3796
+// bot.mouseMove(100, 100);
3797
+// bot.mousePress(mask);
3798
+// bot.mouseRelease(mask);
3799
+// }
3800
+// catch (Exception e)
3801
+// {
3802
+//
3803
+// }
3804
+
25513805 } else
2552
- if (event.getSource() == threeButton)
3806
+ if (source == threeButton)
25533807 {
25543808 radio.layout = threeButton;
2555
- bigThree.remove(jtp);
2556
- bigThree.remove(cameraPanel);
2557
- bigThree.remove(XYZPanel);
2558
- aWindowConstraints.gridx = 0;
2559
- aWindowConstraints.gridy = 0;
2560
- aWindowConstraints.gridwidth = 1;
2561
- // aConstraints.gridheight = 3;
2562
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2563
- aWindowConstraints.weightx = 0;
2564
- aWindowConstraints.weighty = 1;
2565
- //bigThree.add(jtp, aWindowConstraints);
2566
- aWindowConstraints.weightx = 1;
2567
- aWindowConstraints.gridwidth = 3;
2568
- // aConstraints.gridheight = 3;
2569
- aWindowConstraints.gridx = 1;
2570
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2571
- bigThree.add(cameraPanel, aWindowConstraints);
2572
- aWindowConstraints.weightx = 0;
2573
- aWindowConstraints.gridx = 4;
2574
- aWindowConstraints.gridwidth = 1;
2575
- // aConstraints.gridheight = 3;
2576
- aConstraints.fill = GridBagConstraints.VERTICAL;
2577
- bigThree.add(XYZPanel, aWindowConstraints);
2578
- bigThree.revalidate();
3809
+
3810
+ if (CameraPane.FULLSCREEN)
3811
+ fullscreenLayout = radio.layout;
3812
+
3813
+// bigThree.remove(scenePanel);
3814
+// bigThree.remove(centralPanel);
3815
+// bigThree.remove(XYZPanel);
3816
+// aWindowConstraints.gridx = 0;
3817
+// aWindowConstraints.gridy = 0;
3818
+// aWindowConstraints.gridwidth = 1;
3819
+// // aConstraints.gridheight = 3;
3820
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3821
+// aWindowConstraints.weightx = 0;
3822
+// aWindowConstraints.weighty = 1;
3823
+// //bigThree.add(jtp, aWindowConstraints);
3824
+// aWindowConstraints.weightx = 1;
3825
+// aWindowConstraints.gridwidth = 3;
3826
+// // aConstraints.gridheight = 3;
3827
+// aWindowConstraints.gridx = 1;
3828
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3829
+// bigThree.add(centralPanel, aWindowConstraints);
3830
+// aWindowConstraints.weightx = 0;
3831
+// aWindowConstraints.gridx = 4;
3832
+// aWindowConstraints.gridwidth = 1;
3833
+// // aConstraints.gridheight = 3;
3834
+// aConstraints.fill = GridBagConstraints.VERTICAL;
3835
+// bigThree.add(XYZPanel, aWindowConstraints);
3836
+// bigThree.validate();
3837
+// scenePanel.setVisible(false);
3838
+// centralPanel.setVisible(true);
3839
+// XYZPanel.setVisible(true);
3840
+ bigThree.ClearUI();
3841
+ bigThree.add(scenePanel);
3842
+ bigThree.add(centralPanel);
3843
+ bigThree.FlushUI();
3844
+
3845
+ cameraView.requestFocusInWindow();
25793846 } else
2580
- if (event.getSource() == fourButton)
3847
+ if (source == fourButton)
25813848 {
25823849 radio.layout = fourButton;
2583
- bigThree.remove(jtp);
2584
- bigThree.remove(cameraPanel);
2585
- bigThree.remove(XYZPanel);
2586
- aWindowConstraints.gridx = 0;
2587
- aWindowConstraints.gridy = 0;
2588
- aWindowConstraints.gridwidth = 1;
2589
- // aWindowConstraints.gridheight = 3;
2590
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2591
- aWindowConstraints.weightx = 1;
2592
- aWindowConstraints.weighty = 1;
2593
- bigThree.add(jtp, aWindowConstraints);
2594
- aWindowConstraints.weightx = 1;
2595
- aWindowConstraints.gridwidth = 3;
2596
- // aConstraints.gridheight = 3;
2597
- aWindowConstraints.gridx = 1;
2598
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599
- //bigThree.add(cameraPanel, aWindowConstraints);
2600
- aWindowConstraints.weightx = 0;
2601
- aWindowConstraints.gridx = 4;
2602
- aWindowConstraints.gridwidth = 1;
2603
- // aWindowConstraints.gridheight = 3;
2604
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605
- //bigThree.add(XYZPanel, aWindowConstraints);
2606
- bigThree.revalidate();
3850
+
3851
+ if (CameraPane.FULLSCREEN)
3852
+ fullscreenLayout = radio.layout;
3853
+
3854
+// bigThree.remove(scenePanel);
3855
+// bigThree.remove(centralPanel);
3856
+// bigThree.remove(XYZPanel);
3857
+// aWindowConstraints.gridx = 0;
3858
+// aWindowConstraints.gridy = 0;
3859
+// aWindowConstraints.gridwidth = 1;
3860
+// // aWindowConstraints.gridheight = 3;
3861
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3862
+// aWindowConstraints.weightx = 1;
3863
+// aWindowConstraints.weighty = 1;
3864
+// bigThree.add(scenePanel, aWindowConstraints);
3865
+// aWindowConstraints.weightx = 1;
3866
+// aWindowConstraints.gridwidth = 3;
3867
+// // aConstraints.gridheight = 3;
3868
+// aWindowConstraints.gridx = 1;
3869
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3870
+// //bigThree.add(cameraPanel, aWindowConstraints);
3871
+// aWindowConstraints.weightx = 0;
3872
+// aWindowConstraints.gridx = 4;
3873
+// aWindowConstraints.gridwidth = 1;
3874
+// // aWindowConstraints.gridheight = 3;
3875
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3876
+// //bigThree.add(XYZPanel, aWindowConstraints);
3877
+// bigThree.validate();
3878
+// scenePanel.setVisible(true);
3879
+// centralPanel.setVisible(false);
3880
+// XYZPanel.setVisible(false);
3881
+ bigThree.ClearUI();
3882
+ bigThree.add(scenePanel);
3883
+ bigThree.FlushUI();
3884
+
3885
+ cameraView.requestFocusInWindow();
26073886 } else
2608
- if (event.getSource() == sixButton)
3887
+ if (source == sixButton)
26093888 {
26103889 radio.layout = sixButton;
2611
- bigThree.remove(jtp);
2612
- bigThree.remove(cameraPanel);
2613
- bigThree.remove(XYZPanel);
2614
- aWindowConstraints.gridx = 0;
2615
- aWindowConstraints.gridy = 0;
2616
- aWindowConstraints.gridwidth = 1;
2617
- // aConstraints.gridheight = 3;
2618
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619
- aWindowConstraints.weightx = 0;
2620
- aWindowConstraints.weighty = 1;
2621
- bigThree.add(jtp, aWindowConstraints);
2622
- aWindowConstraints.weightx = 1;
2623
- aWindowConstraints.gridwidth = 3;
2624
- // aWindowConstraints.gridheight = 3;
2625
- aWindowConstraints.gridx = 1;
2626
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627
- bigThree.add(cameraPanel, aWindowConstraints);
2628
- aWindowConstraints.weightx = 0;
2629
- aWindowConstraints.gridx = 4;
2630
- aWindowConstraints.gridwidth = 1;
2631
- // aWindowConstraints.gridheight = 3;
2632
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2633
- //bigThree.add(XYZPanel, aConstraints);
2634
- bigThree.revalidate();
3890
+
3891
+ if (CameraPane.FULLSCREEN)
3892
+ fullscreenLayout = radio.layout;
3893
+
3894
+// bigThree.remove(scenePanel);
3895
+// bigThree.remove(centralPanel);
3896
+// bigThree.remove(XYZPanel);
3897
+// aWindowConstraints.gridx = 0;
3898
+// aWindowConstraints.gridy = 0;
3899
+// aWindowConstraints.gridwidth = 1;
3900
+// // aConstraints.gridheight = 3;
3901
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3902
+// aWindowConstraints.weightx = 0;
3903
+// aWindowConstraints.weighty = 1;
3904
+// bigThree.add(scenePanel, aWindowConstraints);
3905
+// aWindowConstraints.weightx = 1;
3906
+// aWindowConstraints.gridwidth = 3;
3907
+// // aWindowConstraints.gridheight = 3;
3908
+// aWindowConstraints.gridx = 1;
3909
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3910
+// bigThree.add(centralPanel, aWindowConstraints);
3911
+// aWindowConstraints.weightx = 0;
3912
+// aWindowConstraints.gridx = 4;
3913
+// aWindowConstraints.gridwidth = 1;
3914
+// // aWindowConstraints.gridheight = 3;
3915
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3916
+// //bigThree.add(XYZPanel, aConstraints);
3917
+// bigThree.validate();
3918
+// scenePanel.setVisible(true);
3919
+// centralPanel.setVisible(true);
3920
+// XYZPanel.setVisible(false);
3921
+ bigThree.ClearUI();
3922
+ bigThree.add(centralPanel);
3923
+ bigThree.add(scenePanel);
3924
+ bigThree.FlushUI();
3925
+
3926
+ cameraView.requestFocusInWindow();
26353927 } else
2636
- if (event.getSource() == sevenButton)
3928
+ if (source == sevenButton)
26373929 {
26383930 radio.layout = sevenButton;
2639
- bigThree.remove(jtp);
2640
- bigThree.remove(cameraPanel);
2641
- bigThree.remove(XYZPanel);
2642
- aWindowConstraints.gridx = 0;
2643
- aWindowConstraints.gridy = 0;
2644
- aWindowConstraints.gridwidth = 1;
2645
- // aWindowConstraints.gridheight = 3;
2646
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2647
- aWindowConstraints.weightx = 0;
2648
- aWindowConstraints.weighty = 1;
2649
- bigThree.add(jtp, aWindowConstraints);
2650
- aWindowConstraints.weightx = 1;
2651
- aWindowConstraints.gridwidth = 3;
2652
- // aWindowConstraints.gridheight = 3;
2653
- aWindowConstraints.gridx = 1;
2654
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655
- bigThree.add(cameraPanel, aWindowConstraints);
2656
- aWindowConstraints.weightx = 0;
2657
- aWindowConstraints.gridx = 4;
2658
- aWindowConstraints.gridwidth = 1;
2659
- // aConstraints.gridheight = 3;
2660
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661
- bigThree.add(XYZPanel, aWindowConstraints);
2662
- bigThree.revalidate();
3931
+
3932
+ if (CameraPane.FULLSCREEN)
3933
+ fullscreenLayout = radio.layout;
3934
+
3935
+// bigThree.remove(scenePanel);
3936
+// bigThree.remove(centralPanel);
3937
+// bigThree.remove(XYZPanel);
3938
+// aWindowConstraints.gridx = 0;
3939
+// aWindowConstraints.gridy = 0;
3940
+// aWindowConstraints.gridwidth = 1;
3941
+// // aWindowConstraints.gridheight = 3;
3942
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3943
+// aWindowConstraints.weightx = 0;
3944
+// aWindowConstraints.weighty = 1;
3945
+// bigThree.add(scenePanel, aWindowConstraints);
3946
+// aWindowConstraints.weightx = 1;
3947
+// aWindowConstraints.gridwidth = 3;
3948
+// // aWindowConstraints.gridheight = 3;
3949
+// aWindowConstraints.gridx = 1;
3950
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3951
+// bigThree.add(centralPanel, aWindowConstraints);
3952
+// aWindowConstraints.weightx = 0;
3953
+// aWindowConstraints.gridx = 4;
3954
+// aWindowConstraints.gridwidth = 1;
3955
+// // aConstraints.gridheight = 3;
3956
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3957
+// bigThree.add(XYZPanel, aWindowConstraints);
3958
+// bigThree.validate();
3959
+// scenePanel.setVisible(true);
3960
+// centralPanel.setVisible(true);
3961
+// XYZPanel.setVisible(true);
3962
+ bigThree.ClearUI();
3963
+ bigThree.add(scenePanel);
3964
+ bigThree.add(centralPanel);
3965
+ bigThree.add(XYZPanel);
3966
+ bigThree.FlushUI();
3967
+
3968
+ cameraView.requestFocusInWindow();
26633969 } else
2664
- if (event.getSource() == rootButton)
3970
+ if (source == rootButton)
26653971 {
3972
+ Replace();
26663973 Object3D obj;
26673974 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
26683975 {
....@@ -2671,66 +3978,87 @@
26713978 EditObject(obj);
26723979 }
26733980
3981
+ cameraView.requestFocusInWindow();
26743982 refreshContents(true);
26753983 } else
2676
- if (event.getSource() == closeButton)
3984
+ if (source == closeButton)
26773985 {
26783986 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3987
+ Replace();
3988
+
26793989 cRadio ab;
26803990 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
26813991 {
26823992 ab = (cRadio)e.nextElement();
2683
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3993
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
26843994 {
3995
+ // Patch to avoid bug with transparency.
3996
+ if (!ab.hadMaterial)
3997
+ {
3998
+ ab.object.material = null;
3999
+ }
4000
+
26854001 buttonGroup.remove(ab);
26864002 radioPanel.remove(ab);
26874003
2688
- ab.GetObject().editWindow = null;
4004
+ //ab.GetObject().editWindow = null;
4005
+ ab.GetObject().manipWindow = null;
26894006 // ab.GetObject().objectUI = null; // ?????????
26904007
26914008 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
26924009 break;
26934010 }
26944011 }
4012
+
4013
+ cameraView.requestFocusInWindow();
26954014 refreshContents(true);
26964015 } else
2697
- if (event.getSource() == editItem || event.getSource() == editButton)
4016
+ if (source == editItem || source == editButton)
26984017 {
4018
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4019
+ {
4020
+ Object3D child = (Object3D)e.nextElement();
4021
+ child.pinned = true;
4022
+ }
4023
+
26994024 EditSelection(false);
27004025 } else
2701
- if (event.getSource() == uneditButton)
4026
+ if (source == uneditButton)
27024027 {
27034028 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
27044029 {
27054030 Object3D child = (Object3D)e.nextElement();
27064031 if(child.editWindow != null)
2707
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4032
+ child.pinned = false;
27084033 child.CloseUI();
27094034 listUI.remove(child);
4035
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
27104036
2711
- child.editWindow = null; // ???????????
4037
+ //child.editWindow = null; // ???????????
27124038 }
2713
- objEditor.ctrlPanel.revalidate();
4039
+ objEditor.ctrlPanel.FlushUI();
27144040 //objEditor.jTree.clearSelection();
27154041 //objEditor.ResetSliders();
27164042 refreshContents(true);
27174043 } else
2718
- if (event.getSource() == clearPanelButton)
4044
+ if (source == clearPanelButton)
27194045 {
27204046 assert(copy == group);
27214047 //copy.ClearUI();
27224048 for (Object3D obj : listUI)
27234049 {
4050
+ obj.pinned = false;
27244051 obj.CloseUI();
27254052 }
27264053 listUI.clear();
4054
+ SetPinStates(group.selection.size() > 0);
27274055 refreshContents(true);
27284056 } else
2729
- if (event.getSource() == allParamsButton)
4057
+ if (source == allParamsButton)
27304058 {
27314059 assert(copy == group);
27324060
2733
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4061
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
27344062
27354063 for (Object3D obj : listUI)
27364064 {
....@@ -2747,19 +4075,21 @@
27474075
27484076 refreshContents(true);
27494077 } else
2750
- if (event.getSource() == unselectButton)
4078
+ if (source == unselectButton)
27514079 {
27524080 objEditor.jTree.clearSelection();
2753
- // ?? oct 2012 GraphreeD.clipboard.clear();
4081
+ // ?? oct 2012 GrafreeD.clipboard.clear();
27544082 objEditor.ResetSliders();
27554083 refreshContents(true);
27564084 } else
2757
- if(event.getSource() instanceof cRadio)
4085
+ if(source instanceof cRadio)
27584086 {
4087
+ Replace();
4088
+
27594089 group.parent = keepparent;
27604090 group.attributes = 0;
27614091 //group.editWindow = null;
2762
- /*cRadio*/ radio = (cRadio)event.getSource();
4092
+ /*cRadio*/ radio = (cRadio)source;
27634093 Object3D obj = radio.GetObject();
27644094 System.out.println("Edit " + obj);
27654095 if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
....@@ -2779,7 +4109,8 @@
27794109 }
27804110
27814111 copy = group;
2782
- //CameraPane.theRenderer.object = group;
4112
+
4113
+ //Globals.theRenderer.object = group;
27834114 if(!useclient)
27844115 {
27854116 cameraView.renderCamera = radio.camera;
....@@ -2788,25 +4119,80 @@
27884119 cameraView.cameras[cameraView.cameracount] = radio.camera;
27894120 cameraView.targetLookAt.set(radio.camera.lookAt);
27904121 cameraView.object = group;
2791
- cameraView.lighttouched = true;
4122
+ //cameraView.lighttouched = true;
4123
+ Globals.lighttouched = true;
27924124 topView.object = group;
27934125 frontView.object = group;
27944126 sideView.object = group;
27954127 }
2796
- group.editWindow = this;
4128
+
4129
+// fix "+" issue
4130
+ //group.editWindow = this;
4131
+ group.manipWindow = this;
4132
+
27974133 /*
27984134 currentLayout = radio.layout;
27994135 if (currentLayout == null)
28004136 currentLayout = sevenButton;
28014137 */
28024138 radio.layout.doClick();
4139
+
4140
+ assert(copy instanceof Composite);
4141
+
4142
+ if (copy.versionlist == null)
4143
+ {
4144
+ copy.versionindex = -1;
4145
+
4146
+ // Cannot work with loops
4147
+ // To fix this issue, we first mark all nodes above the root,
4148
+ // and check if any of these nodes are reachable below the root.
4149
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4150
+
4151
+ if (copy.versionlist == null && !copy.HasTags())
4152
+ {
4153
+ copy.versionlist = new Object3D[100];
4154
+
4155
+ //Save(true);
4156
+ }
4157
+ else
4158
+ copy.versionindex = -2;
4159
+
4160
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4161
+ }
4162
+
4163
+ SetVersionStates();
4164
+
4165
+ ClearUnpinned();
4166
+
4167
+ //Grafreed.Assert(group != null);
4168
+ //Grafreed.Assert(group.selection != null);
4169
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4170
+ if (group.selection == null || group.selection.size() == 1)
4171
+ EditSelection(false);
28034172 keepparent = group.parent;
28044173 // PARENT = NULL or not???
28054174 //group.parent = null; // ROOT
28064175 //group.attributes = -1;
28074176 ResetModel();
4177
+
4178
+ cameraView.requestFocusInWindow();
28084179 refreshContents(true);
2809
- }
4180
+ } else if (event.getSource() == editCameraItem)
4181
+ {
4182
+ cameraView.ProtectCamera();
4183
+ cameraView.requestFocusInWindow();
4184
+ cameraView.repaint();
4185
+ return;
4186
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
4187
+ {
4188
+ cameraView.RevertCamera();
4189
+ cameraView.requestFocusInWindow();
4190
+ cameraView.repaint();
4191
+ return;
4192
+ // } else if (event.getSource() == textureButton)
4193
+ // {
4194
+ // return; // true;
4195
+ }
28104196 else
28114197 {
28124198 //return super.action(event, arg);
....@@ -2815,7 +4201,6 @@
28154201 }
28164202
28174203 boolean useclient = false;
2818
- cRadio radio;
28194204
28204205 void ToggleRoot()
28214206 {
....@@ -2824,7 +4209,7 @@
28244209 if (useclient)
28254210 {
28264211 cameraView.object = client;
2827
- cameraView.lighttouched = true;
4212
+ Globals.lighttouched = true;
28284213 //topView.object = client;
28294214 //frontView.object = client;
28304215 //sideView.object = client;
....@@ -2832,7 +4217,7 @@
28324217 else
28334218 {
28344219 cameraView.object = group;
2835
- cameraView.lighttouched = true;
4220
+ Globals.lighttouched = true;
28364221 //topView.object = group;
28374222 //frontView.object = group;
28384223 //sideView.object = group;
....@@ -2867,6 +4252,28 @@
28674252 refreshContents();
28684253 }
28694254
4255
+ void TransformChildren()
4256
+ {
4257
+ Object3D obj;
4258
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4259
+ {
4260
+ obj = (Object3D)e.nextElement();
4261
+ obj.KeepTextureMatrices();
4262
+ obj.TransformChildren();
4263
+ obj.RestoreTextureMatrices();
4264
+
4265
+// if (obj.parent == null)
4266
+// {
4267
+// System.out.println("NULL PARENT!");
4268
+// new Exception().printStackTrace();
4269
+// }
4270
+// else
4271
+// TouchTransform(obj);
4272
+// //obj.parent.Touch();
4273
+ }
4274
+
4275
+ refreshContents();
4276
+ }
28704277
28714278 void ResetTransform()
28724279 {
....@@ -2898,7 +4305,7 @@
28984305 TouchTransform(obj);
28994306 continue;
29004307 }
2901
- if ((mask&2) != 0) // Scale
4308
+ if ((mask&2) != 0) // Scale/rotation
29024309 {
29034310 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
29044311 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -2906,10 +4313,6 @@
29064313 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
29074314 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
29084315 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
2909
- }
2910
- if ((mask&4) != 0) // Rotation
2911
- {
2912
- // ?
29134316 }
29144317 if ((mask&1) != 0) // Translation
29154318 {
....@@ -2979,7 +4382,7 @@
29794382 refreshContents();
29804383 }
29814384
2982
- void ResetCentroid()
4385
+ void ResetCentroid(boolean full)
29834386 {
29844387 Object3D obj;
29854388 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2994,12 +4397,16 @@
29944397 LA.matIdentity(Object3D.mat);
29954398 obj.getBounds(minima, maxima, false);
29964399 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4400
+ if (full)
4401
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
29984402 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
29994403 obj.TransformMesh(Object3D.mat);
4404
+
30004405 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4406
+ if (full)
4407
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
30024408 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4409
+
30034410 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
30044411 //Object3D.mat[3][0] = -Object3D.mat[3][0];
30054412 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3028,7 +4435,8 @@
30284435
30294436 int size = obj.MemorySize();
30304437
3031
- System.err.println((size/1024) + " KB is the size of " + obj);
4438
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4439
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
30324440 }
30334441 }
30344442 catch (Exception e)
....@@ -3065,9 +4473,9 @@
30654473 obj = (Object3D)e.nextElement();
30664474
30674475 System.out.println("Object is: " + obj);
3068
- GraphreeD.AnalyzeObject(obj);
4476
+ Grafreed.AnalyzeObject(obj);
30694477 System.out.println("Boundary rep: " + obj.bRep);
3070
- GraphreeD.AnalyzeObject(obj.bRep);
4478
+ Grafreed.AnalyzeObject(obj.bRep);
30714479
30724480 // System.err.println((size/1024) + " KB is the size of " + obj);
30734481 }
....@@ -3109,6 +4517,20 @@
31094517 void GenNormals(boolean crease)
31104518 {
31114519 group.GenNormalsS(crease);
4520
+
4521
+ refreshContents();
4522
+ }
4523
+
4524
+ void GenNormalsMESH()
4525
+ {
4526
+ group.GenNormalsMeshS();
4527
+
4528
+ refreshContents();
4529
+ }
4530
+
4531
+ void GenNormalsMINE()
4532
+ {
4533
+ group.selection.GenNormalsMINE();
31124534
31134535 refreshContents();
31144536 }
....@@ -3157,104 +4579,259 @@
31574579
31584580 //Object3D buffer;
31594581 cVector temp = new cVector();
3160
- BoundaryRep temprep;
3161
- Object3D nodes;
3162
- Vector<Vertex> vertices;
3163
-
3164
- public void Vertex(Object3D node, Vertex v)
3165
- {
3166
- vertices.add(v);
3167
- nodes.addElement(node);
3168
-
3169
- if (temprep.GetCache(v) != null)
3170
- {
3171
- temprep.Remove(v);
3172
- }
3173
- else
3174
- {
3175
- temprep.Remember(v);
3176
- }
3177
- }
3178
-
3179
- public void Face(Object3D node, Face f)
3180
- {
3181
-
3182
- }
3183
-
4582
+// BoundaryRep temprep;
4583
+// Object3D nodes;
4584
+// Vector<Vertex> vertices;
4585
+//
4586
+// cGroup buffer;
4587
+//
4588
+// public void Vertex(Object3D node, Vertex v)
4589
+// {
4590
+//// vertices.add(v);
4591
+//// nodes.addElement(node);
4592
+////
4593
+//// if (temprep.GetCache(v) != null)
4594
+//// {
4595
+//// temprep.Remove(v);
4596
+//// } else
4597
+//// {
4598
+//// temprep.Remember(v);
4599
+//// }
4600
+//
4601
+// //Object3D node = nodes.get(index);
4602
+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
4603
+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
4604
+//
4605
+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
4606
+//
4607
+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
4608
+//
4609
+// cGroup g = new cGroup();
4610
+//
4611
+// if (g.toParent == null)
4612
+// {
4613
+// g.toParent = LA.newMatrix();
4614
+// g.fromParent = LA.newMatrix();
4615
+// }
4616
+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
4617
+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
4618
+//
4619
+// g.add(GrafreeD.clipboard);
4620
+//
4621
+// buffer.add(g);
4622
+// }
4623
+//
4624
+// public void Face(Object3D node, Face f)
4625
+// {
4626
+//
4627
+// }
4628
+//
4629
+// void ParseVerticesOld() // ??
4630
+// {
4631
+// //if (group.selection.size() != 1)
4632
+// // return;
4633
+//
4634
+// temprep = new BoundaryRep();
4635
+// nodes = new Object3D();
4636
+// vertices = new Vector<Vertex>();
4637
+//
4638
+// boolean epsequal = GrafreeD.epsequal;
4639
+// GrafreeD.epsequal = true;
4640
+//
4641
+// for (int i=0; i<group.selection.size(); i++)
4642
+// {
4643
+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
4644
+//
4645
+// group.selection.get(i).Parse(
4646
+//this );
4647
+//
4648
+// int repsize = temprep.VertexCount();
4649
+// int tablesize = temprep.vertextable.size();
4650
+// int nodesize = nodes.size();
4651
+//
4652
+// assert(vertices.size() == nodes.size());
4653
+//
4654
+// temprep.vertextable.elements();
4655
+//
4656
+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
4657
+//
4658
+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
4659
+// {
4660
+// cGroup g = new cGroup();
4661
+//
4662
+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
4663
+//
4664
+// Object3D node = nodes.get(index);
4665
+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
4666
+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
4667
+//
4668
+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
4669
+//
4670
+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
4671
+//
4672
+// if (g.toParent == null)
4673
+// {
4674
+// g.toParent = LA.newMatrix();
4675
+// g.fromParent = LA.newMatrix();
4676
+// }
4677
+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
4678
+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
4679
+//
4680
+// g.add(GrafreeD.clipboard);
4681
+//
4682
+// buffer.add(g);
4683
+// }
4684
+//
4685
+// makeSomething(buffer, i==group.selection.size()-1);
4686
+// }
4687
+//
4688
+// GrafreeD.epsequal = epsequal;
4689
+//
4690
+// //buffer = null;
4691
+// temprep = null;
4692
+// nodes = null;
4693
+//
4694
+// refreshContents();
4695
+// }
4696
+
31844697 void ParseVertices()
31854698 {
3186
- //if (group.selection.size() != 1)
3187
- // return;
3188
-
3189
- temprep = new BoundaryRep();
3190
- nodes = new Object3D();
3191
- vertices = new Vector<Vertex>();
3192
-
3193
- boolean epsequal = GraphreeD.epsequal;
3194
- GraphreeD.epsequal = true;
4699
+ boolean epsequal = Grafreed.epsequal;
4700
+ Grafreed.epsequal = true;
31954701
31964702 for (int i=0; i<group.selection.size(); i++)
31974703 {
3198
- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
4704
+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
31994705
3200
- group.selection.get(i).Parse(this);
3201
-
3202
- int repsize = temprep.VertexCount();
3203
- int tablesize = temprep.vertextable.size();
3204
- int nodesize = nodes.size();
4706
+ group.selection.get(i).Parse(
4707
+
4708
+ new iParse()
4709
+ {
4710
+ public void Vertex(Object3D node, Vertex v)
4711
+ {
4712
+ temp.set(v);
4713
+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
32054714
3206
- assert(vertices.size() == nodes.size());
3207
-
3208
- temprep.vertextable.elements();
3209
-
3210
- java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
4715
+ cGroup g = new cGroup();
32114716
3212
- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213
- {
3214
- cGroup g = new cGroup();
4717
+ if (g.toParent == null)
4718
+ {
4719
+ g.toParent = LA.newMatrix();
4720
+ g.fromParent = LA.newMatrix();
4721
+ }
4722
+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
4723
+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
32154724
3216
- int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
3217
- Object3D node = nodes.get(index);
3218
- temp.set(vertices.get(index)); // temprep.GetVertex(k));
3219
- // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
4725
+ g.add(Grafreed.clipboard);
32204726
3221
- LA.xformPos(temp, node.GlobalTransformInv(), temp);
3222
-
3223
- // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
3224
-
3225
- if (g.toParent == null)
3226
- {
3227
- g.toParent = LA.newMatrix();
3228
- g.fromParent = LA.newMatrix();
3229
- }
3230
- LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3231
- LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
4727
+ buffer.add(g);
4728
+ }
32324729
3233
- g.add(GraphreeD.clipboard);
4730
+ public void Face(Object3D node, Face f)
4731
+ {
32344732
3235
- buffer.add(g);
3236
- }
4733
+ }
4734
+ }
4735
+ );
32374736
32384737 makeSomething(buffer, i==group.selection.size()-1);
32394738 }
32404739
3241
- GraphreeD.epsequal = epsequal;
3242
-
3243
- //buffer = null;
3244
- temprep = null;
3245
- nodes = null;
4740
+ Grafreed.epsequal = epsequal;
32464741
32474742 refreshContents();
32484743 }
3249
-
4744
+
4745
+ void TextureVertices()
4746
+ {
4747
+ for (int i=0; i<group.selection.size(); i++)
4748
+ {
4749
+ group.selection.get(i).Parse(
4750
+ new iParse()
4751
+ {
4752
+ public void Vertex(Object3D node, Vertex v)
4753
+ {
4754
+ cTexture tex = node.GetTextures();
4755
+ String pigment = Object3D.GetPigment(tex);
4756
+ //String bump = Object3D.GetBump(tex);
4757
+
4758
+ com.sun.opengl.util.texture.TextureData texturedata = null;
4759
+
4760
+ try
4761
+ {
4762
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4763
+ }
4764
+ catch (Exception e)
4765
+ {
4766
+ System.err.println("FAIL: " + node);
4767
+ }
4768
+
4769
+ double s = v.s;
4770
+
4771
+ if (s == 1)
4772
+ s = 0;
4773
+
4774
+ double t = v.t;
4775
+
4776
+ if (t == 1)
4777
+ t = 0;
4778
+
4779
+ int indexs = (int) (texturedata.getWidth() * s);
4780
+ int indext = (int) (texturedata.getHeight() * t);
4781
+
4782
+ int index = indext * texturedata.getWidth() + indexs;
4783
+
4784
+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
4785
+
4786
+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
4787
+
4788
+ float scale = bytebuf.get(index*slide) & 0xFF;
4789
+ scale += bytebuf.get(index*slide+1) & 0xFF;
4790
+ scale += bytebuf.get(index*slide+2) & 0xFF;
4791
+ scale /= 3;
4792
+
4793
+ scale /= 0xFF;
4794
+ // c'est quoi ca? scale /= 4;
4795
+
4796
+ //v.AO = scale;
4797
+
4798
+ v.x += v.norm.x * scale;
4799
+ v.y += v.norm.y * scale;
4800
+ v.z += v.norm.z * scale;
4801
+ }
4802
+
4803
+ public void Face(Object3D node, Face f)
4804
+ {
4805
+ }
4806
+ }
4807
+ );
4808
+ }
4809
+
4810
+ refreshContents();
4811
+ }
4812
+
32504813 void Align()
32514814 {
4815
+ if (group.selection.size() == 0)
4816
+ return;
4817
+
4818
+ cVector bbmin = new cVector();
4819
+ cVector bbmax = new cVector();
4820
+
4821
+ group.selection.get(0).getBounds(bbmin, bbmax, true);
4822
+
4823
+ double dx = bbmax.x - bbmin.x;
4824
+ double dy = bbmax.y - bbmin.y;
4825
+ double dz = bbmax.z - bbmin.z;
4826
+
4827
+ double scale = Math.sqrt(dx*dx + dy*dy + dz*dz);
4828
+
32524829 for (int i=0; i<group.selection.size(); i++)
32534830 {
32544831 Object3D obj = group.selection.get(i);
32554832
3256
- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257
- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
4833
+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
4834
+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
32584835 }
32594836
32604837 refreshContents();
....@@ -3267,7 +4844,7 @@
32674844 // ref.SaveSupports();
32684845 // Object3D par = ref.parent;
32694846 // ref.parent = null;
3270
-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
4847
+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
32714848 // ref.parent = par;
32724849 // ref.RestoreSupports();
32734850
....@@ -3275,11 +4852,11 @@
32754852
32764853 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
32774854
3278
- boolean random = CameraPane.RANDOM;
3279
- CameraPane.RANDOM = false; // parse all random nodes
4855
+ boolean random = CameraPane.SWITCH;
4856
+ CameraPane.SWITCH = false; // parse all random nodes
32804857 lowres.linkVerticesThis(null);
32814858 lowres.linkVerticesThis(sn);
3282
- CameraPane.RANDOM = random;
4859
+ CameraPane.SWITCH = random;
32834860
32844861 System.err.flush();
32854862
....@@ -3297,7 +4874,7 @@
32974874 // lowres.SaveSupports();
32984875 // par = lowres.parent;
32994876 // lowres.parent = null;
3300
-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
4877
+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
33014878 Object3D newlow = CloneObject(lowres, false);
33024879 newlow.name = sn.switchobject.get(i).name;
33034880 System.out.println(" pose#" + i + " = " + newlow);
....@@ -3319,7 +4896,7 @@
33194896 return;
33204897
33214898 Object3D poses = group.selection.get(0);
3322
- Object3D ref = GraphreeD.clipboard.get(0);
4899
+ Object3D ref = Grafreed.clipboard.get(0);
33234900
33244901 Object3D newgroup = new Object3D("Po:" + poses.name);
33254902
....@@ -3488,7 +5065,7 @@
34885065 group.selection.RelinkToSupport(); // july 2014
34895066 System.out.println("DONE.");
34905067 refreshContents();
3491
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
5068
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
34925069 }
34935070
34945071 void ReduceMesh(boolean reduction34)
....@@ -3513,20 +5090,20 @@
35135090
35145091 void ClipMesh()
35155092 {
3516
- if (/*group.selection.size() == 1 &&*/ GraphreeD.clipboard.size() == 1)
5093
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
35175094 {
3518
- Object3D content = GraphreeD.clipboard.get(0);
5095
+ Object3D content = Grafreed.clipboard.get(0);
35195096
35205097 if (content instanceof cGroup && ((cGroup)content).transientlink )
35215098 content = ((cGroup)content).get(0);
35225099
35235100 // for (int i=0; i<group.selection.size(); i++)
35245101 // {
3525
-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
5102
+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
35265103 // }
3527
- group.selection.ClipMesh(GraphreeD.clipboard);
5104
+ group.selection.ClipMesh(Grafreed.clipboard);
35285105 }
3529
-// group.selection.ClipMesh(GraphreeD.clipboard);
5106
+// group.selection.ClipMesh(GrafreeD.clipboard);
35305107 System.out.println("DONE.");
35315108 refreshContents();
35325109 }
....@@ -3541,6 +5118,12 @@
35415118 void ClearMaterials()
35425119 {
35435120 group.selection.ClearMaterials();
5121
+ refreshContents();
5122
+ }
5123
+
5124
+ void ClearVersions()
5125
+ {
5126
+ group.selection.ClearVersions();
35445127 refreshContents();
35455128 }
35465129
....@@ -3571,6 +5154,18 @@
35715154 void MarkLeaves(boolean hide)
35725155 {
35735156 group.selection.MarkLeaves(hide);
5157
+ refreshContents();
5158
+ }
5159
+
5160
+ void RewindLeaves(boolean hide)
5161
+ {
5162
+ group.selection.RewindLeaves(hide);
5163
+ refreshContents();
5164
+ }
5165
+
5166
+ void RandomLeaves(boolean hide)
5167
+ {
5168
+ group.selection.RandomLeaves(hide);
35745169 refreshContents();
35755170 }
35765171
....@@ -3645,28 +5240,25 @@
36455240 // }
36465241 // }
36475242
3648
- static boolean allparams = true;
3649
-
3650
- static Vector<Object3D> listUI = new Vector<Object3D>();
3651
-
36525243 void EditSelection(boolean newWindow)
36535244 {
5245
+ if (group.selection == null)
5246
+ {
5247
+ EditElement(group, newWindow); // ? new
5248
+ return;
5249
+ }
5250
+
36545251 // aConstraints.gridy = 0;
36555252 for (int i=0; i<group.selection.size(); i++)
36565253 {
36575254 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
36585255 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3659
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5256
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
36605257
36615258 Object3D elem = (Object3D)group.selection.elementAt(i);
3662
- if(elem != group)
5259
+ if(elem != group || !newWindow)
36635260 {
3664
- // if (!(elem instanceof Composite))
3665
- // newWindow = false;
3666
- listUI.add(elem);
3667
- elem.openEditWindow(this, newWindow); //, false);
3668
- System.out.println("edit : " + elem);
3669
- elem.editWindow.refreshContents(true); // ? new
5261
+ EditElement(elem, newWindow); // ? new
36705262 }
36715263 }
36725264 }
....@@ -3729,9 +5321,7 @@
37295321
37305322 freezemodel = false;
37315323 }
3732
-
3733
- boolean flashIt = true;
3734
-
5324
+
37355325 public void valueChanged(TreeSelectionEvent e)
37365326 //public boolean handleEvent(Event event)
37375327 {
....@@ -3741,7 +5331,8 @@
37415331 //new Exception().printStackTrace();
37425332
37435333 freezemodel = true;
3744
-
5334
+ ClearUnpinned();
5335
+
37455336 /**/
37465337 //switch (event.id)
37475338 {
....@@ -3749,7 +5340,6 @@
37495340 //case 702: // Event.LIST_DESELECT
37505341 group.deselectAll();
37515342 TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752
- objEditor.ClearInfo(); // .GetMaterial());
37535343 if (tps != null)
37545344 {
37555345 for (int i=0; i < tps.length; i++)
....@@ -3758,33 +5348,39 @@
37585348
37595349 //if (child.parent != null)
37605350 //child.parent.addSelectee(child);
5351
+ objEditor.SetMaterial(child);
37615352 group.addSelectee(child);
3762
- objEditor.SetMaterial(child); // .GetMaterial());
3763
- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764
- System.err.println("info : " + child.GetPath());
37655353 }
37665354 }
3767
- else
3768
- {
3769
- objEditor.SetMaterial(group); // .GetMaterial());
3770
- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771
- System.err.println("info : " + group.GetPath());
3772
- }
5355
+// else
5356
+// {
5357
+// objEditor.SetMaterial(group); // .GetMaterial());
5358
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
5359
+// System.err.println("info : " + group.GetPath());
5360
+// }
37735361
3774
- objEditor.SetText(); // jan 2014
3775
-
3776
- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5362
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
37775363 CameraPane.flash = true;
37785364
3779
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5365
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
37805366 // a camera
37815367 {
3782
- CameraPane.camerachangeframe = 0; // don't refuse it
3783
- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3784
- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3785
- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
5368
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5369
+ {
5370
+ CameraPane.camerachangeframe = 0; // don't refuse it
5371
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5372
+ }
5373
+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5374
+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
37865375 }
37875376
5377
+ if (tps != null && tps.length == 1)
5378
+ {
5379
+ EditSelection(false);
5380
+ }
5381
+
5382
+ SetPinStates(tps != null && tps.length > 0);
5383
+
37885384 refreshContents();
37895385 //return true;
37905386 }
....@@ -3793,6 +5389,53 @@
37935389
37945390 freezemodel = false;
37955391 }
5392
+
5393
+ void SetPinStates(boolean enabled)
5394
+ {
5395
+ editButton.setEnabled(enabled);
5396
+ uneditButton.setEnabled(enabled);
5397
+ //unselectButton.setEnabled(enabled);
5398
+ flashSelectionButton.setEnabled(enabled);
5399
+
5400
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5401
+
5402
+ boolean allComposites = true;
5403
+
5404
+ if (group.selection != null)
5405
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5406
+ {
5407
+ Object next = e.nextElement();
5408
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5409
+ {
5410
+ allComposites = false;
5411
+ break;
5412
+ }
5413
+ }
5414
+
5415
+ rootButton.setEnabled(allComposites);
5416
+ }
5417
+
5418
+ void refreshContents(boolean cp)
5419
+ {
5420
+ if (Globals.ADVANCED)
5421
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5422
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5423
+ {
5424
+ objEditor.ClearInfo(); // .GetMaterial());
5425
+
5426
+ for (int i=0; i < group.selection.Size(); i++)
5427
+ {
5428
+ Object3D child = (Object3D) group.selection.get(i);
5429
+
5430
+ objEditor.AddInfo(child, this, true);
5431
+// System.err.println("info : " + child.GetPath());
5432
+ }
5433
+
5434
+ objEditor.SetText(); // jan 2014
5435
+ }
5436
+
5437
+ super.refreshContents(cp);
5438
+ }
37965439
37975440 void linkSomething(Object3D thing)
37985441 {
....@@ -3864,16 +5507,19 @@
38645507 {
38655508 if (group.selection.isEmpty())
38665509 return;
3867
- GraphreeD.clipboardIsTempGroup = false;
5510
+
5511
+ Grafreed.clipboardIsTempGroup = false;
38685512 Composite tGroup = null;
38695513 if (group.selection.size() > 0) // 1)
38705514 {
38715515 tGroup = new cGroup();
3872
- GraphreeD.clipboardIsTempGroup = true;
5516
+ Grafreed.clipboardIsTempGroup = true;
38735517 }
38745518
38755519 if (cut)
38765520 {
5521
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5522
+// Save();
38775523 //int indices[] = jList.getSelectedIndices();
38785524 //for (int i = indices.length - 1; i >= 0; i--)
38795525 //jList.remove(indices[i]);
....@@ -3909,16 +5555,16 @@
39095555 //System.out.println("cut " + child);
39105556 //System.out.println("parent = " + child.parent);
39115557 // tmp.addChild(child);
3912
- if (GraphreeD.clipboardIsTempGroup)
5558
+ if (Grafreed.clipboardIsTempGroup)
39135559 tGroup.add/*Child*/(tmp);
39145560 else
3915
- GraphreeD.clipboard = tmp;
5561
+ Grafreed.clipboard = tmp;
39165562 }
39175563 else
3918
- if (GraphreeD.clipboardIsTempGroup)
5564
+ if (Grafreed.clipboardIsTempGroup)
39195565 tGroup.add/*Child*/(child);
39205566 else
3921
- GraphreeD.clipboard = child;
5567
+ Grafreed.clipboard = child;
39225568 }
39235569
39245570 //ResetModel();
....@@ -3950,21 +5596,23 @@
39505596 //System.out.println("cut " + elem);
39515597 //System.out.println("parent = " + elem.parent);
39525598 // tmp.addChild(elem);
3953
- if (GraphreeD.clipboardIsTempGroup)
5599
+ if (Grafreed.clipboardIsTempGroup)
39545600 tGroup.add/*Child*/(tmp);
39555601 else
3956
- GraphreeD.clipboard = tmp;
5602
+ Grafreed.clipboard = tmp;
39575603 }
39585604 else
3959
- if (GraphreeD.clipboardIsTempGroup)
5605
+ if (Grafreed.clipboardIsTempGroup)
39605606 tGroup.add/*Child*/(child);
39615607 else
3962
- GraphreeD.clipboard = child;
5608
+ Grafreed.clipboard = child;
39635609 }
39645610
39655611 }
3966
- if (GraphreeD.clipboardIsTempGroup)
3967
- GraphreeD.clipboard = tGroup;
5612
+
5613
+ if (Grafreed.clipboardIsTempGroup)
5614
+ Grafreed.clipboard = tGroup;
5615
+
39685616 if (cut)
39695617 {
39705618 ResetModel();
....@@ -3974,11 +5622,15 @@
39745622
39755623 void paste(boolean expand)
39765624 {
3977
- // if (GraphreeD.clipboard == null)
5625
+ if (Globals.REPLACEONMAKE)
5626
+ Save();
5627
+ boolean keep = Globals.REPLACEONMAKE;
5628
+ Globals.REPLACEONMAKE = false;
5629
+ // if (GrafreeD.clipboard == null)
39785630 // return;
39795631 boolean first = true;
39805632
3981
- if (GraphreeD.clipboardIsTempGroup)
5633
+ if (Grafreed.clipboardIsTempGroup)
39825634 {
39835635 Composite temp;
39845636
....@@ -3989,7 +5641,7 @@
39895641 temp = (Composite)Applet3D.clipboard.deepCopy();
39905642 */
39915643 Object3D elem;
3992
- for (Enumeration e = /*temp.children*/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
5644
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
39935645 {
39945646 Object3D child = (Object3D)e.nextElement();
39955647
....@@ -4003,7 +5655,7 @@
40035655 else
40045656 elem = child.deepCopy(); // ?
40055657 child.parent = keepparent;
4006
- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
5658
+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
40075659 // elem = elem.get(0);
40085660 makeSomething(elem, true); // ?? first);
40095661 //group.addChild(elem);
....@@ -4023,23 +5675,24 @@
40235675 //Object3D cb = Applet3D.clipboard;
40245676 //temp.addChild(cb);
40255677 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4026
- assert(GraphreeD.clipboard.parent == null);
4027
- Object3D /*Composite*/ keepparent = GraphreeD.clipboard.get(0).parent;
4028
- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4029
- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4030
- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
5678
+ assert(Grafreed.clipboard.parent == null);
5679
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
5680
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
5681
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
5682
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
40315683 else
4032
- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033
- GraphreeD.clipboard.get(0).parent = keepparent;
5684
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5685
+ Grafreed.clipboard.get(0).parent = keepparent;
40345686 }
40355687
5688
+ Globals.REPLACEONMAKE = keep;
40365689 ResetModel();
40375690 refreshContents();
40385691 }
40395692
4040
- void pasteInto(boolean copyit)
5693
+ void pasteInto(boolean copyit, boolean clone)
40415694 {
4042
-// if (GraphreeD.clipboard == null)
5695
+// if (GrafreeD.clipboard == null)
40435696 // return;
40445697
40455698 if (group.selection.size() != 1)
....@@ -4066,15 +5719,22 @@
40665719 if (copyit)
40675720 {
40685721 // paste(false);
4069
- CloneClipboard(false); // sept 2014
5722
+ if (clone)
5723
+ {
5724
+ CloneClipboard(false); // sept 2014
5725
+ }
5726
+ else
5727
+ {
5728
+ paste(false);
5729
+ }
40705730 }
40715731 else
40725732 {
40735733 boolean first = true;
40745734
4075
- if (GraphreeD.clipboardIsTempGroup)
5735
+ if (Grafreed.clipboardIsTempGroup)
40765736 {
4077
- Composite temp = (Composite)GraphreeD.clipboard;
5737
+ Composite temp = (Composite)Grafreed.clipboard;
40785738 Object3D copy;
40795739 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
40805740 {
....@@ -4084,7 +5744,7 @@
40845744 }
40855745 } else
40865746 {
4087
- linkSomething(GraphreeD.clipboard); //.get(0));
5747
+ linkSomething(Grafreed.clipboard); //.get(0));
40885748 }
40895749 }
40905750 }
....@@ -4161,6 +5821,10 @@
41615821
41625822 void group(Object3D csg, boolean grab)
41635823 {
5824
+ if (Globals.REPLACEONMAKE)
5825
+ Save();
5826
+ boolean keep = Globals.REPLACEONMAKE;
5827
+ Globals.REPLACEONMAKE = false;
41645828 if (//false) // why??
41655829 !group.selection.isEmpty())
41665830 {
....@@ -4274,8 +5938,34 @@
42745938 //node.add(csg);
42755939 //makeSomething(node);
42765940 makeSomething(csg);
5941
+ Globals.REPLACEONMAKE = keep;
42775942 }
42785943
5944
+ void Ungroup(Object3D g)
5945
+ {
5946
+ if (Globals.REPLACEONMAKE)
5947
+ Save();
5948
+ boolean keep = Globals.REPLACEONMAKE;
5949
+ Globals.REPLACEONMAKE = false;
5950
+ if (g instanceof HiddenObject)
5951
+ {
5952
+ HiddenObject h = (HiddenObject) g;
5953
+
5954
+ for (int i=0; i<h.ActualSize(); i++)
5955
+ {
5956
+ objEditor.makeSomething(h.get(i), false);
5957
+ }
5958
+ }
5959
+ else
5960
+ {
5961
+ for (int i=0; i<g.Size(); i++)
5962
+ {
5963
+ objEditor.makeSomething(g.get(i), false);
5964
+ }
5965
+ }
5966
+ Globals.REPLACEONMAKE = keep;
5967
+ }
5968
+
42795969 void ungroup()
42805970 {
42815971 /*
....@@ -4469,21 +6159,6 @@
44696159 }
44706160 */
44716161
4472
- void ImportGFD()
4473
- {
4474
- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4475
- browser.show();
4476
- String filename = browser.getFile();
4477
- if (filename != null && filename.length() > 0)
4478
- {
4479
- String fullname = browser.getDirectory() + filename;
4480
-
4481
- //Object3D readobj =
4482
- objEditor.ReadGFD(fullname, objEditor);
4483
- //makeSomething(readobj);
4484
- }
4485
- }
4486
-
44876162 /*
44886163 public void Callback(Object obj)
44896164 {
....@@ -4507,26 +6182,9 @@
45076182 }
45086183 */
45096184
4510
- void ImportVRMLX3D()
4511
- {
4512
- if (GraphreeD.standAlone)
4513
- {
4514
- /**/
4515
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4516
- browser.show();
4517
- String filename = browser.getFile();
4518
- if (filename != null && filename.length() > 0)
4519
- {
4520
- String fullname = browser.getDirectory() + filename;
4521
- LoadVRMLX3D(fullname);
4522
- }
4523
- /**/
4524
- }
4525
- }
4526
-
45276185 String GetFile(String dialogName)
45286186 {
4529
- if (GraphreeD.standAlone)
6187
+ if (Grafreed.standAlone)
45306188 {
45316189 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
45326190 browser.show();
....@@ -4590,10 +6248,48 @@
45906248 cButton flashSelectionButton;
45916249 cButton editButton;
45926250 cButton uneditButton;
6251
+ JCheckBox allParamsButton;
45936252 cButton clearpanelButton;
4594
- cButton allParamsButton;
45956253 cButton unselectButton;
45966254
6255
+ cButton restoreCameraButton;
6256
+
6257
+ cButton oneStepButton;
6258
+
6259
+ cButton groupButton;
6260
+ cButton ungroupButton;
6261
+ cButton compositeButton;
6262
+ cButton switchButton;
6263
+ cButton loopButton;
6264
+ cButton textureButton;
6265
+
6266
+ cButton skybox1Button;
6267
+ cButton skybox2Button;
6268
+ cButton skybox3Button;
6269
+ cButton skybox4Button;
6270
+ cButton skybox5Button;
6271
+ cButton skybox6Button;
6272
+ cButton skybox7Button;
6273
+
6274
+ cButton skybox11Button;
6275
+ cButton skybox12Button;
6276
+ cButton skybox13Button;
6277
+ cButton skybox14Button;
6278
+ cButton skybox15Button;
6279
+ cButton skybox16Button;
6280
+ cButton skybox17Button;
6281
+
6282
+ cButton gridButton;
6283
+ cButton boxButton;
6284
+ cButton sphereButton;
6285
+ cButton coneButton;
6286
+ cButton torusButton;
6287
+ cButton superButton;
6288
+ cButton kleinButton;
6289
+ cButton particlesButton;
6290
+ cButton overlayButton;
6291
+ cButton lightButton;
6292
+
45976293 cButton screenfitButton;
45986294 cButton screenfitpointButton;
45996295 cButton snapobjectButton;
....@@ -4605,14 +6301,6 @@
46056301
46066302 cButton setsupportButton;
46076303
4608
- cButton twoButton;
4609
- cButton sixButton;
4610
- cButton threeButton;
4611
- cButton sevenButton;
4612
- cButton fourButton; // full panel
4613
- cButton oneButton; // full XYZ
4614
- //cButton currentLayout;
4615
-
46166304 //
46176305 //Composite
46186306 Object3D // to do !!
....@@ -4622,10 +6310,12 @@
46226310 //JTree jTree;
46236311 private MenuItem lookAtItem;
46246312 private MenuItem lookFromItem;
4625
- private MenuItem switchItem;
4626
- private MenuItem cutItem;
4627
- private MenuItem duplicateItem;
4628
- private MenuItem cloneItem;
6313
+ private MenuItem switchViewItem;
6314
+ private JMenuItem cutItem;
6315
+ private MenuItem undoItem;
6316
+ private MenuItem redoItem;
6317
+ private JMenuItem duplicateItem;
6318
+ private JMenuItem cloneItem;
46296319 private MenuItem cloneSupportItem;
46306320 private MenuItem overwriteGeoItem;
46316321 private MenuItem overwriteMatItem;
....@@ -4635,8 +6325,9 @@
46356325 private MenuItem resetsupportItem;
46366326 private MenuItem resetreferencesItem;
46376327 private MenuItem linkverticesItem;
6328
+ private MenuItem relinkverticesItem;
46386329 private MenuItem setMasterItem;
4639
- private MenuItem resetMeshItem;
6330
+ private MenuItem resetAllItem;
46406331 private MenuItem stepAllItem;
46416332 private MenuItem revertMeshItem;
46426333 private MenuItem poseMeshItem;
....@@ -4645,16 +6336,19 @@
46456336 private MenuItem cloneGeometriesItem;
46466337 private MenuItem shareGeometriesItem;
46476338 private MenuItem mergeGeometriesItem;
4648
- private MenuItem copyItem;
6339
+ private JMenuItem copyItem;
46496340 private MenuItem pasteItem;
4650
- private MenuItem pasteLinkItem;
4651
- private MenuItem pasteCloneItem;
4652
- private MenuItem pasteExpandItem;
4653
- private MenuItem clearItem;
6341
+ private JMenuItem pasteIntoItem;
6342
+ private JMenuItem pasteLinkItem;
6343
+ private JMenuItem pasteCloneItem;
6344
+ private JMenuItem pasteExpandItem;
6345
+ private JMenuItem deleteItem;
46546346 private MenuItem clearAllItem;
46556347 private MenuItem genUVItem;
6348
+ private MenuItem genNormalsMESHItem;
46566349 private MenuItem genNormalsCADItem;
46576350 private MenuItem genNormalsORGANItem;
6351
+ private MenuItem genNormalsMINEItem;
46586352 private MenuItem stripifyItem;
46596353 private MenuItem unstripifyItem;
46606354 private MenuItem trimItem;
....@@ -4674,6 +6368,7 @@
46746368 private MenuItem clipMeshItem;
46756369 private MenuItem smoothMeshItem;
46766370 private MenuItem clearMaterialsItem;
6371
+ private MenuItem clearVersionsItem;
46776372
46786373 private MenuItem liveleavesItem;
46796374 private MenuItem unliveleavesItem;
....@@ -4683,6 +6378,10 @@
46836378 private MenuItem showleavesItem;
46846379 private MenuItem markleavesItem;
46856380 private MenuItem unmarkleavesItem;
6381
+ private MenuItem rewindleavesItem;
6382
+ private MenuItem unrewindleavesItem;
6383
+ private MenuItem randomleavesItem;
6384
+ private MenuItem unrandomleavesItem;
46866385
46876386 private MenuItem flipVItem;
46886387 private MenuItem unflipVItem;
....@@ -4694,14 +6393,17 @@
46946393 private MenuItem panoTexturesItem;
46956394
46966395 private MenuItem resetCentroidItem;
4697
- private MenuItem transformgeometryItem;
6396
+ private MenuItem resetCentroidXZItem;
46986397 private MenuItem resetTransformItem;
4699
- private MenuItem grabItem;
6398
+ private MenuItem transformGeometryItem;
6399
+ private MenuItem transformChildrenItem;
6400
+ private MenuItem hideItem;
6401
+ private JMenuItem grabItem;
47006402 private MenuItem backItem;
47016403 private MenuItem frontItem;
47026404 private MenuItem cameraItem;
47036405 private MenuItem compositeItem;
4704
- private MenuItem randomItem;
6406
+ private MenuItem switchItem;
47056407 private MenuItem physicsItem;
47066408 private MenuItem frameselectorItem;
47076409 private MenuItem scriptNodeItem;
....@@ -4709,13 +6411,14 @@
47096411 private MenuItem switchTransfoItem;
47106412 private MenuItem morphItem;
47116413 private MenuItem linkerItem;
4712
- private MenuItem ungroupItem;
6414
+ private JMenuItem ungroupItem;
47136415 private MenuItem editItem;
47146416 private MenuItem openWindowItem;
47156417 private MenuItem editLeafItem;
47166418
47176419 private MenuItem resetParentItem;
47186420 private MenuItem repairParentItem;
6421
+ private MenuItem repairShadowItem;
47196422 private MenuItem sortbysizeItem;
47206423 private MenuItem sortbynameItem;
47216424
....@@ -4724,20 +6427,25 @@
47246427 private MenuItem attachBumpItem;
47256428 private MenuItem detachBumpItem;
47266429 private MenuItem pigmentBumpItem;
6430
+ private MenuItem embedTexturesItem;
6431
+ private MenuItem deEmbedTexturesItem;
47276432
47286433 private MenuItem particleItem;
47296434 private MenuItem ragdollItem;
47306435 private MenuItem ragdoll2Item;
6436
+ private MenuItem heightFieldItem;
6437
+ private MenuItem textureFieldItem;
47316438 private MenuItem gridItem;
47326439 private MenuItem rectoidItem;
47336440 private MenuItem ellipsoidItem;
47346441 private MenuItem coneItem;
47356442 private MenuItem torusItem;
47366443 private MenuItem superItem;
6444
+ private MenuItem kleinItem;
47376445 private MenuItem blobItem;
47386446 private MenuItem latheItem;
47396447 private MenuItem bezierItem;
4740
- private MenuItem checkerItem;
6448
+ private MenuItem overlayItem;
47416449 private MenuItem meshItem;
47426450 // private MenuItem meshGroupItem;
47436451 private MenuItem springItem;
....@@ -4746,6 +6454,7 @@
47466454 private MenuItem csgItem;
47476455 private MenuItem templateItem;
47486456 private MenuItem textureItem;
6457
+ private MenuItem billboardItem;
47496458 private MenuItem shadowXItem;
47506459 private MenuItem shadowYItem;
47516460 private MenuItem shadowZItem;
....@@ -4758,11 +6467,6 @@
47586467 private MenuItem doubleItem;
47596468 private MenuItem tripleItem;
47606469
4761
- private MenuItem importGFDItem;
4762
- private MenuItem importVRMLX3DItem;
4763
- private MenuItem import3DSItem;
4764
- private MenuItem importOBJItem;
4765
-
47666470 private MenuItem computeAOItem;
47676471 private MenuItem recompileItem;
47686472 private MenuItem editScriptItem;
....@@ -4772,4 +6476,8 @@
47726476 private MenuItem analyzeItem;
47736477 private MenuItem dumpItem;
47746478 //boolean freezemodel = false;
6479
+
6480
+ Menu cameraMenu;
6481
+ MenuItem editCameraItem;
6482
+ MenuItem restoreCameraItem;
47756483 }