Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314
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", !Globals.NIMBUSLAF));
33
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
+ skyboxButton.addActionListener(new ActionListener()
36
+ {
37
+ @Override
38
+ public void actionPerformed(ActionEvent e)
39
+ {
40
+ ChangeSkybox(path);
41
+ }
42
+ });
43
+ }
44
+
45
+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46
+ {
47
+ cButton textureButton;
48
+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
+ textureButton.setToolTipText(c + count);
51
+ textureButton.addActionListener(new ActionListener()
52
+ {
53
+ @Override
54
+ public void actionPerformed(ActionEvent e)
55
+ {
56
+ ChangeTexture(path + t);
57
+ }
58
+ });
59
+ }
60
+
61
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
62
+ {
63
+ cGridBag tab0 = new cGridBag().setVertical(true);
64
+
65
+ tab0.setName("Urban");
66
+ skyboxpanel.add(tab0);
67
+
68
+ cGridBag row0 = new cGridBag();
69
+ cGridBag row1 = new cGridBag();
70
+ cGridBag row2 = new cGridBag();
71
+ cGridBag row3 = new cGridBag();
72
+ cGridBag row4 = new cGridBag();
73
+ cGridBag row5 = new cGridBag();
74
+ cGridBag row6 = new cGridBag();
75
+
76
+ AddSkyboxButton("default", "", row0);
77
+ //AddSkyboxButton("default", "cornell", row0);
78
+ AddSkyboxButton("penguins", "dust", row0);
79
+ AddSkyboxButton("penguins", "tropic", row0);
80
+ AddSkyboxButton("penguins", "yonder", row0);
81
+
82
+ AddSkyboxButton("default", "uffizi", row1);
83
+ AddSkyboxButton("bridge", "Bridge", row1);
84
+ AddSkyboxButton("bridge", "Bridge2", row1);
85
+ AddSkyboxButton("urban", "GamlaStan2", row1);
86
+
87
+ AddSkyboxButton("urban", "Parliament", row2);
88
+ AddSkyboxButton("urban", "Roundabout", row2);
89
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
90
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
91
+
92
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
93
+ AddSkyboxButton("urban", "UnionSquare", row3);
94
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
95
+ AddSkyboxButton("park", "BerzeliiPark", row3);
96
+
97
+ AddSkyboxButton("park", "Buddha", row4);
98
+ AddSkyboxButton("park", "CNTower2", row4);
99
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
100
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
101
+
102
+ AddSkyboxButton("park", "Park", row5);
103
+ AddSkyboxButton("park", "Pond", row5);
104
+ AddSkyboxButton("park", "Skansen", row5);
105
+ AddSkyboxButton("park", "Skansen2", row5);
106
+
107
+ AddSkyboxButton("park", "Skansen3", row6);
108
+ AddSkyboxButton("park", "Skansen4", row6);
109
+ AddSkyboxButton("park", "Skansen5", row6);
110
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
111
+
112
+ tab0.add(row0);
113
+ tab0.add(row1);
114
+ tab0.add(row2);
115
+ tab0.add(row3);
116
+ tab0.add(row4);
117
+ tab0.add(row5);
118
+ tab0.add(row6);
119
+
120
+ for (int i=5; --i>=0;)
121
+ {
122
+ //oe.toolboxPanel.Return();
123
+ //tab0.add(new cGridBag());
124
+ }
125
+ }
126
+
127
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
128
+ {
129
+ cGridBag tab0 = new cGridBag().setVertical(true);
130
+
131
+ tab0.setName("Nature");
132
+ skyboxpanel.add(tab0);
133
+
134
+ cGridBag row0 = new cGridBag();
135
+ cGridBag row1 = new cGridBag();
136
+ cGridBag row2 = new cGridBag();
137
+ cGridBag row3 = new cGridBag();
138
+ cGridBag row4 = new cGridBag();
139
+ cGridBag row5 = new cGridBag();
140
+ cGridBag row6 = new cGridBag();
141
+
142
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
143
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
144
+ AddSkyboxButton("beach", "PalmTrees", row0);
145
+ AddSkyboxButton("beach", "Tenerife", row0);
146
+
147
+ AddSkyboxButton("beach", "Tenerife2", row1);
148
+ AddSkyboxButton("beach", "Tenerife3", row1);
149
+ AddSkyboxButton("field", "FishPond", row1);
150
+ AddSkyboxButton("field", "Footballfield", row1);
151
+
152
+ AddSkyboxButton("field", "Meadow", row2);
153
+ AddSkyboxButton("field", "Sorsele", row2);
154
+ AddSkyboxButton("field", "Sorsele2", row2);
155
+ AddSkyboxButton("field", "Sorsele3", row2);
156
+
157
+ AddSkyboxButton("forest", "Brudslojan", row3);
158
+ AddSkyboxButton("forest", "Langholmen2", row3);
159
+ AddSkyboxButton("forest", "Plants", row3);
160
+ AddSkyboxButton("mountain", "Maskonaive", row3);
161
+
162
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
163
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
164
+ AddSkyboxButton("mountain", "Teide", row4);
165
+ AddSkyboxButton("park", "Tantolunden4", row4);
166
+
167
+ AddSkyboxButton("park", "Stairs", row5);
168
+ AddSkyboxButton("default", "skycube", row6);
169
+ AddSkyboxButton("rocky", "Langholmen", row5);
170
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
171
+
172
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
173
+ AddSkyboxButton("default", "CloudyHills", row6);
174
+ AddSkyboxButton("daz", "Autumn", row6);
175
+ AddSkyboxButton("daz", "MountainTrail", row6);
176
+ /*
177
+Autumn
178
+Greenlands
179
+MountainTrail
180
+Oasis
181
+TheRock
182
+TopOfTheWorld
183
+Winter
184
+ */
185
+
186
+ tab0.add(row0);
187
+ tab0.add(row1);
188
+ tab0.add(row2);
189
+ tab0.add(row3);
190
+ tab0.add(row4);
191
+ tab0.add(row5);
192
+ tab0.add(row6);
193
+
194
+ for (int i=5; --i>=0;)
195
+ {
196
+ //oe.toolboxPanel.Return();
197
+ //tab0.add(new cGridBag());
198
+ }
199
+ }
200
+
201
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
202
+ {
203
+ cGridBag tab0 = new cGridBag().setVertical(true);
204
+
205
+ tab0.setName("Night");
206
+ skyboxpanel.add(tab0);
207
+
208
+ cGridBag row0 = new cGridBag();
209
+ cGridBag row1 = new cGridBag();
210
+ cGridBag row2 = new cGridBag();
211
+ cGridBag row3 = new cGridBag();
212
+ cGridBag row4 = new cGridBag();
213
+ cGridBag row5 = new cGridBag();
214
+ cGridBag row6 = new cGridBag();
215
+
216
+ AddSkyboxButton("night", "NightPath", row0);
217
+ AddSkyboxButton("night", "PondNight", row0);
218
+ AddSkyboxButton("night", "Powerlines", row0);
219
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
220
+
221
+ AddSkyboxButton("urban", "CNTower", row1);
222
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
223
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
224
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
225
+
226
+ AddSkyboxButton("penguins", "kenon_star", row2);
227
+ AddSkyboxButton("persson", "corona", row2);
228
+ AddSkyboxButton("persson", "spaceskybox", row2);
229
+ AddSkyboxButton("indoors", "Vasa", row2);
230
+
231
+ AddSkyboxButton("winter", "Backyard", row3);
232
+ AddSkyboxButton("winter", "Creek", row3);
233
+ AddSkyboxButton("winter", "FootballField3", row3);
234
+ AddSkyboxButton("winter", "Forest", row3);
235
+
236
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
237
+ AddSkyboxButton("winter", "House", row4);
238
+ AddSkyboxButton("winter", "IceLake", row4);
239
+ AddSkyboxButton("winter", "IceRiver", row4);
240
+
241
+ AddSkyboxButton("winter", "Park3", row5);
242
+ AddSkyboxButton("winter", "PondWinter", row5);
243
+ AddSkyboxButton("winter", "Tantolunden5", row5);
244
+ AddSkyboxButton("winter", "Vindelalven", row5);
245
+
246
+ AddSkyboxButton("daz", "TheRock", row6);
247
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
248
+ AddSkyboxButton("daz", "Winter", row6);
249
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
250
+
251
+ tab0.add(row0);
252
+ tab0.add(row1);
253
+ tab0.add(row2);
254
+ tab0.add(row3);
255
+ tab0.add(row4);
256
+ tab0.add(row5);
257
+ tab0.add(row6);
258
+
259
+ for (int i=5; --i>=0;)
260
+ {
261
+ //oe.toolboxPanel.Return();
262
+ //tab0.add(new cGridBag());
263
+ }
264
+ }
265
+
266
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
267
+ {
268
+ cGridBag tab0 = new cGridBag().setVertical(true);
269
+
270
+ tab0.setName("Others");
271
+ skyboxpanel.add(tab0);
272
+
273
+ cGridBag row0 = new cGridBag();
274
+ cGridBag row1 = new cGridBag();
275
+ cGridBag row2 = new cGridBag();
276
+ cGridBag row3 = new cGridBag();
277
+ cGridBag row4 = new cGridBag();
278
+ cGridBag row5 = new cGridBag();
279
+ cGridBag row6 = new cGridBag();
280
+
281
+ AddSkyboxButton("mayhem", "afterrain", row0);
282
+ AddSkyboxButton("mayhem", "aqua4", row0);
283
+ AddSkyboxButton("mayhem", "aqua9", row0);
284
+ AddSkyboxButton("mayhem", "flame", row0);
285
+
286
+ AddSkyboxButton("mayhem", "h2s", row1);
287
+ AddSkyboxButton("mayhem", "prehistoric", row1);
288
+ AddSkyboxButton("mayhem", "scorched", row1);
289
+ AddSkyboxButton("penguins", "desertdawn", row1);
290
+
291
+ AddSkyboxButton("persson", "Citadella", row2);
292
+ AddSkyboxButton("persson", "Citadella2", row2);
293
+ AddSkyboxButton("persson", "clouds1", row2);
294
+ AddSkyboxButton("penguins", "wrath", row2);
295
+
296
+ AddSkyboxButton("persson", "FishermansBastion", row3);
297
+ AddSkyboxButton("persson", "HeroesSquare", row3);
298
+ AddSkyboxButton("indoors", "DallasW", row3);
299
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
300
+
301
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
302
+ AddSkyboxButton("persson", "PereaBeach1", row4);
303
+ AddSkyboxButton("persson", "PereaBeach2", row4);
304
+ AddSkyboxButton("persson", "redeclipse", row4);
305
+
306
+ AddSkyboxButton("daz", "Greenlands", row5);
307
+ AddSkyboxButton("daz", "Oasis", row5);
308
+ AddSkyboxButton("elyvisions", "arch3", row5);
309
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
310
+
311
+ AddSkyboxButton("elyvisions", "rainbow", row6);
312
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
313
+ AddSkyboxButton("elyvisions", "heaven", row6);
314
+ AddSkyboxButton("elyvisions", "hot", row6);
315
+
316
+ tab0.add(row0);
317
+ tab0.add(row1);
318
+ tab0.add(row2);
319
+ tab0.add(row3);
320
+ tab0.add(row4);
321
+ tab0.add(row5);
322
+ tab0.add(row6);
323
+
324
+ for (int i=5; --i>=0;)
325
+ {
326
+ //oe.toolboxPanel.Return();
327
+ //tab0.add(new cGridBag());
328
+ }
329
+ }
330
+
331
+ public void ChangeSkybox(String skybox)
332
+ {
333
+ if (skybox.endsWith("/"))
334
+ {
335
+ group.skyboxname = null;
336
+ group.skyboxext = null;
337
+ cameraView.repaint();
338
+ }
339
+ else
340
+ {
341
+ //cameraView.envyoff = false;
342
+ group.skyboxname = skybox;
343
+ group.skyboxext = "jpg";
344
+ cameraView.repaint();
345
+ }
346
+ }
347
+
348
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
+ {
350
+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
+
352
+ AddSkyboxTab0(skyboxpane);
353
+ AddSkyboxTab1(skyboxpane);
354
+ AddSkyboxTab2(skyboxpane);
355
+ AddSkyboxTab3(skyboxpane);
356
+
357
+ skyboxPanel.add(skyboxpane);
358
+ }
359
+
360
+ public void ChangeTexture(String texture)
361
+ {
362
+ for (int i=0; i<group.selection.size(); i++)
363
+ {
364
+ Object3D obj = group.selection.get(i);
365
+ obj.SetPigmentTexture("@" + texture);
366
+ }
367
+
368
+ refreshContents();
369
+ }
370
+
371
+ public void Show3DView()
372
+ {
373
+ // bug
374
+ //gridPanel.setDividerLocation(1.0);
375
+ //bigPanel.setDividerLocation(0.0);
376
+ bigThree.ClearUI();
377
+ bigThree.add(centralPanel);
378
+ bigThree.FlushUI();
379
+ }
380
+
26381 //ObjEditor objEditor;
27382 public void closeUI2()
28383 {
....@@ -60,11 +415,15 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
63
- if (copy.versions == null)
64
- {
65
- copy.versions = new byte[100][];
66
- copy.versionindex = -1;
67
- }
418
+ assert(false);
419
+
420
+// if (copy.versionlist == null)
421
+// {
422
+// copy.versionlist = new Object3D[100];
423
+// copy.versionindex = -1;
424
+//
425
+// //Save(true);
426
+// }
68427
69428 if(ui)
70429 SetupUI(objEditor);
....@@ -87,13 +446,13 @@
87446
88447 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89448
90
- if (copy.versions == null)
91
- {
92
- copy.versions = new byte[100][];
93
- copy.versionindex = -1;
94
-
95
- Save(true);
96
- }
449
+// if (copy.versionlist == null)
450
+// {
451
+// copy.versionlist = new Object3D[100];
452
+// copy.versionindex = -1;
453
+//
454
+// //Save(true);
455
+// }
97456 }
98457
99458 void CloneSelection(boolean supports)
....@@ -183,33 +542,35 @@
183542 // menu.add("-");
184543 duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
185544 duplicateItem.addActionListener(this);
186
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
187547 cloneItem.addActionListener(this);
188
- if (Globals.ADVANCED)
548
+ //if (Globals.ADVANCED)
189549 {
190550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
191551 cloneSupportItem.addActionListener(this);
192552 }
553
+ oe.jTree.popup.addSeparator();
193554 menu.add("-");
194
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
195556 cutItem.addActionListener(this);
196
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
197558 copyItem.addActionListener(this);
198559 pasteItem = menu.add(new MenuItem("Paste"));
199560 pasteItem.addActionListener(this);
200561
201
- menu.add("-");
202
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
562
+ oe.jTree.popup.addSeparator();
563
+ //menu.add("-");
564
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
203565 pasteIntoItem.addActionListener(this);
204
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
205567 pasteLinkItem.addActionListener(this);
206
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
207569 pasteCloneItem.addActionListener(this);
208
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
209571 // pasteExpandItem.addActionListener(this);
210
- menu.add("-");
211
- deleteItem = menu.add(new MenuItem("Delete"));
212
- deleteItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
213574
214575 if (Globals.ADVANCED)
215576 {
....@@ -295,11 +656,9 @@
295656 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
296657 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
297658 //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
298
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
299659 oe.cameraMenu.add("-");
300660 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
301661 openWindowItem.addActionListener(this);
302
- editLeafItem.addActionListener(this);
303662 lookAtItem.addActionListener(this);
304663 //lookFromItem.addActinoListener(this);
305664 //switchViewItem.addActionListener(this);
....@@ -346,9 +705,8 @@
346705 setMasterItem.addActionListener(this);
347706 }
348707
349
- oe.menuBar.add(menu = new Menu("Group"));
350
-// grabItem = menu.add(new MenuItem("Grab"));
351
-// grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
352710 backItem = menu.add(new MenuItem("Back"));
353711 backItem.addActionListener(this);
354712 frontItem = menu.add(new MenuItem("Front"));
....@@ -356,13 +714,21 @@
356714 // compositeItem = menu.add(new MenuItem("Composite"));
357715 // compositeItem.addActionListener(this);
358716
717
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+ grabItem.addActionListener(this);
719
+
359720 if (Globals.ADVANCED)
360721 {
361722 hideItem = menu.add(new MenuItem("Hidden Group"));
362723 hideItem.addActionListener(this);
363724 }
364
- ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
365726 ungroupItem.addActionListener(this);
727
+
728
+ oe.jTree.popup.addSeparator();
729
+
730
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+ deleteItem.addActionListener(this);
366732
367733 // menu.add("-");
368734 //
....@@ -469,6 +835,8 @@
469835 }
470836
471837 oe.menuBar.add(menu = new Menu("Attributes"));
838
+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
839
+ clearVersionsItem.addActionListener(this);
472840 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
473841 clearMaterialsItem.addActionListener(this);
474842 resetAllItem = menu.add(new MenuItem("Reset All"));
....@@ -491,9 +859,9 @@
491859 hideleavesItem.addActionListener(this);
492860 showleavesItem = menu.add(new MenuItem("Show Leaves"));
493861 showleavesItem.addActionListener(this);
494
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
862
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
495863 markleavesItem.addActionListener(this);
496
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
864
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
497865 unmarkleavesItem.addActionListener(this);
498866 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
499867 rewindleavesItem.addActionListener(this);
....@@ -528,10 +896,15 @@
528896 attachBumpItem.addActionListener(this);
529897 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530898 pigmentBumpItem.addActionListener(this);
899
+ //embedTexturesItem
531900 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532901 detachPigmentItem.addActionListener(this);
533902 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534903 detachBumpItem.addActionListener(this);
904
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
905
+ embedTexturesItem.addActionListener(this);
906
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
907
+ deEmbedTexturesItem.addActionListener(this);
535908 menu.add("-");
536909 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537910 sortbysizeItem.addActionListener(this);
....@@ -542,6 +915,9 @@
542915 shareGeometriesItem.addActionListener(this);
543916 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
544917 mergeGeometriesItem.addActionListener(this);
918
+ menu.add("-");
919
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
920
+ editLeafItem.addActionListener(this);
545921 if (Globals.ADVANCED)
546922 {
547923 // Pretty much the same as duplicate and clone.
....@@ -558,6 +934,79 @@
558934 buildToolsMenu(menu);
559935 }
560936
937
+ JTabbedPane resourcecontainer;
938
+ cGridBag currenttab;
939
+ //boolean added; // patch for jar
940
+
941
+ int totalcount = 0;
942
+
943
+ int tabcount = 0;
944
+ int colcount = 0;
945
+ int rowcount = 0;
946
+ int texturecount = 0;
947
+
948
+ int columns = 5;
949
+ int rows = 7;
950
+
951
+ public void ResourceCallBack(String[] path)
952
+ {
953
+// for (int i = 0; i < path.length; i++)
954
+// System.out.print(path[i] + "/");
955
+// System.out.println();
956
+
957
+ if (//rowcount == 0 ||
958
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
959
+ {
960
+ currenttab = new cGridBag();
961
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
962
+ currenttab.setName(tabname);
963
+ //added = false;
964
+ resourcecontainer.add(currenttab);
965
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
966
+ rowcount = 1;
967
+ colcount = 0;
968
+ texturecount = 0;
969
+ }
970
+
971
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
972
+ {
973
+ //if (!added)
974
+ {
975
+ //added = true;
976
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
977
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
978
+ }
979
+
980
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
981
+ totalcount++;
982
+
983
+ if (++colcount >= columns)
984
+ {
985
+ colcount = 0;
986
+ currenttab.Return();
987
+
988
+ if (rowcount++ >= rows)
989
+ {
990
+ rowcount = 0;
991
+ }
992
+ }
993
+ }
994
+ else
995
+ {
996
+// if (!path[path.length-1].equals("icons"))
997
+// resourcecontainer.Return();
998
+ }
999
+ }
1000
+
1001
+ void CreateTexturePanel(cGridBag container)
1002
+ {
1003
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1004
+ container.add(resourcecontainer);
1005
+
1006
+ Grafreed.ParseResources("textures", this);
1007
+
1008
+ // 935. System.out.println("Total = " + totalcount);
1009
+ }
5611010
5621011 void SetupUI2(ObjEditor oe)
5631012 {
....@@ -576,11 +1025,6 @@
5761025 //new Exception().printStackTrace();
5771026
5781027 oe.radioPanel = new JPanel(new GridBagLayout());
579
- oe.aConstraints.weightx = 1;
580
- oe.aConstraints.weighty = 0;
581
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
582
- oe.aConstraints.gridwidth = 100;
583
- oe.aConstraints.gridheight = 1;
5841028 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5851029
5861030 oe.buttonGroup = new ButtonGroup();
....@@ -601,9 +1045,9 @@
6011045 oe.radioPanel.add(dummyButton);
6021046 oe.buttonGroup.add(dummyButton);
6031047 */
604
- cGridBag copyOptionsPanel = new cGridBag();
1048
+ cGridBag versionManagerPanel = new cGridBag();
6051049
606
- copyOptionsPanel.preferredHeight = 1;
1050
+ versionManagerPanel.preferredHeight = 4;
6071051
6081052 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
6091053
....@@ -613,58 +1057,102 @@
6131057
6141058 if (Globals.ADVANCED)
6151059 {
616
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617
- maxButton.setToolTipText("Maximize window");
618
- maxButton.addActionListener(this);
1060
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// maxButton.setToolTipText("Maximize window");
1062
+// maxButton.addActionListener(this);
6191063 }
6201064
621
- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065
+ cButton gcButton;
1066
+
1067
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+// gcButton.setToolTipText("Garbage collect");
1069
+// gcButton.addActionListener(new ActionListener()
1070
+// {
1071
+// public void actionPerformed(ActionEvent e)
1072
+// {
1073
+// System.gc();
1074
+// }
1075
+// });
1076
+
1077
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1078
+ collapseButton.setToolTipText("Collapse toolbar");
1079
+ collapseButton.addActionListener(this);
1080
+
1081
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
+ maximize3DButton.setToolTipText("Maximize 3D view");
1083
+ maximize3DButton.addActionListener(this);
1084
+
1085
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1086
+ twoButton.setToolTipText("Show 3D view only");
1087
+ twoButton.addActionListener(this);
1088
+ this.fullscreenLayout = twoButton;
1089
+
1090
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1091
+ threeButton.setToolTipText("Show controls and 3D view");
1092
+ threeButton.addActionListener(this);
1093
+ if (Globals.ADVANCED)
1094
+ {
1095
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096
+ sixButton.setToolTipText("Show 3D view and controls");
1097
+ sixButton.addActionListener(this);
1098
+ }
1099
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+// sevenButton.setToolTipText("3-column layout");
1101
+// sevenButton.addActionListener(this);
1102
+ //
1103
+
1104
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6221105 fullButton.setToolTipText("Full-screen window");
6231106 fullButton.addActionListener(this);
6241107
625
- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6261109 screenfitButton.setToolTipText("Screen fit");
6271110 screenfitButton.addActionListener(this);
6281111
629
- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6301113 restoreCameraButton.setToolTipText("Restore viewpoint");
6311114 restoreCameraButton.addActionListener(this);
6321115
633
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
- saveButton.setToolTipText("New version");
635
- saveButton.addActionListener(this);
1116
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
+ saveVersionButton.setToolTipText("Duplicate current version");
1118
+ saveVersionButton.addActionListener(this);
6361119
637
- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638
- undoButton.setToolTipText("Previous version");
639
- undoButton.addActionListener(this);
640
- undoButton.setEnabled(false);
1120
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1121
+ deleteVersionButton.setToolTipText("Delete current version");
1122
+ deleteVersionButton.addActionListener(this);
1123
+ deleteVersionButton.setEnabled(false);
1124
+
1125
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1126
+ previousVersionButton.setToolTipText("Previous version");
1127
+ previousVersionButton.addActionListener(this);
1128
+ previousVersionButton.setEnabled(false);
6411129
6421130 cGridBag updown = new cGridBag().setVertical(true);
643
- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644
- restoreButton.setToolTipText("Restore current");
1131
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1132
+ restoreButton.setToolTipText("Undo (restore current version)");
6451133 restoreButton.addActionListener(this);
6461134 restoreButton.setEnabled(false);
6471135
648
- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649
- replaceButton.setToolTipText("Replace current");
1136
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1137
+ replaceButton.setToolTipText("Save (replace current version)");
6501138 replaceButton.addActionListener(this);
6511139 replaceButton.setEnabled(false);
6521140
653
- copyOptionsPanel.add(updown);
1141
+ versionManagerPanel.add(updown);
6541142
655
- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656
- redoButton.setToolTipText("Next version");
657
- redoButton.addActionListener(this);
658
- redoButton.setEnabled(false);
1143
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144
+ nextVersionButton.setToolTipText("Next version");
1145
+ nextVersionButton.addActionListener(this);
1146
+ nextVersionButton.setEnabled(false);
1147
+
1148
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1149
+ oneStepButton.setToolTipText("Animate one step forward");
1150
+ oneStepButton.addActionListener(this);
6591151
6601152 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
6611153 liveCB.setToolTipText("Enable animation");
6621154 liveCB.addItemListener(this);
6631155
664
- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665
- oneStepButton.setToolTipText("Animate one step forward");
666
- oneStepButton.addActionListener(this);
667
-
6681156 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
6691157 fastCB.setToolTipText("Fast mode");
6701158 fastCB.addItemListener(this);
....@@ -680,143 +1168,137 @@
6801168
6811169 if (Globals.ADVANCED)
6821170 {
683
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1171
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6841172 snapobjectButton.addActionListener(this);
6851173 snapobjectButton.setToolTipText("Snap Object");
1174
+
1175
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1176
+ fourButton.addActionListener(this);
1177
+ fourButton.setToolTipText("Show control panel only");
6861178 }
6871179
6881180 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6891181
690
- oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691
- fourButton.addActionListener(this);
692
- fourButton.setToolTipText("Show left panel only");
693
-
694
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695
- twoButton.setToolTipText("Show right view only");
696
- twoButton.addActionListener(this);
697
- this.fullscreenLayout = twoButton;
698
-
699
- oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
- sixButton.setToolTipText("Show left and right");
701
- sixButton.addActionListener(this);
702
-// oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
-// threeButton.setToolTipText("2-column layout right");
704
-// threeButton.addActionListener(this);
705
-// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
706
-// sevenButton.setToolTipText("3-column layout");
707
-// sevenButton.addActionListener(this);
708
- //
7091182
710
- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1183
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7111184 rootButton.setToolTipText("Open selection in new tab");
7121185 rootButton.addActionListener(this);
7131186
714
- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1187
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7151188 closeButton.setToolTipText("Close tab");
7161189 closeButton.addActionListener(this);
7171190 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
7181191 //clearButton.addActionListener(this);
7191192
1193
+ cGridBag row1 = new cGridBag();
1194
+
7201195 // INSERT
721
- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722
- gridButton.setToolTipText("Create grid");
1196
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
+ gridButton.setToolTipText("Create ground");
7231198 gridButton.addActionListener(this);
7241199
725
- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1200
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7261201 boxButton.setToolTipText("Create box");
7271202 boxButton.addActionListener(this);
7281203
729
- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730
- sphereButton.setToolTipText("Create sphere");
731
- sphereButton.addActionListener(this);
732
-
733
- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734
- coneButton.setToolTipText("Create cone");
735
- coneButton.addActionListener(this);
736
-
737
- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738
- torusButton.setToolTipText("Create torus");
739
- torusButton.addActionListener(this);
740
-
741
- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1204
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7421205 superButton.setToolTipText("Create superellipsoid");
7431206 superButton.addActionListener(this);
7441207
1208
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1209
+ sphereButton.setToolTipText("Create sphere");
1210
+ sphereButton.addActionListener(this);
1211
+
1212
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
+ coneButton.setToolTipText("Create cone");
1214
+ coneButton.addActionListener(this);
1215
+
1216
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1217
+ torusButton.setToolTipText("Create torus");
1218
+ torusButton.addActionListener(this);
1219
+
7451220 if (Globals.ADVANCED)
7461221 {
747
- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1222
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7481223 kleinButton.setToolTipText("Create Klein bottle");
7491224 kleinButton.addActionListener(this);
7501225 }
7511226
752
- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1227
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7531228 particlesButton.setToolTipText("Create particle system");
7541229 particlesButton.addActionListener(this);
7551230
756
- oe.toolboxPanel.Return();
1231
+ oe.toolboxPanel.add(row1);
7571232
758
- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+ cGridBag row2 = new cGridBag();
1234
+
1235
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7591236 groupButton.setToolTipText("Create group");
7601237 groupButton.addActionListener(this);
7611238
762
- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1239
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7631240 compositeButton.setToolTipText("Create composite");
7641241 compositeButton.addActionListener(this);
7651242
766
- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1243
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7671244 switchButton.setToolTipText("Create item switcher");
7681245 switchButton.addActionListener(this);
7691246
770
- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1247
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7711248 loopButton.setToolTipText("Create loop");
7721249 loopButton.addActionListener(this);
7731250
774
- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1251
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7751252 textureButton.setToolTipText("Create texture");
7761253 textureButton.addActionListener(this);
7771254
778
- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1255
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7791256 overlayButton.setToolTipText("Create overlay");
7801257 overlayButton.addActionListener(this);
7811258
782
- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1259
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7831260 lightButton.setToolTipText("Create light");
7841261 lightButton.addActionListener(this);
7851262
786
- for (int i=6; --i>=0;)
787
- {
788
- oe.toolboxPanel.Return();
789
- oe.toolboxPanel.add(new cGridBag());
790
- oe.toolboxPanel.add(new cGridBag());
791
- oe.toolboxPanel.add(new cGridBag());
792
- oe.toolboxPanel.add(new cGridBag());
793
- oe.toolboxPanel.add(new cGridBag());
794
- oe.toolboxPanel.add(new cGridBag());
795
- oe.toolboxPanel.add(new cGridBag());
796
- }
1263
+ oe.toolboxPanel.add(row2);
1264
+
1265
+ cGridBag textures = new cGridBag();
1266
+
1267
+ CreateTexturePanel(textures);
1268
+
1269
+ int tabCount = resourcecontainer.getTabCount();
1270
+
1271
+ if (tabCount > 0)
1272
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1273
+
1274
+ oe.toolboxPanel.add(textures);
1275
+
1276
+ textures.preferredHeight = 100;
1277
+
1278
+ CreateSkyboxPanel(oe.skyboxPanel);
7971279
7981280 // EDIT panel
799
- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1281
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
8001282 editButton.setToolTipText("Pin selection controls");
8011283 editButton.addActionListener(this);
8021284
803
- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804
- uneditButton.setToolTipText("Remove selection controls");
1285
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1286
+ uneditButton.setToolTipText("Unpin and remove selection controls");
8051287 uneditButton.addActionListener(this);
8061288
8071289 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
808
- allParamsButton.setToolTipText("Show all controle");
1290
+ allParamsButton.setToolTipText("Show all controls");
8091291 allParamsButton.addActionListener(this);
8101292
811
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812
- clearPanelButton.setToolTipText("Clear edit panel");
1293
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1294
+ clearPanelButton.setToolTipText("Clear all controls");
8131295 clearPanelButton.addActionListener(this);
8141296
815
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816
- unselectButton.setToolTipText("Unselect");
817
- unselectButton.addActionListener(this);
1297
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1298
+ //unselectButton.setToolTipText("Unselect");
1299
+ //unselectButton.addActionListener(this);
8181300
819
- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1301
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
8201302 flashSelectionButton.setToolTipText("Highlight selection");
8211303 flashSelectionButton.addActionListener(this);
8221304
....@@ -839,6 +1321,8 @@
8391321
8401322 cGridBag jSPPanel = new cGridBag();
8411323
1324
+ jSPPanel.preferredHeight = 20;
1325
+
8421326 JScrollPane jSP;
8431327 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
8441328 jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -847,14 +1331,14 @@
8471331 oe.treePanel.add(jSPPanel);
8481332 oe.treePanel.Return();
8491333
850
- oe.treePanel.add(copyOptionsPanel);
1334
+ oe.treePanel.add(versionManagerPanel);
8511335 oe.treePanel.Return();
852
- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
853
- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854
- sliderPane.preferredHeight = 1;
1336
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1337
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1338
+ versionSliderPane.preferredHeight = 3;
8551339
856
-// mainPanel.setDividerLocation(0.5); //1.0);
857
-// mainPanel.setResizeWeight(0.5);
1340
+// mainPanel.setDividerLocation(0.1); //1.0);
1341
+ mainPanel.setResizeWeight(0.4);
8581342
8591343 //jList.addListSelectionListener(this);
8601344 oe.jTree.addTreeSelectionListener(this);
....@@ -862,7 +1346,7 @@
8621346 //jTree.setEditable(true);
8631347 oe.jTree.setDragEnabled(true);
8641348 //jTree.setPreferredSize(new Dimension(10,10));
865
- jSP.setPreferredSize(new Dimension(100,200));
1349
+ //jSP.setPreferredSize(new Dimension(100,200));
8661350
8671351 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
8681352
....@@ -874,7 +1358,7 @@
8741358 dgr.addDragGestureListener(this);
8751359 }catch(Exception e) {}
8761360 */
877
- radio.layout = sixButton; // sevenButton;
1361
+ radio.layout = threeButton; // sixButton;
8781362 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8791363 }
8801364
....@@ -925,9 +1409,12 @@
9251409 smoothCB.setToolTipText("Snapping delay");
9261410 smoothCB.addItemListener(this);
9271411
928
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
929
- slowCB.setToolTipText("Smooth interpolation");
930
- slowCB.addItemListener(this);
1412
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1413
+// slowCB.setToolTipText("Smooth interpolation");
1414
+// slowCB.addItemListener(this);
1415
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1416
+ minshaderCB.setToolTipText("Minimal fast shader");
1417
+ minshaderCB.addItemListener(this);
9311418
9321419 // constraints.gridy += 1;
9331420 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -1006,6 +1493,14 @@
10061493
10071494 void EditObject(Object3D obj)
10081495 {
1496
+ assert(obj instanceof Composite);
1497
+
1498
+// if (obj.versionlist == null)
1499
+// {
1500
+// obj.versionlist = new Object3D[100];
1501
+// obj.versionindex = -1;
1502
+// }
1503
+
10091504 cRadio radioButton = new cRadio(obj.name);
10101505
10111506 // June 2019. Patch to avoid bug with transparency.
....@@ -1016,7 +1511,7 @@
10161511 }
10171512
10181513 radioButton.SetObject(obj);
1019
- radioButton.layout = sixButton; // sevenButton;
1514
+ radioButton.layout = threeButton; // sixButton;
10201515 radioButton.SetCamera(cameraView.renderCamera, false);
10211516 radioButton.addActionListener(this);
10221517 radioPanel.add(radioButton);
....@@ -1030,6 +1525,7 @@
10301525
10311526 oe.SetupViews();
10321527
1528
+ if (Globals.DEBUG)
10331529 System.out.println("SetupViews");
10341530 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
10351531 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1041,6 +1537,8 @@
10411537 cCheckBox localCB;
10421538 cCheckBox crowdCB;
10431539 cCheckBox smoothCB;
1540
+ cCheckBox minshaderCB;
1541
+
10441542 cToggleButton fastCB;
10451543 cCheckBox slowCB;
10461544 cCheckBox boxCB;
....@@ -1111,6 +1609,12 @@
11111609 {
11121610 cameraView.ToggleInertia();
11131611 cameraView.repaint();
1612
+ }
1613
+ else if(e.getSource() == minshaderCB)
1614
+ {
1615
+ Globals.MINSHADER ^= true;
1616
+ cameraView.programInitialized = false;
1617
+ cameraView.repaint();
11141618 }
11151619 else if(e.getSource() == localCB)
11161620 {
....@@ -1388,7 +1892,12 @@
13881892 TreePath path;
13891893
13901894 public TransferableTreePath(TreePath tp) {
1391
- path = tp;
1895
+ Object[] objs = new Object[tp.getPathCount()];
1896
+ for (int i=0; i<objs.length; i++)
1897
+ {
1898
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1899
+ }
1900
+ path = new TreePath(objs);
13921901 }
13931902
13941903 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1620,24 +2129,24 @@
16202129 switch(axis)
16212130 {
16222131 case 0 :
1623
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1624
- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1625
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1626
- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2132
+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2133
+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2134
+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2135
+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
16272136 norm = cVector.X;
16282137 break;
16292138 case 1 :
1630
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1631
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1632
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1633
- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2139
+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2140
+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2141
+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2142
+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
16342143 norm = cVector.Y;
16352144 break;
16362145 case 2 :
1637
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1638
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1639
- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1640
- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2146
+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2147
+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2148
+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2149
+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
16412150 norm = cVector.Z;
16422151 break;
16432152 }
....@@ -1678,7 +2187,11 @@
16782187 shadow.material = new cMaterial(obj.material);
16792188 shadow.material.diffuse = 0.0001f;
16802189 shadow.material.specular = 0.0001f;
1681
- //shadow.projectedVertices[1].x = 300;
2190
+ shadow.material.opacity = 0.75f;
2191
+
2192
+ AllocProjectedVertices(shadow);
2193
+
2194
+ shadow.projectedVertices[1].x = 300;
16822195
16832196 makeSomething(shadow);
16842197 }
....@@ -2134,6 +2647,23 @@
21342647 {
21352648 makeSomething(new Light());
21362649 } else
2650
+// if (source == skybox1Button ||
2651
+// source == skybox2Button ||
2652
+// source == skybox3Button ||
2653
+// source == skybox4Button ||
2654
+// source == skybox5Button ||
2655
+// source == skybox6Button ||
2656
+// source == skybox7Button ||
2657
+// source == skybox11Button ||
2658
+// source == skybox12Button ||
2659
+// source == skybox13Button ||
2660
+// source == skybox14Button ||
2661
+// source == skybox15Button ||
2662
+// source == skybox16Button ||
2663
+// source == skybox17Button)
2664
+// {
2665
+// ChangeSkybox(source);
2666
+// } else
21372667 if (source == csgItem)
21382668 {
21392669 group(new CSG());
....@@ -2182,27 +2712,35 @@
21822712 } else
21832713 if (source == loopItem || source == loopButton)
21842714 {
2715
+ if (!group.selection.isEmpty())
2716
+ {
21852717 Composite csg = new GroupLeaf();
21862718 csg.count = 5;
2187
- group(csg);
21882719 Composite child = new cGroup("Branch");
21892720 csg.addChild(child);
21902721 child.addChild(csg);
2722
+ group(csg);
2723
+ }
21912724 } else
21922725 if (source == doubleItem)
21932726 {
2727
+ if (!group.selection.isEmpty())
2728
+ {
21942729 Composite csg = new GroupLeaf("Fork");
21952730 csg.count = 5;
2196
- group(csg);
21972731 Composite child = new cGroup("Branch A");
21982732 csg.addChild(child);
21992733 child.addChild(csg);
22002734 child = new cGroup("Branch B");
22012735 csg.addChild(child);
22022736 child.addChild(csg);
2737
+ group(csg);
2738
+ }
22032739 } else
22042740 if (source == tripleItem)
22052741 {
2742
+ if (!group.selection.isEmpty())
2743
+ {
22062744 Composite csg = new GroupLeaf("Trident");
22072745 csg.count = 4;
22082746 group(csg);
....@@ -2215,11 +2753,12 @@
22152753 child = new cGroup();
22162754 csg.addChild(child);
22172755 child.addChild(csg);
2756
+ }
22182757 } else
22192758 if (source == computeAOItem)
22202759 {
22212760 Globals.drawMode = CameraPane.OCCLUSION;
2222
- Globals.theRenderer.repaint();
2761
+ cameraView.repaint();
22232762 } else
22242763 if (source == recompileItem)
22252764 {
....@@ -2234,7 +2773,7 @@
22342773 if (source == invariantsItem)
22352774 {
22362775 System.out.println("Invariants:");
2237
- Grafreed.grafreeD.universe.invariants();
2776
+ Grafreed.grafreed.universe.invariants();
22382777 } else
22392778 if (source == memoryItem)
22402779 {
....@@ -2265,33 +2804,52 @@
22652804 {
22662805 ToggleFullScreen();
22672806 } else
2268
- if (source == undoButton)
2807
+ if (source == collapseButton)
2808
+ {
2809
+ this.expandedLayout = radio.layout;
2810
+ CollapseToolbar();
2811
+ } else
2812
+ if (source == maximize3DButton)
2813
+ {
2814
+ this.expandedLayout = radio.layout;
2815
+ radio.layout = twoButton;
2816
+ Show3DView();
2817
+ CollapseToolbar();
2818
+ } else
2819
+ if (source == previousVersionButton)
22692820 {
22702821 // Go to previous version
22712822 //if (!Undo())
22722823 //java.awt.Toolkit.getDefaultToolkit().beep();
2273
- Undo();
2824
+ PreviousVersion();
22742825 } else
22752826 if (source == restoreButton)
22762827 {
22772828 // Restore current version
22782829 Restore();
2830
+ //restoreButton.setEnabled(false);
22792831 } else
22802832 if (source == replaceButton)
22812833 {
22822834 // Overwrite current version
22832835 Replace();
2836
+ //replaceButton.setEnabled(false);
22842837 } else
2285
- if (source == redoButton)
2838
+ if (source == nextVersionButton)
22862839 {
22872840 // Go to next version
2288
- Redo();
2841
+ NextVersion();
22892842 } else
2290
- if (source == saveButton)
2843
+ if (source == saveVersionButton)
22912844 {
22922845 // Save a new version
22932846 if (!Save(true))
22942847 java.awt.Toolkit.getDefaultToolkit().beep();
2848
+ } else
2849
+ if (source == deleteVersionButton)
2850
+ {
2851
+ // Delete a new version
2852
+ DeleteVersion();
22952853 } else
22962854 if (source == oneStepButton)
22972855 {
....@@ -2346,11 +2904,11 @@
23462904 } else
23472905 if (source == undoItem)
23482906 {
2349
- Undo();
2907
+ PreviousVersion();
23502908 } else
23512909 if (source == redoItem)
23522910 {
2353
- Redo();
2911
+ NextVersion();
23542912 } else
23552913 if (source == duplicateItem)
23562914 {
....@@ -2831,22 +3389,34 @@
28313389 } else
28323390 if (source == ungroupItem || source == ungroupButton)
28333391 {
2834
- boolean hasRoot = false;
3392
+ boolean canUngroup = true;
28353393
28363394 for (int i=0; i<group.selection.size(); i++)
28373395 {
2838
- if (group.selection.get(i) == group)
3396
+ Object3D selectedItem = group.selection.get(i);
3397
+
3398
+ if (selectedItem.Size() == 0)
28393399 {
2840
- hasRoot = true;
3400
+ // Cannot ungroup leaves
3401
+ canUngroup = false;
3402
+ break;
3403
+ }
3404
+
3405
+ if (selectedItem == group)
3406
+ {
3407
+ // Cannot ungroup root
3408
+ canUngroup = false;
28413409 break;
28423410 }
28433411 }
28443412
2845
- if (!hasRoot)
3413
+ if (canUngroup)
28463414 {
28473415 for (int i=0; i<group.selection.size(); i++)
28483416 {
2849
- Ungroup(group.selection.get(i));
3417
+ Object3D selectedItem = group.selection.get(i);
3418
+
3419
+ Ungroup(selectedItem);
28503420 }
28513421
28523422 ClearSelection(false);
....@@ -2897,6 +3467,10 @@
28973467 if (source == clearMaterialsItem)
28983468 {
28993469 ClearMaterials();
3470
+ } else
3471
+ if (source == clearVersionsItem)
3472
+ {
3473
+ ClearVersions();
29003474 } else
29013475 if (source == liveleavesItem)
29023476 {
....@@ -3153,7 +3727,7 @@
31533727 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31543728 {
31553729 obj = (Object3D)e.nextElement();
3156
- obj.SetBumpTexture(null);
3730
+ obj.ResetBumpTexture();
31573731 }
31583732
31593733 refreshContents();
....@@ -3167,6 +3741,31 @@
31673741 obj.SetBumpTexture(obj.GetPigmentTexture());
31683742 }
31693743
3744
+ refreshContents();
3745
+ } else
3746
+ if (source == embedTexturesItem)
3747
+ {
3748
+ Object3D obj;
3749
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3750
+ {
3751
+ obj = (Object3D)e.nextElement();
3752
+ obj.EmbedTextures(true);
3753
+ }
3754
+
3755
+ refreshContents();
3756
+ } else
3757
+ if (source == deEmbedTexturesItem)
3758
+ {
3759
+ Object3D obj;
3760
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3761
+ {
3762
+ obj = (Object3D)e.nextElement();
3763
+ obj.EmbedTextures(false);
3764
+ }
3765
+
3766
+ CameraPane.texturepigment.clear();
3767
+ CameraPane.texturebump.clear();
3768
+
31703769 refreshContents();
31713770 } else
31723771 if (source == flashSelectionButton)
....@@ -3184,38 +3783,7 @@
31843783 if (CameraPane.FULLSCREEN)
31853784 fullscreenLayout = radio.layout;
31863785
3187
- // bug
3188
- //gridPanel.setDividerLocation(1.0);
3189
- //bigPanel.setDividerLocation(0.0);
3190
-// bigThree.remove(scenePanel);
3191
-// bigThree.remove(centralPanel);
3192
-// bigThree.remove(XYZPanel);
3193
-// aWindowConstraints.gridx = 0;
3194
-// aWindowConstraints.gridy = 0;
3195
-// aWindowConstraints.gridwidth = 1;
3196
-// // aConstraints.gridheight = 3;
3197
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3198
-// aWindowConstraints.weightx = 0;
3199
-// aWindowConstraints.weighty = 1;
3200
-// //bigThree.add(jtp, aWindowConstraints);
3201
-// aWindowConstraints.weightx = 1;
3202
-// aWindowConstraints.gridwidth = 3;
3203
-// // aConstraints.gridheight = 3;
3204
-// aWindowConstraints.gridx = 1;
3205
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3206
-// bigThree.add(centralPanel, aWindowConstraints);
3207
-// aWindowConstraints.weightx = 0;
3208
-// aWindowConstraints.gridx = 4;
3209
-// aWindowConstraints.gridwidth = 1;
3210
-// // aConstraints.gridheight = 3;
3211
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3212
-// //bigThree.add(XYZPanel, aWindowConstraints);
3213
-// scenePanel.setVisible(false);
3214
-// centralPanel.setVisible(true);
3215
-// XYZPanel.setVisible(false);
3216
- bigThree.ClearUI();
3217
- bigThree.add(centralPanel);
3218
- bigThree.FlushUI();
3786
+ Show3DView();
32193787
32203788 cameraView.requestFocusInWindow();
32213789
....@@ -3270,8 +3838,8 @@
32703838 // centralPanel.setVisible(true);
32713839 // XYZPanel.setVisible(true);
32723840 bigThree.ClearUI();
3841
+ bigThree.add(scenePanel);
32733842 bigThree.add(centralPanel);
3274
- bigThree.add(XYZPanel);
32753843 bigThree.FlushUI();
32763844
32773845 cameraView.requestFocusInWindow();
....@@ -3351,8 +3919,8 @@
33513919 // centralPanel.setVisible(true);
33523920 // XYZPanel.setVisible(false);
33533921 bigThree.ClearUI();
3354
- bigThree.add(scenePanel);
33553922 bigThree.add(centralPanel);
3923
+ bigThree.add(scenePanel);
33563924 bigThree.FlushUI();
33573925
33583926 cameraView.requestFocusInWindow();
....@@ -3401,6 +3969,7 @@
34013969 } else
34023970 if (source == rootButton)
34033971 {
3972
+ Replace();
34043973 Object3D obj;
34053974 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
34063975 {
....@@ -3415,6 +3984,8 @@
34153984 if (source == closeButton)
34163985 {
34173986 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3987
+ Replace();
3988
+
34183989 cRadio ab;
34193990 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
34203991 {
....@@ -3458,10 +4029,10 @@
34584029 {
34594030 Object3D child = (Object3D)e.nextElement();
34604031 if(child.editWindow != null)
3461
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34624032 child.pinned = false;
34634033 child.CloseUI();
34644034 listUI.remove(child);
4035
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34654036
34664037 //child.editWindow = null; // ???????????
34674038 }
....@@ -3480,6 +4051,7 @@
34804051 obj.CloseUI();
34814052 }
34824053 listUI.clear();
4054
+ SetPinStates(group.selection.size() > 0);
34834055 refreshContents(true);
34844056 } else
34854057 if (source == allParamsButton)
....@@ -3512,6 +4084,8 @@
35124084 } else
35134085 if(source instanceof cRadio)
35144086 {
4087
+ Replace();
4088
+
35154089 group.parent = keepparent;
35164090 group.attributes = 0;
35174091 //group.editWindow = null;
....@@ -3536,8 +4110,6 @@
35364110
35374111 copy = group;
35384112
3539
- SetUndoStates();
3540
-
35414113 //Globals.theRenderer.object = group;
35424114 if(!useclient)
35434115 {
....@@ -3565,7 +4137,33 @@
35654137 */
35664138 radio.layout.doClick();
35674139
4140
+ assert(copy instanceof Composite);
4141
+
4142
+ if (copy.versionlist == null)
4143
+ {
4144
+ copy.versionindex = -1;
4145
+
4146
+ // Cannot work with loops
4147
+ // To fix this issue, we first mark all nodes above the root,
4148
+ // and check if any of these nodes are reachable below the root.
4149
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4150
+
4151
+ if (copy.versionlist == null && !copy.HasTags())
4152
+ {
4153
+ copy.versionlist = new Object3D[100];
4154
+
4155
+ //Save(true);
4156
+ }
4157
+ else
4158
+ copy.versionindex = -2;
4159
+
4160
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4161
+ }
4162
+
4163
+ SetVersionStates();
4164
+
35684165 ClearUnpinned();
4166
+
35694167 //Grafreed.Assert(group != null);
35704168 //Grafreed.Assert(group.selection != null);
35714169 SetPinStates(group.selection == null || group.selection.size() > 0);
....@@ -3582,11 +4180,13 @@
35824180 } else if (event.getSource() == editCameraItem)
35834181 {
35844182 cameraView.ProtectCamera();
4183
+ cameraView.requestFocusInWindow();
35854184 cameraView.repaint();
35864185 return;
35874186 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
35884187 {
35894188 cameraView.RevertCamera();
4189
+ cameraView.requestFocusInWindow();
35904190 cameraView.repaint();
35914191 return;
35924192 // } else if (event.getSource() == textureButton)
....@@ -3705,7 +4305,7 @@
37054305 TouchTransform(obj);
37064306 continue;
37074307 }
3708
- if ((mask&2) != 0) // Scale
4308
+ if ((mask&2) != 0) // Scale/rotation
37094309 {
37104310 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
37114311 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -3713,10 +4313,6 @@
37134313 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
37144314 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
37154315 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3716
- }
3717
- if ((mask&4) != 0) // Rotation
3718
- {
3719
- // ?
37204316 }
37214317 if ((mask&1) != 0) // Translation
37224318 {
....@@ -4163,7 +4759,7 @@
41634759
41644760 try
41654761 {
4166
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4762
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
41674763 }
41684764 catch (Exception e)
41694765 {
....@@ -4525,6 +5121,12 @@
45255121 refreshContents();
45265122 }
45275123
5124
+ void ClearVersions()
5125
+ {
5126
+ group.selection.ClearVersions();
5127
+ refreshContents();
5128
+ }
5129
+
45285130 void FlipV(boolean flip)
45295131 {
45305132 group.selection.FlipV(flip);
....@@ -4719,9 +5321,7 @@
47195321
47205322 freezemodel = false;
47215323 }
4722
-
4723
- boolean flashIt = true;
4724
-
5324
+
47255325 public void valueChanged(TreeSelectionEvent e)
47265326 //public boolean handleEvent(Event event)
47275327 {
....@@ -4794,13 +5394,31 @@
47945394 {
47955395 editButton.setEnabled(enabled);
47965396 uneditButton.setEnabled(enabled);
4797
- unselectButton.setEnabled(enabled);
5397
+ //unselectButton.setEnabled(enabled);
47985398 flashSelectionButton.setEnabled(enabled);
5399
+
5400
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5401
+
5402
+ boolean allComposites = true;
5403
+
5404
+ if (group.selection != null)
5405
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5406
+ {
5407
+ Object next = e.nextElement();
5408
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5409
+ {
5410
+ allComposites = false;
5411
+ break;
5412
+ }
5413
+ }
5414
+
5415
+ rootButton.setEnabled(allComposites);
47995416 }
48005417
48015418 void refreshContents(boolean cp)
48025419 {
4803
- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5420
+ if (Globals.ADVANCED)
5421
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
48045422 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
48055423 {
48065424 objEditor.ClearInfo(); // .GetMaterial());
....@@ -4810,7 +5428,7 @@
48105428 Object3D child = (Object3D) group.selection.get(i);
48115429
48125430 objEditor.AddInfo(child, this, true);
4813
- System.err.println("info : " + child.GetPath());
5431
+// System.err.println("info : " + child.GetPath());
48145432 }
48155433
48165434 objEditor.SetText(); // jan 2014
....@@ -5636,7 +6254,6 @@
56366254
56376255 cButton restoreCameraButton;
56386256
5639
- cButton saveButton;
56406257 cButton oneStepButton;
56416258
56426259 cButton groupButton;
....@@ -5645,6 +6262,22 @@
56456262 cButton switchButton;
56466263 cButton loopButton;
56476264 cButton textureButton;
6265
+
6266
+ cButton skybox1Button;
6267
+ cButton skybox2Button;
6268
+ cButton skybox3Button;
6269
+ cButton skybox4Button;
6270
+ cButton skybox5Button;
6271
+ cButton skybox6Button;
6272
+ cButton skybox7Button;
6273
+
6274
+ cButton skybox11Button;
6275
+ cButton skybox12Button;
6276
+ cButton skybox13Button;
6277
+ cButton skybox14Button;
6278
+ cButton skybox15Button;
6279
+ cButton skybox16Button;
6280
+ cButton skybox17Button;
56486281
56496282 cButton gridButton;
56506283 cButton boxButton;
....@@ -5678,11 +6311,11 @@
56786311 private MenuItem lookAtItem;
56796312 private MenuItem lookFromItem;
56806313 private MenuItem switchViewItem;
5681
- private MenuItem cutItem;
6314
+ private JMenuItem cutItem;
56826315 private MenuItem undoItem;
56836316 private MenuItem redoItem;
56846317 private JMenuItem duplicateItem;
5685
- private MenuItem cloneItem;
6318
+ private JMenuItem cloneItem;
56866319 private MenuItem cloneSupportItem;
56876320 private MenuItem overwriteGeoItem;
56886321 private MenuItem overwriteMatItem;
....@@ -5703,13 +6336,13 @@
57036336 private MenuItem cloneGeometriesItem;
57046337 private MenuItem shareGeometriesItem;
57056338 private MenuItem mergeGeometriesItem;
5706
- private MenuItem copyItem;
6339
+ private JMenuItem copyItem;
57076340 private MenuItem pasteItem;
5708
- private MenuItem pasteIntoItem;
5709
- private MenuItem pasteLinkItem;
5710
- private MenuItem pasteCloneItem;
5711
- private MenuItem pasteExpandItem;
5712
- private MenuItem deleteItem;
6341
+ private JMenuItem pasteIntoItem;
6342
+ private JMenuItem pasteLinkItem;
6343
+ private JMenuItem pasteCloneItem;
6344
+ private JMenuItem pasteExpandItem;
6345
+ private JMenuItem deleteItem;
57136346 private MenuItem clearAllItem;
57146347 private MenuItem genUVItem;
57156348 private MenuItem genNormalsMESHItem;
....@@ -5735,6 +6368,7 @@
57356368 private MenuItem clipMeshItem;
57366369 private MenuItem smoothMeshItem;
57376370 private MenuItem clearMaterialsItem;
6371
+ private MenuItem clearVersionsItem;
57386372
57396373 private MenuItem liveleavesItem;
57406374 private MenuItem unliveleavesItem;
....@@ -5764,7 +6398,7 @@
57646398 private MenuItem transformGeometryItem;
57656399 private MenuItem transformChildrenItem;
57666400 private MenuItem hideItem;
5767
- private MenuItem grabItem;
6401
+ private JMenuItem grabItem;
57686402 private MenuItem backItem;
57696403 private MenuItem frontItem;
57706404 private MenuItem cameraItem;
....@@ -5777,7 +6411,7 @@
57776411 private MenuItem switchTransfoItem;
57786412 private MenuItem morphItem;
57796413 private MenuItem linkerItem;
5780
- private MenuItem ungroupItem;
6414
+ private JMenuItem ungroupItem;
57816415 private MenuItem editItem;
57826416 private MenuItem openWindowItem;
57836417 private MenuItem editLeafItem;
....@@ -5793,6 +6427,8 @@
57936427 private MenuItem attachBumpItem;
57946428 private MenuItem detachBumpItem;
57956429 private MenuItem pigmentBumpItem;
6430
+ private MenuItem embedTexturesItem;
6431
+ private MenuItem deEmbedTexturesItem;
57966432
57976433 private MenuItem particleItem;
57986434 private MenuItem ragdollItem;