Normand Briere
2019-08-13 0cdf3fb57ddea3226f094ba45c836c7e9b123e3a
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,360 @@
2324 DragGestureListener, DragSourceListener, DropTargetListener,
2425 ItemListener // ListSelectionListener
2526 {
27
+
28
+ public void AddSkyboxButton(String f, String s, cGridBag row)
29
+ {
30
+ cButton skyboxButton;
31
+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+ skyboxButton.setToolTipText(s.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, !Grafreed.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();
351
+
352
+ AddSkyboxTab0(skyboxpane);
353
+ AddSkyboxTab1(skyboxpane);
354
+ AddSkyboxTab2(skyboxpane);
355
+ AddSkyboxTab3(skyboxpane);
356
+
357
+ skyboxPanel.add(skyboxpane);
358
+ }
359
+
360
+ public void ChangeTexture(String texture)
361
+ {
362
+ for (int i=0; i<group.selection.size(); i++)
363
+ {
364
+ Object3D obj = group.selection.get(i);
365
+ obj.SetPigmentTexture("@" + texture);
366
+ }
367
+
368
+ refreshContents();
369
+ }
370
+
371
+ public void Show3DView()
372
+ {
373
+ // bug
374
+ //gridPanel.setDividerLocation(1.0);
375
+ //bigPanel.setDividerLocation(0.0);
376
+ bigThree.ClearUI();
377
+ bigThree.add(centralPanel);
378
+ bigThree.FlushUI();
379
+ }
380
+
26381 //ObjEditor objEditor;
27382 public void closeUI2()
28383 {
....@@ -60,6 +415,14 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
418
+ if (copy.versionlist == null)
419
+ {
420
+ copy.versionlist = new Object3D[100];
421
+ copy.versionindex = -1;
422
+
423
+ Save(true);
424
+ }
425
+
63426 if(ui)
64427 SetupUI(objEditor);
65428 }
....@@ -74,16 +437,28 @@
74437 this.copy = this.group = copy;
75438 //selectees = this.group.selectees;
76439
77
- SetupMenu2(objEditor);
440
+ SetupMenu2(this); //objEditor);
78441 SetupUI2(objEditor);
79442 objEditor.SetupUI(true);
80443 SetupViews(objEditor);
81444
82445 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446
+
447
+ if (copy.versionlist == null)
448
+ {
449
+ copy.versionlist = new Object3D[100];
450
+ copy.versionindex = -1;
451
+
452
+ Save(true);
453
+ }
83454 }
84455
85456 void CloneSelection(boolean supports)
86457 {
458
+ if (Globals.REPLACEONMAKE)
459
+ Save();
460
+ boolean keep = Globals.REPLACEONMAKE;
461
+ Globals.REPLACEONMAKE = false;
87462 // Object3D keep = GrafreeD.clipboard;
88463 //Object3D obj;
89464 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,18 +469,19 @@
94469
95470 makeSomething(clone, i==group.selection.size()-1);
96471 }
472
+ Globals.REPLACEONMAKE = keep;
97473 }
98474
99475 void CloneClipboard(boolean supports)
100476 {
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));
477
+ assert(Grafreed.clipboard.parent == null);
478
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
479
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
480
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
481
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106482 else
107
- makeSomething(CloneObject(GrafreeD.clipboard, false));
108
- GrafreeD.clipboard.get(0).parent = keepparent;
483
+ makeSomething(CloneObject(Grafreed.clipboard, false));
484
+ Grafreed.clipboard.get(0).parent = keepparent;
109485 }
110486
111487 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -119,7 +495,7 @@
119495 // obj.support = null;
120496 if (!supports)
121497 obj.SaveSupports();
122
- Object3D clone = (Object3D)GrafreeD.clone(obj);
498
+ Object3D clone = (Object3D)Grafreed.clone(obj);
123499 obj.parent = parent;
124500 // obj.support = support;
125501 // clone.support = support; // aout 2013
....@@ -148,30 +524,29 @@
148524
149525 //JTextField nameField;
150526
151
- void SetupMenu2(ObjEditor oe)
527
+ void SetupMenu2(GroupEditor oe)
152528 {
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);
529
+ oe.jTree = new cTree();
530
+
164531 Menu menu;
165532 oe.menuBar.add(menu = new Menu("Edit"));
166533 //editItem = menu.add(new MenuItem("Edit"));
167534 //editItem.addActionListener(this);
168
- duplicateItem = menu.add(new MenuItem("Duplicate"));
535
+
536
+// undoItem = menu.add(new MenuItem("Undo"));
537
+// undoItem.addActionListener(this);
538
+// redoItem = menu.add(new MenuItem("Redo"));
539
+// redoItem.addActionListener(this);
540
+// menu.add("-");
541
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169542 duplicateItem.addActionListener(this);
170
- menu.add("-");
171543 cloneItem = menu.add(new MenuItem("Clone"));
172544 cloneItem.addActionListener(this);
545
+ if (Globals.ADVANCED)
546
+ {
173547 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174548 cloneSupportItem.addActionListener(this);
549
+ }
175550 menu.add("-");
176551 cutItem = menu.add(new MenuItem("Cut"));
177552 cutItem.addActionListener(this);
....@@ -179,27 +554,121 @@
179554 copyItem.addActionListener(this);
180555 pasteItem = menu.add(new MenuItem("Paste"));
181556 pasteItem.addActionListener(this);
557
+
558
+ menu.add("-");
559
+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
560
+ pasteIntoItem.addActionListener(this);
182561 pasteLinkItem = menu.add(new MenuItem("Paste link"));
183562 pasteLinkItem.addActionListener(this);
184563 pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185564 pasteCloneItem.addActionListener(this);
186565 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187566 // pasteExpandItem.addActionListener(this);
188
- clearItem = menu.add(new MenuItem("Clear"));
189
- clearItem.addActionListener(this);
567
+ menu.add("-");
568
+ deleteItem = menu.add(new MenuItem("Delete"));
569
+ deleteItem.addActionListener(this);
570
+
571
+ if (Globals.ADVANCED)
572
+ {
573
+ // Deletes the cameras...
190574 clearAllItem = menu.add(new MenuItem("Clear All"));
191575 clearAllItem.addActionListener(this);
576
+ }
577
+
578
+ menuBar.add(cameraMenu = new Menu("View"));
579
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
580
+ //zBufferItem.addActionListener(this);
581
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
582
+ //normalLensItem.addActionListener(this);
583
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
584
+ restoreCameraItem.addActionListener(this);
585
+
586
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
587
+// toggleFullScreenItem.addItemListener(this);
588
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
589
+// cameraMenu.add("-");
590
+//
591
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
592
+// toggleTextureItem.addItemListener(this);
593
+// toggleTextureItem.setState(CameraPane.textureon);
594
+//
595
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
596
+// toggleSwitchItem.addItemListener(this);
597
+// toggleSwitchItem.setState(CameraPane.SWITCH);
598
+
599
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
600
+ toggleHandleItem.addItemListener(this);
601
+ toggleHandleItem.setState(CameraPane.HANDLES);
602
+
603
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
604
+ togglePaintItem.addItemListener(this);
605
+ togglePaintItem.setState(CameraPane.PAINTMODE);
606
+
607
+ if (Globals.ADVANCED)
608
+ {
609
+ cameraMenu.add("-");
610
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
611
+ toggleLiveItem.addItemListener(this);
612
+ toggleLiveItem.setState(Globals.isLIVE());
192613
614
+ cameraMenu.add(stepItem = new MenuItem("Step"));
615
+ stepItem.addActionListener(this);
616
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
617
+ // toggleDLItem.addItemListener(this);
618
+ // toggleDLItem.setState(false);
619
+
620
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
621
+ toggleRenderItem.addItemListener(this);
622
+ toggleRenderItem.setState(!CameraPane.frozen);
623
+
624
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
625
+ toggleDebugItem.addItemListener(this);
626
+ toggleDebugItem.setState(Globals.DEBUG);
627
+
628
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
629
+ toggleFrustumItem.addItemListener(this);
630
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
631
+
632
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
633
+ toggleFootContactItem.addItemListener(this);
634
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
635
+
636
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
637
+ toggleTimelineItem.addItemListener(this);
638
+ }
639
+
640
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
641
+// toggleRootItem.addItemListener(this);
642
+// toggleRootItem.setState(false);
643
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
644
+// animationItem.addItemListener(this);
645
+// animationItem.setState(CameraPane.ANIMATION);
646
+ cameraMenu.add("-");
647
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
648
+ editCameraItem.addActionListener(this);
649
+
650
+ if (Globals.ADVANCED)
651
+ {
652
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
653
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
654
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
655
+ oe.cameraMenu.add("-");
656
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
657
+ openWindowItem.addActionListener(this);
658
+ lookAtItem.addActionListener(this);
659
+ //lookFromItem.addActinoListener(this);
660
+ //switchViewItem.addActionListener(this);
661
+ }
662
+
193663 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);
664
+ if (Globals.ADVANCED)
665
+ {
198666 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199667 revertMeshItem.addActionListener(this);
200668 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201669 resetreferencesItem.addActionListener(this);
202670 menu.add("-");
671
+ }
203672 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204673 overwriteGeoItem.addActionListener(this);
205674 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -211,79 +680,104 @@
211680 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212681 overwriteUVItem.addActionListener(this);
213682 menu.add("-");
683
+ if (Globals.ADVANCED)
684
+ {
214685 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215686 generateMeshItem.addActionListener(this);
216687 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217688 poseMeshItem.addActionListener(this);
218689 menu.add("-");
690
+ }
219691 resetsupportItem = menu.add(new MenuItem("Reset support"));
220692 resetsupportItem.addActionListener(this);
221693 linkverticesItem = menu.add(new MenuItem("Link to Support"));
222694 linkverticesItem.addActionListener(this);
223695 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224696 relinkverticesItem.addActionListener(this);
697
+
698
+ if (Globals.ADVANCED)
699
+ {
225700 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226701 setMasterItem.addActionListener(this);
702
+ }
227703
228704 oe.menuBar.add(menu = new Menu("Group"));
229
- grabItem = menu.add(new MenuItem("Grab"));
230
- grabItem.addActionListener(this);
705
+// grabItem = menu.add(new MenuItem("Grab"));
706
+// grabItem.addActionListener(this);
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
+ if (Globals.ADVANCED)
715
+ {
716
+ hideItem = menu.add(new MenuItem("Hidden Group"));
238717 hideItem.addActionListener(this);
718
+ }
239719 ungroupItem = menu.add(new MenuItem("Ungroup"));
240720 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);
721
+
722
+// menu.add("-");
723
+//
724
+// switchItem = menu.add(new MenuItem("Switch node"));
725
+// switchItem.addActionListener(this);
726
+ if (Globals.ADVANCED)
727
+ {
248728 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249729 switchGeoItem.addActionListener(this);
250730 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251731 switchTransfoItem.addActionListener(this);
252
- morphItem = menu.add(new MenuItem("Morph"));
732
+ morphItem = menu.add(new MenuItem("Morph Group"));
253733 morphItem.addActionListener(this);
734
+
735
+ menu.add("-");
736
+ physicsItem = menu.add(new MenuItem("Physics"));
737
+ physicsItem.addActionListener(this);
738
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
739
+ frameselectorItem.addActionListener(this);
254740 scriptNodeItem = menu.add(new MenuItem("Script Node"));
255741 scriptNodeItem.addActionListener(this);
256
- cameraItem = menu.add(new MenuItem("Camera"));
257
- cameraItem.addActionListener(this);
742
+ }
258743
259744 oe.menuBar.add(menu = new Menu("Object"));
260
- textureItem = menu.add(new MenuItem("Texture"));
261
- textureItem.addActionListener(this);
745
+// textureItem = menu.add(new MenuItem("Texture"));
746
+// textureItem.addActionListener(this);
262747 billboardItem = menu.add(new MenuItem("Billboard"));
263748 billboardItem.addActionListener(this);
264749 csgItem = menu.add(new MenuItem("CSG"));
265750 csgItem.addActionListener(this);
266
- shadowXItem = menu.add(new MenuItem("Shadow X"));
751
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267752 shadowXItem.addActionListener(this);
268
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
753
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269754 shadowYItem.addActionListener(this);
270
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
755
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271756 shadowZItem.addActionListener(this);
757
+ attributeItem = menu.add(new MenuItem("Attribute"));
758
+ attributeItem.addActionListener(this);
759
+
760
+ if (Globals.ADVANCED)
761
+ {
762
+ menu.add("-");
272763 linkerItem = menu.add(new MenuItem("Linker"));
273764 linkerItem.addActionListener(this);
274765 templateItem = menu.add(new MenuItem("Template"));
275766 templateItem.addActionListener(this);
276
- attributeItem = menu.add(new MenuItem("Attribute"));
277
- attributeItem.addActionListener(this);
278767 pointflowItem = menu.add(new MenuItem("Point Flow"));
279768 pointflowItem.addActionListener(this);
769
+ }
280770 menu.add("-");
281771 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282772 resetTransformItem.addActionListener(this);
283773 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284774 resetCentroidItem.addActionListener(this);
285
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
- transformgeometryItem.addActionListener(this);
775
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
776
+ resetCentroidXZItem.addActionListener(this);
777
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
778
+ transformGeometryItem.addActionListener(this);
779
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
780
+ transformChildrenItem.addActionListener(this);
287781
288782 oe.menuBar.add(menu = new Menu("Geometry"));
289783 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -294,8 +788,11 @@
294788 genNormalsCADItem.addActionListener(this);
295789 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296790 genNormalsMESHItem.addActionListener(this);
297
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
791
+ if (Globals.ADVANCED)
792
+ {
793
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298794 genNormalsMINEItem.addActionListener(this);
795
+ }
299796 stripifyItem = menu.add(new MenuItem("Stripify"));
300797 stripifyItem.addActionListener(this);
301798 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -317,23 +814,34 @@
317814 reduce34MeshItem.addActionListener(this);
318815 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319816 increaseMeshItem.addActionListener(this);
320
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
- smoothMeshItem.addActionListener(this);
322817 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323818 clipMeshItem.addActionListener(this);
819
+
820
+ if (Globals.ADVANCED)
821
+ {
822
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
823
+ smoothMeshItem.addActionListener(this);
824
+ }
324825
325826 oe.menuBar.add(menu = new Menu("Attributes"));
326827 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327828 clearMaterialsItem.addActionListener(this);
829
+ resetAllItem = menu.add(new MenuItem("Reset All"));
830
+ resetAllItem.addActionListener(this);
831
+ stepAllItem = menu.add(new MenuItem("Step All"));
832
+ stepAllItem.addActionListener(this);
328833 menu.add("-");
329834 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330835 liveleavesItem.addActionListener(this);
331836 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332837 unliveleavesItem.addActionListener(this);
838
+ if (Globals.ADVANCED)
839
+ {
333840 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334841 supportleavesItem.addActionListener(this);
335842 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336843 unsupportleavesItem.addActionListener(this);
844
+ }
337845 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338846 hideleavesItem.addActionListener(this);
339847 showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -342,6 +850,14 @@
342850 markleavesItem.addActionListener(this);
343851 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344852 unmarkleavesItem.addActionListener(this);
853
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
854
+ rewindleavesItem.addActionListener(this);
855
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
856
+ unrewindleavesItem.addActionListener(this);
857
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
858
+ randomleavesItem.addActionListener(this);
859
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
860
+ unrandomleavesItem.addActionListener(this);
345861 menu.add("-");
346862 flipVItem = menu.add(new MenuItem("Flip V"));
347863 flipVItem.addActionListener(this);
....@@ -367,53 +883,129 @@
367883 attachBumpItem.addActionListener(this);
368884 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369885 pigmentBumpItem.addActionListener(this);
886
+ //embedTexturesItem
370887 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371888 detachPigmentItem.addActionListener(this);
372889 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373890 detachBumpItem.addActionListener(this);
891
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
892
+ embedTexturesItem.addActionListener(this);
893
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
894
+ deEmbedTexturesItem.addActionListener(this);
374895 menu.add("-");
375896 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376897 sortbysizeItem.addActionListener(this);
377898 sortbynameItem = menu.add(new MenuItem("Sort by name"));
378899 sortbynameItem.addActionListener(this);
379900 menu.add("-");
901
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
902
+ shareGeometriesItem.addActionListener(this);
903
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
904
+ mergeGeometriesItem.addActionListener(this);
905
+ menu.add("-");
906
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
907
+ editLeafItem.addActionListener(this);
908
+ if (Globals.ADVANCED)
909
+ {
910
+ // Pretty much the same as duplicate and clone.
380911 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381912 extractGeometriesItem.addActionListener(this);
382913 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383914 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);
915
+ }
388916
389917 oe.menuBar.add(menu = new Menu("Insert"));
390918 buildCreateMenu(menu);
391919
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
-
403920 oe.menuBar.add(menu = new Menu("Tools"));
404921 buildToolsMenu(menu);
405922 }
406923
924
+ JTabbedPane resourcecontainer;
925
+ cGridBag currenttab;
926
+ boolean added; // patch for jar
927
+
928
+ int tabcount = 0;
929
+ int colcount = 0;
930
+ int rowcount = 0;
931
+ int texturecount = 0;
932
+
933
+ int columns = 5;
934
+ int rows = 7;
935
+
936
+ public void ResourceCallBack(String[] path)
937
+ {
938
+// for (int i = 0; i < path.length; i++)
939
+// System.out.print(path[i] + "/");
940
+// System.out.println();
941
+
942
+ if (//rowcount == 0 ||
943
+ path.length == 1)
944
+ {
945
+ currenttab = new cGridBag();
946
+ added = false;
947
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
948
+ currenttab.setName(tabname);
949
+ rowcount = 1;
950
+ colcount = 0;
951
+ texturecount = 0;
952
+ }
953
+
954
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
955
+ {
956
+ if (!added)
957
+ {
958
+ added = true;
959
+ resourcecontainer.add(currenttab);
960
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
961
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
962
+ }
963
+
964
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
965
+
966
+ if (++colcount >= columns)
967
+ {
968
+ colcount = 0;
969
+ currenttab.Return();
970
+
971
+ if (rowcount++ >= rows)
972
+ {
973
+ rowcount = 0;
974
+ }
975
+ }
976
+ }
977
+ else
978
+ {
979
+// if (!path[path.length-1].equals("icons"))
980
+// resourcecontainer.Return();
981
+ }
982
+ }
983
+
984
+ void CreateTexturePanel(cGridBag container)
985
+ {
986
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
987
+ container.add(resourcecontainer);
988
+
989
+ Grafreed.ParseResources("textures", this);
990
+ }
991
+
407992 void SetupUI2(ObjEditor oe)
408993 {
994
+ // June 2019
995
+ if (oe == null)
996
+ {
997
+ //super.SetupUI2(this);
998
+ //return;
999
+ }
1000
+
1001
+ if (copy != group)
1002
+ {
1003
+ //super.SetupUI2(this);
1004
+ }
1005
+
4091006 //new Exception().printStackTrace();
4101007
4111008 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;
4171009 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
4181010
4191011 oe.buttonGroup = new ButtonGroup();
....@@ -434,110 +1026,263 @@
4341026 oe.radioPanel.add(dummyButton);
4351027 oe.buttonGroup.add(dummyButton);
4361028 */
437
- aConstraints.gridy += 1;
1029
+ cGridBag copyOptionsPanel = new cGridBag();
1030
+
1031
+ copyOptionsPanel.preferredHeight = 2;
4381032
4391033 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
4401034
441
- oe.aConstraints.gridwidth = 1;
442
- oe.aConstraints.gridx = 0;
1035
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1036
+ //minButton.setToolTipText("Minimize window");
1037
+ //minButton.addActionListener(this);
4431038
444
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445
- liveCB.setToolTipText("Enabled animation");
446
- liveCB.addItemListener(this);
447
-
448
- oe.aConstraints.gridx += 1;
449
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
450
- trackCB.setToolTipText("Enable tracking");
451
- trackCB.addItemListener(this);
452
-
453
- oe.aConstraints.gridx += 1;
454
- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
1039
+ if (Globals.ADVANCED)
1040
+ {
1041
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1042
+// maxButton.setToolTipText("Maximize window");
1043
+// maxButton.addActionListener(this);
1044
+ }
1045
+
1046
+// cButton gcButton;
1047
+//
1048
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1049
+// gcButton.setToolTipText("Garbage collect");
1050
+// gcButton.addActionListener(new ActionListener()
1051
+// {
1052
+// public void actionPerformed(ActionEvent e)
1053
+// {
1054
+// System.gc();
1055
+// }
1056
+// });
1057
+
1058
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+ collapseButton.setToolTipText("Collapse toolbar");
1060
+ collapseButton.addActionListener(this);
1061
+
1062
+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
+ maximize3DButton.setToolTipText("Maximize 3D view");
1064
+ maximize3DButton.addActionListener(this);
1065
+
1066
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1067
+ twoButton.setToolTipText("Show 3D view only");
1068
+ twoButton.addActionListener(this);
1069
+ this.fullscreenLayout = twoButton;
1070
+
1071
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1072
+ threeButton.setToolTipText("Show controls and 3D view");
1073
+ threeButton.addActionListener(this);
1074
+ if (Globals.ADVANCED)
1075
+ {
1076
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
+ sixButton.setToolTipText("Show 3D view and controls");
1078
+ sixButton.addActionListener(this);
1079
+ }
1080
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1081
+// sevenButton.setToolTipText("3-column layout");
1082
+// sevenButton.addActionListener(this);
1083
+ //
1084
+
1085
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1086
+ fullButton.setToolTipText("Full-screen window");
1087
+ fullButton.addActionListener(this);
1088
+
1089
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
4551090 screenfitButton.setToolTipText("Screen fit");
4561091 screenfitButton.addActionListener(this);
457
- oe.aConstraints.gridx += 1;
1092
+
1093
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1094
+ restoreCameraButton.setToolTipText("Restore viewpoint");
1095
+ restoreCameraButton.addActionListener(this);
1096
+
1097
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1098
+ saveVersionButton.setToolTipText("Duplicate current version");
1099
+ saveVersionButton.addActionListener(this);
1100
+
1101
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1102
+ deleteVersionButton.setToolTipText("Delete current version");
1103
+ deleteVersionButton.addActionListener(this);
1104
+
1105
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106
+ previousVersionButton.setToolTipText("Previous version");
1107
+ previousVersionButton.addActionListener(this);
1108
+ previousVersionButton.setEnabled(false);
1109
+
1110
+ cGridBag updown = new cGridBag().setVertical(true);
1111
+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+ restoreButton.setToolTipText("Undo (restore current version)");
1113
+ restoreButton.addActionListener(this);
1114
+ //restoreButton.setEnabled(false);
1115
+
1116
+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1117
+ replaceButton.setToolTipText("Save (replace current version)");
1118
+ replaceButton.addActionListener(this);
1119
+ //replaceButton.setEnabled(false);
1120
+
1121
+ copyOptionsPanel.add(updown);
1122
+
1123
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124
+ nextVersionButton.setToolTipText("Next version");
1125
+ nextVersionButton.addActionListener(this);
1126
+ nextVersionButton.setEnabled(false);
1127
+
1128
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+ oneStepButton.setToolTipText("Animate one step forward");
1130
+ oneStepButton.addActionListener(this);
1131
+
1132
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1133
+ liveCB.setToolTipText("Enable animation");
1134
+ liveCB.addItemListener(this);
1135
+
1136
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1137
+ fastCB.setToolTipText("Fast mode");
1138
+ fastCB.addItemListener(this);
1139
+
1140
+ //oe.toolboxPanel.Return();
1141
+
1142
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
1143
+// trackCB.setToolTipText("Enable tracking");
1144
+// trackCB.addItemListener(this);
1145
+
4581146 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
4591147 // screenfitpointButton.addActionListener(this);
460
-// oe.aConstraints.gridx += 1;
461
- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462
- snapobjectButton.addActionListener(this);
463
- snapobjectButton.setToolTipText("Snap Object");
464
- oe.aConstraints.gridx += 1;
4651148
466
- //aConstraints.gridx = 0;
467
- //aConstraints.gridy += 1;
468
- oe.aConstraints.weighty = 0;
469
- oe.aConstraints.gridwidth = 1;
470
-
471
- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
472
- flashSelectionButton.setToolTipText("Show selection");
473
- flashSelectionButton.addActionListener(this);
474
-
475
- oe.toolbarPanel.add(new cButton(" ", false));
476
-
477
- oe.aConstraints.gridx += 1;
478
- oe.aConstraints.weighty = 0;
479
- oe.aConstraints.gridwidth = 1;
480
-
481
- //
482
- oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
483
- twoButton.setToolTipText("Show center view only");
484
- twoButton.addActionListener(this);
485
- oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
1149
+ if (Globals.ADVANCED)
1150
+ {
1151
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152
+ snapobjectButton.addActionListener(this);
1153
+ snapobjectButton.setToolTipText("Snap Object");
1154
+
1155
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
4861156 fourButton.addActionListener(this);
487
- fourButton.setToolTipText("Show left panel only");
488
- oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
489
- sixButton.setToolTipText("2-column layout left");
490
- sixButton.addActionListener(this);
491
- oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
492
- threeButton.setToolTipText("2-column layout right");
493
- threeButton.addActionListener(this);
494
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
495
- sevenButton.setToolTipText("3-column layout");
496
- sevenButton.addActionListener(this);
497
- //
1157
+ fourButton.setToolTipText("Show control panel only");
1158
+ }
4981159
499
- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500
- rootButton.setToolTipText("Edit object in new tab");
1160
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1161
+
1162
+
1163
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+ rootButton.setToolTipText("Open selection in new tab");
5011165 rootButton.addActionListener(this);
502
- oe.aConstraints.gridx += 1;
503
- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
1166
+
1167
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
5041168 closeButton.setToolTipText("Close tab");
5051169 closeButton.addActionListener(this);
5061170 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
5071171 //clearButton.addActionListener(this);
508
- oe.aConstraints.gridx += 1;
509
-
510
- oe.aConstraints.gridx = 1; //
511
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
512
- editButton.addActionListener(this);
513
- oe.aConstraints.gridx += 1;
514
- oe.aConstraints.weighty = 0;
515
- oe.aConstraints.gridwidth = 1;
5161172
517
- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
1173
+ cGridBag row1 = new cGridBag();
1174
+
1175
+ // INSERT
1176
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1177
+ gridButton.setToolTipText("Create ground");
1178
+ gridButton.addActionListener(this);
1179
+
1180
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1181
+ boxButton.setToolTipText("Create box");
1182
+ boxButton.addActionListener(this);
1183
+
1184
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185
+ sphereButton.setToolTipText("Create sphere");
1186
+ sphereButton.addActionListener(this);
1187
+
1188
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1189
+ coneButton.setToolTipText("Create cone");
1190
+ coneButton.addActionListener(this);
1191
+
1192
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+ torusButton.setToolTipText("Create torus");
1194
+ torusButton.addActionListener(this);
1195
+
1196
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+ superButton.setToolTipText("Create superellipsoid");
1198
+ superButton.addActionListener(this);
1199
+
1200
+ if (Globals.ADVANCED)
1201
+ {
1202
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1203
+ kleinButton.setToolTipText("Create Klein bottle");
1204
+ kleinButton.addActionListener(this);
1205
+ }
1206
+
1207
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1208
+ particlesButton.setToolTipText("Create particle system");
1209
+ particlesButton.addActionListener(this);
1210
+
1211
+ oe.toolboxPanel.add(row1);
1212
+
1213
+ cGridBag row2 = new cGridBag();
1214
+
1215
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1216
+ groupButton.setToolTipText("Create group");
1217
+ groupButton.addActionListener(this);
1218
+
1219
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+ compositeButton.setToolTipText("Create composite");
1221
+ compositeButton.addActionListener(this);
1222
+
1223
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1224
+ switchButton.setToolTipText("Create item switcher");
1225
+ switchButton.addActionListener(this);
1226
+
1227
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1228
+ loopButton.setToolTipText("Create loop");
1229
+ loopButton.addActionListener(this);
1230
+
1231
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+ textureButton.setToolTipText("Create texture");
1233
+ textureButton.addActionListener(this);
1234
+
1235
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+ overlayButton.setToolTipText("Create overlay");
1237
+ overlayButton.addActionListener(this);
1238
+
1239
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+ lightButton.setToolTipText("Create light");
1241
+ lightButton.addActionListener(this);
1242
+
1243
+ oe.toolboxPanel.add(row2);
1244
+
1245
+ cGridBag textures = new cGridBag();
1246
+
1247
+ CreateTexturePanel(textures);
1248
+
1249
+ oe.toolboxPanel.add(textures);
1250
+
1251
+ textures.preferredHeight = 100;
1252
+
1253
+ CreateSkyboxPanel(oe.skyboxPanel);
1254
+
1255
+ // EDIT panel
1256
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1257
+ editButton.setToolTipText("Pin selection controls");
1258
+ editButton.addActionListener(this);
1259
+
1260
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1261
+ uneditButton.setToolTipText("Unpin and remove selection controls");
5181262 uneditButton.addActionListener(this);
5191263
520
- oe.aConstraints.gridx += 1;
521
- oe.aConstraints.weighty = 0;
522
- oe.aConstraints.gridwidth = 1;
523
-
524
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525
- clearPanelButton.addActionListener(this);
526
-
527
- oe.aConstraints.gridx += 1;
528
- oe.aConstraints.weighty = 0;
529
- oe.aConstraints.gridwidth = 1;
530
-
531
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
1264
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1265
+ allParamsButton.setToolTipText("Show all controls");
5321266 allParamsButton.addActionListener(this);
5331267
534
- oe.aConstraints.gridx += 1;
535
- oe.aConstraints.weighty = 0;
536
- oe.aConstraints.gridwidth = 1;
537
-
538
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
539
- unselectButton.addActionListener(this);
1268
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1269
+ clearPanelButton.setToolTipText("Clear all controls");
1270
+ clearPanelButton.addActionListener(this);
5401271
1272
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1273
+ //unselectButton.setToolTipText("Unselect");
1274
+ //unselectButton.addActionListener(this);
1275
+
1276
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1277
+ flashSelectionButton.setToolTipText("Highlight selection");
1278
+ flashSelectionButton.addActionListener(this);
1279
+
1280
+ editCommandsPanel.preferredHeight = 1;
1281
+
1282
+ SetPinStates(false);
1283
+// oe.treePanel.add(commandsPanel);
1284
+// oe.treePanel.Return();
1285
+
5411286 // oe.aConstraints.gridx += 1;
5421287 // oe.aConstraints.weighty = 0;
5431288 // oe.aConstraints.gridwidth = 1;
....@@ -549,47 +1294,32 @@
5491294 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
5501295 // gcButton.addActionListener(this);
5511296
552
- oe.aConstraints.gridx = 0;
553
- oe.aConstraints.gridy += 1;
554
-
555
- //ctrlPanel.add(objList = new List(5, true));
556
- oe.aConstraints.gridwidth = 100;
557
- // oe.aConstraints.gridheight = 100;
558
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559
- oe.aConstraints.gridheight = 1;
560
- oe.aConstraints.weighty = 0.5;
561
- oe.aConstraints.gridx = 0;
562
- JScrollPane jSP;
1297
+ cGridBag jSPPanel = new cGridBag();
1298
+
1299
+ JScrollPane jSP;
5631300 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
1301
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
5651302 ResetModel();
566
- oe.aConstraints.weighty = 0.5;
567
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568
- oe.aConstraints.gridy += 1;
569
- oe.aConstraints.gridwidth = 1;
570
-
571
- oe.aConstraints.weighty = 0;
572
- oe.aConstraints.gridwidth = 2;
573
-
574
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
575
- colorCB.addItemListener(this);
576
- oe.aConstraints.gridx += 2;
577
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
578
- materialCB.addItemListener(this);
579
- oe.aConstraints.gridx += 2;
580
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
581
- textureCB.addItemListener(this);
582
-
583
- oe.aConstraints.gridx = 0;
584
- oe.aConstraints.gridy += 1;
5851303
1304
+ oe.treePanel.add(jSPPanel);
1305
+ oe.treePanel.Return();
1306
+
1307
+ oe.treePanel.add(copyOptionsPanel);
1308
+ oe.treePanel.Return();
1309
+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1310
+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1311
+ sliderPane.preferredHeight = 1;
1312
+
1313
+// mainPanel.setDividerLocation(0.1); //1.0);
1314
+ mainPanel.setResizeWeight(0.4);
1315
+
5861316 //jList.addListSelectionListener(this);
5871317 oe.jTree.addTreeSelectionListener(this);
5881318 //jTree.setRootVisible(false);
5891319 //jTree.setEditable(true);
5901320 oe.jTree.setDragEnabled(true);
5911321 //jTree.setPreferredSize(new Dimension(10,10));
592
- jSP.setPreferredSize(new Dimension(100,200));
1322
+ //jSP.setPreferredSize(new Dimension(100,200));
5931323
5941324 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
5951325
....@@ -601,53 +1331,70 @@
6011331 dgr.addDragGestureListener(this);
6021332 }catch(Exception e) {}
6031333 */
604
- radio.layout = sevenButton;
1334
+ radio.layout = threeButton; // sixButton;
6051335 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
6061336 }
6071337
6081338 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
6091339 {
610
- //constraints.gridx = 0;
611
- //constraints.gridy = 0;
612
- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613
- fastCB.setToolTipText("Fast mode");
614
- fastCB.addItemListener(this);
615
- //constraints.gridy += 1;
616
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617
- supportCB.setToolTipText("Enabled rigging");
618
- supportCB.addItemListener(this);
1340
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
1341
+ colorCB.setToolTipText("Copy color when dropped");
1342
+ colorCB.addItemListener(this);
6191343
620
- // constraints.gridy += 1;
1344
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
1345
+ materialCB.setToolTipText("Copy material when dropped");
1346
+ materialCB.addItemListener(this);
1347
+
1348
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
1349
+ textureCB.setToolTipText("Copy texture when dropped");
1350
+ textureCB.addItemListener(this);
1351
+
1352
+ panel.Return();
1353
+
1354
+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
1355
+ boxCB.setToolTipText("Display bounding boxes");
1356
+ boxCB.addItemListener(this);
1357
+
1358
+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
1359
+ zoomBoxCB.setToolTipText("Display only for wheel");
1360
+ zoomBoxCB.addItemListener(this);
1361
+
1362
+ if (true) // Globals.ADVANCED)
1363
+ {
1364
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1365
+// supportCB.setToolTipText("Enable rigging");
1366
+// supportCB.addItemListener(this);
1367
+
1368
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1369
+ freezeCB.setToolTipText("Fast moving camera");
1370
+ freezeCB.addItemListener(this);
1371
+
6211372 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
6221373 // localCB.addItemListener(this);
6231374
624
- //constraints.gridy += 1;
1375
+ panel.Return();
1376
+
6251377 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
6261378 crowdCB.setToolTipText("Used for crowds");
6271379 crowdCB.addItemListener(this);
6281380
629
- //constraints.gridy += 1;
6301381 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
6311382 smoothCB.setToolTipText("Snapping delay");
6321383 smoothCB.addItemListener(this);
6331384
634
- //constraints.gridy += 1;
635
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636
- slowCB.setToolTipText("Smooth interpolation");
637
- slowCB.addItemListener(this);
638
- //constraints.gridy += 1;
639
- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640
- boxCB.setToolTipText("Display bounding boxes");
641
- boxCB.addItemListener(this);
642
- //constraints.gridy += 1;
643
- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645
- zoomBoxCB.addItemListener(this);
646
-
1385
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1386
+// slowCB.setToolTipText("Smooth interpolation");
1387
+// slowCB.addItemListener(this);
1388
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1389
+ minshaderCB.setToolTipText("Minimal fast shader");
1390
+ minshaderCB.addItemListener(this);
1391
+
6471392 // constraints.gridy += 1;
6481393 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
6491394 // speakerMocapCB.addItemListener(this);
6501395
1396
+ panel.Return();
1397
+
6511398 if (false)
6521399 {
6531400 // handled in scripts
....@@ -662,36 +1409,93 @@
6621409 //constraints.gridy += 1;
6631410 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
6641411 smoothfocusCB.addItemListener(this);
1412
+ panel.Return();
6651413 }
6661414
6671415 //constraints.gridx += 1;
6681416 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
6691417 // debugCB.addItemListener(this);
6701418
671
- //constraints.gridy += 1;
1419
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
1420
+ trackCB.setToolTipText("Enable tracking target");
1421
+ trackCB.addItemListener(this);
1422
+
6721423 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
1424
+ oeilCB.setToolTipText("Move camera when tracking");
6731425 oeilCB.addItemListener(this);
6741426
675
- //constraints.gridy += 1;
1427
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
1428
+ shadowCB.setToolTipText("When live compute shadows");
1429
+ shadowCB.addItemListener(this);
1430
+
1431
+ panel.Return();
1432
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
1433
+ toggleTextureCB.setToolTipText("Load textures");
1434
+ toggleTextureCB.addItemListener(this);
1435
+
1436
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
1437
+ toggleSwitchCB.setToolTipText("Choose a single item");
1438
+ toggleSwitchCB.addItemListener(this);
1439
+
1440
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1441
+ autokeepCB.setToolTipText("On structure change");
1442
+ autokeepCB.addItemListener(this);
1443
+
1444
+ panel.Return();
1445
+ if (Globals.ADVANCED)
1446
+ {
6761447 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
6771448 lookAtCB.setToolTipText("Look-at target");
6781449 lookAtCB.addItemListener(this);
1450
+ }
1451
+
1452
+ }
1453
+
1454
+ cGridBag fill = new cGridBag();
1455
+ fill.preferredHeight = 200;
1456
+ cGridBag fill2 = new cGridBag();
1457
+ fill2.preferredHeight = 200;
1458
+ cGridBag fill3 = new cGridBag();
1459
+ fill3.preferredHeight = 200;
1460
+
1461
+ panel.add(fill);
1462
+ panel.add(fill2);
1463
+ panel.add(fill3);
6791464
6801465 }
6811466
6821467 void EditObject(Object3D obj)
6831468 {
1469
+ assert(obj instanceof Composite);
1470
+
1471
+// if (obj.versionlist == null)
1472
+// {
1473
+// obj.versionlist = new Object3D[100];
1474
+// obj.versionindex = -1;
1475
+// }
1476
+
6841477 cRadio radioButton = new cRadio(obj.name);
1478
+
1479
+ // June 2019. Patch to avoid bug with transparency.
1480
+ radioButton.hadMaterial = obj.material != null;
1481
+ if (!radioButton.hadMaterial)
1482
+ {
1483
+ obj.material = new cMaterial();
1484
+ }
1485
+
6851486 radioButton.SetObject(obj);
686
- radioButton.layout = sevenButton;
1487
+ radioButton.layout = threeButton; // sixButton;
6871488 radioButton.SetCamera(cameraView.renderCamera, false);
6881489 radioButton.addActionListener(this);
6891490 radioPanel.add(radioButton);
6901491 buttonGroup.add(radioButton);
6911492 radioButton.doClick();
6921493 }
1494
+
6931495 void SetupViews(ObjEditor oe)
6941496 {
1497
+ theFrame = this;
1498
+
6951499 oe.SetupViews();
6961500
6971501 System.out.println("SetupViews");
....@@ -700,23 +1504,30 @@
7001504 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
7011505 }
7021506
703
- JCheckBox liveCB;
704
- JCheckBox supportCB;
705
- JCheckBox localCB;
706
- JCheckBox crowdCB;
707
- JCheckBox smoothCB;
708
- JCheckBox fastCB;
709
- JCheckBox slowCB;
710
- JCheckBox boxCB;
711
- JCheckBox zoomBoxCB;
712
- JCheckBox trackCB;
713
- JCheckBox smoothfocusCB;
1507
+ cToggleButton liveCB;
1508
+ cCheckBox supportCB;
1509
+ cCheckBox localCB;
1510
+ cCheckBox crowdCB;
1511
+ cCheckBox smoothCB;
1512
+ cCheckBox minshaderCB;
1513
+
1514
+ cToggleButton fastCB;
1515
+ cCheckBox slowCB;
1516
+ cCheckBox boxCB;
1517
+ cCheckBox zoomBoxCB;
1518
+ cCheckBox freezeCB;
1519
+ //cToggleButton trackCB;
1520
+ cCheckBox trackCB;
1521
+ cCheckBox smoothfocusCB;
7141522 // JCheckBox speakerMocapCB;
715
- JCheckBox speakerCameraCB;
716
- JCheckBox speakerFocusCB;
717
- JCheckBox debugCB;
718
- JCheckBox oeilCB;
719
- JCheckBox lookAtCB;
1523
+ cCheckBox speakerCameraCB;
1524
+ cCheckBox speakerFocusCB;
1525
+ cCheckBox debugCB;
1526
+
1527
+ cCheckBox oeilCB;
1528
+ cCheckBox shadowCB;
1529
+ cCheckBox autokeepCB;
1530
+ cCheckBox lookAtCB;
7201531
7211532 // static int COLOR = 1;
7221533 // static int MATERIAL = 2;
....@@ -724,9 +1535,9 @@
7241535
7251536 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7261537
727
- JCheckBox colorCB;
728
- JCheckBox materialCB;
729
- JCheckBox textureCB;
1538
+ cCheckBox colorCB;
1539
+ cCheckBox materialCB;
1540
+ cCheckBox textureCB;
7301541
7311542 public void itemStateChanged(ItemEvent e)
7321543 {
....@@ -754,6 +1565,7 @@
7541565 } else if(e.getSource() == liveCB)
7551566 {
7561567 cameraView.ToggleLive();
1568
+ refreshContents(false);
7571569 }
7581570 else if(e.getSource() == supportCB)
7591571 {
....@@ -769,6 +1581,12 @@
7691581 {
7701582 cameraView.ToggleInertia();
7711583 cameraView.repaint();
1584
+ }
1585
+ else if(e.getSource() == minshaderCB)
1586
+ {
1587
+ Globals.MINSHADER ^= true;
1588
+ cameraView.programInitialized = false;
1589
+ cameraView.repaint();
7721590 }
7731591 else if(e.getSource() == localCB)
7741592 {
....@@ -818,6 +1636,18 @@
8181636 {
8191637 cameraView.ToggleOeil();
8201638 }
1639
+ else if(e.getSource() == shadowCB)
1640
+ {
1641
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1642
+ }
1643
+ else if(e.getSource() == freezeCB)
1644
+ {
1645
+ Globals.FREEZEONMOVE ^= true;
1646
+ }
1647
+ else if(e.getSource() == autokeepCB)
1648
+ {
1649
+ Globals.REPLACEONMAKE ^= true;
1650
+ }
8211651 else if(e.getSource() == lookAtCB)
8221652 {
8231653 cameraView.ToggleLookAt();
....@@ -834,7 +1664,8 @@
8341664
8351665 /**/
8361666 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
837
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1667
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1668
+ TreePath path = objEditor.jTree.getSelectionPath();
8381669 if ((path == null) || (path.getPathCount() <= 1)) {
8391670 // We can't move the root node or an empty selection
8401671 return;
....@@ -897,8 +1728,6 @@
8971728 }
8981729 }
8991730
900
- String string = (String) object;
901
-
9021731 System.out.println("Transfer = " + object + "; drop : " + target);
9031732 // if( object instanceof java.io.File[])
9041733 // {
....@@ -906,7 +1735,11 @@
9061735 // objEditor.DropFile((java.io.File[]) object, true);
9071736 // return;
9081737 // }
909
- if (string.charAt(0) == '/')
1738
+
1739
+ String string = object.toString();
1740
+
1741
+ // File path for Mac and Windows
1742
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
9101743 {
9111744 // file(s)
9121745 String[] names = string.split("\n");
....@@ -933,7 +1766,7 @@
9331766
9341767 flashIt = false;
9351768 CameraPane pane = (CameraPane) target;
936
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1769
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
9371770 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
9381771
9391772 if (group.selection.size() == 1)
....@@ -949,23 +1782,33 @@
9491782
9501783 assert target == objEditor.jTree;
9511784 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1785
+ Object3D destinationLeaf;
9521786 try {
953
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1787
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9541788 } catch (Exception e) {
9551789 System.out.println("destinationPath : " + destinationPath);
9561790 return;
9571791 }
9581792
959
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1793
+ for (int i=group.selection.size(); --i>=0;)
9601794 {
1795
+ Object3D child = (Object3D)group.selection.elementAt(i);
1796
+
1797
+ // Cannot move into itself
1798
+ if (child == destinationLeaf)
1799
+ return;
1800
+ }
1801
+
1802
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1803
+// {
9611804 loadClipboard(true);
9621805 objEditor.jTree.setSelectionPath(destinationPath);
963
- pasteInto(false);
964
- } else {
965
- loadClipboard(false);
966
- objEditor.jTree.setSelectionPath(destinationPath);
967
- pasteInto(false); // true); // ???
968
- }
1806
+ pasteInto(false, false);
1807
+// } else {
1808
+// loadClipboard(false);
1809
+// objEditor.jTree.setSelectionPath(destinationPath);
1810
+// pasteInto(false, false); // true); // ???
1811
+// }
9691812 }
9701813 public void dropActionChanged(DropTargetDragEvent dtde)
9711814 // Called if the user has modified the current drop gesture
....@@ -1021,7 +1864,12 @@
10211864 TreePath path;
10221865
10231866 public TransferableTreePath(TreePath tp) {
1024
- path = tp;
1867
+ Object[] objs = new Object[tp.getPathCount()];
1868
+ for (int i=0; i<objs.length; i++)
1869
+ {
1870
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1871
+ }
1872
+ path = new TreePath(objs);
10251873 }
10261874
10271875 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1070,85 +1918,107 @@
10701918 {
10711919 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10721920 //heightFieldItem.addActionListener(this);
1073
- gridItem = menu.add(new MenuItem("Grid"));
1074
- gridItem.addActionListener(this);
1075
- rectoidItem = menu.add(new MenuItem("Box"));
1076
- rectoidItem.addActionListener(this);
1077
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1078
- ellipsoidItem.addActionListener(this);
1079
- coneItem = menu.add(new MenuItem("Cone"));
1080
- coneItem.addActionListener(this);
1081
- torusItem = menu.add(new MenuItem("Torus"));
1082
- torusItem.addActionListener(this);
1083
- superItem = menu.add(new MenuItem("Superellipsoid"));
1084
- superItem.addActionListener(this);
1921
+// gridItem = menu.add(new MenuItem("Grid"));
1922
+// gridItem.addActionListener(this);
1923
+// rectoidItem = menu.add(new MenuItem("Box"));
1924
+// rectoidItem.addActionListener(this);
1925
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1926
+// ellipsoidItem.addActionListener(this);
1927
+// coneItem = menu.add(new MenuItem("Cone"));
1928
+// coneItem.addActionListener(this);
1929
+// torusItem = menu.add(new MenuItem("Torus"));
1930
+// torusItem.addActionListener(this);
1931
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1932
+// superItem.addActionListener(this);
1933
+
1934
+ cameraItem = menu.add(new MenuItem("Camera"));
1935
+ cameraItem.addActionListener(this);
1936
+
1937
+ if (!Globals.ADVANCED)
1938
+ {
10851939 kleinItem = menu.add(new MenuItem("Klein Bottle"));
10861940 kleinItem.addActionListener(this);
1087
- particleItem = menu.add(new MenuItem("Particle system"));
1088
- particleItem.addActionListener(this);
1941
+ }
1942
+
1943
+// particleItem = menu.add(new MenuItem("Particle system"));
1944
+// particleItem.addActionListener(this);
1945
+ if (Globals.ADVANCED)
1946
+ {
10891947 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10901948 ragdollItem.addActionListener(this);
10911949 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10921950 ragdoll2Item.addActionListener(this);
1951
+ }
10931952 menu.add("-");
1094
- meshItem = menu.add(new MenuItem("Mesh"));
1953
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10951954 meshItem.addActionListener(this);
10961955 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10971956 // meshGroupItem.addActionListener(this);
1957
+ if (Globals.ADVANCED)
1958
+ {
10981959 springItem = menu.add(new MenuItem("Spring"));
10991960 springItem.addActionListener(this);
11001961 flagItem = menu.add(new MenuItem("Flag"));
11011962 flagItem.addActionListener(this);
1102
- bezierItem = menu.add(new MenuItem("Patch"));
1103
- bezierItem.addActionListener(this);
1104
- checkerItem = menu.add(new MenuItem("Checker"));
1105
- checkerItem.addActionListener(this);
11061963 blobItem = menu.add(new MenuItem("Blob"));
11071964 blobItem.addActionListener(this);
11081965 latheItem = menu.add(new MenuItem("Lathe"));
11091966 latheItem.addActionListener(this);
1110
- lightItem = menu.add(new MenuItem("Light"));
1111
- lightItem.addActionListener(this);
1967
+ }
1968
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
1969
+ bezierItem.addActionListener(this);
1970
+// overlayItem = menu.add(new MenuItem("Overlay"));
1971
+// overlayItem.addActionListener(this);
1972
+// lightItem = menu.add(new MenuItem("Light"));
1973
+// lightItem.addActionListener(this);
11121974 menu.add("-");
11131975 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11141976 //superLoopItem.addActionListener(this);
1115
- loopItem = menu.add(new MenuItem("Loop"));
1116
- loopItem.addActionListener(this);
1977
+// loopItem = menu.add(new MenuItem("Loop"));
1978
+// loopItem.addActionListener(this);
11171979 doubleItem = menu.add(new MenuItem("Fork"));
11181980 doubleItem.addActionListener(this);
1981
+ if (Globals.ADVANCED)
1982
+ {
11191983 tripleItem = menu.add(new MenuItem("Trident"));
11201984 tripleItem.addActionListener(this);
1985
+ }
11211986 }
11221987
11231988 void buildToolsMenu(Menu menu)
11241989 {
11251990 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11261991 animationItem.addItemListener(this);
1127
- animationItem.setState(CameraPane.ANIMATION);
1992
+ animationItem.setState(Globals.ANIMATION);
1993
+
1994
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
1995
+ archiveItem.addActionListener(this);
11281996
11291997 menu.add("-");
11301998 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11311999 parseverticesItem.addActionListener(this);
11322000 textureFieldItem = menu.add(new MenuItem("Texture Field"));
11332001 textureFieldItem.addActionListener(this);
1134
- alignItem = menu.add(new MenuItem("Align"));
2002
+ alignItem = menu.add(new MenuItem("Align Objects"));
11352003 alignItem.addActionListener(this);
1136
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137
- mirrorItem.addActionListener(this);
11382004 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11392005 reduceMorphItem.addActionListener(this);
11402006 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11412007 reduce34MorphItem.addActionListener(this);
1142
-
1143
- menu.add(computeAOItem = new MenuItem("Compute AO"));
1144
- computeAOItem.addActionListener(this);
11452008 menu.add("-");
1146
-
11472009 menu.add(memoryItem = new MenuItem("Memory Usage"));
11482010 memoryItem.addActionListener(this);
2011
+ menu.add(computeAOItem = new MenuItem("Compute AO"));
2012
+ computeAOItem.addActionListener(this);
2013
+
2014
+ if (Globals.ADVANCED)
2015
+ {
2016
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
2017
+ mirrorItem.addActionListener(this);
2018
+ menu.add("-");
11492019 menu.add(analyzeItem = new MenuItem("Analyze"));
11502020 analyzeItem.addActionListener(this);
1151
- menu.add(dumpItem = new MenuItem("Dump"));
2021
+ menu.add(dumpItem = new MenuItem("Print"));
11522022 dumpItem.addActionListener(this);
11532023 // menu.add(pathItem = new MenuItem("From-to path"));
11542024 // pathItem.addActionListener(this);
....@@ -1166,6 +2036,7 @@
11662036 menu.add("-");
11672037 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11682038 editScriptItem.addActionListener(this);
2039
+ }
11692040 }
11702041
11712042 void ScreenFit()
....@@ -1288,9 +2159,34 @@
12882159 shadow.material = new cMaterial(obj.material);
12892160 shadow.material.diffuse = 0.0001f;
12902161 shadow.material.specular = 0.0001f;
2162
+ //shadow.projectedVertices[1].x = 300;
12912163
12922164 makeSomething(shadow);
12932165 }
2166
+
2167
+ private void ClearUnpinned()
2168
+ {
2169
+ //for (Object3D obj : listUI)
2170
+ for (int i=listUI.size(); --i>=0;)
2171
+ {
2172
+ Object3D obj = listUI.elementAt(i);
2173
+ if (!obj.pinned)
2174
+ {
2175
+ obj.CloseUI();
2176
+ listUI.remove(i);
2177
+ }
2178
+ }
2179
+ }
2180
+
2181
+ private void EditElement(Object3D elem, boolean newWindow)
2182
+ {
2183
+ // if (!(elem instanceof Composite))
2184
+ // newWindow = false;
2185
+ listUI.add(elem);
2186
+ elem.openEditWindow(this, newWindow); //, false);
2187
+ System.out.println("edit : " + elem);
2188
+ elem.editWindow.refreshContents(true); // ? new
2189
+ }
12942190
12952191 /**
12962192 * applyExample
....@@ -1494,9 +2390,9 @@
14942390
14952391 void Overwrite(int mask)
14962392 {
1497
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2393
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14982394 {
1499
- Object3D content = GrafreeD.clipboard.get(0);
2395
+ Object3D content = Grafreed.clipboard.get(0);
15002396
15012397 if (content instanceof cGroup && ((cGroup)content).transientlink )
15022398 content = ((cGroup)content).get(0);
....@@ -1535,7 +2431,7 @@
15352431 {
15362432 ScreenFit();
15372433 } else
1538
- if (source == switchItem)
2434
+ if (source == switchViewItem)
15392435 {
15402436 cVector v1 = new cVector();
15412437 cVector v2 = new cVector();
....@@ -1544,11 +2440,11 @@
15442440 objEditor.cameraView.renderCamera.setAim(v2, v1);
15452441 objEditor.cameraView.repaint();
15462442 } else
1547
- if (source == rectoidItem)
2443
+ if (source == rectoidItem || source == boxButton)
15482444 {
15492445 makeSomething(new Box());
15502446 } else
1551
- if (source == particleItem)
2447
+ if (source == particleItem || source == particlesButton)
15522448 {
15532449 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15542450 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1627,27 +2523,27 @@
16272523
16282524 makeSomething(obj);
16292525 } else
1630
- if (source == gridItem)
2526
+ if (source == gridItem || source == gridButton)
16312527 {
16322528 makeSomething(new Grid());
16332529 } else
1634
- if (source == ellipsoidItem)
2530
+ if (source == ellipsoidItem || source == sphereButton)
16352531 {
16362532 makeSomething(new Sphere());
16372533 } else
1638
- if (source == coneItem)
2534
+ if (source == coneItem || source == coneButton)
16392535 {
16402536 makeSomething(new Cone());
16412537 } else
1642
- if (source == torusItem)
2538
+ if (source == torusItem || source == torusButton)
16432539 {
16442540 makeSomething(new Torus());
16452541 } else
1646
- if (source == superItem)
2542
+ if (source == superItem || source == superButton)
16472543 {
16482544 makeSomething(new Superellipsoid());
16492545 } else
1650
- if (source == kleinItem)
2546
+ if (source == kleinItem || source == kleinButton)
16512547 {
16522548 makeSomething(new Klein());
16532549 } else
....@@ -1667,7 +2563,7 @@
16672563 {
16682564 makeSomething(new BezierSurface());
16692565 } else
1670
- if (source == checkerItem)
2566
+ if (source == overlayItem || source == overlayButton)
16712567 {
16722568 /*
16732569 Object3D obj = new BezierSurface(5,8);
....@@ -1715,10 +2611,27 @@
17152611 s.setup();
17162612 makeSomething(s);
17172613 } else
1718
- if (source == lightItem)
2614
+ if (source == lightItem || source == lightButton)
17192615 {
17202616 makeSomething(new Light());
17212617 } else
2618
+// if (source == skybox1Button ||
2619
+// source == skybox2Button ||
2620
+// source == skybox3Button ||
2621
+// source == skybox4Button ||
2622
+// source == skybox5Button ||
2623
+// source == skybox6Button ||
2624
+// source == skybox7Button ||
2625
+// source == skybox11Button ||
2626
+// source == skybox12Button ||
2627
+// source == skybox13Button ||
2628
+// source == skybox14Button ||
2629
+// source == skybox15Button ||
2630
+// source == skybox16Button ||
2631
+// source == skybox17Button)
2632
+// {
2633
+// ChangeSkybox(source);
2634
+// } else
17222635 if (source == csgItem)
17232636 {
17242637 group(new CSG());
....@@ -1765,30 +2678,30 @@
17652678
17662679 group(g);
17672680 } else
1768
- if (source == loopItem)
2681
+ if (source == loopItem || source == loopButton)
17692682 {
17702683 Composite csg = new GroupLeaf();
17712684 csg.count = 5;
17722685 group(csg);
1773
- Composite child = new cGroup();
2686
+ Composite child = new cGroup("Branch");
17742687 csg.addChild(child);
17752688 child.addChild(csg);
17762689 } else
17772690 if (source == doubleItem)
17782691 {
1779
- Composite csg = new GroupLeaf();
2692
+ Composite csg = new GroupLeaf("Fork");
17802693 csg.count = 5;
17812694 group(csg);
1782
- Composite child = new cGroup();
2695
+ Composite child = new cGroup("Branch A");
17832696 csg.addChild(child);
17842697 child.addChild(csg);
1785
- child = new cGroup();
2698
+ child = new cGroup("Branch B");
17862699 csg.addChild(child);
17872700 child.addChild(csg);
17882701 } else
17892702 if (source == tripleItem)
17902703 {
1791
- Composite csg = new GroupLeaf();
2704
+ Composite csg = new GroupLeaf("Trident");
17922705 csg.count = 4;
17932706 group(csg);
17942707 Composite child = new cGroup();
....@@ -1801,27 +2714,10 @@
18012714 csg.addChild(child);
18022715 child.addChild(csg);
18032716 } else
1804
-
1805
- if (source == importGFDItem)
1806
- {
1807
- ImportGFD();
1808
- } else
1809
- if (source == importVRMLX3DItem)
1810
- {
1811
- ImportVRMLX3D();
1812
- } else
1813
- if (source == import3DSItem)
1814
- {
1815
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1816
- } else
1817
- if (source == importOBJItem)
1818
- {
1819
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1820
- } else
18212717 if (source == computeAOItem)
18222718 {
18232719 Globals.drawMode = CameraPane.OCCLUSION;
1824
- Globals.theRenderer.repaint();
2720
+ cameraView.repaint();
18252721 } else
18262722 if (source == recompileItem)
18272723 {
....@@ -1836,7 +2732,7 @@
18362732 if (source == invariantsItem)
18372733 {
18382734 System.out.println("Invariants:");
1839
- GrafreeD.grafreeD.universe.invariants();
2735
+ Grafreed.grafreed.universe.invariants();
18402736 } else
18412737 if (source == memoryItem)
18422738 {
....@@ -1855,19 +2751,80 @@
18552751 {
18562752 DumpObject();
18572753 } else
2754
+ if (source == minButton)
2755
+ {
2756
+ Minimize();
2757
+ } else
2758
+ if (source == maxButton)
2759
+ {
2760
+ Maximize();
2761
+ } else
2762
+ if (source == fullButton)
2763
+ {
2764
+ ToggleFullScreen();
2765
+ } else
2766
+ if (source == collapseButton)
2767
+ {
2768
+ this.expandedLayout = radio.layout;
2769
+ CollapseToolbar();
2770
+ } else
2771
+ if (source == maximize3DButton)
2772
+ {
2773
+ this.expandedLayout = radio.layout;
2774
+ radio.layout = twoButton;
2775
+ Show3DView();
2776
+ CollapseToolbar();
2777
+ } else
2778
+ if (source == previousVersionButton)
2779
+ {
2780
+ // Go to previous version
2781
+ //if (!Undo())
2782
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2783
+ PreviousVersion();
2784
+ } else
2785
+ if (source == restoreButton)
2786
+ {
2787
+ // Restore current version
2788
+ Restore();
2789
+ //restoreButton.setEnabled(false);
2790
+ } else
2791
+ if (source == replaceButton)
2792
+ {
2793
+ // Overwrite current version
2794
+ Replace();
2795
+ //replaceButton.setEnabled(false);
2796
+ } else
2797
+ if (source == nextVersionButton)
2798
+ {
2799
+ // Go to next version
2800
+ NextVersion();
2801
+ } else
2802
+ if (source == saveVersionButton)
2803
+ {
2804
+ // Save a new version
2805
+ if (!Save(true))
2806
+ java.awt.Toolkit.getDefaultToolkit().beep();
2807
+ } else
2808
+ if (source == deleteVersionButton)
2809
+ {
2810
+ // Delete a new version
2811
+ DeleteVersion();
2812
+ } else
2813
+ if (source == oneStepButton)
2814
+ {
2815
+ Globals.ONESTEP = true;
2816
+ cameraView.repaint();
2817
+ } else
18582818 if (source == screenfitButton)
18592819 {
1860
- //Reload(lastConverter, lastFilename, true);
18612820 ScreenFit();
18622821 } else
18632822 if (source == screenfitpointButton)
18642823 {
1865
- //Reload(lastConverter, lastFilename, true);
18662824 ScreenFitPoint();
18672825 } else
18682826 if (source == snapobjectButton)
18692827 {
1870
- //Reload(lastConverter, lastFilename, true);
18712828 SnapObject();
18722829 } else
18732830 // if (event.getSource() == recompileButton)
....@@ -1904,12 +2861,20 @@
19042861 {
19052862 loadClipboard(true);
19062863 } else
2864
+ if (source == undoItem)
2865
+ {
2866
+ PreviousVersion();
2867
+ } else
2868
+ if (source == redoItem)
2869
+ {
2870
+ NextVersion();
2871
+ } else
19072872 if (source == duplicateItem)
19082873 {
1909
- Object3D keep = GrafreeD.clipboard;
2874
+ Object3D keep = Grafreed.clipboard;
19102875 loadClipboard(false);
19112876 paste(false);
1912
- GrafreeD.clipboard = keep;
2877
+ Grafreed.clipboard = keep;
19132878 } else
19142879 if (source == cloneItem)
19152880 {
....@@ -1927,13 +2892,17 @@
19272892 {
19282893 paste(false);
19292894 } else
2895
+ if (source == pasteIntoItem)
2896
+ {
2897
+ pasteInto(true, false);
2898
+ } else
19302899 if (source == pasteLinkItem)
19312900 {
1932
- pasteInto(false);
2901
+ pasteInto(false, false);
19332902 } else
19342903 if (source == pasteCloneItem)
19352904 {
1936
- pasteInto(true);
2905
+ pasteInto(true, true);
19372906 } else
19382907 if (source == pasteExpandItem)
19392908 {
....@@ -2125,9 +3094,9 @@
21253094 // group.selection.get(0).setMasterThis(content); // should be identity
21263095 // refreshContents();
21273096 // }
2128
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3097
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
21293098 {
2130
- Object3D content = GrafreeD.clipboard.get(0);
3099
+ Object3D content = Grafreed.clipboard.get(0);
21313100
21323101 if (content instanceof cGroup && ((cGroup)content).transientlink )
21333102 content = ((cGroup)content).get(0);
....@@ -2135,11 +3104,11 @@
21353104 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21363105 for (int i=0; i<group.selection.size(); i++)
21373106 {
2138
- boolean random = CameraPane.RANDOM;
2139
- CameraPane.RANDOM = false; // parse all random nodes
3107
+ boolean random = CameraPane.SWITCH;
3108
+ CameraPane.SWITCH = false; // parse all random nodes
21403109 group.selection.get(i).linkVerticesThis(content);
21413110 // group.selection.get(i).setMasterThis(content); // should be identity
2142
- CameraPane.RANDOM = random;
3111
+ CameraPane.SWITCH = random;
21433112 }
21443113 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21453114 refreshContents();
....@@ -2149,20 +3118,20 @@
21493118 {
21503119 for (int i=0; i<group.selection.size(); i++)
21513120 {
2152
- boolean random = CameraPane.RANDOM;
2153
- CameraPane.RANDOM = false; // parse all random nodes
3121
+ boolean random = CameraPane.SWITCH;
3122
+ CameraPane.SWITCH = false; // parse all random nodes
21543123 group.selection.get(i).linkVerticesThis(null);
2155
- CameraPane.RANDOM = random;
3124
+ CameraPane.SWITCH = random;
21563125 }
21573126
21583127 refreshContents();
21593128 } else
21603129 if (source == relinkverticesItem)
21613130 {
2162
- boolean random = CameraPane.RANDOM;
2163
- CameraPane.RANDOM = false; // parse all random nodes
3131
+ boolean random = CameraPane.SWITCH;
3132
+ CameraPane.SWITCH = false; // parse all random nodes
21643133 group.selection.RelinkToSupport();
2165
- CameraPane.RANDOM = random;
3134
+ CameraPane.SWITCH = random;
21663135
21673136 refreshContents();
21683137 } else
....@@ -2177,9 +3146,9 @@
21773146 } else
21783147 if (source == setMasterItem)
21793148 {
2180
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
3149
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21813150 {
2182
- Object3D content = GrafreeD.clipboard.get(0);
3151
+ Object3D content = Grafreed.clipboard.get(0);
21833152
21843153 if (content instanceof cGroup && ((cGroup)content).transientlink )
21853154 content = ((cGroup)content).get(0);
....@@ -2192,9 +3161,9 @@
21923161 {
21933162 if (group.selection.size() == 1)
21943163 {
2195
- if (GrafreeD.clipboard.size() == 1)
3164
+ if (Grafreed.clipboard.size() == 1)
21963165 {
2197
- Object3D content = GrafreeD.clipboard.get(0);
3166
+ Object3D content = Grafreed.clipboard.get(0);
21983167
21993168 if (content instanceof cGroup && ((cGroup)content).transientlink )
22003169 content = ((cGroup)content).get(0);
....@@ -2211,7 +3180,7 @@
22113180 {
22123181 RevertMeshes();
22133182 } else
2214
- if (source == resetMeshItem)
3183
+ if (source == resetAllItem)
22153184 {
22163185 ResetAll();
22173186 } else
....@@ -2219,7 +3188,7 @@
22193188 {
22203189 StepAll();
22213190 } else
2222
- if (source == clearItem) // || event.getSource() == clearButton)
3191
+ if (source == deleteItem) // || event.getSource() == clearButton)
22233192 {
22243193 //int indices[] = jList.getSelectedIndices();
22253194 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2231,9 +3200,9 @@
22313200 {
22323201 ClearSelection(true);
22333202 } else
2234
- if (source == grabItem)
3203
+ if (source == grabItem || source == groupButton)
22353204 {
2236
- group(new cGroup(), true);
3205
+ group(new cGroup(), false); // true);
22373206 } else
22383207 if (source == hideItem)
22393208 {
....@@ -2251,16 +3220,16 @@
22513220 {
22523221 makeSomething(new Camera());
22533222 } else
2254
- if (source == compositeItem)
3223
+ if (source == compositeItem || source == compositeButton)
22553224 {
22563225 group(new Composite());
22573226 } else
2258
- if (source == randomItem)
3227
+ if (source == switchItem || source == switchButton)
22593228 {
22603229 RandomNode random = new RandomNode();
22613230 group(random);
22623231 if (random.size() > 0)
2263
- random.name = random.get(0).name + "Rnd";
3232
+ random.name = random.get(0).name + "Switch";
22643233 } else
22653234 if (source == physicsItem)
22663235 {
....@@ -2357,7 +3326,7 @@
23573326 {
23583327 group(new cLinker());
23593328 } else
2360
- if (source == textureItem)
3329
+ if (source == textureItem || source == textureButton)
23613330 {
23623331 group(new TextureNode());
23633332 } else
....@@ -2377,17 +3346,30 @@
23773346 {
23783347 CastShadow(2);
23793348 } else
2380
- if (source == ungroupItem)
3349
+ if (source == ungroupItem || source == ungroupButton)
23813350 {
2382
- //ungroup();
3351
+ boolean hasRoot = false;
3352
+
23833353 for (int i=0; i<group.selection.size(); i++)
23843354 {
2385
- Ungroup(group.selection.get(i));
3355
+ if (group.selection.get(i) == group)
3356
+ {
3357
+ hasRoot = true;
3358
+ break;
3359
+ }
23863360 }
23873361
2388
- ClearSelection(false);
2389
-
2390
- refreshContents();
3362
+ if (!hasRoot)
3363
+ {
3364
+ for (int i=0; i<group.selection.size(); i++)
3365
+ {
3366
+ Ungroup(group.selection.get(i));
3367
+ }
3368
+
3369
+ ClearSelection(false);
3370
+
3371
+ refreshContents();
3372
+ }
23913373 } else
23923374 if (source == genUVItem)
23933375 {
....@@ -2399,7 +3381,7 @@
23993381 } else
24003382 if (source == genNormalsMESHItem)
24013383 {
2402
- GenNormals(true); // TODO
3384
+ GenNormalsMESH();
24033385 } else
24043386 if (source == genNormalsORGANItem)
24053387 {
....@@ -2464,6 +3446,22 @@
24643446 if (source == unmarkleavesItem)
24653447 {
24663448 MarkLeaves(false);
3449
+ } else
3450
+ if (source == rewindleavesItem)
3451
+ {
3452
+ RewindLeaves(true);
3453
+ } else
3454
+ if (source == unrewindleavesItem)
3455
+ {
3456
+ RewindLeaves(false);
3457
+ } else
3458
+ if (source == randomleavesItem)
3459
+ {
3460
+ RandomLeaves(true);
3461
+ } else
3462
+ if (source == unrandomleavesItem)
3463
+ {
3464
+ RandomLeaves(false);
24673465 } else
24683466 if (source == flipVItem)
24693467 {
....@@ -2549,9 +3547,13 @@
25493547 {
25503548 SmoothMesh();
25513549 } else
2552
- if (source == transformgeometryItem)
3550
+ if (source == transformGeometryItem)
25533551 {
25543552 TransformGeometry();
3553
+ } else
3554
+ if (source == transformChildrenItem)
3555
+ {
3556
+ TransformChildren();
25553557 } else
25563558 if (source == resetTransformItem)
25573559 {
....@@ -2559,7 +3561,11 @@
25593561 } else
25603562 if (source == resetCentroidItem)
25613563 {
2562
- ResetCentroid();
3564
+ ResetCentroid(true);
3565
+ } else
3566
+ if (source == resetCentroidXZItem)
3567
+ {
3568
+ ResetCentroid(false);
25633569 } else
25643570 if (source == resetParentItem)
25653571 {
....@@ -2664,7 +3670,7 @@
26643670 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
26653671 {
26663672 obj = (Object3D)e.nextElement();
2667
- obj.SetBumpTexture(null);
3673
+ obj.ResetBumpTexture();
26683674 }
26693675
26703676 refreshContents();
....@@ -2680,6 +3686,31 @@
26803686
26813687 refreshContents();
26823688 } else
3689
+ if (source == embedTexturesItem)
3690
+ {
3691
+ Object3D obj;
3692
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3693
+ {
3694
+ obj = (Object3D)e.nextElement();
3695
+ obj.EmbedTextures(true);
3696
+ }
3697
+
3698
+ refreshContents();
3699
+ } else
3700
+ if (source == deEmbedTexturesItem)
3701
+ {
3702
+ Object3D obj;
3703
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3704
+ {
3705
+ obj = (Object3D)e.nextElement();
3706
+ obj.EmbedTextures(false);
3707
+ }
3708
+
3709
+ CameraPane.texturepigment.clear();
3710
+ CameraPane.texturebump.clear();
3711
+
3712
+ refreshContents();
3713
+ } else
26833714 if (source == flashSelectionButton)
26843715 {
26853716 CameraPane.flash = true;
....@@ -2691,42 +3722,36 @@
26913722 if (source == twoButton)
26923723 {
26933724 radio.layout = twoButton;
2694
- // bug
2695
- //gridPanel.setDividerLocation(1.0);
2696
- //bigPanel.setDividerLocation(0.0);
2697
-// bigThree.remove(scenePanel);
2698
-// bigThree.remove(centralPanel);
2699
-// bigThree.remove(XYZPanel);
2700
-// aWindowConstraints.gridx = 0;
2701
-// aWindowConstraints.gridy = 0;
2702
-// aWindowConstraints.gridwidth = 1;
2703
-// // aConstraints.gridheight = 3;
2704
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2705
-// aWindowConstraints.weightx = 0;
2706
-// aWindowConstraints.weighty = 1;
2707
-// //bigThree.add(jtp, aWindowConstraints);
2708
-// aWindowConstraints.weightx = 1;
2709
-// aWindowConstraints.gridwidth = 3;
2710
-// // aConstraints.gridheight = 3;
2711
-// aWindowConstraints.gridx = 1;
2712
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2713
-// bigThree.add(centralPanel, aWindowConstraints);
2714
-// aWindowConstraints.weightx = 0;
2715
-// aWindowConstraints.gridx = 4;
2716
-// aWindowConstraints.gridwidth = 1;
2717
-// // aConstraints.gridheight = 3;
2718
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719
-// //bigThree.add(XYZPanel, aWindowConstraints);
2720
-// scenePanel.setVisible(false);
2721
-// centralPanel.setVisible(true);
2722
-// XYZPanel.setVisible(false);
2723
- bigThree.ClearUI();
2724
- bigThree.add(centralPanel);
2725
- bigThree.FlushUI();
3725
+
3726
+ if (CameraPane.FULLSCREEN)
3727
+ fullscreenLayout = radio.layout;
3728
+
3729
+ Show3DView();
3730
+
3731
+ cameraView.requestFocusInWindow();
3732
+
3733
+// refreshContents(true);
3734
+//
3735
+// try
3736
+// {
3737
+// java.awt.Robot bot = new java.awt.Robot();
3738
+// int mask = InputEvent.BUTTON1_MASK;
3739
+// bot.mouseMove(100, 100);
3740
+// bot.mousePress(mask);
3741
+// bot.mouseRelease(mask);
3742
+// }
3743
+// catch (Exception e)
3744
+// {
3745
+//
3746
+// }
3747
+
27263748 } else
27273749 if (source == threeButton)
27283750 {
27293751 radio.layout = threeButton;
3752
+
3753
+ if (CameraPane.FULLSCREEN)
3754
+ fullscreenLayout = radio.layout;
27303755
27313756 // bigThree.remove(scenePanel);
27323757 // bigThree.remove(centralPanel);
....@@ -2756,13 +3781,18 @@
27563781 // centralPanel.setVisible(true);
27573782 // XYZPanel.setVisible(true);
27583783 bigThree.ClearUI();
3784
+ bigThree.add(scenePanel);
27593785 bigThree.add(centralPanel);
2760
- bigThree.add(XYZPanel);
27613786 bigThree.FlushUI();
3787
+
3788
+ cameraView.requestFocusInWindow();
27623789 } else
27633790 if (source == fourButton)
27643791 {
27653792 radio.layout = fourButton;
3793
+
3794
+ if (CameraPane.FULLSCREEN)
3795
+ fullscreenLayout = radio.layout;
27663796
27673797 // bigThree.remove(scenePanel);
27683798 // bigThree.remove(centralPanel);
....@@ -2794,10 +3824,15 @@
27943824 bigThree.ClearUI();
27953825 bigThree.add(scenePanel);
27963826 bigThree.FlushUI();
3827
+
3828
+ cameraView.requestFocusInWindow();
27973829 } else
27983830 if (source == sixButton)
27993831 {
28003832 radio.layout = sixButton;
3833
+
3834
+ if (CameraPane.FULLSCREEN)
3835
+ fullscreenLayout = radio.layout;
28013836
28023837 // bigThree.remove(scenePanel);
28033838 // bigThree.remove(centralPanel);
....@@ -2827,13 +3862,18 @@
28273862 // centralPanel.setVisible(true);
28283863 // XYZPanel.setVisible(false);
28293864 bigThree.ClearUI();
2830
- bigThree.add(scenePanel);
28313865 bigThree.add(centralPanel);
3866
+ bigThree.add(scenePanel);
28323867 bigThree.FlushUI();
3868
+
3869
+ cameraView.requestFocusInWindow();
28333870 } else
28343871 if (source == sevenButton)
28353872 {
28363873 radio.layout = sevenButton;
3874
+
3875
+ if (CameraPane.FULLSCREEN)
3876
+ fullscreenLayout = radio.layout;
28373877
28383878 // bigThree.remove(scenePanel);
28393879 // bigThree.remove(centralPanel);
....@@ -2867,9 +3907,12 @@
28673907 bigThree.add(centralPanel);
28683908 bigThree.add(XYZPanel);
28693909 bigThree.FlushUI();
3910
+
3911
+ cameraView.requestFocusInWindow();
28703912 } else
28713913 if (source == rootButton)
28723914 {
3915
+ Replace();
28733916 Object3D obj;
28743917 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28753918 {
....@@ -2878,6 +3921,7 @@
28783921 EditObject(obj);
28793922 }
28803923
3924
+ cameraView.requestFocusInWindow();
28813925 refreshContents(true);
28823926 } else
28833927 if (source == closeButton)
....@@ -2887,22 +3931,37 @@
28873931 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
28883932 {
28893933 ab = (cRadio)e.nextElement();
2890
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3934
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
28913935 {
3936
+ // Patch to avoid bug with transparency.
3937
+ if (!ab.hadMaterial)
3938
+ {
3939
+ ab.object.material = null;
3940
+ }
3941
+
28923942 buttonGroup.remove(ab);
28933943 radioPanel.remove(ab);
28943944
2895
- ab.GetObject().editWindow = null;
3945
+ //ab.GetObject().editWindow = null;
3946
+ ab.GetObject().manipWindow = null;
28963947 // ab.GetObject().objectUI = null; // ?????????
28973948
28983949 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
28993950 break;
29003951 }
29013952 }
3953
+
3954
+ cameraView.requestFocusInWindow();
29023955 refreshContents(true);
29033956 } else
29043957 if (source == editItem || source == editButton)
29053958 {
3959
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3960
+ {
3961
+ Object3D child = (Object3D)e.nextElement();
3962
+ child.pinned = true;
3963
+ }
3964
+
29063965 EditSelection(false);
29073966 } else
29083967 if (source == uneditButton)
....@@ -2911,13 +3970,14 @@
29113970 {
29123971 Object3D child = (Object3D)e.nextElement();
29133972 if(child.editWindow != null)
2914
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3973
+ child.pinned = false;
29153974 child.CloseUI();
29163975 listUI.remove(child);
3976
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29173977
2918
- child.editWindow = null; // ???????????
3978
+ //child.editWindow = null; // ???????????
29193979 }
2920
- objEditor.ctrlPanel.validate();
3980
+ objEditor.ctrlPanel.FlushUI();
29213981 //objEditor.jTree.clearSelection();
29223982 //objEditor.ResetSliders();
29233983 refreshContents(true);
....@@ -2928,16 +3988,18 @@
29283988 //copy.ClearUI();
29293989 for (Object3D obj : listUI)
29303990 {
3991
+ obj.pinned = false;
29313992 obj.CloseUI();
29323993 }
29333994 listUI.clear();
3995
+ SetPinStates(group.selection.size() > 0);
29343996 refreshContents(true);
29353997 } else
29363998 if (source == allParamsButton)
29373999 {
29384000 assert(copy == group);
29394001
2940
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4002
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
29414003
29424004 for (Object3D obj : listUI)
29434005 {
....@@ -2986,6 +4048,7 @@
29864048 }
29874049
29884050 copy = group;
4051
+
29894052 //Globals.theRenderer.object = group;
29904053 if(!useclient)
29914054 {
....@@ -3001,20 +4064,61 @@
30014064 frontView.object = group;
30024065 sideView.object = group;
30034066 }
3004
- group.editWindow = this;
4067
+
4068
+// fix "+" issue
4069
+ //group.editWindow = this;
4070
+ group.manipWindow = this;
4071
+
30054072 /*
30064073 currentLayout = radio.layout;
30074074 if (currentLayout == null)
30084075 currentLayout = sevenButton;
30094076 */
30104077 radio.layout.doClick();
4078
+
4079
+ assert(copy instanceof Composite);
4080
+
4081
+ if (copy.versionlist == null)
4082
+ {
4083
+ copy.versionlist = new Object3D[100];
4084
+ copy.versionindex = -1;
4085
+
4086
+ Save(true);
4087
+ }
4088
+
4089
+ SetVersionStates();
4090
+
4091
+ ClearUnpinned();
4092
+
4093
+ //Grafreed.Assert(group != null);
4094
+ //Grafreed.Assert(group.selection != null);
4095
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4096
+ if (group.selection == null || group.selection.size() == 1)
4097
+ EditSelection(false);
30114098 keepparent = group.parent;
30124099 // PARENT = NULL or not???
30134100 //group.parent = null; // ROOT
30144101 //group.attributes = -1;
30154102 ResetModel();
4103
+
4104
+ cameraView.requestFocusInWindow();
30164105 refreshContents(true);
3017
- }
4106
+ } else if (event.getSource() == editCameraItem)
4107
+ {
4108
+ cameraView.ProtectCamera();
4109
+ cameraView.requestFocusInWindow();
4110
+ cameraView.repaint();
4111
+ return;
4112
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
4113
+ {
4114
+ cameraView.RevertCamera();
4115
+ cameraView.requestFocusInWindow();
4116
+ cameraView.repaint();
4117
+ return;
4118
+ // } else if (event.getSource() == textureButton)
4119
+ // {
4120
+ // return; // true;
4121
+ }
30184122 else
30194123 {
30204124 //return super.action(event, arg);
....@@ -3023,7 +4127,6 @@
30234127 }
30244128
30254129 boolean useclient = false;
3026
- cRadio radio;
30274130
30284131 void ToggleRoot()
30294132 {
....@@ -3075,6 +4178,28 @@
30754178 refreshContents();
30764179 }
30774180
4181
+ void TransformChildren()
4182
+ {
4183
+ Object3D obj;
4184
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4185
+ {
4186
+ obj = (Object3D)e.nextElement();
4187
+ obj.KeepTextureMatrices();
4188
+ obj.TransformChildren();
4189
+ obj.RestoreTextureMatrices();
4190
+
4191
+// if (obj.parent == null)
4192
+// {
4193
+// System.out.println("NULL PARENT!");
4194
+// new Exception().printStackTrace();
4195
+// }
4196
+// else
4197
+// TouchTransform(obj);
4198
+// //obj.parent.Touch();
4199
+ }
4200
+
4201
+ refreshContents();
4202
+ }
30784203
30794204 void ResetTransform()
30804205 {
....@@ -3187,7 +4312,7 @@
31874312 refreshContents();
31884313 }
31894314
3190
- void ResetCentroid()
4315
+ void ResetCentroid(boolean full)
31914316 {
31924317 Object3D obj;
31934318 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3202,12 +4327,16 @@
32024327 LA.matIdentity(Object3D.mat);
32034328 obj.getBounds(minima, maxima, false);
32044329 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
4330
+ if (full)
4331
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
32064332 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
32074333 obj.TransformMesh(Object3D.mat);
4334
+
32084335 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
4336
+ if (full)
4337
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
32104338 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
4339
+
32114340 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
32124341 //Object3D.mat[3][0] = -Object3D.mat[3][0];
32134342 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3236,7 +4365,8 @@
32364365
32374366 int size = obj.MemorySize();
32384367
3239
- System.err.println((size/1024) + " KB is the size of " + obj);
4368
+ //System.err.println((size/1024) + " KB is the size of " + obj);
4369
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
32404370 }
32414371 }
32424372 catch (Exception e)
....@@ -3273,9 +4403,9 @@
32734403 obj = (Object3D)e.nextElement();
32744404
32754405 System.out.println("Object is: " + obj);
3276
- GrafreeD.AnalyzeObject(obj);
4406
+ Grafreed.AnalyzeObject(obj);
32774407 System.out.println("Boundary rep: " + obj.bRep);
3278
- GrafreeD.AnalyzeObject(obj.bRep);
4408
+ Grafreed.AnalyzeObject(obj.bRep);
32794409
32804410 // System.err.println((size/1024) + " KB is the size of " + obj);
32814411 }
....@@ -3317,6 +4447,13 @@
33174447 void GenNormals(boolean crease)
33184448 {
33194449 group.GenNormalsS(crease);
4450
+
4451
+ refreshContents();
4452
+ }
4453
+
4454
+ void GenNormalsMESH()
4455
+ {
4456
+ group.GenNormalsMeshS();
33204457
33214458 refreshContents();
33224459 }
....@@ -3489,8 +4626,8 @@
34894626
34904627 void ParseVertices()
34914628 {
3492
- boolean epsequal = GrafreeD.epsequal;
3493
- GrafreeD.epsequal = true;
4629
+ boolean epsequal = Grafreed.epsequal;
4630
+ Grafreed.epsequal = true;
34944631
34954632 for (int i=0; i<group.selection.size(); i++)
34964633 {
....@@ -3515,7 +4652,7 @@
35154652 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
35164653 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
35174654
3518
- g.add(GrafreeD.clipboard);
4655
+ g.add(Grafreed.clipboard);
35194656
35204657 buffer.add(g);
35214658 }
....@@ -3530,7 +4667,7 @@
35304667 makeSomething(buffer, i==group.selection.size()-1);
35314668 }
35324669
3533
- GrafreeD.epsequal = epsequal;
4670
+ Grafreed.epsequal = epsequal;
35344671
35354672 refreshContents();
35364673 }
....@@ -3548,7 +4685,16 @@
35484685 String pigment = Object3D.GetPigment(tex);
35494686 //String bump = Object3D.GetBump(tex);
35504687
3551
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4688
+ com.sun.opengl.util.texture.TextureData texturedata = null;
4689
+
4690
+ try
4691
+ {
4692
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4693
+ }
4694
+ catch (Exception e)
4695
+ {
4696
+ System.err.println("FAIL: " + node);
4697
+ }
35524698
35534699 double s = v.s;
35544700
....@@ -3636,11 +4782,11 @@
36364782
36374783 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36384784
3639
- boolean random = CameraPane.RANDOM;
3640
- CameraPane.RANDOM = false; // parse all random nodes
4785
+ boolean random = CameraPane.SWITCH;
4786
+ CameraPane.SWITCH = false; // parse all random nodes
36414787 lowres.linkVerticesThis(null);
36424788 lowres.linkVerticesThis(sn);
3643
- CameraPane.RANDOM = random;
4789
+ CameraPane.SWITCH = random;
36444790
36454791 System.err.flush();
36464792
....@@ -3680,7 +4826,7 @@
36804826 return;
36814827
36824828 Object3D poses = group.selection.get(0);
3683
- Object3D ref = GrafreeD.clipboard.get(0);
4829
+ Object3D ref = Grafreed.clipboard.get(0);
36844830
36854831 Object3D newgroup = new Object3D("Po:" + poses.name);
36864832
....@@ -3874,9 +5020,9 @@
38745020
38755021 void ClipMesh()
38765022 {
3877
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
5023
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
38785024 {
3879
- Object3D content = GrafreeD.clipboard.get(0);
5025
+ Object3D content = Grafreed.clipboard.get(0);
38805026
38815027 if (content instanceof cGroup && ((cGroup)content).transientlink )
38825028 content = ((cGroup)content).get(0);
....@@ -3885,7 +5031,7 @@
38855031 // {
38865032 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
38875033 // }
3888
- group.selection.ClipMesh(GrafreeD.clipboard);
5034
+ group.selection.ClipMesh(Grafreed.clipboard);
38895035 }
38905036 // group.selection.ClipMesh(GrafreeD.clipboard);
38915037 System.out.println("DONE.");
....@@ -3932,6 +5078,18 @@
39325078 void MarkLeaves(boolean hide)
39335079 {
39345080 group.selection.MarkLeaves(hide);
5081
+ refreshContents();
5082
+ }
5083
+
5084
+ void RewindLeaves(boolean hide)
5085
+ {
5086
+ group.selection.RewindLeaves(hide);
5087
+ refreshContents();
5088
+ }
5089
+
5090
+ void RandomLeaves(boolean hide)
5091
+ {
5092
+ group.selection.RandomLeaves(hide);
39355093 refreshContents();
39365094 }
39375095
....@@ -4006,28 +5164,25 @@
40065164 // }
40075165 // }
40085166
4009
- static boolean allparams = true;
4010
-
4011
- static Vector<Object3D> listUI = new Vector<Object3D>();
4012
-
40135167 void EditSelection(boolean newWindow)
40145168 {
5169
+ if (group.selection == null)
5170
+ {
5171
+ EditElement(group, newWindow); // ? new
5172
+ return;
5173
+ }
5174
+
40155175 // aConstraints.gridy = 0;
40165176 for (int i=0; i<group.selection.size(); i++)
40175177 {
40185178 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
40195179 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4020
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
5180
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
40215181
40225182 Object3D elem = (Object3D)group.selection.elementAt(i);
4023
- if(elem != group)
5183
+ if(elem != group || !newWindow)
40245184 {
4025
- // if (!(elem instanceof Composite))
4026
- // newWindow = false;
4027
- listUI.add(elem);
4028
- elem.openEditWindow(this, newWindow); //, false);
4029
- System.out.println("edit : " + elem);
4030
- elem.editWindow.refreshContents(true); // ? new
5185
+ EditElement(elem, newWindow); // ? new
40315186 }
40325187 }
40335188 }
....@@ -4090,9 +5245,7 @@
40905245
40915246 freezemodel = false;
40925247 }
4093
-
4094
- boolean flashIt = true;
4095
-
5248
+
40965249 public void valueChanged(TreeSelectionEvent e)
40975250 //public boolean handleEvent(Event event)
40985251 {
....@@ -4102,7 +5255,8 @@
41025255 //new Exception().printStackTrace();
41035256
41045257 freezemodel = true;
4105
-
5258
+ ClearUnpinned();
5259
+
41065260 /**/
41075261 //switch (event.id)
41085262 {
....@@ -4110,7 +5264,6 @@
41105264 //case 702: // Event.LIST_DESELECT
41115265 group.deselectAll();
41125266 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4113
- objEditor.ClearInfo(); // .GetMaterial());
41145267 if (tps != null)
41155268 {
41165269 for (int i=0; i < tps.length; i++)
....@@ -4119,33 +5272,39 @@
41195272
41205273 //if (child.parent != null)
41215274 //child.parent.addSelectee(child);
5275
+ objEditor.SetMaterial(child);
41225276 group.addSelectee(child);
4123
- objEditor.SetMaterial(child); // .GetMaterial());
4124
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4125
- System.err.println("info : " + child.GetPath());
41265277 }
41275278 }
4128
- else
4129
- {
4130
- objEditor.SetMaterial(group); // .GetMaterial());
4131
- objEditor.AddInfo(group, this, true); // .GetMaterial());
4132
- System.err.println("info : " + group.GetPath());
4133
- }
5279
+// else
5280
+// {
5281
+// objEditor.SetMaterial(group); // .GetMaterial());
5282
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
5283
+// System.err.println("info : " + group.GetPath());
5284
+// }
41345285
4135
- objEditor.SetText(); // jan 2014
4136
-
4137
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
5286
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
41385287 CameraPane.flash = true;
41395288
4140
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
5289
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
41415290 // a camera
41425291 {
4143
- CameraPane.camerachangeframe = 0; // don't refuse it
4144
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5292
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5293
+ {
5294
+ CameraPane.camerachangeframe = 0; // don't refuse it
5295
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5296
+ }
41455297 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
41465298 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
41475299 }
41485300
5301
+ if (tps != null && tps.length == 1)
5302
+ {
5303
+ EditSelection(false);
5304
+ }
5305
+
5306
+ SetPinStates(tps != null && tps.length > 0);
5307
+
41495308 refreshContents();
41505309 //return true;
41515310 }
....@@ -4154,6 +5313,50 @@
41545313
41555314 freezemodel = false;
41565315 }
5316
+
5317
+ void SetPinStates(boolean enabled)
5318
+ {
5319
+ editButton.setEnabled(enabled);
5320
+ uneditButton.setEnabled(enabled);
5321
+ //unselectButton.setEnabled(enabled);
5322
+ flashSelectionButton.setEnabled(enabled);
5323
+
5324
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5325
+
5326
+ boolean allComposites = true;
5327
+
5328
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5329
+ {
5330
+ if (!(e.nextElement() instanceof Composite))
5331
+ {
5332
+ allComposites = false;
5333
+ break;
5334
+ }
5335
+ }
5336
+
5337
+ rootButton.setEnabled(allComposites);
5338
+ }
5339
+
5340
+ void refreshContents(boolean cp)
5341
+ {
5342
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5343
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5344
+ {
5345
+ objEditor.ClearInfo(); // .GetMaterial());
5346
+
5347
+ for (int i=0; i < group.selection.Size(); i++)
5348
+ {
5349
+ Object3D child = (Object3D) group.selection.get(i);
5350
+
5351
+ objEditor.AddInfo(child, this, true);
5352
+// System.err.println("info : " + child.GetPath());
5353
+ }
5354
+
5355
+ objEditor.SetText(); // jan 2014
5356
+ }
5357
+
5358
+ super.refreshContents(cp);
5359
+ }
41575360
41585361 void linkSomething(Object3D thing)
41595362 {
....@@ -4225,16 +5428,19 @@
42255428 {
42265429 if (group.selection.isEmpty())
42275430 return;
4228
- GrafreeD.clipboardIsTempGroup = false;
5431
+
5432
+ Grafreed.clipboardIsTempGroup = false;
42295433 Composite tGroup = null;
42305434 if (group.selection.size() > 0) // 1)
42315435 {
42325436 tGroup = new cGroup();
4233
- GrafreeD.clipboardIsTempGroup = true;
5437
+ Grafreed.clipboardIsTempGroup = true;
42345438 }
42355439
42365440 if (cut)
42375441 {
5442
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5443
+// Save();
42385444 //int indices[] = jList.getSelectedIndices();
42395445 //for (int i = indices.length - 1; i >= 0; i--)
42405446 //jList.remove(indices[i]);
....@@ -4270,16 +5476,16 @@
42705476 //System.out.println("cut " + child);
42715477 //System.out.println("parent = " + child.parent);
42725478 // tmp.addChild(child);
4273
- if (GrafreeD.clipboardIsTempGroup)
5479
+ if (Grafreed.clipboardIsTempGroup)
42745480 tGroup.add/*Child*/(tmp);
42755481 else
4276
- GrafreeD.clipboard = tmp;
5482
+ Grafreed.clipboard = tmp;
42775483 }
42785484 else
4279
- if (GrafreeD.clipboardIsTempGroup)
5485
+ if (Grafreed.clipboardIsTempGroup)
42805486 tGroup.add/*Child*/(child);
42815487 else
4282
- GrafreeD.clipboard = child;
5488
+ Grafreed.clipboard = child;
42835489 }
42845490
42855491 //ResetModel();
....@@ -4311,21 +5517,23 @@
43115517 //System.out.println("cut " + elem);
43125518 //System.out.println("parent = " + elem.parent);
43135519 // tmp.addChild(elem);
4314
- if (GrafreeD.clipboardIsTempGroup)
5520
+ if (Grafreed.clipboardIsTempGroup)
43155521 tGroup.add/*Child*/(tmp);
43165522 else
4317
- GrafreeD.clipboard = tmp;
5523
+ Grafreed.clipboard = tmp;
43185524 }
43195525 else
4320
- if (GrafreeD.clipboardIsTempGroup)
5526
+ if (Grafreed.clipboardIsTempGroup)
43215527 tGroup.add/*Child*/(child);
43225528 else
4323
- GrafreeD.clipboard = child;
5529
+ Grafreed.clipboard = child;
43245530 }
43255531
43265532 }
4327
- if (GrafreeD.clipboardIsTempGroup)
4328
- GrafreeD.clipboard = tGroup;
5533
+
5534
+ if (Grafreed.clipboardIsTempGroup)
5535
+ Grafreed.clipboard = tGroup;
5536
+
43295537 if (cut)
43305538 {
43315539 ResetModel();
....@@ -4335,11 +5543,15 @@
43355543
43365544 void paste(boolean expand)
43375545 {
5546
+ if (Globals.REPLACEONMAKE)
5547
+ Save();
5548
+ boolean keep = Globals.REPLACEONMAKE;
5549
+ Globals.REPLACEONMAKE = false;
43385550 // if (GrafreeD.clipboard == null)
43395551 // return;
43405552 boolean first = true;
43415553
4342
- if (GrafreeD.clipboardIsTempGroup)
5554
+ if (Grafreed.clipboardIsTempGroup)
43435555 {
43445556 Composite temp;
43455557
....@@ -4350,7 +5562,7 @@
43505562 temp = (Composite)Applet3D.clipboard.deepCopy();
43515563 */
43525564 Object3D elem;
4353
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
5565
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
43545566 {
43555567 Object3D child = (Object3D)e.nextElement();
43565568
....@@ -4384,21 +5596,22 @@
43845596 //Object3D cb = Applet3D.clipboard;
43855597 //temp.addChild(cb);
43865598 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387
- assert(GrafreeD.clipboard.parent == null);
4388
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4389
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
5599
+ assert(Grafreed.clipboard.parent == null);
5600
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
5601
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
5602
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
5603
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
43925604 else
4393
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394
- GrafreeD.clipboard.get(0).parent = keepparent;
5605
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
5606
+ Grafreed.clipboard.get(0).parent = keepparent;
43955607 }
43965608
5609
+ Globals.REPLACEONMAKE = keep;
43975610 ResetModel();
43985611 refreshContents();
43995612 }
44005613
4401
- void pasteInto(boolean copyit)
5614
+ void pasteInto(boolean copyit, boolean clone)
44025615 {
44035616 // if (GrafreeD.clipboard == null)
44045617 // return;
....@@ -4427,15 +5640,22 @@
44275640 if (copyit)
44285641 {
44295642 // paste(false);
4430
- CloneClipboard(false); // sept 2014
5643
+ if (clone)
5644
+ {
5645
+ CloneClipboard(false); // sept 2014
5646
+ }
5647
+ else
5648
+ {
5649
+ paste(false);
5650
+ }
44315651 }
44325652 else
44335653 {
44345654 boolean first = true;
44355655
4436
- if (GrafreeD.clipboardIsTempGroup)
5656
+ if (Grafreed.clipboardIsTempGroup)
44375657 {
4438
- Composite temp = (Composite)GrafreeD.clipboard;
5658
+ Composite temp = (Composite)Grafreed.clipboard;
44395659 Object3D copy;
44405660 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
44415661 {
....@@ -4445,7 +5665,7 @@
44455665 }
44465666 } else
44475667 {
4448
- linkSomething(GrafreeD.clipboard); //.get(0));
5668
+ linkSomething(Grafreed.clipboard); //.get(0));
44495669 }
44505670 }
44515671 }
....@@ -4522,6 +5742,10 @@
45225742
45235743 void group(Object3D csg, boolean grab)
45245744 {
5745
+ if (Globals.REPLACEONMAKE)
5746
+ Save();
5747
+ boolean keep = Globals.REPLACEONMAKE;
5748
+ Globals.REPLACEONMAKE = false;
45255749 if (//false) // why??
45265750 !group.selection.isEmpty())
45275751 {
....@@ -4635,10 +5859,15 @@
46355859 //node.add(csg);
46365860 //makeSomething(node);
46375861 makeSomething(csg);
5862
+ Globals.REPLACEONMAKE = keep;
46385863 }
46395864
46405865 void Ungroup(Object3D g)
46415866 {
5867
+ if (Globals.REPLACEONMAKE)
5868
+ Save();
5869
+ boolean keep = Globals.REPLACEONMAKE;
5870
+ Globals.REPLACEONMAKE = false;
46425871 if (g instanceof HiddenObject)
46435872 {
46445873 HiddenObject h = (HiddenObject) g;
....@@ -4655,6 +5884,7 @@
46555884 objEditor.makeSomething(g.get(i), false);
46565885 }
46575886 }
5887
+ Globals.REPLACEONMAKE = keep;
46585888 }
46595889
46605890 void ungroup()
....@@ -4850,21 +6080,6 @@
48506080 }
48516081 */
48526082
4853
- void ImportGFD()
4854
- {
4855
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4856
- browser.show();
4857
- String filename = browser.getFile();
4858
- if (filename != null && filename.length() > 0)
4859
- {
4860
- String fullname = browser.getDirectory() + filename;
4861
-
4862
- //Object3D readobj =
4863
- objEditor.ReadGFD(fullname, objEditor);
4864
- //makeSomething(readobj);
4865
- }
4866
- }
4867
-
48686083 /*
48696084 public void Callback(Object obj)
48706085 {
....@@ -4888,26 +6103,9 @@
48886103 }
48896104 */
48906105
4891
- void ImportVRMLX3D()
4892
- {
4893
- if (GrafreeD.standAlone)
4894
- {
4895
- /**/
4896
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4897
- browser.show();
4898
- String filename = browser.getFile();
4899
- if (filename != null && filename.length() > 0)
4900
- {
4901
- String fullname = browser.getDirectory() + filename;
4902
- LoadVRMLX3D(fullname);
4903
- }
4904
- /**/
4905
- }
4906
- }
4907
-
49086106 String GetFile(String dialogName)
49096107 {
4910
- if (GrafreeD.standAlone)
6108
+ if (Grafreed.standAlone)
49116109 {
49126110 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
49136111 browser.show();
....@@ -4971,10 +6169,48 @@
49716169 cButton flashSelectionButton;
49726170 cButton editButton;
49736171 cButton uneditButton;
6172
+ JCheckBox allParamsButton;
49746173 cButton clearpanelButton;
4975
- cButton allParamsButton;
49766174 cButton unselectButton;
49776175
6176
+ cButton restoreCameraButton;
6177
+
6178
+ cButton oneStepButton;
6179
+
6180
+ cButton groupButton;
6181
+ cButton ungroupButton;
6182
+ cButton compositeButton;
6183
+ cButton switchButton;
6184
+ cButton loopButton;
6185
+ cButton textureButton;
6186
+
6187
+ cButton skybox1Button;
6188
+ cButton skybox2Button;
6189
+ cButton skybox3Button;
6190
+ cButton skybox4Button;
6191
+ cButton skybox5Button;
6192
+ cButton skybox6Button;
6193
+ cButton skybox7Button;
6194
+
6195
+ cButton skybox11Button;
6196
+ cButton skybox12Button;
6197
+ cButton skybox13Button;
6198
+ cButton skybox14Button;
6199
+ cButton skybox15Button;
6200
+ cButton skybox16Button;
6201
+ cButton skybox17Button;
6202
+
6203
+ cButton gridButton;
6204
+ cButton boxButton;
6205
+ cButton sphereButton;
6206
+ cButton coneButton;
6207
+ cButton torusButton;
6208
+ cButton superButton;
6209
+ cButton kleinButton;
6210
+ cButton particlesButton;
6211
+ cButton overlayButton;
6212
+ cButton lightButton;
6213
+
49786214 cButton screenfitButton;
49796215 cButton screenfitpointButton;
49806216 cButton snapobjectButton;
....@@ -4986,14 +6222,6 @@
49866222
49876223 cButton setsupportButton;
49886224
4989
- cButton twoButton;
4990
- cButton sixButton;
4991
- cButton threeButton;
4992
- cButton sevenButton;
4993
- cButton fourButton; // full panel
4994
- cButton oneButton; // full XYZ
4995
- //cButton currentLayout;
4996
-
49976225 //
49986226 //Composite
49996227 Object3D // to do !!
....@@ -5003,9 +6231,11 @@
50036231 //JTree jTree;
50046232 private MenuItem lookAtItem;
50056233 private MenuItem lookFromItem;
5006
- private MenuItem switchItem;
6234
+ private MenuItem switchViewItem;
50076235 private MenuItem cutItem;
5008
- private MenuItem duplicateItem;
6236
+ private MenuItem undoItem;
6237
+ private MenuItem redoItem;
6238
+ private JMenuItem duplicateItem;
50096239 private MenuItem cloneItem;
50106240 private MenuItem cloneSupportItem;
50116241 private MenuItem overwriteGeoItem;
....@@ -5018,7 +6248,7 @@
50186248 private MenuItem linkverticesItem;
50196249 private MenuItem relinkverticesItem;
50206250 private MenuItem setMasterItem;
5021
- private MenuItem resetMeshItem;
6251
+ private MenuItem resetAllItem;
50226252 private MenuItem stepAllItem;
50236253 private MenuItem revertMeshItem;
50246254 private MenuItem poseMeshItem;
....@@ -5029,10 +6259,11 @@
50296259 private MenuItem mergeGeometriesItem;
50306260 private MenuItem copyItem;
50316261 private MenuItem pasteItem;
6262
+ private MenuItem pasteIntoItem;
50326263 private MenuItem pasteLinkItem;
50336264 private MenuItem pasteCloneItem;
50346265 private MenuItem pasteExpandItem;
5035
- private MenuItem clearItem;
6266
+ private MenuItem deleteItem;
50366267 private MenuItem clearAllItem;
50376268 private MenuItem genUVItem;
50386269 private MenuItem genNormalsMESHItem;
....@@ -5067,6 +6298,10 @@
50676298 private MenuItem showleavesItem;
50686299 private MenuItem markleavesItem;
50696300 private MenuItem unmarkleavesItem;
6301
+ private MenuItem rewindleavesItem;
6302
+ private MenuItem unrewindleavesItem;
6303
+ private MenuItem randomleavesItem;
6304
+ private MenuItem unrandomleavesItem;
50706305
50716306 private MenuItem flipVItem;
50726307 private MenuItem unflipVItem;
....@@ -5078,15 +6313,17 @@
50786313 private MenuItem panoTexturesItem;
50796314
50806315 private MenuItem resetCentroidItem;
5081
- private MenuItem transformgeometryItem;
6316
+ private MenuItem resetCentroidXZItem;
50826317 private MenuItem resetTransformItem;
6318
+ private MenuItem transformGeometryItem;
6319
+ private MenuItem transformChildrenItem;
50836320 private MenuItem hideItem;
50846321 private MenuItem grabItem;
50856322 private MenuItem backItem;
50866323 private MenuItem frontItem;
50876324 private MenuItem cameraItem;
50886325 private MenuItem compositeItem;
5089
- private MenuItem randomItem;
6326
+ private MenuItem switchItem;
50906327 private MenuItem physicsItem;
50916328 private MenuItem frameselectorItem;
50926329 private MenuItem scriptNodeItem;
....@@ -5110,6 +6347,8 @@
51106347 private MenuItem attachBumpItem;
51116348 private MenuItem detachBumpItem;
51126349 private MenuItem pigmentBumpItem;
6350
+ private MenuItem embedTexturesItem;
6351
+ private MenuItem deEmbedTexturesItem;
51136352
51146353 private MenuItem particleItem;
51156354 private MenuItem ragdollItem;
....@@ -5126,7 +6365,7 @@
51266365 private MenuItem blobItem;
51276366 private MenuItem latheItem;
51286367 private MenuItem bezierItem;
5129
- private MenuItem checkerItem;
6368
+ private MenuItem overlayItem;
51306369 private MenuItem meshItem;
51316370 // private MenuItem meshGroupItem;
51326371 private MenuItem springItem;
....@@ -5148,11 +6387,6 @@
51486387 private MenuItem doubleItem;
51496388 private MenuItem tripleItem;
51506389
5151
- private MenuItem importGFDItem;
5152
- private MenuItem importVRMLX3DItem;
5153
- private MenuItem import3DSItem;
5154
- private MenuItem importOBJItem;
5155
-
51566390 private MenuItem computeAOItem;
51576391 private MenuItem recompileItem;
51586392 private MenuItem editScriptItem;
....@@ -5162,4 +6396,8 @@
51626396 private MenuItem analyzeItem;
51636397 private MenuItem dumpItem;
51646398 //boolean freezemodel = false;
6399
+
6400
+ Menu cameraMenu;
6401
+ MenuItem editCameraItem;
6402
+ MenuItem restoreCameraItem;
51656403 }