Normand Briere
2019-09-20 cbe4e90105d07d7d3fecabffaa01342403aa2ae3
GroupEditor.java
....@@ -16,6 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1920 ObjectUI,
2021 Runnable,
2122 ActionListener,
....@@ -23,6 +24,350 @@
2324 DragGestureListener, DragSourceListener, DropTargetListener,
2425 ItemListener // ListSelectionListener
2526 {
27
+
28
+ public void AddSkyboxButton(String f, String s, cGridBag row)
29
+ {
30
+ cButton skyboxButton;
31
+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !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
+
26371 //ObjEditor objEditor;
27372 public void closeUI2()
28373 {
....@@ -60,6 +405,16 @@
60405 this.copy = this.group = group;
61406 //selectees = this.group.selectees;
62407
408
+ assert(false);
409
+
410
+// if (copy.versionlist == null)
411
+// {
412
+// copy.versionlist = new Object3D[100];
413
+// copy.versionindex = -1;
414
+//
415
+// //Save(true);
416
+// }
417
+
63418 if(ui)
64419 SetupUI(objEditor);
65420 }
....@@ -74,16 +429,28 @@
74429 this.copy = this.group = copy;
75430 //selectees = this.group.selectees;
76431
77
- SetupMenu2(objEditor);
432
+ SetupMenu2(this); //objEditor);
78433 SetupUI2(objEditor);
79434 objEditor.SetupUI(true);
80435 SetupViews(objEditor);
81436
82437 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
438
+
439
+// if (copy.versionlist == null)
440
+// {
441
+// copy.versionlist = new Object3D[100];
442
+// copy.versionindex = -1;
443
+//
444
+// //Save(true);
445
+// }
83446 }
84447
85448 void CloneSelection(boolean supports)
86449 {
450
+ if (Globals.REPLACEONMAKE)
451
+ Save();
452
+ boolean keep = Globals.REPLACEONMAKE;
453
+ Globals.REPLACEONMAKE = false;
87454 // Object3D keep = GrafreeD.clipboard;
88455 //Object3D obj;
89456 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,18 +461,19 @@
94461
95462 makeSomething(clone, i==group.selection.size()-1);
96463 }
464
+ Globals.REPLACEONMAKE = keep;
97465 }
98466
99467 void CloneClipboard(boolean supports)
100468 {
101
- assert(GrafreeD.clipboard.parent == null);
102
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
103
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105
- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
469
+ assert(Grafreed.clipboard.parent == null);
470
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
471
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
472
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
473
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106474 else
107
- makeSomething(CloneObject(GrafreeD.clipboard, false));
108
- GrafreeD.clipboard.get(0).parent = keepparent;
475
+ makeSomething(CloneObject(Grafreed.clipboard, false));
476
+ Grafreed.clipboard.get(0).parent = keepparent;
109477 }
110478
111479 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -115,11 +483,16 @@
115483
116484 Object3D parent = obj.parent;
117485 obj.parent = null;
486
+
118487 // Object3D support = obj.support;
119488 // obj.support = null;
120489 if (!supports)
121490 obj.SaveSupports();
122
- Object3D clone = (Object3D)GrafreeD.clone(obj);
491
+
492
+ Object3D clone = (Object3D)Grafreed.clone(obj);
493
+
494
+ clone.ResetUUIDs();
495
+
123496 obj.parent = parent;
124497 // obj.support = support;
125498 // clone.support = support; // aout 2013
....@@ -148,58 +521,155 @@
148521
149522 //JTextField nameField;
150523
151
- void SetupMenu2(ObjEditor oe)
524
+ void SetupMenu2(GroupEditor oe)
152525 {
153
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157
- oe.cameraMenu.add("-");
158
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159
- openWindowItem.addActionListener(this);
160
- editLeafItem.addActionListener(this);
161
- lookAtItem.addActionListener(this);
162
- //lookFromItem.addActinoListener(this);
163
- //switchItem.addActionListener(this);
526
+ oe.jTree = new cTree();
527
+
164528 Menu menu;
165529 oe.menuBar.add(menu = new Menu("Edit"));
166530 //editItem = menu.add(new MenuItem("Edit"));
167531 //editItem.addActionListener(this);
168
- duplicateItem = menu.add(new MenuItem("Duplicate"));
532
+
533
+// undoItem = menu.add(new MenuItem("Undo"));
534
+// undoItem.addActionListener(this);
535
+// redoItem = menu.add(new MenuItem("Redo"));
536
+// redoItem.addActionListener(this);
537
+// menu.add("-");
538
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169539 duplicateItem.addActionListener(this);
170
- menu.add("-");
171
- cloneItem = menu.add(new MenuItem("Clone"));
540
+
541
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
172542 cloneItem.addActionListener(this);
543
+ //if (Globals.ADVANCED)
544
+ {
173545 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174546 cloneSupportItem.addActionListener(this);
547
+ }
548
+ oe.jTree.popup.addSeparator();
175549 menu.add("-");
176
- cutItem = menu.add(new MenuItem("Cut"));
550
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
177551 cutItem.addActionListener(this);
178
- copyItem = menu.add(new MenuItem("Copy"));
552
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
179553 copyItem.addActionListener(this);
180554 pasteItem = menu.add(new MenuItem("Paste"));
181555 pasteItem.addActionListener(this);
182
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
556
+
557
+ oe.jTree.popup.addSeparator();
558
+ //menu.add("-");
559
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
560
+ pasteIntoItem.addActionListener(this);
561
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
183562 pasteLinkItem.addActionListener(this);
184
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
563
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
185564 pasteCloneItem.addActionListener(this);
186
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187
-// pasteExpandItem.addActionListener(this);
188
- clearItem = menu.add(new MenuItem("Clear"));
189
- clearItem.addActionListener(this);
565
+// CRASH
566
+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
567
+//
568
+ pasteExpandItem.addActionListener(this);
569
+ //menu.add("-");
570
+ oe.jTree.popup.addSeparator();
571
+
572
+ if (Globals.ADVANCED)
573
+ {
574
+ // Deletes the cameras...
190575 clearAllItem = menu.add(new MenuItem("Clear All"));
191576 clearAllItem.addActionListener(this);
577
+ }
578
+
579
+ menuBar.add(cameraMenu = new Menu("View"));
580
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
581
+ //zBufferItem.addActionListener(this);
582
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
583
+ //normalLensItem.addActionListener(this);
584
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
585
+ restoreCameraItem.addActionListener(this);
586
+
587
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
588
+// toggleFullScreenItem.addItemListener(this);
589
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
590
+// cameraMenu.add("-");
591
+//
592
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
593
+// toggleTextureItem.addItemListener(this);
594
+// toggleTextureItem.setState(CameraPane.textureon);
595
+//
596
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
597
+// toggleSwitchItem.addItemListener(this);
598
+// toggleSwitchItem.setState(CameraPane.SWITCH);
599
+
600
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
601
+ toggleHandleItem.addItemListener(this);
602
+ toggleHandleItem.setState(CameraPane.HANDLES);
603
+
604
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
605
+ togglePaintItem.addItemListener(this);
606
+ togglePaintItem.setState(CameraPane.PAINTMODE);
607
+
608
+ if (Globals.ADVANCED)
609
+ {
610
+ cameraMenu.add("-");
611
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
612
+ toggleLiveItem.addItemListener(this);
613
+ toggleLiveItem.setState(Globals.isLIVE());
192614
615
+ cameraMenu.add(stepItem = new MenuItem("Step"));
616
+ stepItem.addActionListener(this);
617
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
618
+ // toggleDLItem.addItemListener(this);
619
+ // toggleDLItem.setState(false);
620
+
621
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
622
+ toggleRenderItem.addItemListener(this);
623
+ toggleRenderItem.setState(!CameraPane.frozen);
624
+
625
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
626
+ toggleDebugItem.addItemListener(this);
627
+ toggleDebugItem.setState(Globals.DEBUG);
628
+
629
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
630
+ toggleFrustumItem.addItemListener(this);
631
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
632
+
633
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
634
+ toggleFootContactItem.addItemListener(this);
635
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
636
+
637
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
638
+ toggleTimelineItem.addItemListener(this);
639
+ }
640
+
641
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
642
+// toggleRootItem.addItemListener(this);
643
+// toggleRootItem.setState(false);
644
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
645
+// animationItem.addItemListener(this);
646
+// animationItem.setState(CameraPane.ANIMATION);
647
+ cameraMenu.add("-");
648
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
649
+ editCameraItem.addActionListener(this);
650
+
651
+ if (Globals.ADVANCED)
652
+ {
653
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
654
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
655
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
656
+ oe.cameraMenu.add("-");
657
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
658
+ openWindowItem.addActionListener(this);
659
+ lookAtItem.addActionListener(this);
660
+ //lookFromItem.addActinoListener(this);
661
+ //switchViewItem.addActionListener(this);
662
+ }
663
+
193664 oe.menuBar.add(menu = new Menu("Setting"));
194
- resetMeshItem = menu.add(new MenuItem("Reset All"));
195
- resetMeshItem.addActionListener(this);
196
- stepAllItem = menu.add(new MenuItem("Step All"));
197
- stepAllItem.addActionListener(this);
665
+ if (Globals.ADVANCED)
666
+ {
198667 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199668 revertMeshItem.addActionListener(this);
200669 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201670 resetreferencesItem.addActionListener(this);
202671 menu.add("-");
672
+ }
203673 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204674 overwriteGeoItem.addActionListener(this);
205675 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -211,79 +681,118 @@
211681 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212682 overwriteUVItem.addActionListener(this);
213683 menu.add("-");
684
+ if (Globals.ADVANCED)
685
+ {
214686 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215687 generateMeshItem.addActionListener(this);
216688 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217689 poseMeshItem.addActionListener(this);
218690 menu.add("-");
691
+ }
219692 resetsupportItem = menu.add(new MenuItem("Reset support"));
220693 resetsupportItem.addActionListener(this);
221694 linkverticesItem = menu.add(new MenuItem("Link to Support"));
222695 linkverticesItem.addActionListener(this);
223696 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224697 relinkverticesItem.addActionListener(this);
698
+
699
+ if (Globals.ADVANCED)
700
+ {
225701 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226702 setMasterItem.addActionListener(this);
703
+ }
227704
228
- oe.menuBar.add(menu = new Menu("Group"));
229
- grabItem = menu.add(new MenuItem("Grab"));
230
- grabItem.addActionListener(this);
705
+ oe.menuBar.add(menu = new Menu("Order"));
706
+
231707 backItem = menu.add(new MenuItem("Back"));
232708 backItem.addActionListener(this);
233709 frontItem = menu.add(new MenuItem("Front"));
234710 frontItem.addActionListener(this);
235
- compositeItem = menu.add(new MenuItem("Composite"));
236
- compositeItem.addActionListener(this);
237
- hideItem = menu.add(new MenuItem("Hide"));
711
+// compositeItem = menu.add(new MenuItem("Composite"));
712
+// compositeItem.addActionListener(this);
713
+
714
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
715
+ grabItem.addActionListener(this);
716
+
717
+ if (Globals.ADVANCED)
718
+ {
719
+ hideItem = menu.add(new MenuItem("Hidden Group"));
238720 hideItem.addActionListener(this);
239
- ungroupItem = menu.add(new MenuItem("Ungroup"));
721
+ }
722
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
240723 ungroupItem.addActionListener(this);
241
- menu.add("-");
242
- randomItem = menu.add(new MenuItem("Random"));
243
- randomItem.addActionListener(this);
244
- physicsItem = menu.add(new MenuItem("Physics"));
245
- physicsItem.addActionListener(this);
246
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247
- frameselectorItem.addActionListener(this);
724
+
725
+ oe.jTree.popup.addSeparator();
726
+
727
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
728
+ deleteItem.addActionListener(this);
729
+
730
+// menu.add("-");
731
+//
732
+// switchItem = menu.add(new MenuItem("Switch node"));
733
+// switchItem.addActionListener(this);
734
+ if (Globals.ADVANCED)
735
+ {
248736 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249737 switchGeoItem.addActionListener(this);
250738 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251739 switchTransfoItem.addActionListener(this);
252
- morphItem = menu.add(new MenuItem("Morph"));
740
+ morphItem = menu.add(new MenuItem("Morph Group"));
253741 morphItem.addActionListener(this);
742
+
743
+ menu.add("-");
744
+ physicsItem = menu.add(new MenuItem("Physics"));
745
+ physicsItem.addActionListener(this);
746
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
747
+ frameselectorItem.addActionListener(this);
254748 scriptNodeItem = menu.add(new MenuItem("Script Node"));
255749 scriptNodeItem.addActionListener(this);
256
- cameraItem = menu.add(new MenuItem("Camera"));
257
- cameraItem.addActionListener(this);
750
+ }
258751
259752 oe.menuBar.add(menu = new Menu("Object"));
260
- textureItem = menu.add(new MenuItem("Texture"));
261
- textureItem.addActionListener(this);
753
+// textureItem = menu.add(new MenuItem("Texture"));
754
+// textureItem.addActionListener(this);
262755 billboardItem = menu.add(new MenuItem("Billboard"));
263756 billboardItem.addActionListener(this);
264757 csgItem = menu.add(new MenuItem("CSG"));
265758 csgItem.addActionListener(this);
266
- shadowXItem = menu.add(new MenuItem("Shadow X"));
759
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267760 shadowXItem.addActionListener(this);
268
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
761
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269762 shadowYItem.addActionListener(this);
270
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
763
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271764 shadowZItem.addActionListener(this);
765
+
766
+ attributeItem = menu.add(new MenuItem("Attribute"));
767
+ attributeItem.addActionListener(this);
768
+ if (Globals.ADVANCED)
769
+ {
770
+ menu.add("-");
272771 linkerItem = menu.add(new MenuItem("Linker"));
273772 linkerItem.addActionListener(this);
274773 templateItem = menu.add(new MenuItem("Template"));
275774 templateItem.addActionListener(this);
276
- attributeItem = menu.add(new MenuItem("Attribute"));
277
- attributeItem.addActionListener(this);
278775 pointflowItem = menu.add(new MenuItem("Point Flow"));
279776 pointflowItem.addActionListener(this);
777
+ }
778
+ menu.add("-");
779
+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
780
+ textureRatioRItem.addActionListener(this);
781
+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
782
+ textureRatioGItem.addActionListener(this);
783
+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
784
+ textureRatioBItem.addActionListener(this);
280785 menu.add("-");
281786 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282787 resetTransformItem.addActionListener(this);
283788 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284789 resetCentroidItem.addActionListener(this);
285
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
- transformgeometryItem.addActionListener(this);
790
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
791
+ resetCentroidXZItem.addActionListener(this);
792
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
793
+ transformGeometryItem.addActionListener(this);
794
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
795
+ transformChildrenItem.addActionListener(this);
287796
288797 oe.menuBar.add(menu = new Menu("Geometry"));
289798 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -294,8 +803,11 @@
294803 genNormalsCADItem.addActionListener(this);
295804 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296805 genNormalsMESHItem.addActionListener(this);
297
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
806
+ //if (Globals.ADVANCED)
807
+ {
808
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298809 genNormalsMINEItem.addActionListener(this);
810
+ }
299811 stripifyItem = menu.add(new MenuItem("Stripify"));
300812 stripifyItem.addActionListener(this);
301813 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -317,31 +829,52 @@
317829 reduce34MeshItem.addActionListener(this);
318830 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319831 increaseMeshItem.addActionListener(this);
320
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
- smoothMeshItem.addActionListener(this);
322832 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323833 clipMeshItem.addActionListener(this);
834
+
835
+ if (Globals.ADVANCED)
836
+ {
837
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
838
+ smoothMeshItem.addActionListener(this);
839
+ }
324840
325841 oe.menuBar.add(menu = new Menu("Attributes"));
842
+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
843
+ clearVersionsItem.addActionListener(this);
326844 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327845 clearMaterialsItem.addActionListener(this);
846
+ resetAllItem = menu.add(new MenuItem("Reset All"));
847
+ resetAllItem.addActionListener(this);
848
+ stepAllItem = menu.add(new MenuItem("Step All"));
849
+ stepAllItem.addActionListener(this);
328850 menu.add("-");
329851 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330852 liveleavesItem.addActionListener(this);
331853 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332854 unliveleavesItem.addActionListener(this);
855
+ if (Globals.ADVANCED)
856
+ {
333857 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334858 supportleavesItem.addActionListener(this);
335859 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336860 unsupportleavesItem.addActionListener(this);
861
+ }
337862 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338863 hideleavesItem.addActionListener(this);
339864 showleavesItem = menu.add(new MenuItem("Show Leaves"));
340865 showleavesItem.addActionListener(this);
341
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
866
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
342867 markleavesItem.addActionListener(this);
343
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
868
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
344869 unmarkleavesItem.addActionListener(this);
870
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
871
+ rewindleavesItem.addActionListener(this);
872
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
873
+ unrewindleavesItem.addActionListener(this);
874
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
875
+ randomleavesItem.addActionListener(this);
876
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
877
+ unrandomleavesItem.addActionListener(this);
345878 menu.add("-");
346879 flipVItem = menu.add(new MenuItem("Flip V"));
347880 flipVItem.addActionListener(this);
....@@ -367,53 +900,140 @@
367900 attachBumpItem.addActionListener(this);
368901 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369902 pigmentBumpItem.addActionListener(this);
903
+ //embedTexturesItem
370904 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371905 detachPigmentItem.addActionListener(this);
372906 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373907 detachBumpItem.addActionListener(this);
908
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
909
+ embedTexturesItem.addActionListener(this);
910
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
911
+ deEmbedTexturesItem.addActionListener(this);
374912 menu.add("-");
375913 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376914 sortbysizeItem.addActionListener(this);
377915 sortbynameItem = menu.add(new MenuItem("Sort by name"));
378916 sortbynameItem.addActionListener(this);
379917 menu.add("-");
918
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
919
+ shareGeometriesItem.addActionListener(this);
920
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
921
+ mergeGeometriesItem.addActionListener(this);
922
+ menu.add("-");
923
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
924
+ editLeafItem.addActionListener(this);
925
+ if (Globals.ADVANCED)
926
+ {
927
+ // Pretty much the same as duplicate and clone.
380928 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381929 extractGeometriesItem.addActionListener(this);
382930 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383931 cloneGeometriesItem.addActionListener(this);
384
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385
- shareGeometriesItem.addActionListener(this);
386
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387
- mergeGeometriesItem.addActionListener(this);
932
+ }
388933
389934 oe.menuBar.add(menu = new Menu("Insert"));
390935 buildCreateMenu(menu);
391936
392
-
393
- oe.menuBar.add(menu = new Menu("Include"));
394
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395
- importGFDItem.addActionListener(this);
396
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397
- importVRMLX3DItem.addActionListener(this);
398
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399
- importOBJItem.addActionListener(this);
400
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401
- import3DSItem.addActionListener(this);
402
-
403937 oe.menuBar.add(menu = new Menu("Tools"));
404938 buildToolsMenu(menu);
405939 }
406940
941
+ JTabbedPane resourcecontainer;
942
+ cGridBag currenttab;
943
+ //boolean added; // patch for jar
944
+
945
+ int totalcount = 0;
946
+
947
+ int tabcount = 0;
948
+ int colcount = 0;
949
+ int rowcount = 0;
950
+ int texturecount = 0;
951
+
952
+ int columns = 5;
953
+ int rows = 7;
954
+
955
+ public void ResourceCallBack(String[] path)
956
+ {
957
+// for (int i = 0; i < path.length; i++)
958
+// System.out.print(path[i] + "/");
959
+// System.out.println();
960
+
961
+ if (//rowcount == 0 ||
962
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
963
+ {
964
+ currenttab = new cGridBag();
965
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
966
+ currenttab.setName(tabname);
967
+ //added = false;
968
+ resourcecontainer.add(currenttab);
969
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
970
+ rowcount = 1;
971
+ colcount = 0;
972
+ texturecount = 0;
973
+ }
974
+
975
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
976
+ {
977
+ //if (!added)
978
+ {
979
+ //added = true;
980
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
981
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
982
+ }
983
+
984
+ columns = 5;
985
+
986
+ if (path[0].contains("D&R") || path[0].contains("Paint"))
987
+ columns = 4;
988
+
989
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
990
+ totalcount++;
991
+
992
+ if (++colcount >= columns)
993
+ {
994
+ colcount = 0;
995
+ currenttab.Return();
996
+
997
+ if (rowcount++ >= rows)
998
+ {
999
+ rowcount = 0;
1000
+ }
1001
+ }
1002
+ }
1003
+ else
1004
+ {
1005
+// if (!path[path.length-1].equals("icons"))
1006
+// resourcecontainer.Return();
1007
+ }
1008
+ }
1009
+
1010
+ void CreateTexturePanel(cGridBag container)
1011
+ {
1012
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1013
+ container.add(resourcecontainer);
1014
+
1015
+ Grafreed.ParseResources("textures", this);
1016
+
1017
+ // 935. System.out.println("Total = " + totalcount);
1018
+ }
1019
+
4071020 void SetupUI2(ObjEditor oe)
4081021 {
1022
+ // June 2019
1023
+ if (oe == null)
1024
+ {
1025
+ //super.SetupUI2(this);
1026
+ //return;
1027
+ }
1028
+
1029
+ if (copy != group)
1030
+ {
1031
+ //super.SetupUI2(this);
1032
+ }
1033
+
4091034 //new Exception().printStackTrace();
4101035
4111036 oe.radioPanel = new JPanel(new GridBagLayout());
412
- oe.aConstraints.weightx = 1;
413
- oe.aConstraints.weighty = 0;
414
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
415
- oe.aConstraints.gridwidth = 100;
416
- oe.aConstraints.gridheight = 1;
4171037 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
4181038
4191039 oe.buttonGroup = new ButtonGroup();
....@@ -434,92 +1054,270 @@
4341054 oe.radioPanel.add(dummyButton);
4351055 oe.buttonGroup.add(dummyButton);
4361056 */
1057
+ cGridBag versionManagerPanel = new cGridBag();
1058
+
1059
+ versionManagerPanel.preferredHeight = 4;
1060
+
4371061 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
4381062
439
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440
- liveCB.setToolTipText("Enabled animation");
441
- liveCB.addItemListener(this);
442
-
443
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444
- trackCB.setToolTipText("Enable tracking");
445
- trackCB.addItemListener(this);
446
-
447
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
1063
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1064
+ //minButton.setToolTipText("Minimize window");
1065
+ //minButton.addActionListener(this);
1066
+
1067
+ if (Globals.ADVANCED)
1068
+ {
1069
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1070
+// maxButton.setToolTipText("Maximize window");
1071
+// maxButton.addActionListener(this);
1072
+ }
1073
+
1074
+ cButton gcButton;
1075
+
1076
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
+// gcButton.setToolTipText("Garbage collect");
1078
+// gcButton.addActionListener(new ActionListener()
1079
+// {
1080
+// public void actionPerformed(ActionEvent e)
1081
+// {
1082
+// System.gc();
1083
+// }
1084
+// });
1085
+
1086
+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1087
+ fullScreenButton.setToolTipText("Full-screen window");
1088
+ fullScreenButton.addActionListener(this);
1089
+
1090
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1091
+ collapseButton.setToolTipText("Collapse toolbar");
1092
+ collapseButton.addActionListener(this);
1093
+
1094
+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1095
+// maximize3DButton.setToolTipText("Maximize 3D view");
1096
+// maximize3DButton.addActionListener(this);
1097
+
1098
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1099
+ twoButton.setToolTipText("Show 3D view only");
1100
+ twoButton.addActionListener(this);
1101
+ this.fullscreenLayout = twoButton;
1102
+
1103
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1104
+ threeButton.setToolTipText("Show controls and 3D view");
1105
+ threeButton.addActionListener(this);
1106
+ if (Globals.ADVANCED)
1107
+ {
1108
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1109
+ sixButton.setToolTipText("Show 3D view and controls");
1110
+ sixButton.addActionListener(this);
1111
+ }
1112
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+// sevenButton.setToolTipText("3-column layout");
1114
+// sevenButton.addActionListener(this);
1115
+ //
1116
+
1117
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
4481118 screenfitButton.setToolTipText("Screen fit");
4491119 screenfitButton.addActionListener(this);
4501120
1121
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1122
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1123
+ restoreCameraButton.addActionListener(this);
1124
+
1125
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1126
+ saveVersionButton.setToolTipText("Duplicate current version");
1127
+ saveVersionButton.addActionListener(this);
1128
+
1129
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
+ deleteVersionButton.setToolTipText("Delete current version");
1131
+ deleteVersionButton.addActionListener(this);
1132
+ deleteVersionButton.setEnabled(false);
1133
+
1134
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1135
+ previousVersionButton.setToolTipText("Previous version");
1136
+ previousVersionButton.addActionListener(this);
1137
+ previousVersionButton.setEnabled(false);
1138
+
1139
+ cGridBag updown = new cGridBag().setVertical(true);
1140
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1141
+ restoreButton.setToolTipText("Undo (restore current version)");
1142
+ restoreButton.addActionListener(this);
1143
+ restoreButton.setEnabled(false);
1144
+
1145
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1146
+ replaceButton.setToolTipText("Save (replace current version)");
1147
+ replaceButton.addActionListener(this);
1148
+ replaceButton.setEnabled(false);
1149
+
1150
+ versionManagerPanel.add(updown);
1151
+
1152
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1153
+ nextVersionButton.setToolTipText("Next version");
1154
+ nextVersionButton.addActionListener(this);
1155
+ nextVersionButton.setEnabled(false);
1156
+
1157
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1158
+ oneStepButton.setToolTipText("Animate one step forward");
1159
+ oneStepButton.addActionListener(this);
1160
+
1161
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1162
+ liveCB.setToolTipText("Enable animation");
1163
+ liveCB.addItemListener(this);
1164
+
1165
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1166
+ fastCB.setToolTipText("Fast mode");
1167
+ fastCB.addItemListener(this);
1168
+
1169
+ //oe.toolboxPanel.Return();
1170
+
1171
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1172
+// trackCB.setToolTipText("Enable tracking");
1173
+// trackCB.addItemListener(this);
1174
+
4511175 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
4521176 // screenfitpointButton.addActionListener(this);
453
-// oe.aConstraints.gridx += 1;
454
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
- snapobjectButton.addActionListener(this);
456
- snapobjectButton.setToolTipText("Snap Object");
457
- oe.aConstraints.gridx += 1;
4581177
459
- //aConstraints.gridx = 0;
460
- //aConstraints.gridy += 1;
461
- oe.aConstraints.weighty = 0;
462
- oe.aConstraints.gridwidth = 1;
463
-
464
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465
- flashSelectionButton.setToolTipText("Show selection");
466
- flashSelectionButton.addActionListener(this);
467
-
468
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469
-
470
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471
- twoButton.setToolTipText("Show center view only");
472
- twoButton.addActionListener(this);
473
- oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
1178
+ if (Globals.ADVANCED)
1179
+ {
1180
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1181
+ snapobjectButton.addActionListener(this);
1182
+ snapobjectButton.setToolTipText("Snap Object");
1183
+
1184
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
4741185 fourButton.addActionListener(this);
475
- fourButton.setToolTipText("Show left panel only");
476
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
477
- sixButton.setToolTipText("2-column layout left");
478
- sixButton.addActionListener(this);
479
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
480
- threeButton.setToolTipText("2-column layout right");
481
- threeButton.addActionListener(this);
482
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483
- sevenButton.setToolTipText("3-column layout");
484
- sevenButton.addActionListener(this);
485
- //
1186
+ fourButton.setToolTipText("Show control panel only");
1187
+ }
4861188
487
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
- rootButton.setToolTipText("Edit selection in new tab");
1189
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1190
+
1191
+
1192
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1193
+ rootButton.setToolTipText("Open selection in new tab");
4891194 rootButton.addActionListener(this);
4901195
491
- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
1196
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
4921197 closeButton.setToolTipText("Close tab");
4931198 closeButton.addActionListener(this);
4941199 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
4951200 //clearButton.addActionListener(this);
496
-
497
- cGridBag commandsPanel = new cGridBag();
1201
+
1202
+ cGridBag row1 = new cGridBag();
1203
+ row1.preferredHeight = 8;
4981204
499
- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
500
- editButton.setToolTipText("Edit selection");
1205
+ // INSERT
1206
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207
+ gridButton.setToolTipText("Create ground");
1208
+ gridButton.addActionListener(this);
1209
+
1210
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1211
+ boxButton.setToolTipText("Create box");
1212
+ boxButton.addActionListener(this);
1213
+
1214
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1215
+ superButton.setToolTipText("Create superellipsoid");
1216
+ superButton.addActionListener(this);
1217
+
1218
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1219
+ sphereButton.setToolTipText("Create sphere");
1220
+ sphereButton.addActionListener(this);
1221
+
1222
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1223
+ coneButton.setToolTipText("Create cone");
1224
+ coneButton.addActionListener(this);
1225
+
1226
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1227
+ torusButton.setToolTipText("Create torus");
1228
+ torusButton.addActionListener(this);
1229
+
1230
+ if (false) //Globals.ADVANCED)
1231
+ {
1232
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1233
+ kleinButton.setToolTipText("Create Klein bottle");
1234
+ kleinButton.addActionListener(this);
1235
+ }
1236
+
1237
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1238
+ particlesButton.setToolTipText("Create particle system");
1239
+ particlesButton.addActionListener(this);
1240
+
1241
+ oe.toolboxPanel.add(row1);
1242
+
1243
+ cGridBag row2 = new cGridBag();
1244
+ row2.preferredHeight = 8;
1245
+
1246
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1247
+ groupButton.setToolTipText("Create group");
1248
+ groupButton.addActionListener(this);
1249
+
1250
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1251
+ compositeButton.setToolTipText("Create composite");
1252
+ compositeButton.addActionListener(this);
1253
+
1254
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1255
+ switchButton.setToolTipText("Create item switcher");
1256
+ switchButton.addActionListener(this);
1257
+
1258
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1259
+ loopButton.setToolTipText("Create loop");
1260
+ loopButton.addActionListener(this);
1261
+
1262
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1263
+ textureButton.setToolTipText("Create texture");
1264
+ textureButton.addActionListener(this);
1265
+
1266
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1267
+ overlayButton.setToolTipText("Create overlay");
1268
+ overlayButton.addActionListener(this);
1269
+
1270
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1271
+ lightButton.setToolTipText("Create light");
1272
+ lightButton.addActionListener(this);
1273
+
1274
+ oe.toolboxPanel.add(row2);
1275
+
1276
+ cGridBag textures = new cGridBag();
1277
+
1278
+ CreateTexturePanel(textures);
1279
+
1280
+ int tabCount = resourcecontainer.getTabCount();
1281
+
1282
+ if (tabCount > 0)
1283
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1284
+
1285
+ oe.toolboxPanel.add(textures);
1286
+
1287
+ textures.preferredHeight = 100;
1288
+
1289
+ CreateSkyboxPanel(oe.skyboxPanel);
1290
+
1291
+ // EDIT panel
1292
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1293
+ editButton.setToolTipText("Pin selection controls");
5011294 editButton.addActionListener(this);
5021295
503
- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504
- uneditButton.setToolTipText("Unedit selection");
1296
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1297
+ uneditButton.setToolTipText("Unpin and remove selection controls");
5051298 uneditButton.addActionListener(this);
5061299
507
- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508
- clearPanelButton.setToolTipText("Clear edit panel");
509
- clearPanelButton.addActionListener(this);
510
-
511
- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512
- allParamsButton.setToolTipText("All params??");
1300
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1301
+ allParamsButton.setToolTipText("Show all controls");
5131302 allParamsButton.addActionListener(this);
5141303
515
- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
- unselectButton.setToolTipText("Unselect");
517
- unselectButton.addActionListener(this);
1304
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1305
+ clearPanelButton.setToolTipText("Clear all controls");
1306
+ clearPanelButton.addActionListener(this);
5181307
519
- commandsPanel.preferredHeight = 1;
1308
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1309
+ //unselectButton.setToolTipText("Unselect");
1310
+ //unselectButton.addActionListener(this);
1311
+
1312
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1313
+ flashSelectionButton.setToolTipText("Highlight selection");
1314
+ flashSelectionButton.addActionListener(this);
5201315
521
- oe.treePanel.add(commandsPanel);
522
- oe.treePanel.Return();
1316
+ editCommandsPanel.preferredHeight = 1;
1317
+
1318
+ SetPinStates(false);
1319
+// oe.treePanel.add(commandsPanel);
1320
+// oe.treePanel.Return();
5231321
5241322 // oe.aConstraints.gridx += 1;
5251323 // oe.aConstraints.weighty = 0;
....@@ -534,34 +1332,25 @@
5341332
5351333 cGridBag jSPPanel = new cGridBag();
5361334
1335
+ jSPPanel.preferredHeight = 20;
1336
+
5371337 JScrollPane jSP;
5381338 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
539
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
1339
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
5401340 ResetModel();
5411341
5421342 oe.treePanel.add(jSPPanel);
5431343 oe.treePanel.Return();
5441344
545
- cGridBag copyOptionsPanel = new cGridBag();
546
-
547
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
548
- colorCB.setToolTipText("Copy color when dropped");
549
- colorCB.addItemListener(this);
550
-
551
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
552
- materialCB.setToolTipText("Copy material when dropped");
553
- materialCB.addItemListener(this);
554
-
555
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
556
- textureCB.setToolTipText("Copy texture when dropped");
557
- textureCB.addItemListener(this);
558
-
559
- copyOptionsPanel.preferredHeight = 1;
560
- oe.treePanel.add(copyOptionsPanel);
1345
+ oe.treePanel.add(versionManagerPanel);
5611346 oe.treePanel.Return();
5621347
563
-// mainPanel.setDividerLocation(0.5); //1.0);
564
-// mainPanel.setResizeWeight(0.5);
1348
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1349
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1350
+ versionSliderPane.preferredHeight = 3;
1351
+
1352
+// mainPanel.setDividerLocation(0.1); //1.0);
1353
+ mainPanel.setResizeWeight(0.4);
5651354
5661355 //jList.addListSelectionListener(this);
5671356 oe.jTree.addTreeSelectionListener(this);
....@@ -569,7 +1358,7 @@
5691358 //jTree.setEditable(true);
5701359 oe.jTree.setDragEnabled(true);
5711360 //jTree.setPreferredSize(new Dimension(10,10));
572
- jSP.setPreferredSize(new Dimension(100,200));
1361
+ //jSP.setPreferredSize(new Dimension(100,200));
5731362
5741363 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
5751364
....@@ -581,128 +1370,203 @@
5811370 dgr.addDragGestureListener(this);
5821371 }catch(Exception e) {}
5831372 */
584
- radio.layout = sevenButton;
1373
+ radio.layout = threeButton; // sixButton;
5851374 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5861375 }
5871376
5881377 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
5891378 {
590
- //constraints.gridx = 0;
591
- //constraints.gridy = 0;
592
- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
593
- fastCB.setToolTipText("Fast mode");
594
- fastCB.addItemListener(this);
595
- //constraints.gridy += 1;
596
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
597
- supportCB.setToolTipText("Enabled rigging");
598
- supportCB.addItemListener(this);
1379
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1380
+ colorCB.setToolTipText("Copy color when dropped");
1381
+ colorCB.addItemListener(this);
5991382
600
- // constraints.gridy += 1;
1383
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1384
+ materialCB.setToolTipText("Copy material when dropped");
1385
+ materialCB.addItemListener(this);
1386
+
1387
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1388
+ textureCB.setToolTipText("Copy texture when dropped");
1389
+ textureCB.addItemListener(this);
1390
+
1391
+ panel.Return();
1392
+
1393
+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
1394
+ boxCB.setToolTipText("Display bounding boxes");
1395
+ boxCB.addItemListener(this);
1396
+
1397
+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
1398
+ zoomBoxCB.setToolTipText("Display only for wheel");
1399
+ zoomBoxCB.addItemListener(this);
1400
+
1401
+ if (true) // Globals.ADVANCED)
1402
+ {
1403
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1404
+// supportCB.setToolTipText("Enable rigging");
1405
+// supportCB.addItemListener(this);
1406
+
1407
+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1408
+ freezeCB.setToolTipText("Fast moving camera");
1409
+ freezeCB.addItemListener(this);
1410
+
6011411 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
6021412 // localCB.addItemListener(this);
6031413
604
- //constraints.gridy += 1;
1414
+ panel.Return();
1415
+
1416
+ if (Globals.ADVANCED)
1417
+ {
6051418 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
6061419 crowdCB.setToolTipText("Used for crowds");
6071420 crowdCB.addItemListener(this);
1421
+ }
6081422
609
- //constraints.gridy += 1;
6101423 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
6111424 smoothCB.setToolTipText("Snapping delay");
6121425 smoothCB.addItemListener(this);
6131426
614
- //constraints.gridy += 1;
615
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
616
- slowCB.setToolTipText("Smooth interpolation");
617
- slowCB.addItemListener(this);
618
- //constraints.gridy += 1;
619
- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620
- boxCB.setToolTipText("Display bounding boxes");
621
- boxCB.addItemListener(this);
622
- //constraints.gridy += 1;
623
- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625
- zoomBoxCB.addItemListener(this);
626
-
627
-// constraints.gridy += 1;
1427
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1428
+// slowCB.setToolTipText("Smooth interpolation");
1429
+// slowCB.addItemListener(this);
1430
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1431
+ minshaderCB.setToolTipText("Minimal fast shader");
1432
+ minshaderCB.addItemListener(this);
1433
+
6281434 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
6291435 // speakerMocapCB.addItemListener(this);
6301436
6311437 if (false)
6321438 {
6331439 // handled in scripts
634
- //constraints.gridy += 1;
6351440 panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
6361441 speakerCameraCB.addItemListener(this);
6371442
638
- //constraints.gridy += 1;
6391443 panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
6401444 speakerFocusCB.addItemListener(this);
6411445
642
- //constraints.gridy += 1;
643
- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
644
- smoothfocusCB.addItemListener(this);
1446
+ panel.Return();
6451447 }
6461448
647
-//constraints.gridx += 1;
1449
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1450
+ smoothfocusCB.addItemListener(this);
1451
+
1452
+ panel.Return();
1453
+
6481454 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
6491455 // debugCB.addItemListener(this);
6501456
651
- //constraints.gridy += 1;
1457
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1458
+ trackCB.setToolTipText("Enable tracking target");
1459
+ trackCB.addItemListener(this);
1460
+
6521461 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1462
+ oeilCB.setToolTipText("Move camera when tracking");
6531463 oeilCB.addItemListener(this);
6541464
655
- //constraints.gridy += 1;
1465
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1466
+ shadowCB.setToolTipText("When live compute shadows");
1467
+ shadowCB.addItemListener(this);
1468
+
1469
+ panel.Return();
1470
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1471
+ toggleTextureCB.setToolTipText("Load textures");
1472
+ toggleTextureCB.addItemListener(this);
1473
+
1474
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1475
+ toggleSwitchCB.setToolTipText("Choose a single item");
1476
+ toggleSwitchCB.addItemListener(this);
1477
+
1478
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1479
+ autokeepCB.setToolTipText("On structure change");
1480
+ autokeepCB.addItemListener(this);
1481
+
1482
+ panel.Return();
1483
+ if (Globals.ADVANCED)
1484
+ {
6561485 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
6571486 lookAtCB.setToolTipText("Look-at target");
6581487 lookAtCB.addItemListener(this);
1488
+ }
1489
+
1490
+ }
6591491
6601492 cGridBag fill = new cGridBag();
661
-
6621493 fill.preferredHeight = 200;
1494
+ cGridBag fill2 = new cGridBag();
1495
+ fill2.preferredHeight = 200;
1496
+ cGridBag fill3 = new cGridBag();
1497
+ fill3.preferredHeight = 200;
6631498
6641499 panel.add(fill);
1500
+ panel.add(fill2);
1501
+ panel.add(fill3);
6651502
6661503 }
6671504
6681505 void EditObject(Object3D obj)
6691506 {
1507
+ //assert(obj instanceof Composite);
1508
+
1509
+// if (obj.versionlist == null)
1510
+// {
1511
+// obj.versionlist = new Object3D[100];
1512
+// obj.versionindex = -1;
1513
+// }
1514
+
6701515 cRadio radioButton = new cRadio(obj.name);
1516
+
1517
+ // June 2019. Patch to avoid bug with transparency.
1518
+ radioButton.hadMaterial = obj.material != null;
1519
+ if (!radioButton.hadMaterial)
1520
+ {
1521
+ obj.material = new cMaterial();
1522
+ }
1523
+
6711524 radioButton.SetObject(obj);
672
- radioButton.layout = sevenButton;
1525
+ radioButton.layout = threeButton; // sixButton;
6731526 radioButton.SetCamera(cameraView.renderCamera, false);
6741527 radioButton.addActionListener(this);
6751528 radioPanel.add(radioButton);
6761529 buttonGroup.add(radioButton);
6771530 radioButton.doClick();
6781531 }
1532
+
6791533 void SetupViews(ObjEditor oe)
6801534 {
1535
+ theFrame = this;
1536
+
6811537 oe.SetupViews();
6821538
1539
+ if (Globals.DEBUG)
6831540 System.out.println("SetupViews");
6841541 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
6851542 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
6861543 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
6871544 }
6881545
689
- JCheckBox liveCB;
690
- JCheckBox supportCB;
691
- JCheckBox localCB;
692
- JCheckBox crowdCB;
693
- JCheckBox smoothCB;
694
- JCheckBox fastCB;
695
- JCheckBox slowCB;
696
- JCheckBox boxCB;
697
- JCheckBox zoomBoxCB;
698
- JCheckBox trackCB;
699
- JCheckBox smoothfocusCB;
1546
+ cToggleButton liveCB;
1547
+ cCheckBox supportCB;
1548
+ cCheckBox localCB;
1549
+ cCheckBox crowdCB;
1550
+ cCheckBox smoothCB;
1551
+ cCheckBox minshaderCB;
1552
+
1553
+ cToggleButton fastCB;
1554
+ cCheckBox slowCB;
1555
+ cCheckBox boxCB;
1556
+ cCheckBox zoomBoxCB;
1557
+ cCheckBox freezeCB;
1558
+ //cToggleButton trackCB;
1559
+ cCheckBox trackCB;
1560
+ cCheckBox smoothfocusCB;
7001561 // JCheckBox speakerMocapCB;
701
- JCheckBox speakerCameraCB;
702
- JCheckBox speakerFocusCB;
703
- JCheckBox debugCB;
704
- JCheckBox oeilCB;
705
- JCheckBox lookAtCB;
1562
+ cCheckBox speakerCameraCB;
1563
+ cCheckBox speakerFocusCB;
1564
+ cCheckBox debugCB;
1565
+
1566
+ cCheckBox oeilCB;
1567
+ cCheckBox shadowCB;
1568
+ cCheckBox autokeepCB;
1569
+ cCheckBox lookAtCB;
7061570
7071571 // static int COLOR = 1;
7081572 // static int MATERIAL = 2;
....@@ -710,9 +1574,9 @@
7101574
7111575 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7121576
713
- JCheckBox colorCB;
714
- JCheckBox materialCB;
715
- JCheckBox textureCB;
1577
+ cCheckBox colorCB;
1578
+ cCheckBox materialCB;
1579
+ cCheckBox textureCB;
7161580
7171581 public void itemStateChanged(ItemEvent e)
7181582 {
....@@ -740,6 +1604,7 @@
7401604 } else if(e.getSource() == liveCB)
7411605 {
7421606 cameraView.ToggleLive();
1607
+ refreshContents(false);
7431608 }
7441609 else if(e.getSource() == supportCB)
7451610 {
....@@ -755,6 +1620,12 @@
7551620 {
7561621 cameraView.ToggleInertia();
7571622 cameraView.repaint();
1623
+ }
1624
+ else if(e.getSource() == minshaderCB)
1625
+ {
1626
+ Globals.MINSHADER ^= true;
1627
+ cameraView.programInitialized = false;
1628
+ cameraView.repaint();
7581629 }
7591630 else if(e.getSource() == localCB)
7601631 {
....@@ -804,6 +1675,18 @@
8041675 {
8051676 cameraView.ToggleOeil();
8061677 }
1678
+ else if(e.getSource() == shadowCB)
1679
+ {
1680
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1681
+ }
1682
+ else if(e.getSource() == freezeCB)
1683
+ {
1684
+ Globals.FREEZEONMOVE ^= true;
1685
+ }
1686
+ else if(e.getSource() == autokeepCB)
1687
+ {
1688
+ Globals.REPLACEONMAKE ^= true;
1689
+ }
8071690 else if(e.getSource() == lookAtCB)
8081691 {
8091692 cameraView.ToggleLookAt();
....@@ -820,7 +1703,8 @@
8201703
8211704 /**/
8221705 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
823
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1706
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1707
+ TreePath path = objEditor.jTree.getSelectionPath();
8241708 if ((path == null) || (path.getPathCount() <= 1)) {
8251709 // We can't move the root node or an empty selection
8261710 return;
....@@ -883,8 +1767,6 @@
8831767 }
8841768 }
8851769
886
- String string = (String) object;
887
-
8881770 System.out.println("Transfer = " + object + "; drop : " + target);
8891771 // if( object instanceof java.io.File[])
8901772 // {
....@@ -892,7 +1774,11 @@
8921774 // objEditor.DropFile((java.io.File[]) object, true);
8931775 // return;
8941776 // }
895
- if (string.charAt(0) == '/')
1777
+
1778
+ String string = object.toString();
1779
+
1780
+ // File path for Mac and Windows
1781
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
8961782 {
8971783 // file(s)
8981784 String[] names = string.split("\n");
....@@ -919,7 +1805,7 @@
9191805
9201806 flashIt = false;
9211807 CameraPane pane = (CameraPane) target;
922
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1808
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
9231809 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
9241810
9251811 if (group.selection.size() == 1)
....@@ -935,23 +1821,33 @@
9351821
9361822 assert target == objEditor.jTree;
9371823 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1824
+ Object3D destinationLeaf;
9381825 try {
939
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1826
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9401827 } catch (Exception e) {
9411828 System.out.println("destinationPath : " + destinationPath);
9421829 return;
9431830 }
9441831
945
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1832
+ for (int i=group.selection.size(); --i>=0;)
9461833 {
1834
+ Object3D child = (Object3D)group.selection.elementAt(i);
1835
+
1836
+ // Cannot move into itself
1837
+ if (child == destinationLeaf)
1838
+ return;
1839
+ }
1840
+
1841
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1842
+// {
9471843 loadClipboard(true);
9481844 objEditor.jTree.setSelectionPath(destinationPath);
949
- pasteInto(false);
950
- } else {
951
- loadClipboard(false);
952
- objEditor.jTree.setSelectionPath(destinationPath);
953
- pasteInto(false); // true); // ???
954
- }
1845
+ pasteInto(false, false);
1846
+// } else {
1847
+// loadClipboard(false);
1848
+// objEditor.jTree.setSelectionPath(destinationPath);
1849
+// pasteInto(false, false); // true); // ???
1850
+// }
9551851 }
9561852 public void dropActionChanged(DropTargetDragEvent dtde)
9571853 // Called if the user has modified the current drop gesture
....@@ -1007,7 +1903,12 @@
10071903 TreePath path;
10081904
10091905 public TransferableTreePath(TreePath tp) {
1010
- path = tp;
1906
+ Object[] objs = new Object[tp.getPathCount()];
1907
+ for (int i=0; i<objs.length; i++)
1908
+ {
1909
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1910
+ }
1911
+ path = new TreePath(objs);
10111912 }
10121913
10131914 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1056,85 +1957,107 @@
10561957 {
10571958 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10581959 //heightFieldItem.addActionListener(this);
1059
- gridItem = menu.add(new MenuItem("Grid"));
1060
- gridItem.addActionListener(this);
1061
- rectoidItem = menu.add(new MenuItem("Box"));
1062
- rectoidItem.addActionListener(this);
1063
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1064
- ellipsoidItem.addActionListener(this);
1065
- coneItem = menu.add(new MenuItem("Cone"));
1066
- coneItem.addActionListener(this);
1067
- torusItem = menu.add(new MenuItem("Torus"));
1068
- torusItem.addActionListener(this);
1069
- superItem = menu.add(new MenuItem("Superellipsoid"));
1070
- superItem.addActionListener(this);
1960
+// gridItem = menu.add(new MenuItem("Grid"));
1961
+// gridItem.addActionListener(this);
1962
+// rectoidItem = menu.add(new MenuItem("Box"));
1963
+// rectoidItem.addActionListener(this);
1964
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1965
+// ellipsoidItem.addActionListener(this);
1966
+// coneItem = menu.add(new MenuItem("Cone"));
1967
+// coneItem.addActionListener(this);
1968
+// torusItem = menu.add(new MenuItem("Torus"));
1969
+// torusItem.addActionListener(this);
1970
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1971
+// superItem.addActionListener(this);
1972
+
1973
+ cameraItem = menu.add(new MenuItem("Camera"));
1974
+ cameraItem.addActionListener(this);
1975
+
1976
+ if (!Globals.ADVANCED)
1977
+ {
10711978 kleinItem = menu.add(new MenuItem("Klein Bottle"));
10721979 kleinItem.addActionListener(this);
1073
- particleItem = menu.add(new MenuItem("Particle system"));
1074
- particleItem.addActionListener(this);
1980
+ }
1981
+
1982
+// particleItem = menu.add(new MenuItem("Particle system"));
1983
+// particleItem.addActionListener(this);
1984
+ if (Globals.ADVANCED)
1985
+ {
10751986 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10761987 ragdollItem.addActionListener(this);
10771988 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10781989 ragdoll2Item.addActionListener(this);
1990
+ }
10791991 menu.add("-");
1080
- meshItem = menu.add(new MenuItem("Mesh"));
1992
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10811993 meshItem.addActionListener(this);
10821994 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10831995 // meshGroupItem.addActionListener(this);
1996
+ if (Globals.ADVANCED)
1997
+ {
10841998 springItem = menu.add(new MenuItem("Spring"));
10851999 springItem.addActionListener(this);
10862000 flagItem = menu.add(new MenuItem("Flag"));
10872001 flagItem.addActionListener(this);
1088
- bezierItem = menu.add(new MenuItem("Patch"));
1089
- bezierItem.addActionListener(this);
1090
- checkerItem = menu.add(new MenuItem("Checker"));
1091
- checkerItem.addActionListener(this);
10922002 blobItem = menu.add(new MenuItem("Blob"));
10932003 blobItem.addActionListener(this);
10942004 latheItem = menu.add(new MenuItem("Lathe"));
10952005 latheItem.addActionListener(this);
1096
- lightItem = menu.add(new MenuItem("Light"));
1097
- lightItem.addActionListener(this);
2006
+ }
2007
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
2008
+ bezierItem.addActionListener(this);
2009
+// overlayItem = menu.add(new MenuItem("Overlay"));
2010
+// overlayItem.addActionListener(this);
2011
+// lightItem = menu.add(new MenuItem("Light"));
2012
+// lightItem.addActionListener(this);
10982013 menu.add("-");
10992014 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11002015 //superLoopItem.addActionListener(this);
1101
- loopItem = menu.add(new MenuItem("Loop"));
1102
- loopItem.addActionListener(this);
2016
+// loopItem = menu.add(new MenuItem("Loop"));
2017
+// loopItem.addActionListener(this);
11032018 doubleItem = menu.add(new MenuItem("Fork"));
11042019 doubleItem.addActionListener(this);
2020
+ if (Globals.ADVANCED)
2021
+ {
11052022 tripleItem = menu.add(new MenuItem("Trident"));
11062023 tripleItem.addActionListener(this);
2024
+ }
11072025 }
11082026
11092027 void buildToolsMenu(Menu menu)
11102028 {
11112029 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11122030 animationItem.addItemListener(this);
1113
- animationItem.setState(CameraPane.ANIMATION);
2031
+ animationItem.setState(Globals.ANIMATION);
2032
+
2033
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2034
+ archiveItem.addActionListener(this);
11142035
11152036 menu.add("-");
11162037 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11172038 parseverticesItem.addActionListener(this);
11182039 textureFieldItem = menu.add(new MenuItem("Texture Field"));
11192040 textureFieldItem.addActionListener(this);
1120
- alignItem = menu.add(new MenuItem("Align"));
2041
+ alignItem = menu.add(new MenuItem("Align Objects"));
11212042 alignItem.addActionListener(this);
1122
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123
- mirrorItem.addActionListener(this);
11242043 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11252044 reduceMorphItem.addActionListener(this);
11262045 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11272046 reduce34MorphItem.addActionListener(this);
1128
-
1129
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1130
- computeAOItem.addActionListener(this);
11312047 menu.add("-");
1132
-
11332048 menu.add(memoryItem = new MenuItem("Memory Usage"));
11342049 memoryItem.addActionListener(this);
2050
+ menu.add(computeAOItem = new MenuItem("Compute AO"));
2051
+ computeAOItem.addActionListener(this);
2052
+
2053
+ if (Globals.ADVANCED)
2054
+ {
2055
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
2056
+ mirrorItem.addActionListener(this);
2057
+ menu.add("-");
11352058 menu.add(analyzeItem = new MenuItem("Analyze"));
11362059 analyzeItem.addActionListener(this);
1137
- menu.add(dumpItem = new MenuItem("Dump"));
2060
+ menu.add(dumpItem = new MenuItem("Print"));
11382061 dumpItem.addActionListener(this);
11392062 // menu.add(pathItem = new MenuItem("From-to path"));
11402063 // pathItem.addActionListener(this);
....@@ -1153,6 +2076,7 @@
11532076 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11542077 editScriptItem.addActionListener(this);
11552078 }
2079
+ }
11562080
11572081 void ScreenFit()
11582082 {
....@@ -1165,7 +2089,7 @@
11652089 Object3D obj = (Object3D)group.selection.elementAt(0);
11662090 objEditor.ScreenFit(obj, false);
11672091
1168
- cameraView.pingthread.StepToTarget(true);
2092
+ cameraView.pingthread.StepToTarget(); //true);
11692093 refreshContents();
11702094 }
11712095
....@@ -1202,7 +2126,7 @@
12022126 obj.parent.TransformToWorld(maxima); //, maxima);
12032127 }
12042128
1205
- Object3D shadow = new Object3D("Shadow " + obj.name);
2129
+ Object3D shadow = new Object3D("Shadow" + obj.name);
12062130
12072131 shadow.toParent = LA.newMatrix();
12082132 shadow.fromParent = LA.newMatrix();
....@@ -1216,24 +2140,24 @@
12162140 switch(axis)
12172141 {
12182142 case 0 :
1219
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1220
- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1221
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1222
- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2143
+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2144
+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2145
+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2146
+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
12232147 norm = cVector.X;
12242148 break;
12252149 case 1 :
1226
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1227
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1228
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1229
- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2150
+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2151
+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2152
+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2153
+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
12302154 norm = cVector.Y;
12312155 break;
12322156 case 2 :
1233
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1234
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1235
- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1236
- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2157
+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2158
+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2159
+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2160
+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
12372161 norm = cVector.Z;
12382162 break;
12392163 }
....@@ -1274,9 +2198,38 @@
12742198 shadow.material = new cMaterial(obj.material);
12752199 shadow.material.diffuse = 0.0001f;
12762200 shadow.material.specular = 0.0001f;
2201
+ shadow.material.opacity = 0.75f;
2202
+
2203
+ AllocProjectedVertices(shadow);
2204
+
2205
+ shadow.projectedVertices[1].x = 300;
12772206
12782207 makeSomething(shadow);
12792208 }
2209
+
2210
+ private void ClearUnpinned()
2211
+ {
2212
+ //for (Object3D obj : listUI)
2213
+ for (int i=listUI.size(); --i>=0;)
2214
+ {
2215
+ Object3D obj = listUI.elementAt(i);
2216
+ if (!obj.pinned)
2217
+ {
2218
+ obj.CloseUI();
2219
+ listUI.remove(i);
2220
+ }
2221
+ }
2222
+ }
2223
+
2224
+ private void EditElement(Object3D elem, boolean newWindow)
2225
+ {
2226
+ // if (!(elem instanceof Composite))
2227
+ // newWindow = false;
2228
+ listUI.add(elem);
2229
+ elem.openEditWindow(this, newWindow); //, false);
2230
+ System.out.println("edit : " + elem);
2231
+ elem.editWindow.refreshContents(true); // ? new
2232
+ }
12802233
12812234 /**
12822235 * applyExample
....@@ -1480,9 +2433,9 @@
14802433
14812434 void Overwrite(int mask)
14822435 {
1483
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2436
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14842437 {
1485
- Object3D content = GrafreeD.clipboard.get(0);
2438
+ Object3D content = Grafreed.clipboard.get(0);
14862439
14872440 if (content instanceof cGroup && ((cGroup)content).transientlink )
14882441 content = ((cGroup)content).get(0);
....@@ -1521,7 +2474,7 @@
15212474 {
15222475 ScreenFit();
15232476 } else
1524
- if (source == switchItem)
2477
+ if (source == switchViewItem)
15252478 {
15262479 cVector v1 = new cVector();
15272480 cVector v2 = new cVector();
....@@ -1530,11 +2483,11 @@
15302483 objEditor.cameraView.renderCamera.setAim(v2, v1);
15312484 objEditor.cameraView.repaint();
15322485 } else
1533
- if (source == rectoidItem)
2486
+ if (source == rectoidItem || source == boxButton)
15342487 {
15352488 makeSomething(new Box());
15362489 } else
1537
- if (source == particleItem)
2490
+ if (source == particleItem || source == particlesButton)
15382491 {
15392492 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15402493 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1613,27 +2566,27 @@
16132566
16142567 makeSomething(obj);
16152568 } else
1616
- if (source == gridItem)
2569
+ if (source == gridItem || source == gridButton)
16172570 {
16182571 makeSomething(new Grid());
16192572 } else
1620
- if (source == ellipsoidItem)
2573
+ if (source == ellipsoidItem || source == sphereButton)
16212574 {
16222575 makeSomething(new Sphere());
16232576 } else
1624
- if (source == coneItem)
2577
+ if (source == coneItem || source == coneButton)
16252578 {
16262579 makeSomething(new Cone());
16272580 } else
1628
- if (source == torusItem)
2581
+ if (source == torusItem || source == torusButton)
16292582 {
16302583 makeSomething(new Torus());
16312584 } else
1632
- if (source == superItem)
2585
+ if (source == superItem || source == superButton)
16332586 {
16342587 makeSomething(new Superellipsoid());
16352588 } else
1636
- if (source == kleinItem)
2589
+ if (source == kleinItem || source == kleinButton)
16372590 {
16382591 makeSomething(new Klein());
16392592 } else
....@@ -1653,7 +2606,7 @@
16532606 {
16542607 makeSomething(new BezierSurface());
16552608 } else
1656
- if (source == checkerItem)
2609
+ if (source == overlayItem || source == overlayButton)
16572610 {
16582611 /*
16592612 Object3D obj = new BezierSurface(5,8);
....@@ -1701,10 +2654,27 @@
17012654 s.setup();
17022655 makeSomething(s);
17032656 } else
1704
- if (source == lightItem)
2657
+ if (source == lightItem || source == lightButton)
17052658 {
17062659 makeSomething(new Light());
17072660 } else
2661
+// if (source == skybox1Button ||
2662
+// source == skybox2Button ||
2663
+// source == skybox3Button ||
2664
+// source == skybox4Button ||
2665
+// source == skybox5Button ||
2666
+// source == skybox6Button ||
2667
+// source == skybox7Button ||
2668
+// source == skybox11Button ||
2669
+// source == skybox12Button ||
2670
+// source == skybox13Button ||
2671
+// source == skybox14Button ||
2672
+// source == skybox15Button ||
2673
+// source == skybox16Button ||
2674
+// source == skybox17Button)
2675
+// {
2676
+// ChangeSkybox(source);
2677
+// } else
17082678 if (source == csgItem)
17092679 {
17102680 group(new CSG());
....@@ -1751,30 +2721,38 @@
17512721
17522722 group(g);
17532723 } else
1754
- if (source == loopItem)
2724
+ if (source == loopItem || source == loopButton)
17552725 {
2726
+ if (!group.selection.isEmpty())
2727
+ {
17562728 Composite csg = new GroupLeaf();
1757
- csg.count = 5;
17582729 group(csg);
1759
- Composite child = new cGroup();
2730
+ csg.count = 5;
2731
+ Composite child = new cGroup("Branch");
17602732 csg.addChild(child);
17612733 child.addChild(csg);
2734
+ }
17622735 } else
17632736 if (source == doubleItem)
17642737 {
1765
- Composite csg = new GroupLeaf();
1766
- csg.count = 5;
2738
+ if (!group.selection.isEmpty())
2739
+ {
2740
+ Composite csg = new GroupLeaf("Fork");
17672741 group(csg);
1768
- Composite child = new cGroup();
2742
+ csg.count = 5;
2743
+ Composite child = new cGroup("Branch A");
17692744 csg.addChild(child);
17702745 child.addChild(csg);
1771
- child = new cGroup();
2746
+ child = new cGroup("Branch B");
17722747 csg.addChild(child);
17732748 child.addChild(csg);
2749
+ }
17742750 } else
17752751 if (source == tripleItem)
17762752 {
1777
- Composite csg = new GroupLeaf();
2753
+ if (!group.selection.isEmpty())
2754
+ {
2755
+ Composite csg = new GroupLeaf("Trident");
17782756 csg.count = 4;
17792757 group(csg);
17802758 Composite child = new cGroup();
....@@ -1786,28 +2764,12 @@
17862764 child = new cGroup();
17872765 csg.addChild(child);
17882766 child.addChild(csg);
1789
- } else
1790
-
1791
- if (source == importGFDItem)
1792
- {
1793
- ImportGFD();
1794
- } else
1795
- if (source == importVRMLX3DItem)
1796
- {
1797
- ImportVRMLX3D();
1798
- } else
1799
- if (source == import3DSItem)
1800
- {
1801
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1802
- } else
1803
- if (source == importOBJItem)
1804
- {
1805
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
2767
+ }
18062768 } else
18072769 if (source == computeAOItem)
18082770 {
18092771 Globals.drawMode = CameraPane.OCCLUSION;
1810
- Globals.theRenderer.repaint();
2772
+ cameraView.repaint();
18112773 } else
18122774 if (source == recompileItem)
18132775 {
....@@ -1822,7 +2784,7 @@
18222784 if (source == invariantsItem)
18232785 {
18242786 System.out.println("Invariants:");
1825
- GrafreeD.grafreeD.universe.invariants();
2787
+ Grafreed.grafreed.universe.invariants();
18262788 } else
18272789 if (source == memoryItem)
18282790 {
....@@ -1841,19 +2803,80 @@
18412803 {
18422804 DumpObject();
18432805 } else
2806
+ if (source == minButton)
2807
+ {
2808
+ Minimize();
2809
+ } else
2810
+ if (source == maxButton)
2811
+ {
2812
+ Maximize();
2813
+ } else
2814
+ if (source == fullScreenButton)
2815
+ {
2816
+ ToggleFullScreen();
2817
+ } else
2818
+ if (source == collapseButton)
2819
+ {
2820
+ this.expandedLayout = radio.layout;
2821
+ CollapseToolbar();
2822
+ } else
2823
+// if (source == maximize3DButton)
2824
+// {
2825
+// this.expandedLayout = radio.layout;
2826
+// radio.layout = twoButton;
2827
+// CollapseToolbar();
2828
+// Show3DView();
2829
+// } else
2830
+ if (source == previousVersionButton)
2831
+ {
2832
+ // Go to previous version
2833
+ //if (!Undo())
2834
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2835
+ PreviousVersion();
2836
+ } else
2837
+ if (source == restoreButton)
2838
+ {
2839
+ // Restore current version
2840
+ Restore();
2841
+ //restoreButton.setEnabled(false);
2842
+ } else
2843
+ if (source == replaceButton)
2844
+ {
2845
+ // Overwrite current version
2846
+ Replace();
2847
+ //replaceButton.setEnabled(false);
2848
+ } else
2849
+ if (source == nextVersionButton)
2850
+ {
2851
+ // Go to next version
2852
+ NextVersion();
2853
+ } else
2854
+ if (source == saveVersionButton)
2855
+ {
2856
+ // Save a new version
2857
+ if (!DuplicateVersion()) //true))
2858
+ java.awt.Toolkit.getDefaultToolkit().beep();
2859
+ } else
2860
+ if (source == deleteVersionButton)
2861
+ {
2862
+ // Delete a new version
2863
+ DeleteVersion();
2864
+ } else
2865
+ if (source == oneStepButton)
2866
+ {
2867
+ Globals.ONESTEP = true;
2868
+ cameraView.repaint();
2869
+ } else
18442870 if (source == screenfitButton)
18452871 {
1846
- //Reload(lastConverter, lastFilename, true);
18472872 ScreenFit();
18482873 } else
18492874 if (source == screenfitpointButton)
18502875 {
1851
- //Reload(lastConverter, lastFilename, true);
18522876 ScreenFitPoint();
18532877 } else
18542878 if (source == snapobjectButton)
18552879 {
1856
- //Reload(lastConverter, lastFilename, true);
18572880 SnapObject();
18582881 } else
18592882 // if (event.getSource() == recompileButton)
....@@ -1890,12 +2913,20 @@
18902913 {
18912914 loadClipboard(true);
18922915 } else
2916
+ if (source == undoItem)
2917
+ {
2918
+ PreviousVersion();
2919
+ } else
2920
+ if (source == redoItem)
2921
+ {
2922
+ NextVersion();
2923
+ } else
18932924 if (source == duplicateItem)
18942925 {
1895
- Object3D keep = GrafreeD.clipboard;
2926
+ Object3D keep = Grafreed.clipboard;
18962927 loadClipboard(false);
18972928 paste(false);
1898
- GrafreeD.clipboard = keep;
2929
+ Grafreed.clipboard = keep;
18992930 } else
19002931 if (source == cloneItem)
19012932 {
....@@ -1913,13 +2944,17 @@
19132944 {
19142945 paste(false);
19152946 } else
2947
+ if (source == pasteIntoItem)
2948
+ {
2949
+ pasteInto(true, false);
2950
+ } else
19162951 if (source == pasteLinkItem)
19172952 {
1918
- pasteInto(false);
2953
+ pasteInto(false, false);
19192954 } else
19202955 if (source == pasteCloneItem)
19212956 {
1922
- pasteInto(true);
2957
+ pasteInto(true, true);
19232958 } else
19242959 if (source == pasteExpandItem)
19252960 {
....@@ -2111,9 +3146,9 @@
21113146 // group.selection.get(0).setMasterThis(content); // should be identity
21123147 // refreshContents();
21133148 // }
2114
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3149
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
21153150 {
2116
- Object3D content = GrafreeD.clipboard.get(0);
3151
+ Object3D content = Grafreed.clipboard.get(0);
21173152
21183153 if (content instanceof cGroup && ((cGroup)content).transientlink )
21193154 content = ((cGroup)content).get(0);
....@@ -2121,11 +3156,11 @@
21213156 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21223157 for (int i=0; i<group.selection.size(); i++)
21233158 {
2124
- boolean random = CameraPane.RANDOM;
2125
- CameraPane.RANDOM = false; // parse all random nodes
3159
+ boolean random = CameraPane.SWITCH;
3160
+ CameraPane.SWITCH = false; // parse all random nodes
21263161 group.selection.get(i).linkVerticesThis(content);
21273162 // group.selection.get(i).setMasterThis(content); // should be identity
2128
- CameraPane.RANDOM = random;
3163
+ CameraPane.SWITCH = random;
21293164 }
21303165 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21313166 refreshContents();
....@@ -2135,20 +3170,20 @@
21353170 {
21363171 for (int i=0; i<group.selection.size(); i++)
21373172 {
2138
- boolean random = CameraPane.RANDOM;
2139
- CameraPane.RANDOM = false; // parse all random nodes
3173
+ boolean random = CameraPane.SWITCH;
3174
+ CameraPane.SWITCH = false; // parse all random nodes
21403175 group.selection.get(i).linkVerticesThis(null);
2141
- CameraPane.RANDOM = random;
3176
+ CameraPane.SWITCH = random;
21423177 }
21433178
21443179 refreshContents();
21453180 } else
21463181 if (source == relinkverticesItem)
21473182 {
2148
- boolean random = CameraPane.RANDOM;
2149
- CameraPane.RANDOM = false; // parse all random nodes
3183
+ boolean random = CameraPane.SWITCH;
3184
+ CameraPane.SWITCH = false; // parse all random nodes
21503185 group.selection.RelinkToSupport();
2151
- CameraPane.RANDOM = random;
3186
+ CameraPane.SWITCH = random;
21523187
21533188 refreshContents();
21543189 } else
....@@ -2163,9 +3198,9 @@
21633198 } else
21643199 if (source == setMasterItem)
21653200 {
2166
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
3201
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21673202 {
2168
- Object3D content = GrafreeD.clipboard.get(0);
3203
+ Object3D content = Grafreed.clipboard.get(0);
21693204
21703205 if (content instanceof cGroup && ((cGroup)content).transientlink )
21713206 content = ((cGroup)content).get(0);
....@@ -2178,9 +3213,9 @@
21783213 {
21793214 if (group.selection.size() == 1)
21803215 {
2181
- if (GrafreeD.clipboard.size() == 1)
3216
+ if (Grafreed.clipboard.size() == 1)
21823217 {
2183
- Object3D content = GrafreeD.clipboard.get(0);
3218
+ Object3D content = Grafreed.clipboard.get(0);
21843219
21853220 if (content instanceof cGroup && ((cGroup)content).transientlink )
21863221 content = ((cGroup)content).get(0);
....@@ -2197,7 +3232,7 @@
21973232 {
21983233 RevertMeshes();
21993234 } else
2200
- if (source == resetMeshItem)
3235
+ if (source == resetAllItem)
22013236 {
22023237 ResetAll();
22033238 } else
....@@ -2205,7 +3240,7 @@
22053240 {
22063241 StepAll();
22073242 } else
2208
- if (source == clearItem) // || event.getSource() == clearButton)
3243
+ if (source == deleteItem) // || event.getSource() == clearButton)
22093244 {
22103245 //int indices[] = jList.getSelectedIndices();
22113246 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2217,9 +3252,9 @@
22173252 {
22183253 ClearSelection(true);
22193254 } else
2220
- if (source == grabItem)
3255
+ if (source == grabItem || source == groupButton)
22213256 {
2222
- group(new cGroup(), true);
3257
+ group(new cGroup(), false); // true);
22233258 } else
22243259 if (source == hideItem)
22253260 {
....@@ -2237,16 +3272,16 @@
22373272 {
22383273 makeSomething(new Camera());
22393274 } else
2240
- if (source == compositeItem)
3275
+ if (source == compositeItem || source == compositeButton)
22413276 {
22423277 group(new Composite());
22433278 } else
2244
- if (source == randomItem)
3279
+ if (source == switchItem || source == switchButton)
22453280 {
22463281 RandomNode random = new RandomNode();
22473282 group(random);
22483283 if (random.size() > 0)
2249
- random.name = random.get(0).name + "Rnd";
3284
+ random.name = random.get(0).name + "Switch";
22503285 } else
22513286 if (source == physicsItem)
22523287 {
....@@ -2343,7 +3378,7 @@
23433378 {
23443379 group(new cLinker());
23453380 } else
2346
- if (source == textureItem)
3381
+ if (source == textureItem || source == textureButton)
23473382 {
23483383 group(new TextureNode());
23493384 } else
....@@ -2363,17 +3398,42 @@
23633398 {
23643399 CastShadow(2);
23653400 } else
2366
- if (source == ungroupItem)
3401
+ if (source == ungroupItem || source == ungroupButton)
23673402 {
2368
- //ungroup();
3403
+ boolean canUngroup = true;
3404
+
23693405 for (int i=0; i<group.selection.size(); i++)
23703406 {
2371
- Ungroup(group.selection.get(i));
3407
+ Object3D selectedItem = group.selection.get(i);
3408
+
3409
+ if (selectedItem.Size() == 0)
3410
+ {
3411
+ // Cannot ungroup leaves
3412
+ canUngroup = false;
3413
+ break;
3414
+ }
3415
+
3416
+ if (selectedItem == group)
3417
+ {
3418
+ // Cannot ungroup root
3419
+ canUngroup = false;
3420
+ break;
3421
+ }
23723422 }
23733423
2374
- ClearSelection(false);
2375
-
2376
- refreshContents();
3424
+ if (canUngroup)
3425
+ {
3426
+ for (int i=0; i<group.selection.size(); i++)
3427
+ {
3428
+ Object3D selectedItem = group.selection.get(i);
3429
+
3430
+ Ungroup(selectedItem);
3431
+ }
3432
+
3433
+ ClearSelection(false);
3434
+
3435
+ refreshContents();
3436
+ }
23773437 } else
23783438 if (source == genUVItem)
23793439 {
....@@ -2385,7 +3445,7 @@
23853445 } else
23863446 if (source == genNormalsMESHItem)
23873447 {
2388
- GenNormals(true); // TODO
3448
+ GenNormalsMESH();
23893449 } else
23903450 if (source == genNormalsORGANItem)
23913451 {
....@@ -2419,6 +3479,10 @@
24193479 {
24203480 ClearMaterials();
24213481 } else
3482
+ if (source == clearVersionsItem)
3483
+ {
3484
+ ClearVersions();
3485
+ } else
24223486 if (source == liveleavesItem)
24233487 {
24243488 LiveLeaves(true);
....@@ -2450,6 +3514,22 @@
24503514 if (source == unmarkleavesItem)
24513515 {
24523516 MarkLeaves(false);
3517
+ } else
3518
+ if (source == rewindleavesItem)
3519
+ {
3520
+ RewindLeaves(true);
3521
+ } else
3522
+ if (source == unrewindleavesItem)
3523
+ {
3524
+ RewindLeaves(false);
3525
+ } else
3526
+ if (source == randomleavesItem)
3527
+ {
3528
+ RandomLeaves(true);
3529
+ } else
3530
+ if (source == unrandomleavesItem)
3531
+ {
3532
+ RandomLeaves(false);
24533533 } else
24543534 if (source == flipVItem)
24553535 {
....@@ -2535,9 +3615,25 @@
25353615 {
25363616 SmoothMesh();
25373617 } else
2538
- if (source == transformgeometryItem)
3618
+ if (source == transformGeometryItem)
25393619 {
25403620 TransformGeometry();
3621
+ } else
3622
+ if (source == transformChildrenItem)
3623
+ {
3624
+ TransformChildren();
3625
+ } else
3626
+ if (source == textureRatioRItem)
3627
+ {
3628
+ TextureRatio(0);
3629
+ } else
3630
+ if (source == textureRatioGItem)
3631
+ {
3632
+ TextureRatio(1);
3633
+ } else
3634
+ if (source == textureRatioBItem)
3635
+ {
3636
+ TextureRatio(2);
25413637 } else
25423638 if (source == resetTransformItem)
25433639 {
....@@ -2545,7 +3641,11 @@
25453641 } else
25463642 if (source == resetCentroidItem)
25473643 {
2548
- ResetCentroid();
3644
+ ResetCentroid(true);
3645
+ } else
3646
+ if (source == resetCentroidXZItem)
3647
+ {
3648
+ ResetCentroid(false);
25493649 } else
25503650 if (source == resetParentItem)
25513651 {
....@@ -2650,7 +3750,7 @@
26503750 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
26513751 {
26523752 obj = (Object3D)e.nextElement();
2653
- obj.SetBumpTexture(null);
3753
+ obj.ResetBumpTexture();
26543754 }
26553755
26563756 refreshContents();
....@@ -2666,6 +3766,31 @@
26663766
26673767 refreshContents();
26683768 } else
3769
+ if (source == embedTexturesItem)
3770
+ {
3771
+ Object3D obj;
3772
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3773
+ {
3774
+ obj = (Object3D)e.nextElement();
3775
+ obj.EmbedTextures(true);
3776
+ }
3777
+
3778
+ refreshContents();
3779
+ } else
3780
+ if (source == deEmbedTexturesItem)
3781
+ {
3782
+ Object3D obj;
3783
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3784
+ {
3785
+ obj = (Object3D)e.nextElement();
3786
+ obj.EmbedTextures(false);
3787
+ }
3788
+
3789
+ CameraPane.texturepigment.clear();
3790
+ CameraPane.texturebump.clear();
3791
+
3792
+ refreshContents();
3793
+ } else
26693794 if (source == flashSelectionButton)
26703795 {
26713796 CameraPane.flash = true;
....@@ -2677,42 +3802,36 @@
26773802 if (source == twoButton)
26783803 {
26793804 radio.layout = twoButton;
2680
- // bug
2681
- //gridPanel.setDividerLocation(1.0);
2682
- //bigPanel.setDividerLocation(0.0);
2683
-// bigThree.remove(scenePanel);
2684
-// bigThree.remove(centralPanel);
2685
-// bigThree.remove(XYZPanel);
2686
-// aWindowConstraints.gridx = 0;
2687
-// aWindowConstraints.gridy = 0;
2688
-// aWindowConstraints.gridwidth = 1;
2689
-// // aConstraints.gridheight = 3;
2690
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2691
-// aWindowConstraints.weightx = 0;
2692
-// aWindowConstraints.weighty = 1;
2693
-// //bigThree.add(jtp, aWindowConstraints);
2694
-// aWindowConstraints.weightx = 1;
2695
-// aWindowConstraints.gridwidth = 3;
2696
-// // aConstraints.gridheight = 3;
2697
-// aWindowConstraints.gridx = 1;
2698
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2699
-// bigThree.add(centralPanel, aWindowConstraints);
2700
-// aWindowConstraints.weightx = 0;
2701
-// aWindowConstraints.gridx = 4;
2702
-// aWindowConstraints.gridwidth = 1;
2703
-// // aConstraints.gridheight = 3;
2704
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2705
-// //bigThree.add(XYZPanel, aWindowConstraints);
2706
-// scenePanel.setVisible(false);
2707
-// centralPanel.setVisible(true);
2708
-// XYZPanel.setVisible(false);
2709
- bigThree.ClearUI();
2710
- bigThree.add(centralPanel);
2711
- bigThree.FlushUI();
3805
+
3806
+ if (CameraPane.FULLSCREEN)
3807
+ fullscreenLayout = radio.layout;
3808
+
3809
+ Show3DView();
3810
+
3811
+ cameraView.requestFocusInWindow();
3812
+
3813
+// refreshContents(true);
3814
+//
3815
+// try
3816
+// {
3817
+// java.awt.Robot bot = new java.awt.Robot();
3818
+// int mask = InputEvent.BUTTON1_MASK;
3819
+// bot.mouseMove(100, 100);
3820
+// bot.mousePress(mask);
3821
+// bot.mouseRelease(mask);
3822
+// }
3823
+// catch (Exception e)
3824
+// {
3825
+//
3826
+// }
3827
+
27123828 } else
27133829 if (source == threeButton)
27143830 {
27153831 radio.layout = threeButton;
3832
+
3833
+ if (CameraPane.FULLSCREEN)
3834
+ fullscreenLayout = radio.layout;
27163835
27173836 // bigThree.remove(scenePanel);
27183837 // bigThree.remove(centralPanel);
....@@ -2742,13 +3861,18 @@
27423861 // centralPanel.setVisible(true);
27433862 // XYZPanel.setVisible(true);
27443863 bigThree.ClearUI();
3864
+ bigThree.add(scenePanel);
27453865 bigThree.add(centralPanel);
2746
- bigThree.add(XYZPanel);
27473866 bigThree.FlushUI();
3867
+
3868
+ cameraView.requestFocusInWindow();
27483869 } else
27493870 if (source == fourButton)
27503871 {
27513872 radio.layout = fourButton;
3873
+
3874
+ if (CameraPane.FULLSCREEN)
3875
+ fullscreenLayout = radio.layout;
27523876
27533877 // bigThree.remove(scenePanel);
27543878 // bigThree.remove(centralPanel);
....@@ -2780,10 +3904,15 @@
27803904 bigThree.ClearUI();
27813905 bigThree.add(scenePanel);
27823906 bigThree.FlushUI();
3907
+
3908
+ cameraView.requestFocusInWindow();
27833909 } else
27843910 if (source == sixButton)
27853911 {
27863912 radio.layout = sixButton;
3913
+
3914
+ if (CameraPane.FULLSCREEN)
3915
+ fullscreenLayout = radio.layout;
27873916
27883917 // bigThree.remove(scenePanel);
27893918 // bigThree.remove(centralPanel);
....@@ -2813,13 +3942,18 @@
28133942 // centralPanel.setVisible(true);
28143943 // XYZPanel.setVisible(false);
28153944 bigThree.ClearUI();
2816
- bigThree.add(scenePanel);
28173945 bigThree.add(centralPanel);
3946
+ bigThree.add(scenePanel);
28183947 bigThree.FlushUI();
3948
+
3949
+ cameraView.requestFocusInWindow();
28193950 } else
28203951 if (source == sevenButton)
28213952 {
28223953 radio.layout = sevenButton;
3954
+
3955
+ if (CameraPane.FULLSCREEN)
3956
+ fullscreenLayout = radio.layout;
28233957
28243958 // bigThree.remove(scenePanel);
28253959 // bigThree.remove(centralPanel);
....@@ -2853,9 +3987,12 @@
28533987 bigThree.add(centralPanel);
28543988 bigThree.add(XYZPanel);
28553989 bigThree.FlushUI();
3990
+
3991
+ cameraView.requestFocusInWindow();
28563992 } else
28573993 if (source == rootButton)
28583994 {
3995
+ Replace();
28593996 Object3D obj;
28603997 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28613998 {
....@@ -2864,31 +4001,50 @@
28644001 EditObject(obj);
28654002 }
28664003
4004
+ cameraView.requestFocusInWindow();
28674005 refreshContents(true);
28684006 } else
28694007 if (source == closeButton)
28704008 {
28714009 //System.out.println("CLOSE: " + buttonGroup.getSelection());
4010
+ if (copy.versionlist != null)
4011
+ Replace();
4012
+
28724013 cRadio ab;
28734014 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
28744015 {
28754016 ab = (cRadio)e.nextElement();
2876
- if(ab.getModel().isSelected() && ab.GetObject() != client)
4017
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
28774018 {
4019
+ // Patch to avoid bug with transparency.
4020
+ if (!ab.hadMaterial)
4021
+ {
4022
+ ab.object.material = null;
4023
+ }
4024
+
28784025 buttonGroup.remove(ab);
28794026 radioPanel.remove(ab);
28804027
2881
- ab.GetObject().editWindow = null;
4028
+ //ab.GetObject().editWindow = null;
4029
+ ab.GetObject().manipWindow = null;
28824030 // ab.GetObject().objectUI = null; // ?????????
28834031
28844032 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
28854033 break;
28864034 }
28874035 }
4036
+
4037
+ cameraView.requestFocusInWindow();
28884038 refreshContents(true);
28894039 } else
28904040 if (source == editItem || source == editButton)
28914041 {
4042
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4043
+ {
4044
+ Object3D child = (Object3D)e.nextElement();
4045
+ child.pinned = true;
4046
+ }
4047
+
28924048 EditSelection(false);
28934049 } else
28944050 if (source == uneditButton)
....@@ -2897,13 +4053,14 @@
28974053 {
28984054 Object3D child = (Object3D)e.nextElement();
28994055 if(child.editWindow != null)
2900
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4056
+ child.pinned = false;
29014057 child.CloseUI();
29024058 listUI.remove(child);
4059
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29034060
2904
- child.editWindow = null; // ???????????
4061
+ //child.editWindow = null; // ???????????
29054062 }
2906
- objEditor.ctrlPanel.validate();
4063
+ objEditor.ctrlPanel.FlushUI();
29074064 //objEditor.jTree.clearSelection();
29084065 //objEditor.ResetSliders();
29094066 refreshContents(true);
....@@ -2914,16 +4071,18 @@
29144071 //copy.ClearUI();
29154072 for (Object3D obj : listUI)
29164073 {
4074
+ obj.pinned = false;
29174075 obj.CloseUI();
29184076 }
29194077 listUI.clear();
4078
+ SetPinStates(group.selection.size() > 0);
29204079 refreshContents(true);
29214080 } else
29224081 if (source == allParamsButton)
29234082 {
29244083 assert(copy == group);
29254084
2926
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4085
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29274086
29284087 for (Object3D obj : listUI)
29294088 {
....@@ -2949,6 +4108,9 @@
29494108 } else
29504109 if(source instanceof cRadio)
29514110 {
4111
+ if (copy.versionlist != null)
4112
+ Replace();
4113
+
29524114 group.parent = keepparent;
29534115 group.attributes = 0;
29544116 //group.editWindow = null;
....@@ -2972,6 +4134,7 @@
29724134 }
29734135
29744136 copy = group;
4137
+
29754138 //Globals.theRenderer.object = group;
29764139 if(!useclient)
29774140 {
....@@ -2987,20 +4150,75 @@
29874150 frontView.object = group;
29884151 sideView.object = group;
29894152 }
2990
- group.editWindow = this;
4153
+
4154
+// fix "+" issue
4155
+ //group.editWindow = this;
4156
+ group.manipWindow = this;
4157
+
29914158 /*
29924159 currentLayout = radio.layout;
29934160 if (currentLayout == null)
29944161 currentLayout = sevenButton;
29954162 */
29964163 radio.layout.doClick();
4164
+
4165
+ //assert(copy instanceof Composite);
4166
+
4167
+ if (copy.versionlist == null)
4168
+ {
4169
+ copy.versionindex = -1;
4170
+
4171
+ // Cannot work with loops
4172
+ // To fix this issue, we first mark all nodes above the root,
4173
+ // and check if any of these nodes are reachable below the root.
4174
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4175
+
4176
+ if (copy instanceof Composite && !copy.HasTags())
4177
+ {
4178
+ if (copy.versionlist == null)
4179
+ copy.versionlist = new Object3D[100];
4180
+
4181
+ //Save(true);
4182
+ }
4183
+ else
4184
+ copy.versionindex = -2;
4185
+
4186
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4187
+ }
4188
+
4189
+ SetVersionStates();
4190
+
4191
+ ClearUnpinned();
4192
+
4193
+ //Grafreed.Assert(group != null);
4194
+ //Grafreed.Assert(group.selection != null);
4195
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4196
+ if (group.selection == null || group.selection.size() == 1)
4197
+ EditSelection(false);
29974198 keepparent = group.parent;
29984199 // PARENT = NULL or not???
29994200 //group.parent = null; // ROOT
30004201 //group.attributes = -1;
30014202 ResetModel();
4203
+
4204
+ cameraView.requestFocusInWindow();
30024205 refreshContents(true);
3003
- }
4206
+ } else if (event.getSource() == editCameraItem)
4207
+ {
4208
+ cameraView.ProtectCamera();
4209
+ cameraView.requestFocusInWindow();
4210
+ cameraView.repaint();
4211
+ return;
4212
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
4213
+ {
4214
+ cameraView.RevertCamera();
4215
+ cameraView.requestFocusInWindow();
4216
+ cameraView.repaint();
4217
+ return;
4218
+ // } else if (event.getSource() == textureButton)
4219
+ // {
4220
+ // return; // true;
4221
+ }
30044222 else
30054223 {
30064224 //return super.action(event, arg);
....@@ -3009,7 +4227,6 @@
30094227 }
30104228
30114229 boolean useclient = false;
3012
- cRadio radio;
30134230
30144231 void ToggleRoot()
30154232 {
....@@ -3061,10 +4278,69 @@
30614278 refreshContents();
30624279 }
30634280
4281
+ void TransformChildren()
4282
+ {
4283
+ Object3D obj;
4284
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4285
+ {
4286
+ obj = (Object3D)e.nextElement();
4287
+ obj.KeepTextureMatrices();
4288
+ obj.TransformChildren();
4289
+ obj.RestoreTextureMatrices();
4290
+
4291
+// if (obj.parent == null)
4292
+// {
4293
+// System.out.println("NULL PARENT!");
4294
+// new Exception().printStackTrace();
4295
+// }
4296
+// else
4297
+// TouchTransform(obj);
4298
+// //obj.parent.Touch();
4299
+ }
4300
+
4301
+ refreshContents();
4302
+ }
4303
+
4304
+ void TextureRatio(int axis)
4305
+ {
4306
+ Object3D obj;
4307
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4308
+ {
4309
+ obj = (Object3D)e.nextElement();
4310
+ obj.TextureRatio(axis);
4311
+ }
4312
+
4313
+ refreshContents();
4314
+ }
30644315
30654316 void ResetTransform()
30664317 {
30674318 ResetTransform(-1);
4319
+ }
4320
+
4321
+ void ScaleSelection(int scale)
4322
+ {
4323
+ Object3D obj;
4324
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4325
+ {
4326
+ obj = (Object3D)e.nextElement();
4327
+
4328
+ if (obj.toParent == null)
4329
+ continue;
4330
+
4331
+ obj.Scale(scale);
4332
+
4333
+ if (obj.parent == null)
4334
+ {
4335
+ System.out.println("NULL PARENT!");
4336
+ // new Exception().printStackTrace();
4337
+ }
4338
+ else
4339
+ TouchTransform(obj);
4340
+ //obj.parent.Touch();
4341
+ }
4342
+
4343
+ refreshContents();
30684344 }
30694345
30704346 void ResetTransform(int mask)
....@@ -3077,42 +4353,8 @@
30774353 if (obj.toParent == null)
30784354 continue;
30794355
3080
- if (mask == -1)
3081
- {
3082
- if (obj instanceof Camera) // jan 2014
3083
- {
3084
- LA.matIdentity(obj.toParent);
3085
- LA.matIdentity(obj.fromParent);
3086
- }
3087
- else
3088
- {
3089
- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3090
- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3091
- }
3092
- TouchTransform(obj);
3093
- continue;
3094
- }
3095
- if ((mask&2) != 0) // Scale
3096
- {
3097
- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3098
- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3099
- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3100
- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3101
- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3102
- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3103
- }
3104
- if ((mask&4) != 0) // Rotation
3105
- {
3106
- // ?
3107
- }
3108
- if ((mask&1) != 0) // Translation
3109
- {
3110
- if (obj.toParent != null)
3111
- {
3112
- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3113
- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3114
- }
3115
- }
4356
+ obj.ResetTransform(mask);
4357
+
31164358 if (obj.parent == null)
31174359 {
31184360 System.out.println("NULL PARENT!");
....@@ -3173,7 +4415,7 @@
31734415 refreshContents();
31744416 }
31754417
3176
- void ResetCentroid()
4418
+ void ResetCentroid(boolean full)
31774419 {
31784420 Object3D obj;
31794421 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3188,12 +4430,16 @@
31884430 LA.matIdentity(Object3D.mat);
31894431 obj.getBounds(minima, maxima, false);
31904432 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4433
+ if (full)
4434
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
31924435 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
31934436 obj.TransformMesh(Object3D.mat);
4437
+
31944438 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4439
+ if (full)
4440
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
31964441 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4442
+
31974443 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
31984444 //Object3D.mat[3][0] = -Object3D.mat[3][0];
31994445 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3222,7 +4468,8 @@
32224468
32234469 int size = obj.MemorySize();
32244470
3225
- System.err.println((size/1024) + " KB is the size of " + obj);
4471
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4472
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
32264473 }
32274474 }
32284475 catch (Exception e)
....@@ -3259,9 +4506,9 @@
32594506 obj = (Object3D)e.nextElement();
32604507
32614508 System.out.println("Object is: " + obj);
3262
- GrafreeD.AnalyzeObject(obj);
4509
+ Grafreed.AnalyzeObject(obj);
32634510 System.out.println("Boundary rep: " + obj.bRep);
3264
- GrafreeD.AnalyzeObject(obj.bRep);
4511
+ Grafreed.AnalyzeObject(obj.bRep);
32654512
32664513 // System.err.println((size/1024) + " KB is the size of " + obj);
32674514 }
....@@ -3303,6 +4550,13 @@
33034550 void GenNormals(boolean crease)
33044551 {
33054552 group.GenNormalsS(crease);
4553
+
4554
+ refreshContents();
4555
+ }
4556
+
4557
+ void GenNormalsMESH()
4558
+ {
4559
+ group.GenNormalsMeshS();
33064560
33074561 refreshContents();
33084562 }
....@@ -3475,8 +4729,8 @@
34754729
34764730 void ParseVertices()
34774731 {
3478
- boolean epsequal = GrafreeD.epsequal;
3479
- GrafreeD.epsequal = true;
4732
+ boolean epsequal = Grafreed.epsequal;
4733
+ Grafreed.epsequal = true;
34804734
34814735 for (int i=0; i<group.selection.size(); i++)
34824736 {
....@@ -3501,7 +4755,7 @@
35014755 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
35024756 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
35034757
3504
- g.add(GrafreeD.clipboard);
4758
+ g.add(Grafreed.clipboard);
35054759
35064760 buffer.add(g);
35074761 }
....@@ -3516,7 +4770,7 @@
35164770 makeSomething(buffer, i==group.selection.size()-1);
35174771 }
35184772
3519
- GrafreeD.epsequal = epsequal;
4773
+ Grafreed.epsequal = epsequal;
35204774
35214775 refreshContents();
35224776 }
....@@ -3534,7 +4788,16 @@
35344788 String pigment = Object3D.GetPigment(tex);
35354789 //String bump = Object3D.GetBump(tex);
35364790
3537
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4791
+ com.sun.opengl.util.texture.TextureData texturedata = null;
4792
+
4793
+ try
4794
+ {
4795
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4796
+ }
4797
+ catch (Exception e)
4798
+ {
4799
+ System.err.println("FAIL: " + node);
4800
+ }
35384801
35394802 double s = v.s;
35404803
....@@ -3600,10 +4863,17 @@
36004863 {
36014864 Object3D obj = group.selection.get(i);
36024865
4866
+ if (obj.toParent == null)
4867
+ {
4868
+ obj.toParent = LA.newMatrix();
4869
+ obj.fromParent = LA.newMatrix();
4870
+ }
4871
+
36034872 LA.matTranslate(obj.toParent, i * scale, 0, 0);
36044873 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
36054874 }
36064875
4876
+ Globals.lighttouched = true;
36074877 refreshContents();
36084878 }
36094879
....@@ -3622,11 +4892,11 @@
36224892
36234893 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36244894
3625
- boolean random = CameraPane.RANDOM;
3626
- CameraPane.RANDOM = false; // parse all random nodes
4895
+ boolean random = CameraPane.SWITCH;
4896
+ CameraPane.SWITCH = false; // parse all random nodes
36274897 lowres.linkVerticesThis(null);
36284898 lowres.linkVerticesThis(sn);
3629
- CameraPane.RANDOM = random;
4899
+ CameraPane.SWITCH = random;
36304900
36314901 System.err.flush();
36324902
....@@ -3666,7 +4936,7 @@
36664936 return;
36674937
36684938 Object3D poses = group.selection.get(0);
3669
- Object3D ref = GrafreeD.clipboard.get(0);
4939
+ Object3D ref = Grafreed.clipboard.get(0);
36704940
36714941 Object3D newgroup = new Object3D("Po:" + poses.name);
36724942
....@@ -3860,9 +5130,9 @@
38605130
38615131 void ClipMesh()
38625132 {
3863
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
5133
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
38645134 {
3865
- Object3D content = GrafreeD.clipboard.get(0);
5135
+ Object3D content = Grafreed.clipboard.get(0);
38665136
38675137 if (content instanceof cGroup && ((cGroup)content).transientlink )
38685138 content = ((cGroup)content).get(0);
....@@ -3871,7 +5141,7 @@
38715141 // {
38725142 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
38735143 // }
3874
- group.selection.ClipMesh(GrafreeD.clipboard);
5144
+ group.selection.ClipMesh(Grafreed.clipboard);
38755145 }
38765146 // group.selection.ClipMesh(GrafreeD.clipboard);
38775147 System.out.println("DONE.");
....@@ -3888,6 +5158,12 @@
38885158 void ClearMaterials()
38895159 {
38905160 group.selection.ClearMaterials();
5161
+ refreshContents();
5162
+ }
5163
+
5164
+ void ClearVersions()
5165
+ {
5166
+ group.selection.ClearVersions();
38915167 refreshContents();
38925168 }
38935169
....@@ -3918,6 +5194,18 @@
39185194 void MarkLeaves(boolean hide)
39195195 {
39205196 group.selection.MarkLeaves(hide);
5197
+ refreshContents();
5198
+ }
5199
+
5200
+ void RewindLeaves(boolean hide)
5201
+ {
5202
+ group.selection.RewindLeaves(hide);
5203
+ refreshContents();
5204
+ }
5205
+
5206
+ void RandomLeaves(boolean hide)
5207
+ {
5208
+ group.selection.RandomLeaves(hide);
39215209 refreshContents();
39225210 }
39235211
....@@ -3992,28 +5280,25 @@
39925280 // }
39935281 // }
39945282
3995
- static boolean allparams = true;
3996
-
3997
- static Vector<Object3D> listUI = new Vector<Object3D>();
3998
-
39995283 void EditSelection(boolean newWindow)
40005284 {
5285
+ if (group.selection == null)
5286
+ {
5287
+ EditElement(group, newWindow); // ? new
5288
+ return;
5289
+ }
5290
+
40015291 // aConstraints.gridy = 0;
40025292 for (int i=0; i<group.selection.size(); i++)
40035293 {
40045294 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
40055295 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4006
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5296
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
40075297
40085298 Object3D elem = (Object3D)group.selection.elementAt(i);
4009
- if(elem != group)
5299
+ if(elem != group || !newWindow)
40105300 {
4011
- // if (!(elem instanceof Composite))
4012
- // newWindow = false;
4013
- listUI.add(elem);
4014
- elem.openEditWindow(this, newWindow); //, false);
4015
- System.out.println("edit : " + elem);
4016
- elem.editWindow.refreshContents(true); // ? new
5301
+ EditElement(elem, newWindow); // ? new
40175302 }
40185303 }
40195304 }
....@@ -4076,9 +5361,7 @@
40765361
40775362 freezemodel = false;
40785363 }
4079
-
4080
- boolean flashIt = true;
4081
-
5364
+
40825365 public void valueChanged(TreeSelectionEvent e)
40835366 //public boolean handleEvent(Event event)
40845367 {
....@@ -4088,7 +5371,8 @@
40885371 //new Exception().printStackTrace();
40895372
40905373 freezemodel = true;
4091
-
5374
+ ClearUnpinned();
5375
+
40925376 /**/
40935377 //switch (event.id)
40945378 {
....@@ -4096,7 +5380,6 @@
40965380 //case 702: // Event.LIST_DESELECT
40975381 group.deselectAll();
40985382 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4099
- objEditor.ClearInfo(); // .GetMaterial());
41005383 if (tps != null)
41015384 {
41025385 for (int i=0; i < tps.length; i++)
....@@ -4105,10 +5388,8 @@
41055388
41065389 //if (child.parent != null)
41075390 //child.parent.addSelectee(child);
5391
+ objEditor.SetMaterial(child);
41085392 group.addSelectee(child);
4109
- objEditor.SetMaterial(child); // .GetMaterial());
4110
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4111
- System.err.println("info : " + child.GetPath());
41125393 }
41135394 }
41145395 // else
....@@ -4118,20 +5399,28 @@
41185399 // System.err.println("info : " + group.GetPath());
41195400 // }
41205401
4121
- objEditor.SetText(); // jan 2014
4122
-
4123
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5402
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
41245403 CameraPane.flash = true;
41255404
4126
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5405
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
41275406 // a camera
41285407 {
4129
- CameraPane.camerachangeframe = 0; // don't refuse it
4130
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5408
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5409
+ {
5410
+ CameraPane.camerachangeframe = 0; // don't refuse it
5411
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5412
+ }
41315413 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
41325414 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
41335415 }
41345416
5417
+ if (tps != null && tps.length == 1)
5418
+ {
5419
+ EditSelection(false);
5420
+ }
5421
+
5422
+ SetPinStates(tps != null && tps.length > 0);
5423
+
41355424 refreshContents();
41365425 //return true;
41375426 }
....@@ -4140,6 +5429,53 @@
41405429
41415430 freezemodel = false;
41425431 }
5432
+
5433
+ void SetPinStates(boolean enabled)
5434
+ {
5435
+ editButton.setEnabled(enabled);
5436
+ uneditButton.setEnabled(enabled);
5437
+ //unselectButton.setEnabled(enabled);
5438
+ flashSelectionButton.setEnabled(enabled);
5439
+
5440
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5441
+
5442
+ boolean allComposites = true;
5443
+
5444
+ if (group.selection != null)
5445
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5446
+ {
5447
+ Object next = e.nextElement();
5448
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5449
+ {
5450
+ allComposites = false;
5451
+ break;
5452
+ }
5453
+ }
5454
+
5455
+ rootButton.setEnabled(true); // allComposites);
5456
+ }
5457
+
5458
+ void refreshContents(boolean cp)
5459
+ {
5460
+ if (Globals.SHOWINFO)
5461
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5462
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5463
+ {
5464
+ objEditor.ClearInfo(); // .GetMaterial());
5465
+
5466
+ for (int i=0; i < group.selection.Size(); i++)
5467
+ {
5468
+ Object3D child = (Object3D) group.selection.get(i);
5469
+
5470
+ objEditor.AddInfo(child, this, true);
5471
+// System.err.println("info : " + child.GetPath());
5472
+ }
5473
+
5474
+ objEditor.SetText(); // jan 2014
5475
+ }
5476
+
5477
+ super.refreshContents(cp);
5478
+ }
41435479
41445480 void linkSomething(Object3D thing)
41455481 {
....@@ -4211,16 +5547,19 @@
42115547 {
42125548 if (group.selection.isEmpty())
42135549 return;
4214
- GrafreeD.clipboardIsTempGroup = false;
5550
+
5551
+ Grafreed.clipboardIsTempGroup = false;
42155552 Composite tGroup = null;
42165553 if (group.selection.size() > 0) // 1)
42175554 {
42185555 tGroup = new cGroup();
4219
- GrafreeD.clipboardIsTempGroup = true;
5556
+ Grafreed.clipboardIsTempGroup = true;
42205557 }
42215558
42225559 if (cut)
42235560 {
5561
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5562
+// Save();
42245563 //int indices[] = jList.getSelectedIndices();
42255564 //for (int i = indices.length - 1; i >= 0; i--)
42265565 //jList.remove(indices[i]);
....@@ -4256,16 +5595,16 @@
42565595 //System.out.println("cut " + child);
42575596 //System.out.println("parent = " + child.parent);
42585597 // tmp.addChild(child);
4259
- if (GrafreeD.clipboardIsTempGroup)
5598
+ if (Grafreed.clipboardIsTempGroup)
42605599 tGroup.add/*Child*/(tmp);
42615600 else
4262
- GrafreeD.clipboard = tmp;
5601
+ Grafreed.clipboard = tmp;
42635602 }
42645603 else
4265
- if (GrafreeD.clipboardIsTempGroup)
5604
+ if (Grafreed.clipboardIsTempGroup)
42665605 tGroup.add/*Child*/(child);
42675606 else
4268
- GrafreeD.clipboard = child;
5607
+ Grafreed.clipboard = child;
42695608 }
42705609
42715610 //ResetModel();
....@@ -4297,21 +5636,23 @@
42975636 //System.out.println("cut " + elem);
42985637 //System.out.println("parent = " + elem.parent);
42995638 // tmp.addChild(elem);
4300
- if (GrafreeD.clipboardIsTempGroup)
5639
+ if (Grafreed.clipboardIsTempGroup)
43015640 tGroup.add/*Child*/(tmp);
43025641 else
4303
- GrafreeD.clipboard = tmp;
5642
+ Grafreed.clipboard = tmp;
43045643 }
43055644 else
4306
- if (GrafreeD.clipboardIsTempGroup)
5645
+ if (Grafreed.clipboardIsTempGroup)
43075646 tGroup.add/*Child*/(child);
43085647 else
4309
- GrafreeD.clipboard = child;
5648
+ Grafreed.clipboard = child;
43105649 }
43115650
43125651 }
4313
- if (GrafreeD.clipboardIsTempGroup)
4314
- GrafreeD.clipboard = tGroup;
5652
+
5653
+ if (Grafreed.clipboardIsTempGroup)
5654
+ Grafreed.clipboard = tGroup;
5655
+
43155656 if (cut)
43165657 {
43175658 ResetModel();
....@@ -4321,11 +5662,15 @@
43215662
43225663 void paste(boolean expand)
43235664 {
5665
+ if (Globals.REPLACEONMAKE)
5666
+ Save();
5667
+ boolean keep = Globals.REPLACEONMAKE;
5668
+ Globals.REPLACEONMAKE = false;
43245669 // if (GrafreeD.clipboard == null)
43255670 // return;
43265671 boolean first = true;
43275672
4328
- if (GrafreeD.clipboardIsTempGroup)
5673
+ if (Grafreed.clipboardIsTempGroup)
43295674 {
43305675 Composite temp;
43315676
....@@ -4336,7 +5681,7 @@
43365681 temp = (Composite)Applet3D.clipboard.deepCopy();
43375682 */
43385683 Object3D elem;
4339
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
5684
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
43405685 {
43415686 Object3D child = (Object3D)e.nextElement();
43425687
....@@ -4370,21 +5715,22 @@
43705715 //Object3D cb = Applet3D.clipboard;
43715716 //temp.addChild(cb);
43725717 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4373
- assert(GrafreeD.clipboard.parent == null);
4374
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4375
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4376
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4377
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
5718
+ assert(Grafreed.clipboard.parent == null);
5719
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
5720
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
5721
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
5722
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
43785723 else
4379
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380
- GrafreeD.clipboard.get(0).parent = keepparent;
5724
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5725
+ Grafreed.clipboard.get(0).parent = keepparent;
43815726 }
43825727
5728
+ Globals.REPLACEONMAKE = keep;
43835729 ResetModel();
43845730 refreshContents();
43855731 }
43865732
4387
- void pasteInto(boolean copyit)
5733
+ void pasteInto(boolean copyit, boolean clone)
43885734 {
43895735 // if (GrafreeD.clipboard == null)
43905736 // return;
....@@ -4413,15 +5759,22 @@
44135759 if (copyit)
44145760 {
44155761 // paste(false);
4416
- CloneClipboard(false); // sept 2014
5762
+ if (clone)
5763
+ {
5764
+ CloneClipboard(false); // sept 2014
5765
+ }
5766
+ else
5767
+ {
5768
+ paste(false);
5769
+ }
44175770 }
44185771 else
44195772 {
44205773 boolean first = true;
44215774
4422
- if (GrafreeD.clipboardIsTempGroup)
5775
+ if (Grafreed.clipboardIsTempGroup)
44235776 {
4424
- Composite temp = (Composite)GrafreeD.clipboard;
5777
+ Composite temp = (Composite)Grafreed.clipboard;
44255778 Object3D copy;
44265779 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
44275780 {
....@@ -4431,7 +5784,7 @@
44315784 }
44325785 } else
44335786 {
4434
- linkSomething(GrafreeD.clipboard); //.get(0));
5787
+ linkSomething(Grafreed.clipboard); //.get(0));
44355788 }
44365789 }
44375790 }
....@@ -4508,6 +5861,10 @@
45085861
45095862 void group(Object3D csg, boolean grab)
45105863 {
5864
+ if (Globals.REPLACEONMAKE)
5865
+ Save();
5866
+ boolean keep = Globals.REPLACEONMAKE;
5867
+ Globals.REPLACEONMAKE = false;
45115868 if (//false) // why??
45125869 !group.selection.isEmpty())
45135870 {
....@@ -4621,10 +5978,15 @@
46215978 //node.add(csg);
46225979 //makeSomething(node);
46235980 makeSomething(csg);
5981
+ Globals.REPLACEONMAKE = keep;
46245982 }
46255983
46265984 void Ungroup(Object3D g)
46275985 {
5986
+ if (Globals.REPLACEONMAKE)
5987
+ Save();
5988
+ boolean keep = Globals.REPLACEONMAKE;
5989
+ Globals.REPLACEONMAKE = false;
46285990 if (g instanceof HiddenObject)
46295991 {
46305992 HiddenObject h = (HiddenObject) g;
....@@ -4641,6 +6003,7 @@
46416003 objEditor.makeSomething(g.get(i), false);
46426004 }
46436005 }
6006
+ Globals.REPLACEONMAKE = keep;
46446007 }
46456008
46466009 void ungroup()
....@@ -4836,21 +6199,6 @@
48366199 }
48376200 */
48386201
4839
- void ImportGFD()
4840
- {
4841
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4842
- browser.show();
4843
- String filename = browser.getFile();
4844
- if (filename != null && filename.length() > 0)
4845
- {
4846
- String fullname = browser.getDirectory() + filename;
4847
-
4848
- //Object3D readobj =
4849
- objEditor.ReadGFD(fullname, objEditor);
4850
- //makeSomething(readobj);
4851
- }
4852
- }
4853
-
48546202 /*
48556203 public void Callback(Object obj)
48566204 {
....@@ -4874,26 +6222,9 @@
48746222 }
48756223 */
48766224
4877
- void ImportVRMLX3D()
4878
- {
4879
- if (GrafreeD.standAlone)
4880
- {
4881
- /**/
4882
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4883
- browser.show();
4884
- String filename = browser.getFile();
4885
- if (filename != null && filename.length() > 0)
4886
- {
4887
- String fullname = browser.getDirectory() + filename;
4888
- LoadVRMLX3D(fullname);
4889
- }
4890
- /**/
4891
- }
4892
- }
4893
-
48946225 String GetFile(String dialogName)
48956226 {
4896
- if (GrafreeD.standAlone)
6227
+ if (Grafreed.standAlone)
48976228 {
48986229 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
48996230 browser.show();
....@@ -4957,10 +6288,48 @@
49576288 cButton flashSelectionButton;
49586289 cButton editButton;
49596290 cButton uneditButton;
6291
+ JCheckBox allParamsButton;
49606292 cButton clearpanelButton;
4961
- cButton allParamsButton;
49626293 cButton unselectButton;
49636294
6295
+ cButton restoreCameraButton;
6296
+
6297
+ cButton oneStepButton;
6298
+
6299
+ cButton groupButton;
6300
+ cButton ungroupButton;
6301
+ cButton compositeButton;
6302
+ cButton switchButton;
6303
+ cButton loopButton;
6304
+ cButton textureButton;
6305
+
6306
+ cButton skybox1Button;
6307
+ cButton skybox2Button;
6308
+ cButton skybox3Button;
6309
+ cButton skybox4Button;
6310
+ cButton skybox5Button;
6311
+ cButton skybox6Button;
6312
+ cButton skybox7Button;
6313
+
6314
+ cButton skybox11Button;
6315
+ cButton skybox12Button;
6316
+ cButton skybox13Button;
6317
+ cButton skybox14Button;
6318
+ cButton skybox15Button;
6319
+ cButton skybox16Button;
6320
+ cButton skybox17Button;
6321
+
6322
+ cButton gridButton;
6323
+ cButton boxButton;
6324
+ cButton sphereButton;
6325
+ cButton coneButton;
6326
+ cButton torusButton;
6327
+ cButton superButton;
6328
+ cButton kleinButton;
6329
+ cButton particlesButton;
6330
+ cButton overlayButton;
6331
+ cButton lightButton;
6332
+
49646333 cButton screenfitButton;
49656334 cButton screenfitpointButton;
49666335 cButton snapobjectButton;
....@@ -4972,14 +6341,6 @@
49726341
49736342 cButton setsupportButton;
49746343
4975
- cButton twoButton;
4976
- cButton sixButton;
4977
- cButton threeButton;
4978
- cButton sevenButton;
4979
- cButton fourButton; // full panel
4980
- cButton oneButton; // full XYZ
4981
- //cButton currentLayout;
4982
-
49836344 //
49846345 //Composite
49856346 Object3D // to do !!
....@@ -4989,10 +6350,12 @@
49896350 //JTree jTree;
49906351 private MenuItem lookAtItem;
49916352 private MenuItem lookFromItem;
4992
- private MenuItem switchItem;
4993
- private MenuItem cutItem;
4994
- private MenuItem duplicateItem;
4995
- private MenuItem cloneItem;
6353
+ private MenuItem switchViewItem;
6354
+ private JMenuItem cutItem;
6355
+ private MenuItem undoItem;
6356
+ private MenuItem redoItem;
6357
+ private JMenuItem duplicateItem;
6358
+ private JMenuItem cloneItem;
49966359 private MenuItem cloneSupportItem;
49976360 private MenuItem overwriteGeoItem;
49986361 private MenuItem overwriteMatItem;
....@@ -5004,7 +6367,7 @@
50046367 private MenuItem linkverticesItem;
50056368 private MenuItem relinkverticesItem;
50066369 private MenuItem setMasterItem;
5007
- private MenuItem resetMeshItem;
6370
+ private MenuItem resetAllItem;
50086371 private MenuItem stepAllItem;
50096372 private MenuItem revertMeshItem;
50106373 private MenuItem poseMeshItem;
....@@ -5013,12 +6376,13 @@
50136376 private MenuItem cloneGeometriesItem;
50146377 private MenuItem shareGeometriesItem;
50156378 private MenuItem mergeGeometriesItem;
5016
- private MenuItem copyItem;
6379
+ private JMenuItem copyItem;
50176380 private MenuItem pasteItem;
5018
- private MenuItem pasteLinkItem;
5019
- private MenuItem pasteCloneItem;
5020
- private MenuItem pasteExpandItem;
5021
- private MenuItem clearItem;
6381
+ private JMenuItem pasteIntoItem;
6382
+ private JMenuItem pasteLinkItem;
6383
+ private JMenuItem pasteCloneItem;
6384
+ private JMenuItem pasteExpandItem;
6385
+ private JMenuItem deleteItem;
50226386 private MenuItem clearAllItem;
50236387 private MenuItem genUVItem;
50246388 private MenuItem genNormalsMESHItem;
....@@ -5044,6 +6408,7 @@
50446408 private MenuItem clipMeshItem;
50456409 private MenuItem smoothMeshItem;
50466410 private MenuItem clearMaterialsItem;
6411
+ private MenuItem clearVersionsItem;
50476412
50486413 private MenuItem liveleavesItem;
50496414 private MenuItem unliveleavesItem;
....@@ -5053,6 +6418,10 @@
50536418 private MenuItem showleavesItem;
50546419 private MenuItem markleavesItem;
50556420 private MenuItem unmarkleavesItem;
6421
+ private MenuItem rewindleavesItem;
6422
+ private MenuItem unrewindleavesItem;
6423
+ private MenuItem randomleavesItem;
6424
+ private MenuItem unrandomleavesItem;
50566425
50576426 private MenuItem flipVItem;
50586427 private MenuItem unflipVItem;
....@@ -5063,16 +6432,21 @@
50636432 private MenuItem maxTexturesItem;
50646433 private MenuItem panoTexturesItem;
50656434
6435
+ private MenuItem textureRatioRItem;
6436
+ private MenuItem textureRatioGItem;
6437
+ private MenuItem textureRatioBItem;
50666438 private MenuItem resetCentroidItem;
5067
- private MenuItem transformgeometryItem;
6439
+ private MenuItem resetCentroidXZItem;
50686440 private MenuItem resetTransformItem;
6441
+ private MenuItem transformGeometryItem;
6442
+ private MenuItem transformChildrenItem;
50696443 private MenuItem hideItem;
5070
- private MenuItem grabItem;
6444
+ private JMenuItem grabItem;
50716445 private MenuItem backItem;
50726446 private MenuItem frontItem;
50736447 private MenuItem cameraItem;
50746448 private MenuItem compositeItem;
5075
- private MenuItem randomItem;
6449
+ private MenuItem switchItem;
50766450 private MenuItem physicsItem;
50776451 private MenuItem frameselectorItem;
50786452 private MenuItem scriptNodeItem;
....@@ -5080,7 +6454,7 @@
50806454 private MenuItem switchTransfoItem;
50816455 private MenuItem morphItem;
50826456 private MenuItem linkerItem;
5083
- private MenuItem ungroupItem;
6457
+ private JMenuItem ungroupItem;
50846458 private MenuItem editItem;
50856459 private MenuItem openWindowItem;
50866460 private MenuItem editLeafItem;
....@@ -5096,6 +6470,8 @@
50966470 private MenuItem attachBumpItem;
50976471 private MenuItem detachBumpItem;
50986472 private MenuItem pigmentBumpItem;
6473
+ private MenuItem embedTexturesItem;
6474
+ private MenuItem deEmbedTexturesItem;
50996475
51006476 private MenuItem particleItem;
51016477 private MenuItem ragdollItem;
....@@ -5112,7 +6488,7 @@
51126488 private MenuItem blobItem;
51136489 private MenuItem latheItem;
51146490 private MenuItem bezierItem;
5115
- private MenuItem checkerItem;
6491
+ private MenuItem overlayItem;
51166492 private MenuItem meshItem;
51176493 // private MenuItem meshGroupItem;
51186494 private MenuItem springItem;
....@@ -5134,11 +6510,6 @@
51346510 private MenuItem doubleItem;
51356511 private MenuItem tripleItem;
51366512
5137
- private MenuItem importGFDItem;
5138
- private MenuItem importVRMLX3DItem;
5139
- private MenuItem import3DSItem;
5140
- private MenuItem importOBJItem;
5141
-
51426513 private MenuItem computeAOItem;
51436514 private MenuItem recompileItem;
51446515 private MenuItem editScriptItem;
....@@ -5148,4 +6519,8 @@
51486519 private MenuItem analyzeItem;
51496520 private MenuItem dumpItem;
51506521 //boolean freezemodel = false;
6522
+
6523
+ Menu cameraMenu;
6524
+ MenuItem editCameraItem;
6525
+ MenuItem restoreCameraItem;
51516526 }