blame | history | patch | commit | commitdiff
Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a 
 GroupEditor.java
....@@ -16,7 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717 
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
-    Grafreed.iResourceCallBack,
19
+        Grafreed.iResourceCallBack,
2020         ObjectUI,
2121         Runnable,
2222         ActionListener,
....@@ -29,9 +29,9 @@
2929     {
3030         cButton skyboxButton;
3131         final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
-        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
3333         //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
-        skyboxButton.setToolTipText(s);
34
+        skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
3535         skyboxButton.addActionListener(new ActionListener()
3636         {
3737                 @Override
....@@ -42,6 +42,22 @@
4242         });
4343     }
4444 
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
+    
4561     public void AddSkyboxTab0(JTabbedPane skyboxpanel)
4662     {
4763         cGridBag tab0 = new cGridBag().setVertical(true);
....@@ -57,7 +73,7 @@
5773         cGridBag row5 = new cGridBag();
5874         cGridBag row6 = new cGridBag();
5975         
60
-        AddSkyboxButton("default", "rgb", row0);
76
+        AddSkyboxButton("default", "", row0);
6177         //AddSkyboxButton("default", "cornell", row0);
6278         AddSkyboxButton("penguins", "dust", row0);
6379         AddSkyboxButton("penguins", "tropic", row0);
....@@ -312,26 +328,56 @@
312328         }
313329     }
314330         
315
-    public void CallBack(String[] path)
316
-    {
317
-        for (int i = 0; i < path.length; i++)
318
-        {
319
-            System.out.print(path[i] + "/");
320
-        }
321
-        
322
-        System.out.println();
323
-    }
324
-    
325331     public void ChangeSkybox(String skybox)
326332     {
327
-        //cameraView.envyoff = false;
328
-        group.skyboxname = skybox;
329
-        group.skyboxext = "jpg";
330
-        cameraView.repaint();
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
+    }
331347 
332
-        Grafreed.ParseResources("textures", this);
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);
333358     }
334359     
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
+
335381     //ObjEditor objEditor;
336382 	public void closeUI2()
337383 	{
....@@ -369,11 +415,15 @@
369415 		this.copy = this.group = group;
370416 		//selectees = this.group.selectees;
371417 		
372
-        if (copy.versionlist == null)
373
-        {
374
-            copy.versionlist = new Object3D[100];
375
-            copy.versionindex = -1;
376
-        }
418
+                assert(false);
419
+                
420
+//        if (copy.versionlist == null)
421
+//        {
422
+//            copy.versionlist = new Object3D[100];
423
+//            copy.versionindex = -1;
424
+//            
425
+//            //Save(true);
426
+//        }
377427         
378428 		if(ui)
379429                     SetupUI(objEditor);
....@@ -396,13 +446,13 @@
396446                 
397447                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
398448                 
399
-        if (copy.versionlist == null)
400
-        {
401
-            copy.versionlist = new Object3D[100];
402
-            copy.versionindex = -1;
403
-            
404
-            Save(true);
405
-        }
449
+//        if (copy.versionlist == null)
450
+//        {
451
+//            copy.versionlist = new Object3D[100];
452
+//            copy.versionindex = -1;
453
+//            
454
+//            //Save(true);
455
+//        }
406456 	}
407457 
408458     void CloneSelection(boolean supports)
....@@ -492,33 +542,35 @@
492542 //		menu.add("-");
493543 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
494544 		duplicateItem.addActionListener(this);
495
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
496547 		cloneItem.addActionListener(this);
497
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
498549         {
499550 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
500551 		cloneSupportItem.addActionListener(this);
501552         }
553
+                oe.jTree.popup.addSeparator();
502554 		menu.add("-");
503
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
504556 		cutItem.addActionListener(this);
505
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
506558 		copyItem.addActionListener(this);
507559 		pasteItem = menu.add(new MenuItem("Paste"));
508560 		pasteItem.addActionListener(this);
509561                 
510
-		menu.add("-");
511
-		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"));
512565 		pasteIntoItem.addActionListener(this);
513
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
514567 		pasteLinkItem.addActionListener(this);
515
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
516569 		pasteCloneItem.addActionListener(this);
517
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
518571 //		pasteExpandItem.addActionListener(this);
519
-		menu.add("-");
520
-		deleteItem = menu.add(new MenuItem("Delete"));
521
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
522574                 
523575         if (Globals.ADVANCED)
524576         {
....@@ -604,11 +656,9 @@
604656 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
605657 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
606658 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
607
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
608659 		oe.cameraMenu.add("-");
609660 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
610661 		openWindowItem.addActionListener(this);
611
-		editLeafItem.addActionListener(this);
612662 		lookAtItem.addActionListener(this);
613663 		//lookFromItem.addActinoListener(this);
614664 		//switchViewItem.addActionListener(this);
....@@ -655,9 +705,8 @@
655705 		setMasterItem.addActionListener(this);
656706         }
657707                 
658
-		oe.menuBar.add(menu = new Menu("Group"));
659
-//		grabItem = menu.add(new MenuItem("Grab"));
660
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
661710 		backItem = menu.add(new MenuItem("Back"));
662711 		backItem.addActionListener(this);
663712 		frontItem = menu.add(new MenuItem("Front"));
....@@ -665,13 +714,21 @@
665714 //		compositeItem = menu.add(new MenuItem("Composite"));
666715 //		compositeItem.addActionListener(this);
667716                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
668720         if (Globals.ADVANCED)
669721         {
670722 		hideItem = menu.add(new MenuItem("Hidden Group"));
671723 		hideItem.addActionListener(this);
672724         }
673
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
674726 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
675732                 
676733 //		menu.add("-");
677734 //                
....@@ -708,11 +765,11 @@
708765 		shadowYItem.addActionListener(this);
709766                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
710767 		shadowZItem.addActionListener(this);
711
-		attributeItem = menu.add(new MenuItem("Attribute"));
712
-		attributeItem.addActionListener(this);
713768                 
714769         if (Globals.ADVANCED)
715770         {
771
+		attributeItem = menu.add(new MenuItem("Attribute"));
772
+		attributeItem.addActionListener(this);
716773 		menu.add("-");
717774 		linkerItem = menu.add(new MenuItem("Linker"));
718775 		linkerItem.addActionListener(this);
....@@ -722,11 +779,18 @@
722779 		pointflowItem.addActionListener(this);
723780         }
724781 		menu.add("-");
782
+		textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
783
+		textureRatioRItem.addActionListener(this);
784
+		textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
785
+		textureRatioGItem.addActionListener(this);
786
+		textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
787
+		textureRatioBItem.addActionListener(this);
788
+		menu.add("-");
725789 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
726790 		resetTransformItem.addActionListener(this);
727791 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
728792 		resetCentroidItem.addActionListener(this);
729
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
793
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
730794 		resetCentroidXZItem.addActionListener(this);
731795 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
732796 		transformGeometryItem.addActionListener(this);
....@@ -778,6 +842,8 @@
778842         }
779843 
780844                 oe.menuBar.add(menu = new Menu("Attributes"));
845
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
846
+		clearVersionsItem.addActionListener(this);
781847 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
782848 		clearMaterialsItem.addActionListener(this);
783849                 resetAllItem = menu.add(new MenuItem("Reset All"));
....@@ -800,9 +866,9 @@
800866 		hideleavesItem.addActionListener(this);
801867 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
802868 		showleavesItem.addActionListener(this);
803
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
869
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
804870 		markleavesItem.addActionListener(this);
805
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
871
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
806872 		unmarkleavesItem.addActionListener(this);
807873 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
808874 		rewindleavesItem.addActionListener(this);
....@@ -856,6 +922,9 @@
856922 		shareGeometriesItem.addActionListener(this);
857923 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
858924 		mergeGeometriesItem.addActionListener(this);
925
+		menu.add("-");
926
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
927
+		editLeafItem.addActionListener(this);
859928         if (Globals.ADVANCED)
860929         {
861930             // Pretty much the same as duplicate and clone.
....@@ -872,6 +941,79 @@
872941 		buildToolsMenu(menu);
873942 	}
874943 	
944
+        JTabbedPane resourcecontainer;
945
+        cGridBag currenttab;
946
+        //boolean added; // patch for jar
947
+                
948
+        int totalcount = 0;
949
+        
950
+        int tabcount = 0;
951
+        int colcount = 0;
952
+        int rowcount = 0;
953
+        int texturecount = 0;
954
+        
955
+        int columns = 5;
956
+        int rows = 7;
957
+        
958
+    public void ResourceCallBack(String[] path)
959
+    {
960
+//        for (int i = 0; i < path.length; i++)
961
+//            System.out.print(path[i] + "/");
962
+//        System.out.println();
963
+        
964
+        if (//rowcount == 0 ||
965
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
966
+        {
967
+            currenttab = new cGridBag();
968
+            String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
969
+            currenttab.setName(tabname);
970
+            //added = false;
971
+            resourcecontainer.add(currenttab);
972
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
973
+            rowcount = 1;
974
+            colcount = 0;
975
+            texturecount = 0;
976
+        }
977
+        
978
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
979
+        {
980
+            //if (!added)
981
+            {
982
+                //added = true;
983
+                String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
984
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
985
+            }
986
+            
987
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
988
+            totalcount++;
989
+            
990
+            if (++colcount >= columns)
991
+            {
992
+                colcount = 0;
993
+                currenttab.Return();
994
+                
995
+                if (rowcount++ >= rows)
996
+                {
997
+                    rowcount = 0;
998
+                }
999
+            }
1000
+        }
1001
+        else
1002
+        {
1003
+//            if (!path[path.length-1].equals("icons"))
1004
+//                resourcecontainer.Return();
1005
+        }
1006
+    }
1007
+    
1008
+        void CreateTexturePanel(cGridBag container)
1009
+        {
1010
+            resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1011
+            container.add(resourcecontainer);
1012
+            
1013
+            Grafreed.ParseResources("textures", this);
1014
+            
1015
+            // 935. System.out.println("Total = " + totalcount);
1016
+        }
8751017         
8761018 	void SetupUI2(ObjEditor oe)
8771019 	{
....@@ -890,11 +1032,6 @@
8901032             //new Exception().printStackTrace();
8911033                 
8921034         oe.radioPanel = new JPanel(new GridBagLayout());
893
-	oe.aConstraints.weightx = 1;
894
-	oe.aConstraints.weighty = 0;
895
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
896
-	oe.aConstraints.gridwidth = 100;
897
-	oe.aConstraints.gridheight = 1;
8981035 //        oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8991036         
9001037         oe.buttonGroup = new ButtonGroup();
....@@ -915,9 +1052,9 @@
9151052         oe.radioPanel.add(dummyButton);
9161053         oe.buttonGroup.add(dummyButton);
9171054          */
918
-                cGridBag copyOptionsPanel = new cGridBag();
1055
+                cGridBag versionManagerPanel = new cGridBag();
9191056                                         
920
-                copyOptionsPanel.preferredHeight = 2;
1057
+                versionManagerPanel.preferredHeight = 4;
9211058                 
9221059                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
9231060                 
....@@ -927,62 +1064,102 @@
9271064                 
9281065                 if (Globals.ADVANCED)
9291066                 {
930
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
-                    maxButton.setToolTipText("Maximize window");
932
-                    maxButton.addActionListener(this);
1067
+//                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+//                    maxButton.setToolTipText("Maximize window");
1069
+//                    maxButton.addActionListener(this);
9331070                 }
9341071                 
935
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1072
+                cButton gcButton;
1073
+                
1074
+//		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
+//                gcButton.setToolTipText("Garbage collect");
1076
+//                gcButton.addActionListener(new ActionListener()
1077
+//                {
1078
+//                        public void actionPerformed(ActionEvent e)
1079
+//                        {
1080
+//                            System.gc();
1081
+//                        }
1082
+//                });
1083
+                
1084
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1085
+                collapseButton.setToolTipText("Collapse toolbar");
1086
+		collapseButton.addActionListener(this);
1087
+                
1088
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
+                maximize3DButton.setToolTipText("Maximize 3D view");
1090
+		maximize3DButton.addActionListener(this);
1091
+                
1092
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1093
+                twoButton.setToolTipText("Show 3D view only");
1094
+		twoButton.addActionListener(this);
1095
+                this.fullscreenLayout = twoButton;
1096
+                
1097
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1098
+                threeButton.setToolTipText("Show controls and 3D view");
1099
+		threeButton.addActionListener(this);
1100
+                if (Globals.ADVANCED)
1101
+                {
1102
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1103
+                sixButton.setToolTipText("Show 3D view and controls");
1104
+		sixButton.addActionListener(this);
1105
+                }
1106
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1107
+//                sevenButton.setToolTipText("3-column layout");
1108
+//		sevenButton.addActionListener(this);
1109
+                //
1110
+                
1111
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9361112                 fullButton.setToolTipText("Full-screen window");
9371113 		fullButton.addActionListener(this);
9381114                 
939
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9401116                 screenfitButton.setToolTipText("Screen fit");
9411117 		screenfitButton.addActionListener(this);
9421118 
943
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1119
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9441120                 restoreCameraButton.setToolTipText("Restore viewpoint");
9451121 		restoreCameraButton.addActionListener(this);
9461122                 
947
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9481124                 saveVersionButton.setToolTipText("Duplicate current version");
9491125 		saveVersionButton.addActionListener(this);
9501126                                                 
951
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1127
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9521128                 deleteVersionButton.setToolTipText("Delete current version");
9531129 		deleteVersionButton.addActionListener(this);
1130
+                deleteVersionButton.setEnabled(false);
9541131                                                 
955
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1132
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9561133                 previousVersionButton.setToolTipText("Previous version");
9571134 		previousVersionButton.addActionListener(this);
9581135                 previousVersionButton.setEnabled(false);
9591136                 
9601137                 cGridBag updown = new cGridBag().setVertical(true);
961
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1138
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9621139                 restoreButton.setToolTipText("Undo (restore current version)");
9631140 		restoreButton.addActionListener(this);
964
-                //restoreButton.setEnabled(false);
1141
+                restoreButton.setEnabled(false);
9651142                 
966
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1143
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9671144                 replaceButton.setToolTipText("Save (replace current version)");
9681145 		replaceButton.addActionListener(this);
969
-                //replaceButton.setEnabled(false);
1146
+                replaceButton.setEnabled(false);
9701147                 
971
-                copyOptionsPanel.add(updown);
1148
+                versionManagerPanel.add(updown);
9721149                 
973
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1150
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9741151                 nextVersionButton.setToolTipText("Next version");
9751152 		nextVersionButton.addActionListener(this);
9761153                 nextVersionButton.setEnabled(false);
1154
+                
1155
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1156
+                oneStepButton.setToolTipText("Animate one step forward");
1157
+		oneStepButton.addActionListener(this);
9771158                 
9781159                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
9791160                 liveCB.setToolTipText("Enable animation");
9801161                                 liveCB.addItemListener(this);
9811162 
982
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
983
-                oneStepButton.setToolTipText("Animate one step forward");
984
-		oneStepButton.addActionListener(this);
985
-                
9861163                 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
9871164                 fastCB.setToolTipText("Fast mode");
9881165                                 fastCB.addItemListener(this);
....@@ -998,38 +1175,23 @@
9981175 
9991176                 if (Globals.ADVANCED)
10001177                 {
1001
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1178
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10021179                         snapobjectButton.addActionListener(this);
10031180                         snapobjectButton.setToolTipText("Snap Object");
10041181                         
1005
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1182
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10061183 		fourButton.addActionListener(this);
10071184                 fourButton.setToolTipText("Show control panel only");
10081185                 }
10091186 
10101187 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
10111188                 
1012
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013
-                twoButton.setToolTipText("Show 3D view only");
1014
-		twoButton.addActionListener(this);
1015
-                this.fullscreenLayout = twoButton;
1016
-                
1017
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018
-                threeButton.setToolTipText("Show controls and 3D view");
1019
-		threeButton.addActionListener(this);
1020
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1021
-                sixButton.setToolTipText("Show 3D view and controls");
1022
-		sixButton.addActionListener(this);
1023
-//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1024
-//                sevenButton.setToolTipText("3-column layout");
1025
-//		sevenButton.addActionListener(this);
1026
-                //
10271189 
1028
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1190
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10291191                 rootButton.setToolTipText("Open selection in new tab");
10301192 		rootButton.addActionListener(this);
10311193 
1032
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10331195                 closeButton.setToolTipText("Close tab");
10341196 		closeButton.addActionListener(this);
10351197 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -1038,38 +1200,38 @@
10381200                 cGridBag row1 = new cGridBag();
10391201                 
10401202                 // INSERT
1041
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1042
-                gridButton.setToolTipText("Create grid");
1203
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204
+                gridButton.setToolTipText("Create ground");
10431205                                 gridButton.addActionListener(this);
10441206 
1045
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1207
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10461208                 boxButton.setToolTipText("Create box");
10471209                                 boxButton.addActionListener(this);
10481210 
1049
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050
-                sphereButton.setToolTipText("Create sphere");
1051
-                                sphereButton.addActionListener(this);
1052
-
1053
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
-                coneButton.setToolTipText("Create cone");
1055
-                                coneButton.addActionListener(this);
1056
-
1057
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
-                torusButton.setToolTipText("Create torus");
1059
-                                torusButton.addActionListener(this);
1060
-
1061
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1211
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10621212                 superButton.setToolTipText("Create superellipsoid");
10631213                                 superButton.addActionListener(this);
10641214 
1065
-                if (Globals.ADVANCED)
1215
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
+                sphereButton.setToolTipText("Create sphere");
1217
+                                sphereButton.addActionListener(this);
1218
+
1219
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
+                coneButton.setToolTipText("Create cone");
1221
+                                coneButton.addActionListener(this);
1222
+
1223
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
+                torusButton.setToolTipText("Create torus");
1225
+                                torusButton.addActionListener(this);
1226
+
1227
+                if (false) //Globals.ADVANCED)
10661228                 {
1067
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1229
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10681230                     kleinButton.setToolTipText("Create Klein bottle");
10691231                                     kleinButton.addActionListener(this);
10701232                 }
10711233                 
1072
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1234
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10731235                 particlesButton.setToolTipText("Create particle system");
10741236                                particlesButton.addActionListener(this);
10751237 
....@@ -1077,72 +1239,73 @@
10771239                 
10781240                 cGridBag row2 = new cGridBag();
10791241                 
1080
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1242
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10811243                 groupButton.setToolTipText("Create group");
10821244                                groupButton.addActionListener(this);
10831245 
1084
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1246
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10851247                 compositeButton.setToolTipText("Create composite");
10861248                                compositeButton.addActionListener(this);
10871249 
1088
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1250
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10891251                 switchButton.setToolTipText("Create item switcher");
10901252                                switchButton.addActionListener(this);
10911253 
1092
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1254
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10931255                 loopButton.setToolTipText("Create loop");
10941256                                loopButton.addActionListener(this);
10951257 
1096
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1258
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10971259                 textureButton.setToolTipText("Create texture");
10981260                                textureButton.addActionListener(this);
10991261 
1100
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1262
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11011263                 overlayButton.setToolTipText("Create overlay");
11021264                                overlayButton.addActionListener(this);
11031265 
1104
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1266
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11051267                 lightButton.setToolTipText("Create light");
11061268                                lightButton.addActionListener(this);
11071269 
11081270                 oe.toolboxPanel.add(row2);
11091271                 
1110
-                // ENVYMAPS
1111
-                cGridBag skyboxpane = new cGridBag();
1112
-                skyboxpane.preferredHeight = 100;
1272
+                cGridBag textures = new cGridBag();
11131273                 
1114
-                oe.skyboxPanel.add(skyboxpane);
1274
+                CreateTexturePanel(textures);
11151275                 
1116
-                JTabbedPane skyboxpanel = new JTabbedPane();
1117
-                skyboxpane.add(skyboxpanel);
1276
+                int tabCount = resourcecontainer.getTabCount();
11181277                 
1119
-                AddSkyboxTab0(skyboxpanel);
1120
-                AddSkyboxTab1(skyboxpanel);
1121
-                AddSkyboxTab2(skyboxpanel);
1122
-                AddSkyboxTab3(skyboxpanel);
1278
+                if (tabCount > 0)
1279
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1280
+                
1281
+                oe.toolboxPanel.add(textures);
1282
+                
1283
+                textures.preferredHeight = 100;
1284
+                
1285
+                CreateSkyboxPanel(oe.skyboxPanel);
11231286                 
11241287                 // EDIT panel
1125
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1288
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11261289                 editButton.setToolTipText("Pin selection controls");
11271290 		editButton.addActionListener(this);
11281291 
1129
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1292
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11301293                 uneditButton.setToolTipText("Unpin and remove selection controls");
11311294 		uneditButton.addActionListener(this);
11321295 
11331296 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1134
-                allParamsButton.setToolTipText("Show all controle");
1297
+                allParamsButton.setToolTipText("Show all controls");
11351298 		allParamsButton.addActionListener(this);
11361299 
1137
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1138
-                clearPanelButton.setToolTipText("Clear edit panel");
1300
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1301
+                clearPanelButton.setToolTipText("Clear all controls");
11391302 		clearPanelButton.addActionListener(this);
11401303 
11411304 		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11421305                 //unselectButton.setToolTipText("Unselect");
11431306 		//unselectButton.addActionListener(this);
11441307 
1145
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1308
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11461309                 flashSelectionButton.setToolTipText("Highlight selection");
11471310 		flashSelectionButton.addActionListener(this);
11481311                 
....@@ -1165,6 +1328,8 @@
11651328                 
11661329                 cGridBag jSPPanel = new cGridBag();
11671330 
1331
+            jSPPanel.preferredHeight = 20;
1332
+            
11681333                 JScrollPane jSP;
11691334 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
11701335 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1173,11 +1338,11 @@
11731338                 oe.treePanel.add(jSPPanel);
11741339                 oe.treePanel.Return();
11751340 
1176
-                oe.treePanel.add(copyOptionsPanel);
1341
+                oe.treePanel.add(versionManagerPanel);
11771342                 oe.treePanel.Return();
1178
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1179
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1180
-            sliderPane.preferredHeight = 1;
1343
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1344
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1345
+            versionSliderPane.preferredHeight = 3;
11811346                 
11821347 //        mainPanel.setDividerLocation(0.1); //1.0);
11831348         mainPanel.setResizeWeight(0.4);
....@@ -1335,6 +1500,14 @@
13351500 	
13361501         void EditObject(Object3D obj)
13371502         {
1503
+            //assert(obj instanceof Composite);
1504
+            
1505
+//            if (obj.versionlist == null)
1506
+//            {
1507
+//                obj.versionlist = new Object3D[100];
1508
+//                obj.versionindex = -1;
1509
+//            }
1510
+            
13381511             cRadio radioButton = new cRadio(obj.name);
13391512             
13401513             // June 2019. Patch to avoid bug with transparency.
....@@ -1359,6 +1532,7 @@
13591532                     
13601533             oe.SetupViews();
13611534             
1535
+        if (Globals.DEBUG)
13621536 		System.out.println("SetupViews");
13631537             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
13641538                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1725,7 +1899,12 @@
17251899   TreePath path;
17261900 
17271901   public TransferableTreePath(TreePath tp) {
1728
-    path = tp;
1902
+      Object[] objs = new Object[tp.getPathCount()];
1903
+      for (int i=0; i<objs.length; i++)
1904
+      {
1905
+          objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1906
+      }
1907
+    path = new TreePath(objs);
17291908   }
17301909 
17311910   public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1957,24 +2136,24 @@
19572136             switch(axis)
19582137             {
19592138                 case 0 :
1960
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1961
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1962
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1963
-                    vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2139
+                    vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2140
+                    vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2141
+                    vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2142
+                    vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
19642143                     norm = cVector.X;
19652144                     break;
19662145                 case 1 :
1967
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1968
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1969
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1970
-                    vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2146
+                    vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2147
+                    vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2148
+                    vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2149
+                    vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
19712150                     norm = cVector.Y;
19722151                     break;
19732152                 case 2 :
1974
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1975
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1976
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1977
-                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2153
+                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2154
+                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2155
+                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2156
+                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
19782157                     norm = cVector.Z;
19792158                     break;
19802159             }
....@@ -2015,7 +2194,11 @@
20152194             shadow.material = new cMaterial(obj.material);
20162195             shadow.material.diffuse = 0.0001f;
20172196             shadow.material.specular = 0.0001f;
2018
-            //shadow.projectedVertices[1].x = 300;
2197
+            shadow.material.opacity = 0.75f;
2198
+            
2199
+            AllocProjectedVertices(shadow);
2200
+        
2201
+            shadow.projectedVertices[1].x = 300;
20192202             
20202203             makeSomething(shadow);
20212204         }
....@@ -2536,27 +2719,35 @@
25362719 		} else
25372720 		if (source == loopItem || source == loopButton)
25382721 		{
2722
+                    if (!group.selection.isEmpty())
2723
+                    {
25392724                         Composite csg = new GroupLeaf();
25402725                         csg.count = 5;
2541
-			group(csg);
25422726                         Composite child = new cGroup("Branch");
25432727                         csg.addChild(child);
25442728                         child.addChild(csg);
2729
+			group(csg);
2730
+                    }
25452731 		} else
25462732 		if (source == doubleItem)
25472733 		{
2734
+                    if (!group.selection.isEmpty())
2735
+                    {
25482736                         Composite csg = new GroupLeaf("Fork");
25492737                         csg.count = 5;
2550
-			group(csg);
25512738                         Composite child = new cGroup("Branch A");
25522739                         csg.addChild(child);
25532740                         child.addChild(csg);
25542741                         child = new cGroup("Branch B");
25552742                         csg.addChild(child);
25562743                         child.addChild(csg);
2744
+			group(csg);
2745
+                    }
25572746 		} else
25582747 		if (source == tripleItem)
25592748 		{
2749
+                    if (!group.selection.isEmpty())
2750
+                    {
25602751                         Composite csg = new GroupLeaf("Trident");
25612752                         csg.count = 4;
25622753 			group(csg);
....@@ -2569,6 +2760,7 @@
25692760                         child = new cGroup();
25702761                         csg.addChild(child);
25712762                         child.addChild(csg);
2763
+                    }
25722764 		} else
25732765 		if (source == computeAOItem)
25742766 		{
....@@ -2618,6 +2810,18 @@
26182810 		if (source == fullButton)
26192811 		{
26202812 			ToggleFullScreen();
2813
+		} else
2814
+		if (source == collapseButton)
2815
+		{
2816
+                        this.expandedLayout = radio.layout;
2817
+			CollapseToolbar();
2818
+		} else
2819
+		if (source == maximize3DButton)
2820
+		{
2821
+                        this.expandedLayout = radio.layout;
2822
+                        radio.layout = twoButton;
2823
+                        Show3DView();
2824
+			CollapseToolbar();
26212825 		} else
26222826 		if (source == previousVersionButton)
26232827 		{
....@@ -3192,22 +3396,34 @@
31923396 		} else
31933397 		if (source == ungroupItem || source == ungroupButton)
31943398 		{
3195
-                    boolean hasRoot = false;
3399
+                    boolean canUngroup = true;
31963400                     
31973401                     for (int i=0; i<group.selection.size(); i++)
31983402                     {
3199
-                        if (group.selection.get(i) == group)
3403
+                        Object3D selectedItem = group.selection.get(i);
3404
+                        
3405
+                        if (selectedItem.Size() == 0)
32003406                         {
3201
-                            hasRoot = true;
3407
+                            // Cannot ungroup leaves
3408
+                            canUngroup = false;
3409
+                            break;
3410
+                        }
3411
+                                
3412
+                        if (selectedItem == group)
3413
+                        {
3414
+                            // Cannot ungroup root
3415
+                            canUngroup = false;
32023416                             break;
32033417                         }
32043418                     }
32053419 
3206
-                    if (!hasRoot)
3420
+                    if (canUngroup)
32073421                     {
32083422                         for (int i=0; i<group.selection.size(); i++)
32093423                         {
3210
-                            Ungroup(group.selection.get(i));
3424
+                            Object3D selectedItem = group.selection.get(i);
3425
+                            
3426
+                            Ungroup(selectedItem);
32113427                         }
32123428 
32133429                         ClearSelection(false);
....@@ -3258,6 +3474,10 @@
32583474 		if (source == clearMaterialsItem)
32593475                 {
32603476 			ClearMaterials();
3477
+		} else
3478
+		if (source == clearVersionsItem)
3479
+                {
3480
+			ClearVersions();
32613481 		} else
32623482 		if (source == liveleavesItem)
32633483                 {
....@@ -3398,6 +3618,18 @@
33983618 		if (source == transformChildrenItem)
33993619 		{
34003620                         TransformChildren();
3621
+		} else
3622
+		if (source == textureRatioRItem)
3623
+		{
3624
+                        TextureRatio(0);
3625
+		} else
3626
+		if (source == textureRatioGItem)
3627
+		{
3628
+                        TextureRatio(1);
3629
+		} else
3630
+		if (source == textureRatioBItem)
3631
+		{
3632
+                        TextureRatio(2);
34013633 		} else
34023634 		if (source == resetTransformItem)
34033635 		{
....@@ -3570,38 +3802,7 @@
35703802                     if (CameraPane.FULLSCREEN)
35713803                         fullscreenLayout = radio.layout;
35723804                     
3573
-                    // bug
3574
-                    //gridPanel.setDividerLocation(1.0);
3575
-                    //bigPanel.setDividerLocation(0.0);
3576
-//                    bigThree.remove(scenePanel);
3577
-//                    bigThree.remove(centralPanel);
3578
-//                    bigThree.remove(XYZPanel);
3579
-//                    aWindowConstraints.gridx = 0;
3580
-//                    aWindowConstraints.gridy = 0;
3581
-//                    aWindowConstraints.gridwidth = 1;
3582
-//            //        aConstraints.gridheight = 3;
3583
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3584
-//                    aWindowConstraints.weightx = 0;
3585
-//                    aWindowConstraints.weighty = 1;
3586
-//                    //bigThree.add(jtp, aWindowConstraints);
3587
-//                    aWindowConstraints.weightx = 1;
3588
-//                    aWindowConstraints.gridwidth = 3;
3589
-//            //        aConstraints.gridheight = 3;
3590
-//                    aWindowConstraints.gridx = 1;
3591
-//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
3592
-//                    bigThree.add(centralPanel, aWindowConstraints);
3593
-//                    aWindowConstraints.weightx = 0;
3594
-//                    aWindowConstraints.gridx = 4;
3595
-//                    aWindowConstraints.gridwidth = 1;
3596
-//            //        aConstraints.gridheight = 3;
3597
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3598
-//                    //bigThree.add(XYZPanel, aWindowConstraints);
3599
-//                    scenePanel.setVisible(false);
3600
-//                    centralPanel.setVisible(true);
3601
-//                    XYZPanel.setVisible(false);
3602
-                    bigThree.ClearUI();
3603
-                    bigThree.add(centralPanel);
3604
-                    bigThree.FlushUI();
3805
+                    Show3DView();
36053806                     
36063807                     cameraView.requestFocusInWindow();
36073808                     
....@@ -3787,6 +3988,7 @@
37873988                 } else
37883989 		if (source == rootButton)
37893990 		{
3991
+                    Replace();
37903992                     Object3D obj;
37913993                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
37923994                     {
....@@ -3801,6 +4003,9 @@
38014003 		if (source == closeButton)
38024004 		{
38034005 //System.out.println("CLOSE: " + buttonGroup.getSelection());
4006
+                    if (copy.versionlist != null)
4007
+                        Replace();
4008
+                    
38044009                     cRadio ab;
38054010                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
38064011                     {
....@@ -3899,6 +4104,9 @@
38994104 		} else
39004105                 if(source instanceof cRadio)
39014106 		{
4107
+                    if (copy.versionlist != null)
4108
+                        Replace();
4109
+                    
39024110                     group.parent = keepparent;
39034111                         group.attributes = 0;
39044112                     //group.editWindow = null;
....@@ -3923,8 +4131,6 @@
39234131                     
39244132                     copy = group;
39254133                     
3926
-                    SetUndoStates();
3927
-
39284134                     //Globals.theRenderer.object = group;
39294135                     if(!useclient)
39304136                     {
....@@ -3952,6 +4158,31 @@
39524158                      */
39534159                     radio.layout.doClick();
39544160                     
4161
+                    //assert(copy instanceof Composite);
4162
+                    
4163
+        if (copy.versionlist == null)
4164
+        {
4165
+            copy.versionindex = -1;
4166
+            
4167
+            // Cannot work with loops
4168
+            // To fix this issue, we first mark all nodes above the root,
4169
+            // and check if any of these nodes are reachable below the root.
4170
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4171
+            
4172
+            if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
4173
+            {
4174
+                copy.versionlist = new Object3D[100];
4175
+                
4176
+                //Save(true);
4177
+            }
4178
+            else
4179
+                copy.versionindex = -2;
4180
+            
4181
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4182
+        }
4183
+        
4184
+                    SetVersionStates();
4185
+
39554186                     ClearUnpinned();
39564187                     
39574188                     //Grafreed.Assert(group != null);
....@@ -4065,6 +4296,18 @@
40654296             refreshContents();
40664297         }
40674298         
4299
+        void TextureRatio(int axis)
4300
+        {
4301
+            Object3D obj;
4302
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4303
+            {
4304
+                    obj = (Object3D)e.nextElement();
4305
+                    obj.TextureRatio(axis);
4306
+            }
4307
+
4308
+            refreshContents();
4309
+        }
4310
+        
40684311         void ResetTransform()
40694312         {
40704313             ResetTransform(-1);
....@@ -4080,42 +4323,8 @@
40804323                     if (obj.toParent == null)
40814324                         continue;
40824325                     
4083
-                    if (mask == -1)
4084
-                    {
4085
-                        if (obj instanceof Camera) // jan 2014
4086
-                        {
4087
-                            LA.matIdentity(obj.toParent);
4088
-                            LA.matIdentity(obj.fromParent);
4089
-                        }
4090
-                        else
4091
-                        {
4092
-                            obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4093
-                            obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4094
-                        }
4095
-                        TouchTransform(obj);
4096
-                        continue;
4097
-                    }
4098
-                    if ((mask&2) != 0) // Scale
4099
-                    {
4100
-                        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4101
-                        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4102
-                        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4103
-                        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4104
-                        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4105
-                        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4106
-                    }
4107
-                    if ((mask&4) != 0) // Rotation
4108
-                    {
4109
-                        // ?
4110
-                    }
4111
-                    if ((mask&1) != 0) // Translation
4112
-                    {
4113
-                        if (obj.toParent != null)
4114
-                        {
4115
-                            obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4116
-                            obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4117
-                        }
4118
-                    }
4326
+                    obj.ResetTransform(mask);
4327
+                    
41194328                     if (obj.parent == null)
41204329                     {
41214330                         System.out.println("NULL PARENT!");
....@@ -4624,6 +4833,12 @@
46244833             {
46254834 		Object3D obj = group.selection.get(i);
46264835                 
4836
+                if (obj.toParent == null)
4837
+                {
4838
+                    obj.toParent = LA.newMatrix();
4839
+                    obj.fromParent = LA.newMatrix();
4840
+                }
4841
+                
46274842                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
46284843                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
46294844             }
....@@ -4915,6 +5130,12 @@
49155130 		refreshContents();
49165131 	}
49175132 	
5133
+	void ClearVersions()
5134
+	{
5135
+		group.selection.ClearVersions();
5136
+		refreshContents();
5137
+	}
5138
+	
49185139 	void FlipV(boolean flip)
49195140 	{
49205141 		group.selection.FlipV(flip);
....@@ -5186,10 +5407,26 @@
51865407             flashSelectionButton.setEnabled(enabled);
51875408             
51885409             clearPanelButton.setEnabled(!listUI.isEmpty());
5410
+            
5411
+            boolean allComposites = true;
5412
+            
5413
+            if (group.selection != null)
5414
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5415
+            {
5416
+                    Object next = e.nextElement();
5417
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5418
+                    {
5419
+                        allComposites = false;
5420
+                        break;
5421
+                    }
5422
+            }
5423
+            
5424
+            rootButton.setEnabled(true); // allComposites);
51895425         }
51905426 
51915427         void refreshContents(boolean cp)
51925428         {
5429
+            if (Globals.ADVANCED)
51935430             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
51945431             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
51955432             {
....@@ -5200,7 +5437,7 @@
52005437                     Object3D child = (Object3D) group.selection.get(i);
52015438 
52025439                     objEditor.AddInfo(child, this, true);
5203
-    System.err.println("info : " + child.GetPath());
5440
+//    System.err.println("info : " + child.GetPath());
52045441                 }
52055442 
52065443                 objEditor.SetText(); // jan 2014
....@@ -6083,11 +6320,11 @@
60836320 	private MenuItem lookAtItem;
60846321 	private MenuItem lookFromItem;
60856322 	private MenuItem switchViewItem;
6086
-	private MenuItem cutItem;
6323
+	private JMenuItem cutItem;
60876324 	private MenuItem undoItem;
60886325 	private MenuItem redoItem;
60896326 	private JMenuItem duplicateItem;
6090
-	private MenuItem cloneItem;
6327
+	private JMenuItem cloneItem;
60916328 	private MenuItem cloneSupportItem;
60926329 	private MenuItem overwriteGeoItem;
60936330 	private MenuItem overwriteMatItem;
....@@ -6108,13 +6345,13 @@
61086345 	private MenuItem cloneGeometriesItem;
61096346 	private MenuItem shareGeometriesItem;
61106347 	private MenuItem mergeGeometriesItem;
6111
-	private MenuItem copyItem;
6348
+	private JMenuItem copyItem;
61126349 	private MenuItem pasteItem;
6113
-	private MenuItem pasteIntoItem;
6114
-	private MenuItem pasteLinkItem;
6115
-	private MenuItem pasteCloneItem;
6116
-	private MenuItem pasteExpandItem;
6117
-	private MenuItem deleteItem;
6350
+	private JMenuItem pasteIntoItem;
6351
+	private JMenuItem pasteLinkItem;
6352
+	private JMenuItem pasteCloneItem;
6353
+	private JMenuItem pasteExpandItem;
6354
+	private JMenuItem deleteItem;
61186355 	private MenuItem clearAllItem;
61196356 	private MenuItem genUVItem;
61206357 	private MenuItem genNormalsMESHItem;
....@@ -6140,6 +6377,7 @@
61406377 	private MenuItem clipMeshItem;
61416378 	private MenuItem smoothMeshItem;
61426379 	private MenuItem clearMaterialsItem;
6380
+	private MenuItem clearVersionsItem;
61436381         
61446382 	private MenuItem liveleavesItem;
61456383 	private MenuItem unliveleavesItem;
....@@ -6163,13 +6401,16 @@
61636401 	private MenuItem maxTexturesItem;
61646402 	private MenuItem panoTexturesItem;
61656403         
6404
+	private MenuItem textureRatioRItem;
6405
+	private MenuItem textureRatioGItem;
6406
+	private MenuItem textureRatioBItem;
61666407 	private MenuItem resetCentroidItem;
61676408 	private MenuItem resetCentroidXZItem;
61686409 	private MenuItem resetTransformItem;
61696410 	private MenuItem transformGeometryItem;
61706411 	private MenuItem transformChildrenItem;
61716412 	private MenuItem hideItem;
6172
-	private MenuItem grabItem;
6413
+	private JMenuItem grabItem;
61736414 	private MenuItem backItem;
61746415 	private MenuItem frontItem;
61756416 	private MenuItem cameraItem;
....@@ -6182,7 +6423,7 @@
61826423 	private MenuItem switchTransfoItem;
61836424 	private MenuItem morphItem;
61846425 	private MenuItem linkerItem;
6185
-	private MenuItem ungroupItem;
6426
+	private JMenuItem ungroupItem;
61866427 	private MenuItem editItem;
61876428 	private MenuItem openWindowItem;
61886429 	private MenuItem editLeafItem;