Normand Briere
2019-08-20 537f4ac57ae2b34f0a04fa63874c8ca6534c9a6d
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,10 +415,14 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
63
- if (copy.versions == null)
418
+ assert(false);
419
+
420
+ if (copy.versionlist == null)
64421 {
65
- copy.versions = new byte[100][];
422
+ copy.versionlist = new Object3D[100];
66423 copy.versionindex = -1;
424
+
425
+ //Save(true);
67426 }
68427
69428 if(ui)
....@@ -87,12 +446,12 @@
87446
88447 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89448
90
- if (copy.versions == null)
449
+ if (copy.versionlist == null)
91450 {
92
- copy.versions = new byte[100][];
451
+ copy.versionlist = new Object3D[100];
93452 copy.versionindex = -1;
94453
95
- Save(true);
454
+ //Save(true);
96455 }
97456 }
98457
....@@ -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 //
....@@ -491,9 +857,9 @@
491857 hideleavesItem.addActionListener(this);
492858 showleavesItem = menu.add(new MenuItem("Show Leaves"));
493859 showleavesItem.addActionListener(this);
494
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
495861 markleavesItem.addActionListener(this);
496
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
497863 unmarkleavesItem.addActionListener(this);
498864 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
499865 rewindleavesItem.addActionListener(this);
....@@ -528,10 +894,15 @@
528894 attachBumpItem.addActionListener(this);
529895 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530896 pigmentBumpItem.addActionListener(this);
897
+ //embedTexturesItem
531898 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532899 detachPigmentItem.addActionListener(this);
533900 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534901 detachBumpItem.addActionListener(this);
902
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
903
+ embedTexturesItem.addActionListener(this);
904
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
905
+ deEmbedTexturesItem.addActionListener(this);
535906 menu.add("-");
536907 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537908 sortbysizeItem.addActionListener(this);
....@@ -542,6 +913,9 @@
542913 shareGeometriesItem.addActionListener(this);
543914 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
544915 mergeGeometriesItem.addActionListener(this);
916
+ menu.add("-");
917
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+ editLeafItem.addActionListener(this);
545919 if (Globals.ADVANCED)
546920 {
547921 // Pretty much the same as duplicate and clone.
....@@ -558,6 +932,74 @@
558932 buildToolsMenu(menu);
559933 }
560934
935
+ JTabbedPane resourcecontainer;
936
+ cGridBag currenttab;
937
+ //boolean added; // patch for jar
938
+
939
+ int tabcount = 0;
940
+ int colcount = 0;
941
+ int rowcount = 0;
942
+ int texturecount = 0;
943
+
944
+ int columns = 5;
945
+ int rows = 7;
946
+
947
+ public void ResourceCallBack(String[] path)
948
+ {
949
+// for (int i = 0; i < path.length; i++)
950
+// System.out.print(path[i] + "/");
951
+// System.out.println();
952
+
953
+ if (//rowcount == 0 ||
954
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
955
+ {
956
+ currenttab = new cGridBag();
957
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
958
+ currenttab.setName(tabname);
959
+ //added = false;
960
+ resourcecontainer.add(currenttab);
961
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
962
+ rowcount = 1;
963
+ colcount = 0;
964
+ texturecount = 0;
965
+ }
966
+
967
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
968
+ {
969
+ //if (!added)
970
+ {
971
+ //added = true;
972
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
973
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
974
+ }
975
+
976
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
977
+
978
+ if (++colcount >= columns)
979
+ {
980
+ colcount = 0;
981
+ currenttab.Return();
982
+
983
+ if (rowcount++ >= rows)
984
+ {
985
+ rowcount = 0;
986
+ }
987
+ }
988
+ }
989
+ else
990
+ {
991
+// if (!path[path.length-1].equals("icons"))
992
+// resourcecontainer.Return();
993
+ }
994
+ }
995
+
996
+ void CreateTexturePanel(cGridBag container)
997
+ {
998
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
999
+ container.add(resourcecontainer);
1000
+
1001
+ Grafreed.ParseResources("textures", this);
1002
+ }
5611003
5621004 void SetupUI2(ObjEditor oe)
5631005 {
....@@ -576,11 +1018,6 @@
5761018 //new Exception().printStackTrace();
5771019
5781020 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;
5841021 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5851022
5861023 oe.buttonGroup = new ButtonGroup();
....@@ -601,9 +1038,9 @@
6011038 oe.radioPanel.add(dummyButton);
6021039 oe.buttonGroup.add(dummyButton);
6031040 */
604
- cGridBag copyOptionsPanel = new cGridBag();
1041
+ cGridBag versionManagerPanel = new cGridBag();
6051042
606
- copyOptionsPanel.preferredHeight = 1;
1043
+ versionManagerPanel.preferredHeight = 4;
6071044
6081045 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
6091046
....@@ -613,58 +1050,102 @@
6131050
6141051 if (Globals.ADVANCED)
6151052 {
616
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617
- maxButton.setToolTipText("Maximize window");
618
- maxButton.addActionListener(this);
1053
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
+// maxButton.setToolTipText("Maximize window");
1055
+// maxButton.addActionListener(this);
6191056 }
6201057
621
- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
+ cButton gcButton;
1059
+
1060
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// gcButton.setToolTipText("Garbage collect");
1062
+// gcButton.addActionListener(new ActionListener()
1063
+// {
1064
+// public void actionPerformed(ActionEvent e)
1065
+// {
1066
+// System.gc();
1067
+// }
1068
+// });
1069
+
1070
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1071
+ collapseButton.setToolTipText("Collapse toolbar");
1072
+ collapseButton.addActionListener(this);
1073
+
1074
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1075
+ maximize3DButton.setToolTipText("Maximize 3D view");
1076
+ maximize3DButton.addActionListener(this);
1077
+
1078
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1079
+ twoButton.setToolTipText("Show 3D view only");
1080
+ twoButton.addActionListener(this);
1081
+ this.fullscreenLayout = twoButton;
1082
+
1083
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084
+ threeButton.setToolTipText("Show controls and 3D view");
1085
+ threeButton.addActionListener(this);
1086
+ if (Globals.ADVANCED)
1087
+ {
1088
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
+ sixButton.setToolTipText("Show 3D view and controls");
1090
+ sixButton.addActionListener(this);
1091
+ }
1092
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093
+// sevenButton.setToolTipText("3-column layout");
1094
+// sevenButton.addActionListener(this);
1095
+ //
1096
+
1097
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6221098 fullButton.setToolTipText("Full-screen window");
6231099 fullButton.addActionListener(this);
6241100
625
- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1101
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6261102 screenfitButton.setToolTipText("Screen fit");
6271103 screenfitButton.addActionListener(this);
6281104
629
- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6301106 restoreCameraButton.setToolTipText("Restore viewpoint");
6311107 restoreCameraButton.addActionListener(this);
6321108
633
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
- saveButton.setToolTipText("New version");
635
- saveButton.addActionListener(this);
1109
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1110
+ saveVersionButton.setToolTipText("Duplicate current version");
1111
+ saveVersionButton.addActionListener(this);
6361112
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);
1113
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1114
+ deleteVersionButton.setToolTipText("Delete current version");
1115
+ deleteVersionButton.addActionListener(this);
1116
+ deleteVersionButton.setEnabled(false);
1117
+
1118
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1119
+ previousVersionButton.setToolTipText("Previous version");
1120
+ previousVersionButton.addActionListener(this);
1121
+ previousVersionButton.setEnabled(false);
6411122
6421123 cGridBag updown = new cGridBag().setVertical(true);
643
- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644
- restoreButton.setToolTipText("Restore current");
1124
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1125
+ restoreButton.setToolTipText("Undo (restore current version)");
6451126 restoreButton.addActionListener(this);
6461127 restoreButton.setEnabled(false);
6471128
648
- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649
- replaceButton.setToolTipText("Replace current");
1129
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
+ replaceButton.setToolTipText("Save (replace current version)");
6501131 replaceButton.addActionListener(this);
6511132 replaceButton.setEnabled(false);
6521133
653
- copyOptionsPanel.add(updown);
1134
+ versionManagerPanel.add(updown);
6541135
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);
1136
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1137
+ nextVersionButton.setToolTipText("Next version");
1138
+ nextVersionButton.addActionListener(this);
1139
+ nextVersionButton.setEnabled(false);
1140
+
1141
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1142
+ oneStepButton.setToolTipText("Animate one step forward");
1143
+ oneStepButton.addActionListener(this);
6591144
6601145 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
6611146 liveCB.setToolTipText("Enable animation");
6621147 liveCB.addItemListener(this);
6631148
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
-
6681149 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
6691150 fastCB.setToolTipText("Fast mode");
6701151 fastCB.addItemListener(this);
....@@ -680,143 +1161,137 @@
6801161
6811162 if (Globals.ADVANCED)
6821163 {
683
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6841165 snapobjectButton.addActionListener(this);
6851166 snapobjectButton.setToolTipText("Snap Object");
1167
+
1168
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1169
+ fourButton.addActionListener(this);
1170
+ fourButton.setToolTipText("Show control panel only");
6861171 }
6871172
6881173 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6891174
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
- //
7091175
710
- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7111177 rootButton.setToolTipText("Open selection in new tab");
7121178 rootButton.addActionListener(this);
7131179
714
- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7151181 closeButton.setToolTipText("Close tab");
7161182 closeButton.addActionListener(this);
7171183 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
7181184 //clearButton.addActionListener(this);
7191185
1186
+ cGridBag row1 = new cGridBag();
1187
+
7201188 // INSERT
721
- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722
- gridButton.setToolTipText("Create grid");
1189
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1190
+ gridButton.setToolTipText("Create ground");
7231191 gridButton.addActionListener(this);
7241192
725
- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7261194 boxButton.setToolTipText("Create box");
7271195 boxButton.addActionListener(this);
7281196
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);
1197
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7421198 superButton.setToolTipText("Create superellipsoid");
7431199 superButton.addActionListener(this);
7441200
1201
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1202
+ sphereButton.setToolTipText("Create sphere");
1203
+ sphereButton.addActionListener(this);
1204
+
1205
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1206
+ coneButton.setToolTipText("Create cone");
1207
+ coneButton.addActionListener(this);
1208
+
1209
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1210
+ torusButton.setToolTipText("Create torus");
1211
+ torusButton.addActionListener(this);
1212
+
7451213 if (Globals.ADVANCED)
7461214 {
747
- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1215
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7481216 kleinButton.setToolTipText("Create Klein bottle");
7491217 kleinButton.addActionListener(this);
7501218 }
7511219
752
- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7531221 particlesButton.setToolTipText("Create particle system");
7541222 particlesButton.addActionListener(this);
7551223
756
- oe.toolboxPanel.Return();
1224
+ oe.toolboxPanel.add(row1);
7571225
758
- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1226
+ cGridBag row2 = new cGridBag();
1227
+
1228
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7591229 groupButton.setToolTipText("Create group");
7601230 groupButton.addActionListener(this);
7611231
762
- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7631233 compositeButton.setToolTipText("Create composite");
7641234 compositeButton.addActionListener(this);
7651235
766
- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7671237 switchButton.setToolTipText("Create item switcher");
7681238 switchButton.addActionListener(this);
7691239
770
- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7711241 loopButton.setToolTipText("Create loop");
7721242 loopButton.addActionListener(this);
7731243
774
- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7751245 textureButton.setToolTipText("Create texture");
7761246 textureButton.addActionListener(this);
7771247
778
- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7791249 overlayButton.setToolTipText("Create overlay");
7801250 overlayButton.addActionListener(this);
7811251
782
- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7831253 lightButton.setToolTipText("Create light");
7841254 lightButton.addActionListener(this);
7851255
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
- }
1256
+ oe.toolboxPanel.add(row2);
1257
+
1258
+ cGridBag textures = new cGridBag();
1259
+
1260
+ CreateTexturePanel(textures);
1261
+
1262
+ int tabCount = resourcecontainer.getTabCount();
1263
+
1264
+ if (tabCount > 0)
1265
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1266
+
1267
+ oe.toolboxPanel.add(textures);
1268
+
1269
+ textures.preferredHeight = 100;
1270
+
1271
+ CreateSkyboxPanel(oe.skyboxPanel);
7971272
7981273 // EDIT panel
799
- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1274
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
8001275 editButton.setToolTipText("Pin selection controls");
8011276 editButton.addActionListener(this);
8021277
803
- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804
- uneditButton.setToolTipText("Remove selection controls");
1278
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1279
+ uneditButton.setToolTipText("Unpin and remove selection controls");
8051280 uneditButton.addActionListener(this);
8061281
8071282 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
808
- allParamsButton.setToolTipText("Show all controle");
1283
+ allParamsButton.setToolTipText("Show all controls");
8091284 allParamsButton.addActionListener(this);
8101285
811
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812
- clearPanelButton.setToolTipText("Clear edit panel");
1286
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1287
+ clearPanelButton.setToolTipText("Clear all controls");
8131288 clearPanelButton.addActionListener(this);
8141289
815
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816
- unselectButton.setToolTipText("Unselect");
817
- unselectButton.addActionListener(this);
1290
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1291
+ //unselectButton.setToolTipText("Unselect");
1292
+ //unselectButton.addActionListener(this);
8181293
819
- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1294
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
8201295 flashSelectionButton.setToolTipText("Highlight selection");
8211296 flashSelectionButton.addActionListener(this);
8221297
....@@ -839,6 +1314,8 @@
8391314
8401315 cGridBag jSPPanel = new cGridBag();
8411316
1317
+ jSPPanel.preferredHeight = 20;
1318
+
8421319 JScrollPane jSP;
8431320 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
8441321 jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -847,14 +1324,14 @@
8471324 oe.treePanel.add(jSPPanel);
8481325 oe.treePanel.Return();
8491326
850
- oe.treePanel.add(copyOptionsPanel);
1327
+ oe.treePanel.add(versionManagerPanel);
8511328 oe.treePanel.Return();
852
- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
853
- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854
- sliderPane.preferredHeight = 1;
1329
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1330
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1331
+ versionSliderPane.preferredHeight = 3;
8551332
856
-// mainPanel.setDividerLocation(0.5); //1.0);
857
-// mainPanel.setResizeWeight(0.5);
1333
+// mainPanel.setDividerLocation(0.1); //1.0);
1334
+ mainPanel.setResizeWeight(0.4);
8581335
8591336 //jList.addListSelectionListener(this);
8601337 oe.jTree.addTreeSelectionListener(this);
....@@ -862,7 +1339,7 @@
8621339 //jTree.setEditable(true);
8631340 oe.jTree.setDragEnabled(true);
8641341 //jTree.setPreferredSize(new Dimension(10,10));
865
- jSP.setPreferredSize(new Dimension(100,200));
1342
+ //jSP.setPreferredSize(new Dimension(100,200));
8661343
8671344 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
8681345
....@@ -874,7 +1351,7 @@
8741351 dgr.addDragGestureListener(this);
8751352 }catch(Exception e) {}
8761353 */
877
- radio.layout = sixButton; // sevenButton;
1354
+ radio.layout = threeButton; // sixButton;
8781355 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8791356 }
8801357
....@@ -925,9 +1402,12 @@
9251402 smoothCB.setToolTipText("Snapping delay");
9261403 smoothCB.addItemListener(this);
9271404
928
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
929
- slowCB.setToolTipText("Smooth interpolation");
930
- slowCB.addItemListener(this);
1405
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1406
+// slowCB.setToolTipText("Smooth interpolation");
1407
+// slowCB.addItemListener(this);
1408
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1409
+ minshaderCB.setToolTipText("Minimal fast shader");
1410
+ minshaderCB.addItemListener(this);
9311411
9321412 // constraints.gridy += 1;
9331413 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -1006,6 +1486,14 @@
10061486
10071487 void EditObject(Object3D obj)
10081488 {
1489
+ assert(obj instanceof Composite);
1490
+
1491
+// if (obj.versionlist == null)
1492
+// {
1493
+// obj.versionlist = new Object3D[100];
1494
+// obj.versionindex = -1;
1495
+// }
1496
+
10091497 cRadio radioButton = new cRadio(obj.name);
10101498
10111499 // June 2019. Patch to avoid bug with transparency.
....@@ -1016,7 +1504,7 @@
10161504 }
10171505
10181506 radioButton.SetObject(obj);
1019
- radioButton.layout = sixButton; // sevenButton;
1507
+ radioButton.layout = threeButton; // sixButton;
10201508 radioButton.SetCamera(cameraView.renderCamera, false);
10211509 radioButton.addActionListener(this);
10221510 radioPanel.add(radioButton);
....@@ -1030,6 +1518,7 @@
10301518
10311519 oe.SetupViews();
10321520
1521
+ if (Globals.DEBUG)
10331522 System.out.println("SetupViews");
10341523 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
10351524 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1041,6 +1530,8 @@
10411530 cCheckBox localCB;
10421531 cCheckBox crowdCB;
10431532 cCheckBox smoothCB;
1533
+ cCheckBox minshaderCB;
1534
+
10441535 cToggleButton fastCB;
10451536 cCheckBox slowCB;
10461537 cCheckBox boxCB;
....@@ -1111,6 +1602,12 @@
11111602 {
11121603 cameraView.ToggleInertia();
11131604 cameraView.repaint();
1605
+ }
1606
+ else if(e.getSource() == minshaderCB)
1607
+ {
1608
+ Globals.MINSHADER ^= true;
1609
+ cameraView.programInitialized = false;
1610
+ cameraView.repaint();
11141611 }
11151612 else if(e.getSource() == localCB)
11161613 {
....@@ -1388,7 +1885,12 @@
13881885 TreePath path;
13891886
13901887 public TransferableTreePath(TreePath tp) {
1391
- path = tp;
1888
+ Object[] objs = new Object[tp.getPathCount()];
1889
+ for (int i=0; i<objs.length; i++)
1890
+ {
1891
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1892
+ }
1893
+ path = new TreePath(objs);
13921894 }
13931895
13941896 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1678,7 +2180,11 @@
16782180 shadow.material = new cMaterial(obj.material);
16792181 shadow.material.diffuse = 0.0001f;
16802182 shadow.material.specular = 0.0001f;
1681
- //shadow.projectedVertices[1].x = 300;
2183
+ shadow.material.opacity = 0.75f;
2184
+
2185
+ AllocProjectedVertices(shadow);
2186
+
2187
+ shadow.projectedVertices[1].x = 300;
16822188
16832189 makeSomething(shadow);
16842190 }
....@@ -2134,6 +2640,23 @@
21342640 {
21352641 makeSomething(new Light());
21362642 } else
2643
+// if (source == skybox1Button ||
2644
+// source == skybox2Button ||
2645
+// source == skybox3Button ||
2646
+// source == skybox4Button ||
2647
+// source == skybox5Button ||
2648
+// source == skybox6Button ||
2649
+// source == skybox7Button ||
2650
+// source == skybox11Button ||
2651
+// source == skybox12Button ||
2652
+// source == skybox13Button ||
2653
+// source == skybox14Button ||
2654
+// source == skybox15Button ||
2655
+// source == skybox16Button ||
2656
+// source == skybox17Button)
2657
+// {
2658
+// ChangeSkybox(source);
2659
+// } else
21372660 if (source == csgItem)
21382661 {
21392662 group(new CSG());
....@@ -2182,27 +2705,35 @@
21822705 } else
21832706 if (source == loopItem || source == loopButton)
21842707 {
2708
+ if (!group.selection.isEmpty())
2709
+ {
21852710 Composite csg = new GroupLeaf();
21862711 csg.count = 5;
2187
- group(csg);
21882712 Composite child = new cGroup("Branch");
21892713 csg.addChild(child);
21902714 child.addChild(csg);
2715
+ group(csg);
2716
+ }
21912717 } else
21922718 if (source == doubleItem)
21932719 {
2720
+ if (!group.selection.isEmpty())
2721
+ {
21942722 Composite csg = new GroupLeaf("Fork");
21952723 csg.count = 5;
2196
- group(csg);
21972724 Composite child = new cGroup("Branch A");
21982725 csg.addChild(child);
21992726 child.addChild(csg);
22002727 child = new cGroup("Branch B");
22012728 csg.addChild(child);
22022729 child.addChild(csg);
2730
+ group(csg);
2731
+ }
22032732 } else
22042733 if (source == tripleItem)
22052734 {
2735
+ if (!group.selection.isEmpty())
2736
+ {
22062737 Composite csg = new GroupLeaf("Trident");
22072738 csg.count = 4;
22082739 group(csg);
....@@ -2215,11 +2746,12 @@
22152746 child = new cGroup();
22162747 csg.addChild(child);
22172748 child.addChild(csg);
2749
+ }
22182750 } else
22192751 if (source == computeAOItem)
22202752 {
22212753 Globals.drawMode = CameraPane.OCCLUSION;
2222
- Globals.theRenderer.repaint();
2754
+ cameraView.repaint();
22232755 } else
22242756 if (source == recompileItem)
22252757 {
....@@ -2234,7 +2766,7 @@
22342766 if (source == invariantsItem)
22352767 {
22362768 System.out.println("Invariants:");
2237
- Grafreed.grafreeD.universe.invariants();
2769
+ Grafreed.grafreed.universe.invariants();
22382770 } else
22392771 if (source == memoryItem)
22402772 {
....@@ -2265,33 +2797,52 @@
22652797 {
22662798 ToggleFullScreen();
22672799 } else
2268
- if (source == undoButton)
2800
+ if (source == collapseButton)
2801
+ {
2802
+ this.expandedLayout = radio.layout;
2803
+ CollapseToolbar();
2804
+ } else
2805
+ if (source == maximize3DButton)
2806
+ {
2807
+ this.expandedLayout = radio.layout;
2808
+ radio.layout = twoButton;
2809
+ Show3DView();
2810
+ CollapseToolbar();
2811
+ } else
2812
+ if (source == previousVersionButton)
22692813 {
22702814 // Go to previous version
22712815 //if (!Undo())
22722816 //java.awt.Toolkit.getDefaultToolkit().beep();
2273
- Undo();
2817
+ PreviousVersion();
22742818 } else
22752819 if (source == restoreButton)
22762820 {
22772821 // Restore current version
22782822 Restore();
2823
+ //restoreButton.setEnabled(false);
22792824 } else
22802825 if (source == replaceButton)
22812826 {
22822827 // Overwrite current version
22832828 Replace();
2829
+ //replaceButton.setEnabled(false);
22842830 } else
2285
- if (source == redoButton)
2831
+ if (source == nextVersionButton)
22862832 {
22872833 // Go to next version
2288
- Redo();
2834
+ NextVersion();
22892835 } else
2290
- if (source == saveButton)
2836
+ if (source == saveVersionButton)
22912837 {
22922838 // Save a new version
22932839 if (!Save(true))
22942840 java.awt.Toolkit.getDefaultToolkit().beep();
2841
+ } else
2842
+ if (source == deleteVersionButton)
2843
+ {
2844
+ // Delete a new version
2845
+ DeleteVersion();
22952846 } else
22962847 if (source == oneStepButton)
22972848 {
....@@ -2346,11 +2897,11 @@
23462897 } else
23472898 if (source == undoItem)
23482899 {
2349
- Undo();
2900
+ PreviousVersion();
23502901 } else
23512902 if (source == redoItem)
23522903 {
2353
- Redo();
2904
+ NextVersion();
23542905 } else
23552906 if (source == duplicateItem)
23562907 {
....@@ -2831,22 +3382,34 @@
28313382 } else
28323383 if (source == ungroupItem || source == ungroupButton)
28333384 {
2834
- boolean hasRoot = false;
3385
+ boolean canUngroup = true;
28353386
28363387 for (int i=0; i<group.selection.size(); i++)
28373388 {
2838
- if (group.selection.get(i) == group)
3389
+ Object3D selectedItem = group.selection.get(i);
3390
+
3391
+ if (selectedItem.Size() == 0)
28393392 {
2840
- hasRoot = true;
3393
+ // Cannot ungroup leaves
3394
+ canUngroup = false;
3395
+ break;
3396
+ }
3397
+
3398
+ if (selectedItem == group)
3399
+ {
3400
+ // Cannot ungroup root
3401
+ canUngroup = false;
28413402 break;
28423403 }
28433404 }
28443405
2845
- if (!hasRoot)
3406
+ if (canUngroup)
28463407 {
28473408 for (int i=0; i<group.selection.size(); i++)
28483409 {
2849
- Ungroup(group.selection.get(i));
3410
+ Object3D selectedItem = group.selection.get(i);
3411
+
3412
+ Ungroup(selectedItem);
28503413 }
28513414
28523415 ClearSelection(false);
....@@ -3153,7 +3716,7 @@
31533716 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31543717 {
31553718 obj = (Object3D)e.nextElement();
3156
- obj.SetBumpTexture(null);
3719
+ obj.ResetBumpTexture();
31573720 }
31583721
31593722 refreshContents();
....@@ -3167,6 +3730,31 @@
31673730 obj.SetBumpTexture(obj.GetPigmentTexture());
31683731 }
31693732
3733
+ refreshContents();
3734
+ } else
3735
+ if (source == embedTexturesItem)
3736
+ {
3737
+ Object3D obj;
3738
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3739
+ {
3740
+ obj = (Object3D)e.nextElement();
3741
+ obj.EmbedTextures(true);
3742
+ }
3743
+
3744
+ refreshContents();
3745
+ } else
3746
+ if (source == deEmbedTexturesItem)
3747
+ {
3748
+ Object3D obj;
3749
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3750
+ {
3751
+ obj = (Object3D)e.nextElement();
3752
+ obj.EmbedTextures(false);
3753
+ }
3754
+
3755
+ CameraPane.texturepigment.clear();
3756
+ CameraPane.texturebump.clear();
3757
+
31703758 refreshContents();
31713759 } else
31723760 if (source == flashSelectionButton)
....@@ -3184,38 +3772,7 @@
31843772 if (CameraPane.FULLSCREEN)
31853773 fullscreenLayout = radio.layout;
31863774
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();
3775
+ Show3DView();
32193776
32203777 cameraView.requestFocusInWindow();
32213778
....@@ -3270,8 +3827,8 @@
32703827 // centralPanel.setVisible(true);
32713828 // XYZPanel.setVisible(true);
32723829 bigThree.ClearUI();
3830
+ bigThree.add(scenePanel);
32733831 bigThree.add(centralPanel);
3274
- bigThree.add(XYZPanel);
32753832 bigThree.FlushUI();
32763833
32773834 cameraView.requestFocusInWindow();
....@@ -3351,8 +3908,8 @@
33513908 // centralPanel.setVisible(true);
33523909 // XYZPanel.setVisible(false);
33533910 bigThree.ClearUI();
3354
- bigThree.add(scenePanel);
33553911 bigThree.add(centralPanel);
3912
+ bigThree.add(scenePanel);
33563913 bigThree.FlushUI();
33573914
33583915 cameraView.requestFocusInWindow();
....@@ -3401,6 +3958,7 @@
34013958 } else
34023959 if (source == rootButton)
34033960 {
3961
+ Replace();
34043962 Object3D obj;
34053963 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
34063964 {
....@@ -3415,6 +3973,8 @@
34153973 if (source == closeButton)
34163974 {
34173975 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3976
+ Replace();
3977
+
34183978 cRadio ab;
34193979 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
34203980 {
....@@ -3458,10 +4018,10 @@
34584018 {
34594019 Object3D child = (Object3D)e.nextElement();
34604020 if(child.editWindow != null)
3461
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34624021 child.pinned = false;
34634022 child.CloseUI();
34644023 listUI.remove(child);
4024
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34654025
34664026 //child.editWindow = null; // ???????????
34674027 }
....@@ -3480,6 +4040,7 @@
34804040 obj.CloseUI();
34814041 }
34824042 listUI.clear();
4043
+ SetPinStates(group.selection.size() > 0);
34834044 refreshContents(true);
34844045 } else
34854046 if (source == allParamsButton)
....@@ -3512,6 +4073,8 @@
35124073 } else
35134074 if(source instanceof cRadio)
35144075 {
4076
+ Replace();
4077
+
35154078 group.parent = keepparent;
35164079 group.attributes = 0;
35174080 //group.editWindow = null;
....@@ -3536,8 +4099,6 @@
35364099
35374100 copy = group;
35384101
3539
- SetUndoStates();
3540
-
35414102 //Globals.theRenderer.object = group;
35424103 if(!useclient)
35434104 {
....@@ -3565,7 +4126,31 @@
35654126 */
35664127 radio.layout.doClick();
35674128
4129
+ assert(copy instanceof Composite);
4130
+
4131
+ if (copy.versionlist == null)
4132
+ {
4133
+ copy.versionindex = -1;
4134
+
4135
+ // Cannot work with loops
4136
+ // To fix this issue, we first mark all nodes above the root,
4137
+ // and check if any of these nodes are reachable below the root.
4138
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4139
+
4140
+ if (!copy.HasTags())
4141
+ {
4142
+ copy.versionlist = new Object3D[100];
4143
+
4144
+ Save(true);
4145
+ }
4146
+
4147
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4148
+ }
4149
+
4150
+ SetVersionStates();
4151
+
35684152 ClearUnpinned();
4153
+
35694154 //Grafreed.Assert(group != null);
35704155 //Grafreed.Assert(group.selection != null);
35714156 SetPinStates(group.selection == null || group.selection.size() > 0);
....@@ -3582,11 +4167,13 @@
35824167 } else if (event.getSource() == editCameraItem)
35834168 {
35844169 cameraView.ProtectCamera();
4170
+ cameraView.requestFocusInWindow();
35854171 cameraView.repaint();
35864172 return;
35874173 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
35884174 {
35894175 cameraView.RevertCamera();
4176
+ cameraView.requestFocusInWindow();
35904177 cameraView.repaint();
35914178 return;
35924179 // } else if (event.getSource() == textureButton)
....@@ -3705,7 +4292,7 @@
37054292 TouchTransform(obj);
37064293 continue;
37074294 }
3708
- if ((mask&2) != 0) // Scale
4295
+ if ((mask&2) != 0) // Scale/rotation
37094296 {
37104297 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
37114298 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -3713,10 +4300,6 @@
37134300 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
37144301 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
37154302 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3716
- }
3717
- if ((mask&4) != 0) // Rotation
3718
- {
3719
- // ?
37204303 }
37214304 if ((mask&1) != 0) // Translation
37224305 {
....@@ -4163,7 +4746,7 @@
41634746
41644747 try
41654748 {
4166
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4749
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
41674750 }
41684751 catch (Exception e)
41694752 {
....@@ -4719,9 +5302,7 @@
47195302
47205303 freezemodel = false;
47215304 }
4722
-
4723
- boolean flashIt = true;
4724
-
5305
+
47255306 public void valueChanged(TreeSelectionEvent e)
47265307 //public boolean handleEvent(Event event)
47275308 {
....@@ -4794,13 +5375,31 @@
47945375 {
47955376 editButton.setEnabled(enabled);
47965377 uneditButton.setEnabled(enabled);
4797
- unselectButton.setEnabled(enabled);
5378
+ //unselectButton.setEnabled(enabled);
47985379 flashSelectionButton.setEnabled(enabled);
5380
+
5381
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5382
+
5383
+ boolean allComposites = true;
5384
+
5385
+ if (group.selection != null)
5386
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5387
+ {
5388
+ Object next = e.nextElement();
5389
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5390
+ {
5391
+ allComposites = false;
5392
+ break;
5393
+ }
5394
+ }
5395
+
5396
+ rootButton.setEnabled(allComposites);
47995397 }
48005398
48015399 void refreshContents(boolean cp)
48025400 {
4803
- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5401
+ if (Globals.ADVANCED)
5402
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
48045403 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
48055404 {
48065405 objEditor.ClearInfo(); // .GetMaterial());
....@@ -4810,7 +5409,7 @@
48105409 Object3D child = (Object3D) group.selection.get(i);
48115410
48125411 objEditor.AddInfo(child, this, true);
4813
- System.err.println("info : " + child.GetPath());
5412
+// System.err.println("info : " + child.GetPath());
48145413 }
48155414
48165415 objEditor.SetText(); // jan 2014
....@@ -5636,7 +6235,6 @@
56366235
56376236 cButton restoreCameraButton;
56386237
5639
- cButton saveButton;
56406238 cButton oneStepButton;
56416239
56426240 cButton groupButton;
....@@ -5645,6 +6243,22 @@
56456243 cButton switchButton;
56466244 cButton loopButton;
56476245 cButton textureButton;
6246
+
6247
+ cButton skybox1Button;
6248
+ cButton skybox2Button;
6249
+ cButton skybox3Button;
6250
+ cButton skybox4Button;
6251
+ cButton skybox5Button;
6252
+ cButton skybox6Button;
6253
+ cButton skybox7Button;
6254
+
6255
+ cButton skybox11Button;
6256
+ cButton skybox12Button;
6257
+ cButton skybox13Button;
6258
+ cButton skybox14Button;
6259
+ cButton skybox15Button;
6260
+ cButton skybox16Button;
6261
+ cButton skybox17Button;
56486262
56496263 cButton gridButton;
56506264 cButton boxButton;
....@@ -5678,11 +6292,11 @@
56786292 private MenuItem lookAtItem;
56796293 private MenuItem lookFromItem;
56806294 private MenuItem switchViewItem;
5681
- private MenuItem cutItem;
6295
+ private JMenuItem cutItem;
56826296 private MenuItem undoItem;
56836297 private MenuItem redoItem;
56846298 private JMenuItem duplicateItem;
5685
- private MenuItem cloneItem;
6299
+ private JMenuItem cloneItem;
56866300 private MenuItem cloneSupportItem;
56876301 private MenuItem overwriteGeoItem;
56886302 private MenuItem overwriteMatItem;
....@@ -5703,13 +6317,13 @@
57036317 private MenuItem cloneGeometriesItem;
57046318 private MenuItem shareGeometriesItem;
57056319 private MenuItem mergeGeometriesItem;
5706
- private MenuItem copyItem;
6320
+ private JMenuItem copyItem;
57076321 private MenuItem pasteItem;
5708
- private MenuItem pasteIntoItem;
5709
- private MenuItem pasteLinkItem;
5710
- private MenuItem pasteCloneItem;
5711
- private MenuItem pasteExpandItem;
5712
- private MenuItem deleteItem;
6322
+ private JMenuItem pasteIntoItem;
6323
+ private JMenuItem pasteLinkItem;
6324
+ private JMenuItem pasteCloneItem;
6325
+ private JMenuItem pasteExpandItem;
6326
+ private JMenuItem deleteItem;
57136327 private MenuItem clearAllItem;
57146328 private MenuItem genUVItem;
57156329 private MenuItem genNormalsMESHItem;
....@@ -5764,7 +6378,7 @@
57646378 private MenuItem transformGeometryItem;
57656379 private MenuItem transformChildrenItem;
57666380 private MenuItem hideItem;
5767
- private MenuItem grabItem;
6381
+ private JMenuItem grabItem;
57686382 private MenuItem backItem;
57696383 private MenuItem frontItem;
57706384 private MenuItem cameraItem;
....@@ -5777,7 +6391,7 @@
57776391 private MenuItem switchTransfoItem;
57786392 private MenuItem morphItem;
57796393 private MenuItem linkerItem;
5780
- private MenuItem ungroupItem;
6394
+ private JMenuItem ungroupItem;
57816395 private MenuItem editItem;
57826396 private MenuItem openWindowItem;
57836397 private MenuItem editLeafItem;
....@@ -5793,6 +6407,8 @@
57936407 private MenuItem attachBumpItem;
57946408 private MenuItem detachBumpItem;
57956409 private MenuItem pigmentBumpItem;
6410
+ private MenuItem embedTexturesItem;
6411
+ private MenuItem deEmbedTexturesItem;
57966412
57976413 private MenuItem particleItem;
57986414 private MenuItem ragdollItem;