blame | history | patch | commit | commitdiff
Normand Briere
2019-08-22 6a823ffbfcda4c843f46e02e83c869d5bc323e25 
 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,
....@@ -28,9 +29,9 @@
2829     {
2930         cButton skyboxButton;
3031         final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
-        //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
32
-        row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
-        skyboxButton.setToolTipText(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);
3435         skyboxButton.addActionListener(new ActionListener()
3536         {
3637                 @Override
....@@ -41,6 +42,22 @@
4142         });
4243     }
4344 
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
+    
4461     public void AddSkyboxTab0(JTabbedPane skyboxpanel)
4562     {
4663         cGridBag tab0 = new cGridBag().setVertical(true);
....@@ -56,12 +73,13 @@
5673         cGridBag row5 = new cGridBag();
5774         cGridBag row6 = new cGridBag();
5875         
59
-        AddSkyboxButton("default", "rgb", row0);
60
-        AddSkyboxButton("default", "cornell", row0);
61
-        AddSkyboxButton("default", "uffizi", row0);
62
-        AddSkyboxButton("default", "CloudyHills", row0);
63
-        
64
-        AddSkyboxButton("default", "skycube", row1);
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);
6583         AddSkyboxButton("bridge", "Bridge", row1);
6684         AddSkyboxButton("bridge", "Bridge2", row1);
6785         AddSkyboxButton("urban", "GamlaStan2", row1);
....@@ -73,23 +91,23 @@
7391         
7492         AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
7593         AddSkyboxButton("urban", "UnionSquare", row3);
94
+        AddSkyboxButton("urban", "Medborgarplatsen", row3);
7695         AddSkyboxButton("park", "BerzeliiPark", row3);
77
-        AddSkyboxButton("park", "Buddha", row3);
7896         
97
+        AddSkyboxButton("park", "Buddha", row4);
7998         AddSkyboxButton("park", "CNTower2", row4);
8099         AddSkyboxButton("park", "NiagaraFalls1", row4);
81100         AddSkyboxButton("park", "NiagaraFalls3", row4);
82
-        AddSkyboxButton("park", "Park", row4);
83101         
102
+        AddSkyboxButton("park", "Park", row5);
84103         AddSkyboxButton("park", "Pond", row5);
85104         AddSkyboxButton("park", "Skansen", row5);
86105         AddSkyboxButton("park", "Skansen2", row5);
87
-        AddSkyboxButton("park", "Skansen3", row5);
88106         
107
+        AddSkyboxButton("park", "Skansen3", row6);
89108         AddSkyboxButton("park", "Skansen4", row6);
90109         AddSkyboxButton("park", "Skansen5", row6);
91
-        AddSkyboxButton("park", "Stairs", row6);
92
-        AddSkyboxButton("park", "Tantolunden4", row6);
110
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
93111         
94112         tab0.add(row0);
95113         tab0.add(row1);
....@@ -140,24 +158,29 @@
140158         AddSkyboxButton("forest", "Langholmen2", row3);
141159         AddSkyboxButton("forest", "Plants", row3);
142160         AddSkyboxButton("mountain", "Maskonaive", row3);
161
+        
143162         AddSkyboxButton("mountain", "Maskonaive2", row4);
144
-        
145163         AddSkyboxButton("mountain", "Maskonaive3", row4);
146
-        AddSkyboxButton("mountain", "Ryfjallet", row4);
147
-        AddSkyboxButton("mountain", "Teide", row4);        
164
+        AddSkyboxButton("mountain", "Teide", row4);
165
+        AddSkyboxButton("park", "Tantolunden4", row4);
148166         
167
+        AddSkyboxButton("park", "Stairs", row5);
168
+        AddSkyboxButton("default", "skycube", row6);
149169         AddSkyboxButton("rocky", "Langholmen", row5);
150
-        AddSkyboxButton("rocky", "Riddarfjarden", row5);
151170         AddSkyboxButton("rocky", "Skinnarviksberget", row5);
171
+        
152172         AddSkyboxButton("rocky", "Tantolunden6", row5);
173
+        AddSkyboxButton("default", "CloudyHills", row6);
174
+        AddSkyboxButton("daz", "Autumn", row6);
175
+        AddSkyboxButton("daz", "MountainTrail", row6);
153176         /*
154
-Kastellholmen
155
-Langholmen
156
-Riddarfjarden
157
-Skinnarviksberget
158
-Tanto
159
-Tantolunden2
160
-Tantolunden6
177
+Autumn
178
+Greenlands
179
+MountainTrail
180
+Oasis
181
+TheRock
182
+TopOfTheWorld
183
+Winter
161184          */
162185         
163186         tab0.add(row0);
....@@ -197,39 +220,33 @@
197220         
198221         AddSkyboxButton("urban", "CNTower", row1);
199222         AddSkyboxButton("bridge", "ArstaBridge", row1);
200
-        AddSkyboxButton("indoors", "DallasW", row1);
201
-        AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
223
+        AddSkyboxButton("rocky", "Riddarfjarden", row1);
224
+        AddSkyboxButton("penguins", "sleepyhollow", row1);
202225         
226
+        AddSkyboxButton("penguins", "kenon_star", row2);
227
+        AddSkyboxButton("persson", "corona", row2);
228
+        AddSkyboxButton("persson", "spaceskybox", row2);
203229         AddSkyboxButton("indoors", "Vasa", row2);
204
-        AddSkyboxButton("winter", "Backyard", row2);
205
-        AddSkyboxButton("winter", "Creek", row2);
206
-        AddSkyboxButton("winter", "FootballField3", row2);
207230         
231
+        AddSkyboxButton("winter", "Backyard", row3);
232
+        AddSkyboxButton("winter", "Creek", row3);
233
+        AddSkyboxButton("winter", "FootballField3", row3);
208234         AddSkyboxButton("winter", "Forest", row3);
209
-        AddSkyboxButton("winter", "HornstullsStrand2", row3);
210
-        AddSkyboxButton("winter", "House", row3);
211
-        AddSkyboxButton("winter", "IceLake", row3);
212235         
236
+        AddSkyboxButton("winter", "HornstullsStrand2", row4);
237
+        AddSkyboxButton("winter", "House", row4);
238
+        AddSkyboxButton("winter", "IceLake", row4);
213239         AddSkyboxButton("winter", "IceRiver", row4);
214
-        AddSkyboxButton("winter", "Park3", row4);
215
-        AddSkyboxButton("winter", "PondWinter", row4);
216240         
241
+        AddSkyboxButton("winter", "Park3", row5);
242
+        AddSkyboxButton("winter", "PondWinter", row5);
217243         AddSkyboxButton("winter", "Tantolunden5", row5);
218244         AddSkyboxButton("winter", "Vindelalven", row5);
219
-        /*
220
-Backyard
221
-Creek
222
-FootballField3
223
-Forest
224
-HornstullsStrand2
225
-House
226
-IceLake
227
-IceRiver
228
-Park3
229
-PondWinter
230
-Tantolunden5
231
-Vindelalven         * 
232
-         */
245
+        
246
+        AddSkyboxButton("daz", "TheRock", row6);
247
+        AddSkyboxButton("daz", "TopOfTheWorld", row6);
248
+        AddSkyboxButton("daz", "Winter", row6);
249
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
233250         
234251         tab0.add(row0);
235252         tab0.add(row1);
....@@ -245,15 +262,122 @@
245262             //tab0.add(new cGridBag());
246263         }
247264     }
248
-    
249
-    public void ChangeSkybox(String name)
265
+
266
+    public void AddSkyboxTab3(JTabbedPane skyboxpanel)
250267     {
251
-        cameraView.envyoff = false;
252
-        cameraView.skyboxname = name;
253
-        cameraView.skyboxext = "jpg";
254
-        cameraView.repaint();
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);
255358     }
256359     
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
+
257381     //ObjEditor objEditor;
258382 	public void closeUI2()
259383 	{
....@@ -291,10 +415,14 @@
291415 		this.copy = this.group = group;
292416 		//selectees = this.group.selectees;
293417 		
294
-        if (copy.versions == null)
418
+                assert(false);
419
+                
420
+        if (copy.versionlist == null)
295421         {
296
-            copy.versions = new byte[100][];
422
+            copy.versionlist = new Object3D[100];
297423             copy.versionindex = -1;
424
+            
425
+            //Save(true);
298426         }
299427         
300428 		if(ui)
....@@ -318,12 +446,12 @@
318446                 
319447                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
320448                 
321
-        if (copy.versions == null)
449
+        if (copy.versionlist == null)
322450         {
323
-            copy.versions = new byte[100][];
451
+            copy.versionlist = new Object3D[100];
324452             copy.versionindex = -1;
325453             
326
-            Save(true);
454
+            //Save(true);
327455         }
328456 	}
329457 
....@@ -414,33 +542,35 @@
414542 //		menu.add("-");
415543 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
416544 		duplicateItem.addActionListener(this);
417
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
418547 		cloneItem.addActionListener(this);
419
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
420549         {
421550 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
422551 		cloneSupportItem.addActionListener(this);
423552         }
553
+                oe.jTree.popup.addSeparator();
424554 		menu.add("-");
425
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
426556 		cutItem.addActionListener(this);
427
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
428558 		copyItem.addActionListener(this);
429559 		pasteItem = menu.add(new MenuItem("Paste"));
430560 		pasteItem.addActionListener(this);
431561                 
432
-		menu.add("-");
433
-		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"));
434565 		pasteIntoItem.addActionListener(this);
435
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
436567 		pasteLinkItem.addActionListener(this);
437
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
438569 		pasteCloneItem.addActionListener(this);
439
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
440571 //		pasteExpandItem.addActionListener(this);
441
-		menu.add("-");
442
-		deleteItem = menu.add(new MenuItem("Delete"));
443
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
444574                 
445575         if (Globals.ADVANCED)
446576         {
....@@ -526,11 +656,9 @@
526656 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
527657 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
528658 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
529
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
530659 		oe.cameraMenu.add("-");
531660 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
532661 		openWindowItem.addActionListener(this);
533
-		editLeafItem.addActionListener(this);
534662 		lookAtItem.addActionListener(this);
535663 		//lookFromItem.addActinoListener(this);
536664 		//switchViewItem.addActionListener(this);
....@@ -577,9 +705,8 @@
577705 		setMasterItem.addActionListener(this);
578706         }
579707                 
580
-		oe.menuBar.add(menu = new Menu("Group"));
581
-//		grabItem = menu.add(new MenuItem("Grab"));
582
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
583710 		backItem = menu.add(new MenuItem("Back"));
584711 		backItem.addActionListener(this);
585712 		frontItem = menu.add(new MenuItem("Front"));
....@@ -587,13 +714,21 @@
587714 //		compositeItem = menu.add(new MenuItem("Composite"));
588715 //		compositeItem.addActionListener(this);
589716                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
590720         if (Globals.ADVANCED)
591721         {
592722 		hideItem = menu.add(new MenuItem("Hidden Group"));
593723 		hideItem.addActionListener(this);
594724         }
595
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
596726 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
597732                 
598733 //		menu.add("-");
599734 //                
....@@ -722,9 +857,9 @@
722857 		hideleavesItem.addActionListener(this);
723858 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
724859 		showleavesItem.addActionListener(this);
725
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
726861 		markleavesItem.addActionListener(this);
727
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
728863 		unmarkleavesItem.addActionListener(this);
729864 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
730865 		rewindleavesItem.addActionListener(this);
....@@ -778,6 +913,9 @@
778913 		shareGeometriesItem.addActionListener(this);
779914 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
780915 		mergeGeometriesItem.addActionListener(this);
916
+		menu.add("-");
917
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+		editLeafItem.addActionListener(this);
781919         if (Globals.ADVANCED)
782920         {
783921             // Pretty much the same as duplicate and clone.
....@@ -794,6 +932,79 @@
794932 		buildToolsMenu(menu);
795933 	}
796934 	
935
+        JTabbedPane resourcecontainer;
936
+        cGridBag currenttab;
937
+        //boolean added; // patch for jar
938
+                
939
+        int totalcount = 0;
940
+        
941
+        int tabcount = 0;
942
+        int colcount = 0;
943
+        int rowcount = 0;
944
+        int texturecount = 0;
945
+        
946
+        int columns = 5;
947
+        int rows = 7;
948
+        
949
+    public void ResourceCallBack(String[] path)
950
+    {
951
+//        for (int i = 0; i < path.length; i++)
952
+//            System.out.print(path[i] + "/");
953
+//        System.out.println();
954
+        
955
+        if (//rowcount == 0 ||
956
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
957
+        {
958
+            currenttab = new cGridBag();
959
+            String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
960
+            currenttab.setName(tabname);
961
+            //added = false;
962
+            resourcecontainer.add(currenttab);
963
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
964
+            rowcount = 1;
965
+            colcount = 0;
966
+            texturecount = 0;
967
+        }
968
+        
969
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
970
+        {
971
+            //if (!added)
972
+            {
973
+                //added = true;
974
+                String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
975
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
976
+            }
977
+            
978
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
979
+            totalcount++;
980
+            
981
+            if (++colcount >= columns)
982
+            {
983
+                colcount = 0;
984
+                currenttab.Return();
985
+                
986
+                if (rowcount++ >= rows)
987
+                {
988
+                    rowcount = 0;
989
+                }
990
+            }
991
+        }
992
+        else
993
+        {
994
+//            if (!path[path.length-1].equals("icons"))
995
+//                resourcecontainer.Return();
996
+        }
997
+    }
998
+    
999
+        void CreateTexturePanel(cGridBag container)
1000
+        {
1001
+            resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1002
+            container.add(resourcecontainer);
1003
+            
1004
+            Grafreed.ParseResources("textures", this);
1005
+            
1006
+            // 935. System.out.println("Total = " + totalcount);
1007
+        }
7971008         
7981009 	void SetupUI2(ObjEditor oe)
7991010 	{
....@@ -812,11 +1023,6 @@
8121023             //new Exception().printStackTrace();
8131024                 
8141025         oe.radioPanel = new JPanel(new GridBagLayout());
815
-	oe.aConstraints.weightx = 1;
816
-	oe.aConstraints.weighty = 0;
817
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
818
-	oe.aConstraints.gridwidth = 100;
819
-	oe.aConstraints.gridheight = 1;
8201026 //        oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8211027         
8221028         oe.buttonGroup = new ButtonGroup();
....@@ -837,9 +1043,9 @@
8371043         oe.radioPanel.add(dummyButton);
8381044         oe.buttonGroup.add(dummyButton);
8391045          */
840
-                cGridBag copyOptionsPanel = new cGridBag();
1046
+                cGridBag versionManagerPanel = new cGridBag();
8411047                                         
842
-                copyOptionsPanel.preferredHeight = 2;
1048
+                versionManagerPanel.preferredHeight = 4;
8431049                 
8441050                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
8451051                 
....@@ -849,58 +1055,102 @@
8491055                 
8501056                 if (Globals.ADVANCED)
8511057                 {
852
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
853
-                    maxButton.setToolTipText("Maximize window");
854
-                    maxButton.addActionListener(this);
1058
+//                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+//                    maxButton.setToolTipText("Maximize window");
1060
+//                    maxButton.addActionListener(this);
8551061                 }
8561062                 
857
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
+                cButton gcButton;
1064
+                
1065
+//		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1066
+//                gcButton.setToolTipText("Garbage collect");
1067
+//                gcButton.addActionListener(new ActionListener()
1068
+//                {
1069
+//                        public void actionPerformed(ActionEvent e)
1070
+//                        {
1071
+//                            System.gc();
1072
+//                        }
1073
+//                });
1074
+                
1075
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1076
+                collapseButton.setToolTipText("Collapse toolbar");
1077
+		collapseButton.addActionListener(this);
1078
+                
1079
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1080
+                maximize3DButton.setToolTipText("Maximize 3D view");
1081
+		maximize3DButton.addActionListener(this);
1082
+                
1083
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084
+                twoButton.setToolTipText("Show 3D view only");
1085
+		twoButton.addActionListener(this);
1086
+                this.fullscreenLayout = twoButton;
1087
+                
1088
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
+                threeButton.setToolTipText("Show controls and 3D view");
1090
+		threeButton.addActionListener(this);
1091
+                if (Globals.ADVANCED)
1092
+                {
1093
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1094
+                sixButton.setToolTipText("Show 3D view and controls");
1095
+		sixButton.addActionListener(this);
1096
+                }
1097
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1098
+//                sevenButton.setToolTipText("3-column layout");
1099
+//		sevenButton.addActionListener(this);
1100
+                //
1101
+                
1102
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
8581103                 fullButton.setToolTipText("Full-screen window");
8591104 		fullButton.addActionListener(this);
8601105                 
861
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
8621107                 screenfitButton.setToolTipText("Screen fit");
8631108 		screenfitButton.addActionListener(this);
8641109 
865
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1110
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
8661111                 restoreCameraButton.setToolTipText("Restore viewpoint");
8671112 		restoreCameraButton.addActionListener(this);
8681113                 
869
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870
-                saveButton.setToolTipText("New version");
871
-		saveButton.addActionListener(this);
1114
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1115
+                saveVersionButton.setToolTipText("Duplicate current version");
1116
+		saveVersionButton.addActionListener(this);
8721117                                                 
873
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
874
-                undoButton.setToolTipText("Previous version");
875
-		undoButton.addActionListener(this);
876
-                undoButton.setEnabled(false);
1118
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1119
+                deleteVersionButton.setToolTipText("Delete current version");
1120
+		deleteVersionButton.addActionListener(this);
1121
+                deleteVersionButton.setEnabled(false);
1122
+                                                
1123
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1124
+                previousVersionButton.setToolTipText("Previous version");
1125
+		previousVersionButton.addActionListener(this);
1126
+                previousVersionButton.setEnabled(false);
8771127                 
8781128                 cGridBag updown = new cGridBag().setVertical(true);
879
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880
-                restoreButton.setToolTipText("Restore current");
1129
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
+                restoreButton.setToolTipText("Undo (restore current version)");
8811131 		restoreButton.addActionListener(this);
8821132                 restoreButton.setEnabled(false);
8831133                 
884
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885
-                replaceButton.setToolTipText("Replace current");
1134
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1135
+                replaceButton.setToolTipText("Save (replace current version)");
8861136 		replaceButton.addActionListener(this);
8871137                 replaceButton.setEnabled(false);
8881138                 
889
-                copyOptionsPanel.add(updown);
1139
+                versionManagerPanel.add(updown);
8901140                 
891
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
892
-                redoButton.setToolTipText("Next version");
893
-		redoButton.addActionListener(this);
894
-                redoButton.setEnabled(false);
1141
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1142
+                nextVersionButton.setToolTipText("Next version");
1143
+		nextVersionButton.addActionListener(this);
1144
+                nextVersionButton.setEnabled(false);
1145
+                
1146
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1147
+                oneStepButton.setToolTipText("Animate one step forward");
1148
+		oneStepButton.addActionListener(this);
8951149                 
8961150                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
8971151                 liveCB.setToolTipText("Enable animation");
8981152                                 liveCB.addItemListener(this);
8991153 
900
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
901
-                oneStepButton.setToolTipText("Animate one step forward");
902
-		oneStepButton.addActionListener(this);
903
-                
9041154                 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
9051155                 fastCB.setToolTipText("Fast mode");
9061156                                 fastCB.addItemListener(this);
....@@ -916,38 +1166,23 @@
9161166 
9171167                 if (Globals.ADVANCED)
9181168                 {
919
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9201170                         snapobjectButton.addActionListener(this);
9211171                         snapobjectButton.setToolTipText("Snap Object");
9221172                         
923
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1173
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9241174 		fourButton.addActionListener(this);
9251175                 fourButton.setToolTipText("Show control panel only");
9261176                 }
9271177 
9281178 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
9291179                 
930
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
-                twoButton.setToolTipText("Show 3D view only");
932
-		twoButton.addActionListener(this);
933
-                this.fullscreenLayout = twoButton;
934
-                
935
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
936
-                threeButton.setToolTipText("Show controls and 3D view");
937
-		threeButton.addActionListener(this);
938
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
-                sixButton.setToolTipText("Show 3D view and controls");
940
-		sixButton.addActionListener(this);
941
-//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942
-//                sevenButton.setToolTipText("3-column layout");
943
-//		sevenButton.addActionListener(this);
944
-                //
9451180 
946
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1181
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9471182                 rootButton.setToolTipText("Open selection in new tab");
9481183 		rootButton.addActionListener(this);
9491184 
950
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9511186                 closeButton.setToolTipText("Close tab");
9521187 		closeButton.addActionListener(this);
9531188 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -956,38 +1191,38 @@
9561191                 cGridBag row1 = new cGridBag();
9571192                 
9581193                 // INSERT
959
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
960
-                gridButton.setToolTipText("Create grid");
1194
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195
+                gridButton.setToolTipText("Create ground");
9611196                                 gridButton.addActionListener(this);
9621197 
963
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9641199                 boxButton.setToolTipText("Create box");
9651200                                 boxButton.addActionListener(this);
9661201 
967
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
968
-                sphereButton.setToolTipText("Create sphere");
969
-                                sphereButton.addActionListener(this);
970
-
971
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
972
-                coneButton.setToolTipText("Create cone");
973
-                                coneButton.addActionListener(this);
974
-
975
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
976
-                torusButton.setToolTipText("Create torus");
977
-                                torusButton.addActionListener(this);
978
-
979
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9801203                 superButton.setToolTipText("Create superellipsoid");
9811204                                 superButton.addActionListener(this);
9821205 
1206
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207
+                sphereButton.setToolTipText("Create sphere");
1208
+                                sphereButton.addActionListener(this);
1209
+
1210
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1211
+                coneButton.setToolTipText("Create cone");
1212
+                                coneButton.addActionListener(this);
1213
+
1214
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1215
+                torusButton.setToolTipText("Create torus");
1216
+                                torusButton.addActionListener(this);
1217
+
9831218                 if (Globals.ADVANCED)
9841219                 {
985
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9861221                     kleinButton.setToolTipText("Create Klein bottle");
9871222                                     kleinButton.addActionListener(this);
9881223                 }
9891224                 
990
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1225
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9911226                 particlesButton.setToolTipText("Create particle system");
9921227                                particlesButton.addActionListener(this);
9931228 
....@@ -995,71 +1230,73 @@
9951230                 
9961231                 cGridBag row2 = new cGridBag();
9971232                 
998
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9991234                 groupButton.setToolTipText("Create group");
10001235                                groupButton.addActionListener(this);
10011236 
1002
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10031238                 compositeButton.setToolTipText("Create composite");
10041239                                compositeButton.addActionListener(this);
10051240 
1006
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10071242                 switchButton.setToolTipText("Create item switcher");
10081243                                switchButton.addActionListener(this);
10091244 
1010
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10111246                 loopButton.setToolTipText("Create loop");
10121247                                loopButton.addActionListener(this);
10131248 
1014
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10151250                 textureButton.setToolTipText("Create texture");
10161251                                textureButton.addActionListener(this);
10171252 
1018
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1253
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10191254                 overlayButton.setToolTipText("Create overlay");
10201255                                overlayButton.addActionListener(this);
10211256 
1022
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1257
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10231258                 lightButton.setToolTipText("Create light");
10241259                                lightButton.addActionListener(this);
10251260 
10261261                 oe.toolboxPanel.add(row2);
10271262                 
1028
-                // ENVYMAPS
1029
-                cGridBag skyboxpane = new cGridBag();
1030
-                skyboxpane.preferredHeight = 100;
1263
+                cGridBag textures = new cGridBag();
10311264                 
1032
-                oe.toolboxPanel.add(skyboxpane);
1265
+                CreateTexturePanel(textures);
10331266                 
1034
-                JTabbedPane skyboxpanel = new JTabbedPane();
1035
-                skyboxpane.add(skyboxpanel);
1267
+                int tabCount = resourcecontainer.getTabCount();
10361268                 
1037
-                AddSkyboxTab0(skyboxpanel);
1038
-                AddSkyboxTab1(skyboxpanel);
1039
-                AddSkyboxTab2(skyboxpanel);
1269
+                if (tabCount > 0)
1270
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1271
+                
1272
+                oe.toolboxPanel.add(textures);
1273
+                
1274
+                textures.preferredHeight = 100;
1275
+                
1276
+                CreateSkyboxPanel(oe.skyboxPanel);
10401277                 
10411278                 // EDIT panel
1042
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10431280                 editButton.setToolTipText("Pin selection controls");
10441281 		editButton.addActionListener(this);
10451282 
1046
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
-                uneditButton.setToolTipText("Remove selection controls");
1283
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1284
+                uneditButton.setToolTipText("Unpin and remove selection controls");
10481285 		uneditButton.addActionListener(this);
10491286 
10501287 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051
-                allParamsButton.setToolTipText("Show all controle");
1288
+                allParamsButton.setToolTipText("Show all controls");
10521289 		allParamsButton.addActionListener(this);
10531290 
1054
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
-                clearPanelButton.setToolTipText("Clear edit panel");
1291
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1292
+                clearPanelButton.setToolTipText("Clear all controls");
10561293 		clearPanelButton.addActionListener(this);
10571294 
1058
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
-                unselectButton.setToolTipText("Unselect");
1060
-		unselectButton.addActionListener(this);
1295
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1296
+                //unselectButton.setToolTipText("Unselect");
1297
+		//unselectButton.addActionListener(this);
10611298 
1062
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1299
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10631300                 flashSelectionButton.setToolTipText("Highlight selection");
10641301 		flashSelectionButton.addActionListener(this);
10651302                 
....@@ -1082,6 +1319,8 @@
10821319                 
10831320                 cGridBag jSPPanel = new cGridBag();
10841321 
1322
+            jSPPanel.preferredHeight = 20;
1323
+            
10851324                 JScrollPane jSP;
10861325 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
10871326 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1090,11 +1329,11 @@
10901329                 oe.treePanel.add(jSPPanel);
10911330                 oe.treePanel.Return();
10921331 
1093
-                oe.treePanel.add(copyOptionsPanel);
1332
+                oe.treePanel.add(versionManagerPanel);
10941333                 oe.treePanel.Return();
1095
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1096
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1097
-            sliderPane.preferredHeight = 1;
1334
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336
+            versionSliderPane.preferredHeight = 3;
10981337                 
10991338 //        mainPanel.setDividerLocation(0.1); //1.0);
11001339         mainPanel.setResizeWeight(0.4);
....@@ -1117,7 +1356,7 @@
11171356 		dgr.addDragGestureListener(this);
11181357 		}catch(Exception e) {}
11191358 		*/
1120
-        radio.layout = sixButton; // sevenButton;
1359
+        radio.layout = threeButton; // sixButton;
11211360         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
11221361 	}
11231362         
....@@ -1168,9 +1407,12 @@
11681407                 smoothCB.setToolTipText("Snapping delay");
11691408                                 smoothCB.addItemListener(this);
11701409 
1171
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172
-                slowCB.setToolTipText("Smooth interpolation");
1173
-                                slowCB.addItemListener(this);
1410
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1411
+//                slowCB.setToolTipText("Smooth interpolation");
1412
+//                                slowCB.addItemListener(this);
1413
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1414
+                minshaderCB.setToolTipText("Minimal fast shader");
1415
+                                minshaderCB.addItemListener(this);
11741416                                 
11751417 //        	constraints.gridy += 1;
11761418 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -1249,6 +1491,14 @@
12491491 	
12501492         void EditObject(Object3D obj)
12511493         {
1494
+            assert(obj instanceof Composite);
1495
+            
1496
+//            if (obj.versionlist == null)
1497
+//            {
1498
+//                obj.versionlist = new Object3D[100];
1499
+//                obj.versionindex = -1;
1500
+//            }
1501
+            
12521502             cRadio radioButton = new cRadio(obj.name);
12531503             
12541504             // June 2019. Patch to avoid bug with transparency.
....@@ -1259,7 +1509,7 @@
12591509             }
12601510             
12611511             radioButton.SetObject(obj);
1262
-            radioButton.layout = sixButton; // sevenButton;
1512
+            radioButton.layout = threeButton; // sixButton;
12631513             radioButton.SetCamera(cameraView.renderCamera, false);
12641514             radioButton.addActionListener(this);
12651515             radioPanel.add(radioButton);
....@@ -1273,6 +1523,7 @@
12731523                     
12741524             oe.SetupViews();
12751525             
1526
+        if (Globals.DEBUG)
12761527 		System.out.println("SetupViews");
12771528             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
12781529                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1284,6 +1535,8 @@
12841535         cCheckBox localCB;
12851536         cCheckBox crowdCB;
12861537         cCheckBox smoothCB;
1538
+        cCheckBox minshaderCB;
1539
+        
12871540         cToggleButton fastCB;
12881541         cCheckBox slowCB;
12891542         cCheckBox boxCB;
....@@ -1354,6 +1607,12 @@
13541607             {
13551608                 cameraView.ToggleInertia();
13561609         cameraView.repaint();
1610
+            }
1611
+            else if(e.getSource() == minshaderCB)
1612
+            {
1613
+                Globals.MINSHADER ^= true;
1614
+                cameraView.programInitialized = false;
1615
+                cameraView.repaint();
13571616             }
13581617             else if(e.getSource() == localCB)
13591618             {
....@@ -1631,7 +1890,12 @@
16311890   TreePath path;
16321891 
16331892   public TransferableTreePath(TreePath tp) {
1634
-    path = tp;
1893
+      Object[] objs = new Object[tp.getPathCount()];
1894
+      for (int i=0; i<objs.length; i++)
1895
+      {
1896
+          objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1897
+      }
1898
+    path = new TreePath(objs);
16351899   }
16361900 
16371901   public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1921,7 +2185,11 @@
19212185             shadow.material = new cMaterial(obj.material);
19222186             shadow.material.diffuse = 0.0001f;
19232187             shadow.material.specular = 0.0001f;
1924
-            //shadow.projectedVertices[1].x = 300;
2188
+            shadow.material.opacity = 0.75f;
2189
+            
2190
+            AllocProjectedVertices(shadow);
2191
+        
2192
+            shadow.projectedVertices[1].x = 300;
19252193             
19262194             makeSomething(shadow);
19272195         }
....@@ -2442,27 +2710,35 @@
24422710 		} else
24432711 		if (source == loopItem || source == loopButton)
24442712 		{
2713
+                    if (!group.selection.isEmpty())
2714
+                    {
24452715                         Composite csg = new GroupLeaf();
24462716                         csg.count = 5;
2447
-			group(csg);
24482717                         Composite child = new cGroup("Branch");
24492718                         csg.addChild(child);
24502719                         child.addChild(csg);
2720
+			group(csg);
2721
+                    }
24512722 		} else
24522723 		if (source == doubleItem)
24532724 		{
2725
+                    if (!group.selection.isEmpty())
2726
+                    {
24542727                         Composite csg = new GroupLeaf("Fork");
24552728                         csg.count = 5;
2456
-			group(csg);
24572729                         Composite child = new cGroup("Branch A");
24582730                         csg.addChild(child);
24592731                         child.addChild(csg);
24602732                         child = new cGroup("Branch B");
24612733                         csg.addChild(child);
24622734                         child.addChild(csg);
2735
+			group(csg);
2736
+                    }
24632737 		} else
24642738 		if (source == tripleItem)
24652739 		{
2740
+                    if (!group.selection.isEmpty())
2741
+                    {
24662742                         Composite csg = new GroupLeaf("Trident");
24672743                         csg.count = 4;
24682744 			group(csg);
....@@ -2475,6 +2751,7 @@
24752751                         child = new cGroup();
24762752                         csg.addChild(child);
24772753                         child.addChild(csg);
2754
+                    }
24782755 		} else
24792756 		if (source == computeAOItem)
24802757 		{
....@@ -2494,7 +2771,7 @@
24942771 		if (source == invariantsItem)
24952772 		{
24962773                     System.out.println("Invariants:");
2497
-                    Grafreed.grafreeD.universe.invariants();
2774
+                    Grafreed.grafreed.universe.invariants();
24982775 		} else
24992776 		if (source == memoryItem)
25002777 		{
....@@ -2525,33 +2802,52 @@
25252802 		{
25262803 			ToggleFullScreen();
25272804 		} else
2528
-		if (source == undoButton)
2805
+		if (source == collapseButton)
2806
+		{
2807
+                        this.expandedLayout = radio.layout;
2808
+			CollapseToolbar();
2809
+		} else
2810
+		if (source == maximize3DButton)
2811
+		{
2812
+                        this.expandedLayout = radio.layout;
2813
+                        radio.layout = twoButton;
2814
+                        Show3DView();
2815
+			CollapseToolbar();
2816
+		} else
2817
+		if (source == previousVersionButton)
25292818 		{
25302819                         // Go to previous version
25312820 			//if (!Undo())
25322821                             //java.awt.Toolkit.getDefaultToolkit().beep();
2533
-			Undo();
2822
+			PreviousVersion();
25342823 		} else
25352824 		if (source == restoreButton)
25362825 		{
25372826                         // Restore current version
25382827 			Restore();
2828
+        //restoreButton.setEnabled(false);
25392829 		} else
25402830 		if (source == replaceButton)
25412831 		{
25422832                         // Overwrite current version
25432833 			Replace();
2834
+        //replaceButton.setEnabled(false);
25442835 		} else
2545
-		if (source == redoButton)
2836
+		if (source == nextVersionButton)
25462837 		{
25472838                         // Go to next version
2548
-			Redo();
2839
+			NextVersion();
25492840 		} else
2550
-		if (source == saveButton)
2841
+		if (source == saveVersionButton)
25512842 		{
25522843                         // Save a new version
25532844 			if (!Save(true))
25542845                             java.awt.Toolkit.getDefaultToolkit().beep();
2846
+		} else
2847
+		if (source == deleteVersionButton)
2848
+		{
2849
+                        // Delete a new version
2850
+                        DeleteVersion();
25552851 		} else
25562852 		if (source == oneStepButton)
25572853 		{
....@@ -2606,11 +2902,11 @@
26062902 		} else
26072903 		if (source == undoItem)
26082904 		{
2609
-			Undo();
2905
+			PreviousVersion();
26102906 		} else
26112907 		if (source == redoItem)
26122908 		{
2613
-			Redo();
2909
+			NextVersion();
26142910 		} else
26152911 		if (source == duplicateItem)
26162912 		{
....@@ -3091,22 +3387,34 @@
30913387 		} else
30923388 		if (source == ungroupItem || source == ungroupButton)
30933389 		{
3094
-                    boolean hasRoot = false;
3390
+                    boolean canUngroup = true;
30953391                     
30963392                     for (int i=0; i<group.selection.size(); i++)
30973393                     {
3098
-                        if (group.selection.get(i) == group)
3394
+                        Object3D selectedItem = group.selection.get(i);
3395
+                        
3396
+                        if (selectedItem.Size() == 0)
30993397                         {
3100
-                            hasRoot = true;
3398
+                            // Cannot ungroup leaves
3399
+                            canUngroup = false;
3400
+                            break;
3401
+                        }
3402
+                                
3403
+                        if (selectedItem == group)
3404
+                        {
3405
+                            // Cannot ungroup root
3406
+                            canUngroup = false;
31013407                             break;
31023408                         }
31033409                     }
31043410 
3105
-                    if (!hasRoot)
3411
+                    if (canUngroup)
31063412                     {
31073413                         for (int i=0; i<group.selection.size(); i++)
31083414                         {
3109
-                            Ungroup(group.selection.get(i));
3415
+                            Object3D selectedItem = group.selection.get(i);
3416
+                            
3417
+                            Ungroup(selectedItem);
31103418                         }
31113419 
31123420                         ClearSelection(false);
....@@ -3469,38 +3777,7 @@
34693777                     if (CameraPane.FULLSCREEN)
34703778                         fullscreenLayout = radio.layout;
34713779                     
3472
-                    // bug
3473
-                    //gridPanel.setDividerLocation(1.0);
3474
-                    //bigPanel.setDividerLocation(0.0);
3475
-//                    bigThree.remove(scenePanel);
3476
-//                    bigThree.remove(centralPanel);
3477
-//                    bigThree.remove(XYZPanel);
3478
-//                    aWindowConstraints.gridx = 0;
3479
-//                    aWindowConstraints.gridy = 0;
3480
-//                    aWindowConstraints.gridwidth = 1;
3481
-//            //        aConstraints.gridheight = 3;
3482
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3483
-//                    aWindowConstraints.weightx = 0;
3484
-//                    aWindowConstraints.weighty = 1;
3485
-//                    //bigThree.add(jtp, aWindowConstraints);
3486
-//                    aWindowConstraints.weightx = 1;
3487
-//                    aWindowConstraints.gridwidth = 3;
3488
-//            //        aConstraints.gridheight = 3;
3489
-//                    aWindowConstraints.gridx = 1;
3490
-//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
3491
-//                    bigThree.add(centralPanel, aWindowConstraints);
3492
-//                    aWindowConstraints.weightx = 0;
3493
-//                    aWindowConstraints.gridx = 4;
3494
-//                    aWindowConstraints.gridwidth = 1;
3495
-//            //        aConstraints.gridheight = 3;
3496
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3497
-//                    //bigThree.add(XYZPanel, aWindowConstraints);
3498
-//                    scenePanel.setVisible(false);
3499
-//                    centralPanel.setVisible(true);
3500
-//                    XYZPanel.setVisible(false);
3501
-                    bigThree.ClearUI();
3502
-                    bigThree.add(centralPanel);
3503
-                    bigThree.FlushUI();
3780
+                    Show3DView();
35043781                     
35053782                     cameraView.requestFocusInWindow();
35063783                     
....@@ -3686,6 +3963,7 @@
36863963                 } else
36873964 		if (source == rootButton)
36883965 		{
3966
+                    Replace();
36893967                     Object3D obj;
36903968                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
36913969                     {
....@@ -3700,6 +3978,8 @@
37003978 		if (source == closeButton)
37013979 		{
37023980 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3981
+                    Replace();
3982
+                    
37033983                     cRadio ab;
37043984                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
37053985                     {
....@@ -3743,10 +4023,10 @@
37434023 			{
37444024 				Object3D child = (Object3D)e.nextElement();
37454025                                 if(child.editWindow != null)
3746
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
37474026                                 child.pinned = false;
37484027 				child.CloseUI();
37494028                                 listUI.remove(child);
4029
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
37504030                                 
37514031                                 //child.editWindow = null; // ???????????
37524032 			}
....@@ -3765,6 +4045,7 @@
37654045                         obj.CloseUI();
37664046                     }
37674047                     listUI.clear();
4048
+                    SetPinStates(group.selection.size() > 0);
37684049                     refreshContents(true);
37694050 		} else
37704051 		if (source == allParamsButton)
....@@ -3797,6 +4078,8 @@
37974078 		} else
37984079                 if(source instanceof cRadio)
37994080 		{
4081
+                    Replace();
4082
+                    
38004083                     group.parent = keepparent;
38014084                         group.attributes = 0;
38024085                     //group.editWindow = null;
....@@ -3821,8 +4104,6 @@
38214104                     
38224105                     copy = group;
38234106                     
3824
-                    SetUndoStates();
3825
-
38264107                     //Globals.theRenderer.object = group;
38274108                     if(!useclient)
38284109                     {
....@@ -3850,7 +4131,31 @@
38504131                      */
38514132                     radio.layout.doClick();
38524133                     
4134
+                    assert(copy instanceof Composite);
4135
+                    
4136
+        if (copy.versionlist == null)
4137
+        {
4138
+            copy.versionindex = -1;
4139
+            
4140
+            // Cannot work with loops
4141
+            // To fix this issue, we first mark all nodes above the root,
4142
+            // and check if any of these nodes are reachable below the root.
4143
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4144
+            
4145
+            if (!copy.HasTags())
4146
+            {
4147
+                copy.versionlist = new Object3D[100];
4148
+                
4149
+                Save(true);
4150
+            }
4151
+            
4152
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4153
+        }
4154
+        
4155
+                    SetVersionStates();
4156
+
38534157                     ClearUnpinned();
4158
+                    
38544159                     //Grafreed.Assert(group != null);
38554160                     //Grafreed.Assert(group.selection != null);
38564161                     SetPinStates(group.selection == null || group.selection.size() > 0);
....@@ -3867,11 +4172,13 @@
38674172                 } else if (event.getSource() == editCameraItem)
38684173                 {
38694174                     cameraView.ProtectCamera();
4175
+                    cameraView.requestFocusInWindow();
38704176                     cameraView.repaint();
38714177                     return;
38724178                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
38734179                 {
38744180                     cameraView.RevertCamera();
4181
+                    cameraView.requestFocusInWindow();
38754182                     cameraView.repaint();
38764183                     return;
38774184         //        } else if (event.getSource() == textureButton)
....@@ -3990,7 +4297,7 @@
39904297                         TouchTransform(obj);
39914298                         continue;
39924299                     }
3993
-                    if ((mask&2) != 0) // Scale
4300
+                    if ((mask&2) != 0) // Scale/rotation
39944301                     {
39954302                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
39964303                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -3998,10 +4305,6 @@
39984305                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
39994306                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
40004307                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4001
-                    }
4002
-                    if ((mask&4) != 0) // Rotation
4003
-                    {
4004
-                        // ?
40054308                     }
40064309                     if ((mask&1) != 0) // Translation
40074310                     {
....@@ -5004,9 +5307,7 @@
50045307 		
50055308 		freezemodel = false;
50065309 	}
5007
-	
5008
-        boolean flashIt = true;
5009
-        
5310
+	        
50105311 	public void valueChanged(TreeSelectionEvent e)
50115312 	//public boolean handleEvent(Event event)
50125313 	{
....@@ -5079,13 +5380,31 @@
50795380         {
50805381             editButton.setEnabled(enabled);
50815382             uneditButton.setEnabled(enabled);
5082
-            unselectButton.setEnabled(enabled);
5383
+            //unselectButton.setEnabled(enabled);
50835384             flashSelectionButton.setEnabled(enabled);
5385
+            
5386
+            clearPanelButton.setEnabled(!listUI.isEmpty());
5387
+            
5388
+            boolean allComposites = true;
5389
+            
5390
+            if (group.selection != null)
5391
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5392
+            {
5393
+                    Object next = e.nextElement();
5394
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5395
+                    {
5396
+                        allComposites = false;
5397
+                        break;
5398
+                    }
5399
+            }
5400
+            
5401
+            rootButton.setEnabled(allComposites);
50845402         }
50855403 
50865404         void refreshContents(boolean cp)
50875405         {
5088
-            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5406
+            if (Globals.ADVANCED)
5407
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
50895408             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
50905409             {
50915410                 objEditor.ClearInfo(); // .GetMaterial());
....@@ -5095,7 +5414,7 @@
50955414                     Object3D child = (Object3D) group.selection.get(i);
50965415 
50975416                     objEditor.AddInfo(child, this, true);
5098
-    System.err.println("info : " + child.GetPath());
5417
+//    System.err.println("info : " + child.GetPath());
50995418                 }
51005419 
51015420                 objEditor.SetText(); // jan 2014
....@@ -5921,7 +6240,6 @@
59216240 	
59226241 	cButton restoreCameraButton;
59236242         
5924
-	cButton saveButton;
59256243 	cButton oneStepButton;
59266244         
59276245         cButton groupButton;
....@@ -5979,11 +6297,11 @@
59796297 	private MenuItem lookAtItem;
59806298 	private MenuItem lookFromItem;
59816299 	private MenuItem switchViewItem;
5982
-	private MenuItem cutItem;
6300
+	private JMenuItem cutItem;
59836301 	private MenuItem undoItem;
59846302 	private MenuItem redoItem;
59856303 	private JMenuItem duplicateItem;
5986
-	private MenuItem cloneItem;
6304
+	private JMenuItem cloneItem;
59876305 	private MenuItem cloneSupportItem;
59886306 	private MenuItem overwriteGeoItem;
59896307 	private MenuItem overwriteMatItem;
....@@ -6004,13 +6322,13 @@
60046322 	private MenuItem cloneGeometriesItem;
60056323 	private MenuItem shareGeometriesItem;
60066324 	private MenuItem mergeGeometriesItem;
6007
-	private MenuItem copyItem;
6325
+	private JMenuItem copyItem;
60086326 	private MenuItem pasteItem;
6009
-	private MenuItem pasteIntoItem;
6010
-	private MenuItem pasteLinkItem;
6011
-	private MenuItem pasteCloneItem;
6012
-	private MenuItem pasteExpandItem;
6013
-	private MenuItem deleteItem;
6327
+	private JMenuItem pasteIntoItem;
6328
+	private JMenuItem pasteLinkItem;
6329
+	private JMenuItem pasteCloneItem;
6330
+	private JMenuItem pasteExpandItem;
6331
+	private JMenuItem deleteItem;
60146332 	private MenuItem clearAllItem;
60156333 	private MenuItem genUVItem;
60166334 	private MenuItem genNormalsMESHItem;
....@@ -6065,7 +6383,7 @@
60656383 	private MenuItem transformGeometryItem;
60666384 	private MenuItem transformChildrenItem;
60676385 	private MenuItem hideItem;
6068
-	private MenuItem grabItem;
6386
+	private JMenuItem grabItem;
60696387 	private MenuItem backItem;
60706388 	private MenuItem frontItem;
60716389 	private MenuItem cameraItem;
....@@ -6078,7 +6396,7 @@
60786396 	private MenuItem switchTransfoItem;
60796397 	private MenuItem morphItem;
60806398 	private MenuItem linkerItem;
6081
-	private MenuItem ungroupItem;
6399
+	private JMenuItem ungroupItem;
60826400 	private MenuItem editItem;
60836401 	private MenuItem openWindowItem;
60846402 	private MenuItem editLeafItem;