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 + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
3233         //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
-        skyboxButton.setToolTipText(s);
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,11 +73,11 @@
5673         cGridBag row5 = new cGridBag();
5774         cGridBag row6 = new cGridBag();
5875         
59
-        AddSkyboxButton("default", "rgb", row0);
76
+        AddSkyboxButton("default", "", row0);
6077         //AddSkyboxButton("default", "cornell", row0);
6178         AddSkyboxButton("penguins", "dust", row0);
6279         AddSkyboxButton("penguins", "tropic", row0);
63
-        AddSkyboxButton("default", "skycube", row0);
80
+        AddSkyboxButton("penguins", "yonder", row0);
6481 
6582         AddSkyboxButton("default", "uffizi", row1);
6683         AddSkyboxButton("bridge", "Bridge", row1);
....@@ -90,7 +107,7 @@
90107         AddSkyboxButton("park", "Skansen3", row6);
91108         AddSkyboxButton("park", "Skansen4", row6);
92109         AddSkyboxButton("park", "Skansen5", row6);
93
-        AddSkyboxButton("park", "Stairs", row6);
110
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94111         
95112         tab0.add(row0);
96113         tab0.add(row1);
....@@ -144,21 +161,18 @@
144161         
145162         AddSkyboxButton("mountain", "Maskonaive2", row4);
146163         AddSkyboxButton("mountain", "Maskonaive3", row4);
147
-        AddSkyboxButton("mountain", "Ryfjallet", row4);
148164         AddSkyboxButton("mountain", "Teide", row4);
149165         AddSkyboxButton("park", "Tantolunden4", row4);
150166         
151
-        AddSkyboxButton("penguins", "wrath", row5);
152
-        AddSkyboxButton("penguins", "yonder", row5);
167
+        AddSkyboxButton("park", "Stairs", row5);
168
+        AddSkyboxButton("default", "skycube", row6);
153169         AddSkyboxButton("rocky", "Langholmen", row5);
154170         AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155
-        AddSkyboxButton("rocky", "Tantolunden6", row5);
156171         
172
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
157173         AddSkyboxButton("default", "CloudyHills", row6);
158174         AddSkyboxButton("daz", "Autumn", row6);
159
-        AddSkyboxButton("daz", "Greenlands", row6);
160175         AddSkyboxButton("daz", "MountainTrail", row6);
161
-        AddSkyboxButton("daz", "Oasis", row6);
162176         /*
163177 Autumn
164178 Greenlands
....@@ -210,8 +224,8 @@
210224         AddSkyboxButton("penguins", "sleepyhollow", row1);
211225         
212226         AddSkyboxButton("penguins", "kenon_star", row2);
213
-        AddSkyboxButton("indoors", "DallasW", row2);
214
-        AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
227
+        AddSkyboxButton("persson", "corona", row2);
228
+        AddSkyboxButton("persson", "spaceskybox", row2);
215229         AddSkyboxButton("indoors", "Vasa", row2);
216230         
217231         AddSkyboxButton("winter", "Backyard", row3);
....@@ -232,7 +246,7 @@
232246         AddSkyboxButton("daz", "TheRock", row6);
233247         AddSkyboxButton("daz", "TopOfTheWorld", row6);
234248         AddSkyboxButton("daz", "Winter", row6);
235
-        AddSkyboxButton("penguins", "desertdawn", row6);
249
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
236250         
237251         tab0.add(row0);
238252         tab0.add(row1);
....@@ -248,15 +262,122 @@
248262             //tab0.add(new cGridBag());
249263         }
250264     }
251
-    
252
-    public void ChangeSkybox(String name)
265
+
266
+    public void AddSkyboxTab3(JTabbedPane skyboxpanel)
253267     {
254
-        //cameraView.envyoff = false;
255
-        group.skyboxname = name;
256
-        group.skyboxext = "jpg";
257
-        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);
258358     }
259359     
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
+
260381     //ObjEditor objEditor;
261382 	public void closeUI2()
262383 	{
....@@ -294,10 +415,14 @@
294415 		this.copy = this.group = group;
295416 		//selectees = this.group.selectees;
296417 		
297
-        if (copy.versions == null)
418
+                assert(false);
419
+                
420
+        if (copy.versionlist == null)
298421         {
299
-            copy.versions = new byte[100][];
422
+            copy.versionlist = new Object3D[100];
300423             copy.versionindex = -1;
424
+            
425
+            //Save(true);
301426         }
302427         
303428 		if(ui)
....@@ -321,12 +446,12 @@
321446                 
322447                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323448                 
324
-        if (copy.versions == null)
449
+        if (copy.versionlist == null)
325450         {
326
-            copy.versions = new byte[100][];
451
+            copy.versionlist = new Object3D[100];
327452             copy.versionindex = -1;
328453             
329
-            Save(true);
454
+            //Save(true);
330455         }
331456 	}
332457 
....@@ -417,33 +542,35 @@
417542 //		menu.add("-");
418543 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
419544 		duplicateItem.addActionListener(this);
420
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
421547 		cloneItem.addActionListener(this);
422
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
423549         {
424550 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
425551 		cloneSupportItem.addActionListener(this);
426552         }
553
+                oe.jTree.popup.addSeparator();
427554 		menu.add("-");
428
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
429556 		cutItem.addActionListener(this);
430
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
431558 		copyItem.addActionListener(this);
432559 		pasteItem = menu.add(new MenuItem("Paste"));
433560 		pasteItem.addActionListener(this);
434561                 
435
-		menu.add("-");
436
-		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"));
437565 		pasteIntoItem.addActionListener(this);
438
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
439567 		pasteLinkItem.addActionListener(this);
440
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
441569 		pasteCloneItem.addActionListener(this);
442
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
443571 //		pasteExpandItem.addActionListener(this);
444
-		menu.add("-");
445
-		deleteItem = menu.add(new MenuItem("Delete"));
446
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
447574                 
448575         if (Globals.ADVANCED)
449576         {
....@@ -529,11 +656,9 @@
529656 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
530657 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
531658 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
532
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
533659 		oe.cameraMenu.add("-");
534660 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
535661 		openWindowItem.addActionListener(this);
536
-		editLeafItem.addActionListener(this);
537662 		lookAtItem.addActionListener(this);
538663 		//lookFromItem.addActinoListener(this);
539664 		//switchViewItem.addActionListener(this);
....@@ -580,9 +705,8 @@
580705 		setMasterItem.addActionListener(this);
581706         }
582707                 
583
-		oe.menuBar.add(menu = new Menu("Group"));
584
-//		grabItem = menu.add(new MenuItem("Grab"));
585
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
586710 		backItem = menu.add(new MenuItem("Back"));
587711 		backItem.addActionListener(this);
588712 		frontItem = menu.add(new MenuItem("Front"));
....@@ -590,13 +714,21 @@
590714 //		compositeItem = menu.add(new MenuItem("Composite"));
591715 //		compositeItem.addActionListener(this);
592716                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
593720         if (Globals.ADVANCED)
594721         {
595722 		hideItem = menu.add(new MenuItem("Hidden Group"));
596723 		hideItem.addActionListener(this);
597724         }
598
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
599726 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
600732                 
601733 //		menu.add("-");
602734 //                
....@@ -725,9 +857,9 @@
725857 		hideleavesItem.addActionListener(this);
726858 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
727859 		showleavesItem.addActionListener(this);
728
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
729861 		markleavesItem.addActionListener(this);
730
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
731863 		unmarkleavesItem.addActionListener(this);
732864 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
733865 		rewindleavesItem.addActionListener(this);
....@@ -781,6 +913,9 @@
781913 		shareGeometriesItem.addActionListener(this);
782914 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
783915 		mergeGeometriesItem.addActionListener(this);
916
+		menu.add("-");
917
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+		editLeafItem.addActionListener(this);
784919         if (Globals.ADVANCED)
785920         {
786921             // Pretty much the same as duplicate and clone.
....@@ -797,6 +932,79 @@
797932 		buildToolsMenu(menu);
798933 	}
799934 	
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
+        }
8001008         
8011009 	void SetupUI2(ObjEditor oe)
8021010 	{
....@@ -815,11 +1023,6 @@
8151023             //new Exception().printStackTrace();
8161024                 
8171025         oe.radioPanel = new JPanel(new GridBagLayout());
818
-	oe.aConstraints.weightx = 1;
819
-	oe.aConstraints.weighty = 0;
820
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
821
-	oe.aConstraints.gridwidth = 100;
822
-	oe.aConstraints.gridheight = 1;
8231026 //        oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8241027         
8251028         oe.buttonGroup = new ButtonGroup();
....@@ -840,9 +1043,9 @@
8401043         oe.radioPanel.add(dummyButton);
8411044         oe.buttonGroup.add(dummyButton);
8421045          */
843
-                cGridBag copyOptionsPanel = new cGridBag();
1046
+                cGridBag versionManagerPanel = new cGridBag();
8441047                                         
845
-                copyOptionsPanel.preferredHeight = 2;
1048
+                versionManagerPanel.preferredHeight = 4;
8461049                 
8471050                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
8481051                 
....@@ -852,58 +1055,102 @@
8521055                 
8531056                 if (Globals.ADVANCED)
8541057                 {
855
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
856
-                    maxButton.setToolTipText("Maximize window");
857
-                    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);
8581061                 }
8591062                 
860
-		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);
8611103                 fullButton.setToolTipText("Full-screen window");
8621104 		fullButton.addActionListener(this);
8631105                 
864
-		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);
8651107                 screenfitButton.setToolTipText("Screen fit");
8661108 		screenfitButton.addActionListener(this);
8671109 
868
-		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);
8691111                 restoreCameraButton.setToolTipText("Restore viewpoint");
8701112 		restoreCameraButton.addActionListener(this);
8711113                 
872
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873
-                saveButton.setToolTipText("New version");
874
-		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);
8751117                                                 
876
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
877
-                undoButton.setToolTipText("Previous version");
878
-		undoButton.addActionListener(this);
879
-                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);
8801127                 
8811128                 cGridBag updown = new cGridBag().setVertical(true);
882
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883
-                restoreButton.setToolTipText("Restore current");
1129
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
+                restoreButton.setToolTipText("Undo (restore current version)");
8841131 		restoreButton.addActionListener(this);
8851132                 restoreButton.setEnabled(false);
8861133                 
887
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888
-                replaceButton.setToolTipText("Replace current");
1134
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1135
+                replaceButton.setToolTipText("Save (replace current version)");
8891136 		replaceButton.addActionListener(this);
8901137                 replaceButton.setEnabled(false);
8911138                 
892
-                copyOptionsPanel.add(updown);
1139
+                versionManagerPanel.add(updown);
8931140                 
894
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
895
-                redoButton.setToolTipText("Next version");
896
-		redoButton.addActionListener(this);
897
-                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);
8981149                 
8991150                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
9001151                 liveCB.setToolTipText("Enable animation");
9011152                                 liveCB.addItemListener(this);
9021153 
903
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
904
-                oneStepButton.setToolTipText("Animate one step forward");
905
-		oneStepButton.addActionListener(this);
906
-                
9071154                 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
9081155                 fastCB.setToolTipText("Fast mode");
9091156                                 fastCB.addItemListener(this);
....@@ -919,38 +1166,23 @@
9191166 
9201167                 if (Globals.ADVANCED)
9211168                 {
922
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9231170                         snapobjectButton.addActionListener(this);
9241171                         snapobjectButton.setToolTipText("Snap Object");
9251172                         
926
-		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);
9271174 		fourButton.addActionListener(this);
9281175                 fourButton.setToolTipText("Show control panel only");
9291176                 }
9301177 
9311178 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
9321179                 
933
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
934
-                twoButton.setToolTipText("Show 3D view only");
935
-		twoButton.addActionListener(this);
936
-                this.fullscreenLayout = twoButton;
937
-                
938
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
-                threeButton.setToolTipText("Show controls and 3D view");
940
-		threeButton.addActionListener(this);
941
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942
-                sixButton.setToolTipText("Show 3D view and controls");
943
-		sixButton.addActionListener(this);
944
-//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
-//                sevenButton.setToolTipText("3-column layout");
946
-//		sevenButton.addActionListener(this);
947
-                //
9481180 
949
-		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);
9501182                 rootButton.setToolTipText("Open selection in new tab");
9511183 		rootButton.addActionListener(this);
9521184 
953
-                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);
9541186                 closeButton.setToolTipText("Close tab");
9551187 		closeButton.addActionListener(this);
9561188 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -959,38 +1191,38 @@
9591191                 cGridBag row1 = new cGridBag();
9601192                 
9611193                 // INSERT
962
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
963
-                gridButton.setToolTipText("Create grid");
1194
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195
+                gridButton.setToolTipText("Create ground");
9641196                                 gridButton.addActionListener(this);
9651197 
966
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9671199                 boxButton.setToolTipText("Create box");
9681200                                 boxButton.addActionListener(this);
9691201 
970
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
971
-                sphereButton.setToolTipText("Create sphere");
972
-                                sphereButton.addActionListener(this);
973
-
974
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
975
-                coneButton.setToolTipText("Create cone");
976
-                                coneButton.addActionListener(this);
977
-
978
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
979
-                torusButton.setToolTipText("Create torus");
980
-                                torusButton.addActionListener(this);
981
-
982
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9831203                 superButton.setToolTipText("Create superellipsoid");
9841204                                 superButton.addActionListener(this);
9851205 
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
+
9861218                 if (Globals.ADVANCED)
9871219                 {
988
-                    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);
9891221                     kleinButton.setToolTipText("Create Klein bottle");
9901222                                     kleinButton.addActionListener(this);
9911223                 }
9921224                 
993
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1225
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9941226                 particlesButton.setToolTipText("Create particle system");
9951227                                particlesButton.addActionListener(this);
9961228 
....@@ -998,71 +1230,73 @@
9981230                 
9991231                 cGridBag row2 = new cGridBag();
10001232                 
1001
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10021234                 groupButton.setToolTipText("Create group");
10031235                                groupButton.addActionListener(this);
10041236 
1005
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10061238                 compositeButton.setToolTipText("Create composite");
10071239                                compositeButton.addActionListener(this);
10081240 
1009
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10101242                 switchButton.setToolTipText("Create item switcher");
10111243                                switchButton.addActionListener(this);
10121244 
1013
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10141246                 loopButton.setToolTipText("Create loop");
10151247                                loopButton.addActionListener(this);
10161248 
1017
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10181250                 textureButton.setToolTipText("Create texture");
10191251                                textureButton.addActionListener(this);
10201252 
1021
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1253
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10221254                 overlayButton.setToolTipText("Create overlay");
10231255                                overlayButton.addActionListener(this);
10241256 
1025
-                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);
10261258                 lightButton.setToolTipText("Create light");
10271259                                lightButton.addActionListener(this);
10281260 
10291261                 oe.toolboxPanel.add(row2);
10301262                 
1031
-                // ENVYMAPS
1032
-                cGridBag skyboxpane = new cGridBag();
1033
-                skyboxpane.preferredHeight = 100;
1263
+                cGridBag textures = new cGridBag();
10341264                 
1035
-                oe.toolboxPanel.add(skyboxpane);
1265
+                CreateTexturePanel(textures);
10361266                 
1037
-                JTabbedPane skyboxpanel = new JTabbedPane();
1038
-                skyboxpane.add(skyboxpanel);
1267
+                int tabCount = resourcecontainer.getTabCount();
10391268                 
1040
-                AddSkyboxTab0(skyboxpanel);
1041
-                AddSkyboxTab1(skyboxpanel);
1042
-                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);
10431277                 
10441278                 // EDIT panel
1045
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10461280                 editButton.setToolTipText("Pin selection controls");
10471281 		editButton.addActionListener(this);
10481282 
1049
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050
-                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");
10511285 		uneditButton.addActionListener(this);
10521286 
10531287 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1054
-                allParamsButton.setToolTipText("Show all controle");
1288
+                allParamsButton.setToolTipText("Show all controls");
10551289 		allParamsButton.addActionListener(this);
10561290 
1057
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
-                clearPanelButton.setToolTipText("Clear edit panel");
1291
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1292
+                clearPanelButton.setToolTipText("Clear all controls");
10591293 		clearPanelButton.addActionListener(this);
10601294 
1061
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1062
-                unselectButton.setToolTipText("Unselect");
1063
-		unselectButton.addActionListener(this);
1295
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1296
+                //unselectButton.setToolTipText("Unselect");
1297
+		//unselectButton.addActionListener(this);
10641298 
1065
-		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);
10661300                 flashSelectionButton.setToolTipText("Highlight selection");
10671301 		flashSelectionButton.addActionListener(this);
10681302                 
....@@ -1085,6 +1319,8 @@
10851319                 
10861320                 cGridBag jSPPanel = new cGridBag();
10871321 
1322
+            jSPPanel.preferredHeight = 20;
1323
+            
10881324                 JScrollPane jSP;
10891325 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
10901326 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1093,11 +1329,11 @@
10931329                 oe.treePanel.add(jSPPanel);
10941330                 oe.treePanel.Return();
10951331 
1096
-                oe.treePanel.add(copyOptionsPanel);
1332
+                oe.treePanel.add(versionManagerPanel);
10971333                 oe.treePanel.Return();
1098
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1099
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1100
-            sliderPane.preferredHeight = 1;
1334
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336
+            versionSliderPane.preferredHeight = 3;
11011337                 
11021338 //        mainPanel.setDividerLocation(0.1); //1.0);
11031339         mainPanel.setResizeWeight(0.4);
....@@ -1120,7 +1356,7 @@
11201356 		dgr.addDragGestureListener(this);
11211357 		}catch(Exception e) {}
11221358 		*/
1123
-        radio.layout = sixButton; // sevenButton;
1359
+        radio.layout = threeButton; // sixButton;
11241360         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
11251361 	}
11261362         
....@@ -1171,9 +1407,12 @@
11711407                 smoothCB.setToolTipText("Snapping delay");
11721408                                 smoothCB.addItemListener(this);
11731409 
1174
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175
-                slowCB.setToolTipText("Smooth interpolation");
1176
-                                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);
11771416                                 
11781417 //        	constraints.gridy += 1;
11791418 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -1252,6 +1491,14 @@
12521491 	
12531492         void EditObject(Object3D obj)
12541493         {
1494
+            assert(obj instanceof Composite);
1495
+            
1496
+//            if (obj.versionlist == null)
1497
+//            {
1498
+//                obj.versionlist = new Object3D[100];
1499
+//                obj.versionindex = -1;
1500
+//            }
1501
+            
12551502             cRadio radioButton = new cRadio(obj.name);
12561503             
12571504             // June 2019. Patch to avoid bug with transparency.
....@@ -1262,7 +1509,7 @@
12621509             }
12631510             
12641511             radioButton.SetObject(obj);
1265
-            radioButton.layout = sixButton; // sevenButton;
1512
+            radioButton.layout = threeButton; // sixButton;
12661513             radioButton.SetCamera(cameraView.renderCamera, false);
12671514             radioButton.addActionListener(this);
12681515             radioPanel.add(radioButton);
....@@ -1276,6 +1523,7 @@
12761523                     
12771524             oe.SetupViews();
12781525             
1526
+        if (Globals.DEBUG)
12791527 		System.out.println("SetupViews");
12801528             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
12811529                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1287,6 +1535,8 @@
12871535         cCheckBox localCB;
12881536         cCheckBox crowdCB;
12891537         cCheckBox smoothCB;
1538
+        cCheckBox minshaderCB;
1539
+        
12901540         cToggleButton fastCB;
12911541         cCheckBox slowCB;
12921542         cCheckBox boxCB;
....@@ -1357,6 +1607,12 @@
13571607             {
13581608                 cameraView.ToggleInertia();
13591609         cameraView.repaint();
1610
+            }
1611
+            else if(e.getSource() == minshaderCB)
1612
+            {
1613
+                Globals.MINSHADER ^= true;
1614
+                cameraView.programInitialized = false;
1615
+                cameraView.repaint();
13601616             }
13611617             else if(e.getSource() == localCB)
13621618             {
....@@ -1634,7 +1890,12 @@
16341890   TreePath path;
16351891 
16361892   public TransferableTreePath(TreePath tp) {
1637
-    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);
16381899   }
16391900 
16401901   public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1924,7 +2185,11 @@
19242185             shadow.material = new cMaterial(obj.material);
19252186             shadow.material.diffuse = 0.0001f;
19262187             shadow.material.specular = 0.0001f;
1927
-            //shadow.projectedVertices[1].x = 300;
2188
+            shadow.material.opacity = 0.75f;
2189
+            
2190
+            AllocProjectedVertices(shadow);
2191
+        
2192
+            shadow.projectedVertices[1].x = 300;
19282193             
19292194             makeSomething(shadow);
19302195         }
....@@ -2445,27 +2710,35 @@
24452710 		} else
24462711 		if (source == loopItem || source == loopButton)
24472712 		{
2713
+                    if (!group.selection.isEmpty())
2714
+                    {
24482715                         Composite csg = new GroupLeaf();
24492716                         csg.count = 5;
2450
-			group(csg);
24512717                         Composite child = new cGroup("Branch");
24522718                         csg.addChild(child);
24532719                         child.addChild(csg);
2720
+			group(csg);
2721
+                    }
24542722 		} else
24552723 		if (source == doubleItem)
24562724 		{
2725
+                    if (!group.selection.isEmpty())
2726
+                    {
24572727                         Composite csg = new GroupLeaf("Fork");
24582728                         csg.count = 5;
2459
-			group(csg);
24602729                         Composite child = new cGroup("Branch A");
24612730                         csg.addChild(child);
24622731                         child.addChild(csg);
24632732                         child = new cGroup("Branch B");
24642733                         csg.addChild(child);
24652734                         child.addChild(csg);
2735
+			group(csg);
2736
+                    }
24662737 		} else
24672738 		if (source == tripleItem)
24682739 		{
2740
+                    if (!group.selection.isEmpty())
2741
+                    {
24692742                         Composite csg = new GroupLeaf("Trident");
24702743                         csg.count = 4;
24712744 			group(csg);
....@@ -2478,6 +2751,7 @@
24782751                         child = new cGroup();
24792752                         csg.addChild(child);
24802753                         child.addChild(csg);
2754
+                    }
24812755 		} else
24822756 		if (source == computeAOItem)
24832757 		{
....@@ -2497,7 +2771,7 @@
24972771 		if (source == invariantsItem)
24982772 		{
24992773                     System.out.println("Invariants:");
2500
-                    Grafreed.grafreeD.universe.invariants();
2774
+                    Grafreed.grafreed.universe.invariants();
25012775 		} else
25022776 		if (source == memoryItem)
25032777 		{
....@@ -2528,33 +2802,52 @@
25282802 		{
25292803 			ToggleFullScreen();
25302804 		} else
2531
-		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)
25322818 		{
25332819                         // Go to previous version
25342820 			//if (!Undo())
25352821                             //java.awt.Toolkit.getDefaultToolkit().beep();
2536
-			Undo();
2822
+			PreviousVersion();
25372823 		} else
25382824 		if (source == restoreButton)
25392825 		{
25402826                         // Restore current version
25412827 			Restore();
2828
+        //restoreButton.setEnabled(false);
25422829 		} else
25432830 		if (source == replaceButton)
25442831 		{
25452832                         // Overwrite current version
25462833 			Replace();
2834
+        //replaceButton.setEnabled(false);
25472835 		} else
2548
-		if (source == redoButton)
2836
+		if (source == nextVersionButton)
25492837 		{
25502838                         // Go to next version
2551
-			Redo();
2839
+			NextVersion();
25522840 		} else
2553
-		if (source == saveButton)
2841
+		if (source == saveVersionButton)
25542842 		{
25552843                         // Save a new version
25562844 			if (!Save(true))
25572845                             java.awt.Toolkit.getDefaultToolkit().beep();
2846
+		} else
2847
+		if (source == deleteVersionButton)
2848
+		{
2849
+                        // Delete a new version
2850
+                        DeleteVersion();
25582851 		} else
25592852 		if (source == oneStepButton)
25602853 		{
....@@ -2609,11 +2902,11 @@
26092902 		} else
26102903 		if (source == undoItem)
26112904 		{
2612
-			Undo();
2905
+			PreviousVersion();
26132906 		} else
26142907 		if (source == redoItem)
26152908 		{
2616
-			Redo();
2909
+			NextVersion();
26172910 		} else
26182911 		if (source == duplicateItem)
26192912 		{
....@@ -3094,22 +3387,34 @@
30943387 		} else
30953388 		if (source == ungroupItem || source == ungroupButton)
30963389 		{
3097
-                    boolean hasRoot = false;
3390
+                    boolean canUngroup = true;
30983391                     
30993392                     for (int i=0; i<group.selection.size(); i++)
31003393                     {
3101
-                        if (group.selection.get(i) == group)
3394
+                        Object3D selectedItem = group.selection.get(i);
3395
+                        
3396
+                        if (selectedItem.Size() == 0)
31023397                         {
3103
-                            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;
31043407                             break;
31053408                         }
31063409                     }
31073410 
3108
-                    if (!hasRoot)
3411
+                    if (canUngroup)
31093412                     {
31103413                         for (int i=0; i<group.selection.size(); i++)
31113414                         {
3112
-                            Ungroup(group.selection.get(i));
3415
+                            Object3D selectedItem = group.selection.get(i);
3416
+                            
3417
+                            Ungroup(selectedItem);
31133418                         }
31143419 
31153420                         ClearSelection(false);
....@@ -3472,38 +3777,7 @@
34723777                     if (CameraPane.FULLSCREEN)
34733778                         fullscreenLayout = radio.layout;
34743779                     
3475
-                    // bug
3476
-                    //gridPanel.setDividerLocation(1.0);
3477
-                    //bigPanel.setDividerLocation(0.0);
3478
-//                    bigThree.remove(scenePanel);
3479
-//                    bigThree.remove(centralPanel);
3480
-//                    bigThree.remove(XYZPanel);
3481
-//                    aWindowConstraints.gridx = 0;
3482
-//                    aWindowConstraints.gridy = 0;
3483
-//                    aWindowConstraints.gridwidth = 1;
3484
-//            //        aConstraints.gridheight = 3;
3485
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3486
-//                    aWindowConstraints.weightx = 0;
3487
-//                    aWindowConstraints.weighty = 1;
3488
-//                    //bigThree.add(jtp, aWindowConstraints);
3489
-//                    aWindowConstraints.weightx = 1;
3490
-//                    aWindowConstraints.gridwidth = 3;
3491
-//            //        aConstraints.gridheight = 3;
3492
-//                    aWindowConstraints.gridx = 1;
3493
-//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
3494
-//                    bigThree.add(centralPanel, aWindowConstraints);
3495
-//                    aWindowConstraints.weightx = 0;
3496
-//                    aWindowConstraints.gridx = 4;
3497
-//                    aWindowConstraints.gridwidth = 1;
3498
-//            //        aConstraints.gridheight = 3;
3499
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3500
-//                    //bigThree.add(XYZPanel, aWindowConstraints);
3501
-//                    scenePanel.setVisible(false);
3502
-//                    centralPanel.setVisible(true);
3503
-//                    XYZPanel.setVisible(false);
3504
-                    bigThree.ClearUI();
3505
-                    bigThree.add(centralPanel);
3506
-                    bigThree.FlushUI();
3780
+                    Show3DView();
35073781                     
35083782                     cameraView.requestFocusInWindow();
35093783                     
....@@ -3689,6 +3963,7 @@
36893963                 } else
36903964 		if (source == rootButton)
36913965 		{
3966
+                    Replace();
36923967                     Object3D obj;
36933968                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
36943969                     {
....@@ -3703,6 +3978,8 @@
37033978 		if (source == closeButton)
37043979 		{
37053980 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3981
+                    Replace();
3982
+                    
37063983                     cRadio ab;
37073984                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
37083985                     {
....@@ -3746,10 +4023,10 @@
37464023 			{
37474024 				Object3D child = (Object3D)e.nextElement();
37484025                                 if(child.editWindow != null)
3749
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
37504026                                 child.pinned = false;
37514027 				child.CloseUI();
37524028                                 listUI.remove(child);
4029
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
37534030                                 
37544031                                 //child.editWindow = null; // ???????????
37554032 			}
....@@ -3768,6 +4045,7 @@
37684045                         obj.CloseUI();
37694046                     }
37704047                     listUI.clear();
4048
+                    SetPinStates(group.selection.size() > 0);
37714049                     refreshContents(true);
37724050 		} else
37734051 		if (source == allParamsButton)
....@@ -3800,6 +4078,8 @@
38004078 		} else
38014079                 if(source instanceof cRadio)
38024080 		{
4081
+                    Replace();
4082
+                    
38034083                     group.parent = keepparent;
38044084                         group.attributes = 0;
38054085                     //group.editWindow = null;
....@@ -3824,8 +4104,6 @@
38244104                     
38254105                     copy = group;
38264106                     
3827
-                    SetUndoStates();
3828
-
38294107                     //Globals.theRenderer.object = group;
38304108                     if(!useclient)
38314109                     {
....@@ -3853,7 +4131,31 @@
38534131                      */
38544132                     radio.layout.doClick();
38554133                     
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
+
38564157                     ClearUnpinned();
4158
+                    
38574159                     //Grafreed.Assert(group != null);
38584160                     //Grafreed.Assert(group.selection != null);
38594161                     SetPinStates(group.selection == null || group.selection.size() > 0);
....@@ -3870,11 +4172,13 @@
38704172                 } else if (event.getSource() == editCameraItem)
38714173                 {
38724174                     cameraView.ProtectCamera();
4175
+                    cameraView.requestFocusInWindow();
38734176                     cameraView.repaint();
38744177                     return;
38754178                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
38764179                 {
38774180                     cameraView.RevertCamera();
4181
+                    cameraView.requestFocusInWindow();
38784182                     cameraView.repaint();
38794183                     return;
38804184         //        } else if (event.getSource() == textureButton)
....@@ -3993,7 +4297,7 @@
39934297                         TouchTransform(obj);
39944298                         continue;
39954299                     }
3996
-                    if ((mask&2) != 0) // Scale
4300
+                    if ((mask&2) != 0) // Scale/rotation
39974301                     {
39984302                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
39994303                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -4001,10 +4305,6 @@
40014305                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
40024306                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
40034307                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4004
-                    }
4005
-                    if ((mask&4) != 0) // Rotation
4006
-                    {
4007
-                        // ?
40084308                     }
40094309                     if ((mask&1) != 0) // Translation
40104310                     {
....@@ -5007,9 +5307,7 @@
50075307 		
50085308 		freezemodel = false;
50095309 	}
5010
-	
5011
-        boolean flashIt = true;
5012
-        
5310
+	        
50135311 	public void valueChanged(TreeSelectionEvent e)
50145312 	//public boolean handleEvent(Event event)
50155313 	{
....@@ -5082,13 +5380,31 @@
50825380         {
50835381             editButton.setEnabled(enabled);
50845382             uneditButton.setEnabled(enabled);
5085
-            unselectButton.setEnabled(enabled);
5383
+            //unselectButton.setEnabled(enabled);
50865384             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);
50875402         }
50885403 
50895404         void refreshContents(boolean cp)
50905405         {
5091
-            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5406
+            if (Globals.ADVANCED)
5407
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
50925408             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
50935409             {
50945410                 objEditor.ClearInfo(); // .GetMaterial());
....@@ -5098,7 +5414,7 @@
50985414                     Object3D child = (Object3D) group.selection.get(i);
50995415 
51005416                     objEditor.AddInfo(child, this, true);
5101
-    System.err.println("info : " + child.GetPath());
5417
+//    System.err.println("info : " + child.GetPath());
51025418                 }
51035419 
51045420                 objEditor.SetText(); // jan 2014
....@@ -5924,7 +6240,6 @@
59246240 	
59256241 	cButton restoreCameraButton;
59266242         
5927
-	cButton saveButton;
59286243 	cButton oneStepButton;
59296244         
59306245         cButton groupButton;
....@@ -5982,11 +6297,11 @@
59826297 	private MenuItem lookAtItem;
59836298 	private MenuItem lookFromItem;
59846299 	private MenuItem switchViewItem;
5985
-	private MenuItem cutItem;
6300
+	private JMenuItem cutItem;
59866301 	private MenuItem undoItem;
59876302 	private MenuItem redoItem;
59886303 	private JMenuItem duplicateItem;
5989
-	private MenuItem cloneItem;
6304
+	private JMenuItem cloneItem;
59906305 	private MenuItem cloneSupportItem;
59916306 	private MenuItem overwriteGeoItem;
59926307 	private MenuItem overwriteMatItem;
....@@ -6007,13 +6322,13 @@
60076322 	private MenuItem cloneGeometriesItem;
60086323 	private MenuItem shareGeometriesItem;
60096324 	private MenuItem mergeGeometriesItem;
6010
-	private MenuItem copyItem;
6325
+	private JMenuItem copyItem;
60116326 	private MenuItem pasteItem;
6012
-	private MenuItem pasteIntoItem;
6013
-	private MenuItem pasteLinkItem;
6014
-	private MenuItem pasteCloneItem;
6015
-	private MenuItem pasteExpandItem;
6016
-	private MenuItem deleteItem;
6327
+	private JMenuItem pasteIntoItem;
6328
+	private JMenuItem pasteLinkItem;
6329
+	private JMenuItem pasteCloneItem;
6330
+	private JMenuItem pasteExpandItem;
6331
+	private JMenuItem deleteItem;
60176332 	private MenuItem clearAllItem;
60186333 	private MenuItem genUVItem;
60196334 	private MenuItem genNormalsMESHItem;
....@@ -6068,7 +6383,7 @@
60686383 	private MenuItem transformGeometryItem;
60696384 	private MenuItem transformChildrenItem;
60706385 	private MenuItem hideItem;
6071
-	private MenuItem grabItem;
6386
+	private JMenuItem grabItem;
60726387 	private MenuItem backItem;
60736388 	private MenuItem frontItem;
60746389 	private MenuItem cameraItem;
....@@ -6081,7 +6396,7 @@
60816396 	private MenuItem switchTransfoItem;
60826397 	private MenuItem morphItem;
60836398 	private MenuItem linkerItem;
6084
-	private MenuItem ungroupItem;
6399
+	private JMenuItem ungroupItem;
60856400 	private MenuItem editItem;
60866401 	private MenuItem openWindowItem;
60876402 	private MenuItem editLeafItem;