blame | history | patch | commit | commitdiff
Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a 
 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,7 +73,7 @@
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);
....@@ -311,14 +328,56 @@
311328         }
312329     }
313330         
314
-    public void ChangeSkybox(String name)
331
+    public void ChangeSkybox(String skybox)
315332     {
316
-        //cameraView.envyoff = false;
317
-        group.skyboxname = name;
318
-        group.skyboxext = "jpg";
319
-        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
+    }
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);
320358     }
321359     
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
+
322381     //ObjEditor objEditor;
323382 	public void closeUI2()
324383 	{
....@@ -356,11 +415,15 @@
356415 		this.copy = this.group = group;
357416 		//selectees = this.group.selectees;
358417 		
359
-        if (copy.versionlist == null)
360
-        {
361
-            copy.versionlist = new Object3D[100];
362
-            copy.versionindex = -1;
363
-        }
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
+//        }
364427         
365428 		if(ui)
366429                     SetupUI(objEditor);
....@@ -383,13 +446,13 @@
383446                 
384447                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385448                 
386
-        if (copy.versionlist == null)
387
-        {
388
-            copy.versionlist = new Object3D[100];
389
-            copy.versionindex = -1;
390
-            
391
-            Save(true);
392
-        }
449
+//        if (copy.versionlist == null)
450
+//        {
451
+//            copy.versionlist = new Object3D[100];
452
+//            copy.versionindex = -1;
453
+//            
454
+//            //Save(true);
455
+//        }
393456 	}
394457 
395458     void CloneSelection(boolean supports)
....@@ -479,33 +542,35 @@
479542 //		menu.add("-");
480543 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
481544 		duplicateItem.addActionListener(this);
482
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
483547 		cloneItem.addActionListener(this);
484
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
485549         {
486550 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
487551 		cloneSupportItem.addActionListener(this);
488552         }
553
+                oe.jTree.popup.addSeparator();
489554 		menu.add("-");
490
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
491556 		cutItem.addActionListener(this);
492
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
493558 		copyItem.addActionListener(this);
494559 		pasteItem = menu.add(new MenuItem("Paste"));
495560 		pasteItem.addActionListener(this);
496561                 
497
-		menu.add("-");
498
-		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"));
499565 		pasteIntoItem.addActionListener(this);
500
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
501567 		pasteLinkItem.addActionListener(this);
502
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
503569 		pasteCloneItem.addActionListener(this);
504
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
505571 //		pasteExpandItem.addActionListener(this);
506
-		menu.add("-");
507
-		deleteItem = menu.add(new MenuItem("Delete"));
508
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
509574                 
510575         if (Globals.ADVANCED)
511576         {
....@@ -591,11 +656,9 @@
591656 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
592657 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
593658 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
594
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
595659 		oe.cameraMenu.add("-");
596660 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
597661 		openWindowItem.addActionListener(this);
598
-		editLeafItem.addActionListener(this);
599662 		lookAtItem.addActionListener(this);
600663 		//lookFromItem.addActinoListener(this);
601664 		//switchViewItem.addActionListener(this);
....@@ -642,9 +705,8 @@
642705 		setMasterItem.addActionListener(this);
643706         }
644707                 
645
-		oe.menuBar.add(menu = new Menu("Group"));
646
-//		grabItem = menu.add(new MenuItem("Grab"));
647
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
648710 		backItem = menu.add(new MenuItem("Back"));
649711 		backItem.addActionListener(this);
650712 		frontItem = menu.add(new MenuItem("Front"));
....@@ -652,13 +714,21 @@
652714 //		compositeItem = menu.add(new MenuItem("Composite"));
653715 //		compositeItem.addActionListener(this);
654716                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
655720         if (Globals.ADVANCED)
656721         {
657722 		hideItem = menu.add(new MenuItem("Hidden Group"));
658723 		hideItem.addActionListener(this);
659724         }
660
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
661726 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
662732                 
663733 //		menu.add("-");
664734 //                
....@@ -695,11 +765,11 @@
695765 		shadowYItem.addActionListener(this);
696766                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
697767 		shadowZItem.addActionListener(this);
698
-		attributeItem = menu.add(new MenuItem("Attribute"));
699
-		attributeItem.addActionListener(this);
700768                 
701769         if (Globals.ADVANCED)
702770         {
771
+		attributeItem = menu.add(new MenuItem("Attribute"));
772
+		attributeItem.addActionListener(this);
703773 		menu.add("-");
704774 		linkerItem = menu.add(new MenuItem("Linker"));
705775 		linkerItem.addActionListener(this);
....@@ -709,11 +779,18 @@
709779 		pointflowItem.addActionListener(this);
710780         }
711781 		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("-");
712789 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
713790 		resetTransformItem.addActionListener(this);
714791 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
715792 		resetCentroidItem.addActionListener(this);
716
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
793
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
717794 		resetCentroidXZItem.addActionListener(this);
718795 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
719796 		transformGeometryItem.addActionListener(this);
....@@ -765,6 +842,8 @@
765842         }
766843 
767844                 oe.menuBar.add(menu = new Menu("Attributes"));
845
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
846
+		clearVersionsItem.addActionListener(this);
768847 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
769848 		clearMaterialsItem.addActionListener(this);
770849                 resetAllItem = menu.add(new MenuItem("Reset All"));
....@@ -787,9 +866,9 @@
787866 		hideleavesItem.addActionListener(this);
788867 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
789868 		showleavesItem.addActionListener(this);
790
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
869
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
791870 		markleavesItem.addActionListener(this);
792
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
871
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
793872 		unmarkleavesItem.addActionListener(this);
794873 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
795874 		rewindleavesItem.addActionListener(this);
....@@ -843,6 +922,9 @@
843922 		shareGeometriesItem.addActionListener(this);
844923 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
845924 		mergeGeometriesItem.addActionListener(this);
925
+		menu.add("-");
926
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
927
+		editLeafItem.addActionListener(this);
846928         if (Globals.ADVANCED)
847929         {
848930             // Pretty much the same as duplicate and clone.
....@@ -859,6 +941,79 @@
859941 		buildToolsMenu(menu);
860942 	}
861943 	
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
+        }
8621017         
8631018 	void SetupUI2(ObjEditor oe)
8641019 	{
....@@ -877,11 +1032,6 @@
8771032             //new Exception().printStackTrace();
8781033                 
8791034         oe.radioPanel = new JPanel(new GridBagLayout());
880
-	oe.aConstraints.weightx = 1;
881
-	oe.aConstraints.weighty = 0;
882
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
883
-	oe.aConstraints.gridwidth = 100;
884
-	oe.aConstraints.gridheight = 1;
8851035 //        oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8861036         
8871037         oe.buttonGroup = new ButtonGroup();
....@@ -902,9 +1052,9 @@
9021052         oe.radioPanel.add(dummyButton);
9031053         oe.buttonGroup.add(dummyButton);
9041054          */
905
-                cGridBag copyOptionsPanel = new cGridBag();
1055
+                cGridBag versionManagerPanel = new cGridBag();
9061056                                         
907
-                copyOptionsPanel.preferredHeight = 2;
1057
+                versionManagerPanel.preferredHeight = 4;
9081058                 
9091059                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
9101060                 
....@@ -914,62 +1064,102 @@
9141064                 
9151065                 if (Globals.ADVANCED)
9161066                 {
917
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
918
-                    maxButton.setToolTipText("Maximize window");
919
-                    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);
9201070                 }
9211071                 
922
-		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);
9231112                 fullButton.setToolTipText("Full-screen window");
9241113 		fullButton.addActionListener(this);
9251114                 
926
-		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);
9271116                 screenfitButton.setToolTipText("Screen fit");
9281117 		screenfitButton.addActionListener(this);
9291118 
930
-		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);
9311120                 restoreCameraButton.setToolTipText("Restore viewpoint");
9321121 		restoreCameraButton.addActionListener(this);
9331122                 
934
-		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);
9351124                 saveVersionButton.setToolTipText("Duplicate current version");
9361125 		saveVersionButton.addActionListener(this);
9371126                                                 
938
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1127
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9391128                 deleteVersionButton.setToolTipText("Delete current version");
9401129 		deleteVersionButton.addActionListener(this);
1130
+                deleteVersionButton.setEnabled(false);
9411131                                                 
942
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1132
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9431133                 previousVersionButton.setToolTipText("Previous version");
9441134 		previousVersionButton.addActionListener(this);
9451135                 previousVersionButton.setEnabled(false);
9461136                 
9471137                 cGridBag updown = new cGridBag().setVertical(true);
948
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1138
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9491139                 restoreButton.setToolTipText("Undo (restore current version)");
9501140 		restoreButton.addActionListener(this);
951
-                //restoreButton.setEnabled(false);
1141
+                restoreButton.setEnabled(false);
9521142                 
953
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1143
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9541144                 replaceButton.setToolTipText("Save (replace current version)");
9551145 		replaceButton.addActionListener(this);
956
-                //replaceButton.setEnabled(false);
1146
+                replaceButton.setEnabled(false);
9571147                 
958
-                copyOptionsPanel.add(updown);
1148
+                versionManagerPanel.add(updown);
9591149                 
960
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1150
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9611151                 nextVersionButton.setToolTipText("Next version");
9621152 		nextVersionButton.addActionListener(this);
9631153                 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);
9641158                 
9651159                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
9661160                 liveCB.setToolTipText("Enable animation");
9671161                                 liveCB.addItemListener(this);
9681162 
969
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
970
-                oneStepButton.setToolTipText("Animate one step forward");
971
-		oneStepButton.addActionListener(this);
972
-                
9731163                 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
9741164                 fastCB.setToolTipText("Fast mode");
9751165                                 fastCB.addItemListener(this);
....@@ -985,38 +1175,23 @@
9851175 
9861176                 if (Globals.ADVANCED)
9871177                 {
988
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1178
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9891179                         snapobjectButton.addActionListener(this);
9901180                         snapobjectButton.setToolTipText("Snap Object");
9911181                         
992
-		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);
9931183 		fourButton.addActionListener(this);
9941184                 fourButton.setToolTipText("Show control panel only");
9951185                 }
9961186 
9971187 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
9981188                 
999
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1000
-                twoButton.setToolTipText("Show 3D view only");
1001
-		twoButton.addActionListener(this);
1002
-                this.fullscreenLayout = twoButton;
1003
-                
1004
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1005
-                threeButton.setToolTipText("Show controls and 3D view");
1006
-		threeButton.addActionListener(this);
1007
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1008
-                sixButton.setToolTipText("Show 3D view and controls");
1009
-		sixButton.addActionListener(this);
1010
-//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1011
-//                sevenButton.setToolTipText("3-column layout");
1012
-//		sevenButton.addActionListener(this);
1013
-                //
10141189 
1015
-		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);
10161191                 rootButton.setToolTipText("Open selection in new tab");
10171192 		rootButton.addActionListener(this);
10181193 
1019
-                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);
10201195                 closeButton.setToolTipText("Close tab");
10211196 		closeButton.addActionListener(this);
10221197 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -1025,38 +1200,38 @@
10251200                 cGridBag row1 = new cGridBag();
10261201                 
10271202                 // INSERT
1028
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1029
-                gridButton.setToolTipText("Create grid");
1203
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204
+                gridButton.setToolTipText("Create ground");
10301205                                 gridButton.addActionListener(this);
10311206 
1032
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1207
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10331208                 boxButton.setToolTipText("Create box");
10341209                                 boxButton.addActionListener(this);
10351210 
1036
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037
-                sphereButton.setToolTipText("Create sphere");
1038
-                                sphereButton.addActionListener(this);
1039
-
1040
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1041
-                coneButton.setToolTipText("Create cone");
1042
-                                coneButton.addActionListener(this);
1043
-
1044
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1045
-                torusButton.setToolTipText("Create torus");
1046
-                                torusButton.addActionListener(this);
1047
-
1048
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1211
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10491212                 superButton.setToolTipText("Create superellipsoid");
10501213                                 superButton.addActionListener(this);
10511214 
1052
-                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)
10531228                 {
1054
-                    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);
10551230                     kleinButton.setToolTipText("Create Klein bottle");
10561231                                     kleinButton.addActionListener(this);
10571232                 }
10581233                 
1059
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1234
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10601235                 particlesButton.setToolTipText("Create particle system");
10611236                                particlesButton.addActionListener(this);
10621237 
....@@ -1064,72 +1239,73 @@
10641239                 
10651240                 cGridBag row2 = new cGridBag();
10661241                 
1067
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1242
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10681243                 groupButton.setToolTipText("Create group");
10691244                                groupButton.addActionListener(this);
10701245 
1071
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1246
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10721247                 compositeButton.setToolTipText("Create composite");
10731248                                compositeButton.addActionListener(this);
10741249 
1075
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1250
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10761251                 switchButton.setToolTipText("Create item switcher");
10771252                                switchButton.addActionListener(this);
10781253 
1079
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1254
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10801255                 loopButton.setToolTipText("Create loop");
10811256                                loopButton.addActionListener(this);
10821257 
1083
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1258
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10841259                 textureButton.setToolTipText("Create texture");
10851260                                textureButton.addActionListener(this);
10861261 
1087
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1262
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10881263                 overlayButton.setToolTipText("Create overlay");
10891264                                overlayButton.addActionListener(this);
10901265 
1091
-                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);
10921267                 lightButton.setToolTipText("Create light");
10931268                                lightButton.addActionListener(this);
10941269 
10951270                 oe.toolboxPanel.add(row2);
10961271                 
1097
-                // ENVYMAPS
1098
-                cGridBag skyboxpane = new cGridBag();
1099
-                skyboxpane.preferredHeight = 100;
1272
+                cGridBag textures = new cGridBag();
11001273                 
1101
-                oe.toolboxPanel.add(skyboxpane);
1274
+                CreateTexturePanel(textures);
11021275                 
1103
-                JTabbedPane skyboxpanel = new JTabbedPane();
1104
-                skyboxpane.add(skyboxpanel);
1276
+                int tabCount = resourcecontainer.getTabCount();
11051277                 
1106
-                AddSkyboxTab0(skyboxpanel);
1107
-                AddSkyboxTab1(skyboxpanel);
1108
-                AddSkyboxTab2(skyboxpanel);
1109
-                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);
11101286                 
11111287                 // EDIT panel
1112
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1288
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11131289                 editButton.setToolTipText("Pin selection controls");
11141290 		editButton.addActionListener(this);
11151291 
1116
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1292
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11171293                 uneditButton.setToolTipText("Unpin and remove selection controls");
11181294 		uneditButton.addActionListener(this);
11191295 
11201296 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1121
-                allParamsButton.setToolTipText("Show all controle");
1297
+                allParamsButton.setToolTipText("Show all controls");
11221298 		allParamsButton.addActionListener(this);
11231299 
1124
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125
-                clearPanelButton.setToolTipText("Clear edit panel");
1300
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1301
+                clearPanelButton.setToolTipText("Clear all controls");
11261302 		clearPanelButton.addActionListener(this);
11271303 
1128
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
-                unselectButton.setToolTipText("Unselect");
1130
-		unselectButton.addActionListener(this);
1304
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1305
+                //unselectButton.setToolTipText("Unselect");
1306
+		//unselectButton.addActionListener(this);
11311307 
1132
-		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);
11331309                 flashSelectionButton.setToolTipText("Highlight selection");
11341310 		flashSelectionButton.addActionListener(this);
11351311                 
....@@ -1152,6 +1328,8 @@
11521328                 
11531329                 cGridBag jSPPanel = new cGridBag();
11541330 
1331
+            jSPPanel.preferredHeight = 20;
1332
+            
11551333                 JScrollPane jSP;
11561334 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
11571335 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1160,11 +1338,11 @@
11601338                 oe.treePanel.add(jSPPanel);
11611339                 oe.treePanel.Return();
11621340 
1163
-                oe.treePanel.add(copyOptionsPanel);
1341
+                oe.treePanel.add(versionManagerPanel);
11641342                 oe.treePanel.Return();
1165
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1166
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1167
-            sliderPane.preferredHeight = 1;
1343
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1344
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1345
+            versionSliderPane.preferredHeight = 3;
11681346                 
11691347 //        mainPanel.setDividerLocation(0.1); //1.0);
11701348         mainPanel.setResizeWeight(0.4);
....@@ -1322,6 +1500,14 @@
13221500 	
13231501         void EditObject(Object3D obj)
13241502         {
1503
+            //assert(obj instanceof Composite);
1504
+            
1505
+//            if (obj.versionlist == null)
1506
+//            {
1507
+//                obj.versionlist = new Object3D[100];
1508
+//                obj.versionindex = -1;
1509
+//            }
1510
+            
13251511             cRadio radioButton = new cRadio(obj.name);
13261512             
13271513             // June 2019. Patch to avoid bug with transparency.
....@@ -1346,6 +1532,7 @@
13461532                     
13471533             oe.SetupViews();
13481534             
1535
+        if (Globals.DEBUG)
13491536 		System.out.println("SetupViews");
13501537             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
13511538                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1712,7 +1899,12 @@
17121899   TreePath path;
17131900 
17141901   public TransferableTreePath(TreePath tp) {
1715
-    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);
17161908   }
17171909 
17181910   public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1944,24 +2136,24 @@
19442136             switch(axis)
19452137             {
19462138                 case 0 :
1947
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1948
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1949
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1950
-                    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;
19512143                     norm = cVector.X;
19522144                     break;
19532145                 case 1 :
1954
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1955
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1956
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1957
-                    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;
19582150                     norm = cVector.Y;
19592151                     break;
19602152                 case 2 :
1961
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1962
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1963
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1964
-                    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;
19652157                     norm = cVector.Z;
19662158                     break;
19672159             }
....@@ -2002,7 +2194,11 @@
20022194             shadow.material = new cMaterial(obj.material);
20032195             shadow.material.diffuse = 0.0001f;
20042196             shadow.material.specular = 0.0001f;
2005
-            //shadow.projectedVertices[1].x = 300;
2197
+            shadow.material.opacity = 0.75f;
2198
+            
2199
+            AllocProjectedVertices(shadow);
2200
+        
2201
+            shadow.projectedVertices[1].x = 300;
20062202             
20072203             makeSomething(shadow);
20082204         }
....@@ -2523,27 +2719,35 @@
25232719 		} else
25242720 		if (source == loopItem || source == loopButton)
25252721 		{
2722
+                    if (!group.selection.isEmpty())
2723
+                    {
25262724                         Composite csg = new GroupLeaf();
25272725                         csg.count = 5;
2528
-			group(csg);
25292726                         Composite child = new cGroup("Branch");
25302727                         csg.addChild(child);
25312728                         child.addChild(csg);
2729
+			group(csg);
2730
+                    }
25322731 		} else
25332732 		if (source == doubleItem)
25342733 		{
2734
+                    if (!group.selection.isEmpty())
2735
+                    {
25352736                         Composite csg = new GroupLeaf("Fork");
25362737                         csg.count = 5;
2537
-			group(csg);
25382738                         Composite child = new cGroup("Branch A");
25392739                         csg.addChild(child);
25402740                         child.addChild(csg);
25412741                         child = new cGroup("Branch B");
25422742                         csg.addChild(child);
25432743                         child.addChild(csg);
2744
+			group(csg);
2745
+                    }
25442746 		} else
25452747 		if (source == tripleItem)
25462748 		{
2749
+                    if (!group.selection.isEmpty())
2750
+                    {
25472751                         Composite csg = new GroupLeaf("Trident");
25482752                         csg.count = 4;
25492753 			group(csg);
....@@ -2556,6 +2760,7 @@
25562760                         child = new cGroup();
25572761                         csg.addChild(child);
25582762                         child.addChild(csg);
2763
+                    }
25592764 		} else
25602765 		if (source == computeAOItem)
25612766 		{
....@@ -2605,6 +2810,18 @@
26052810 		if (source == fullButton)
26062811 		{
26072812 			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();
26082825 		} else
26092826 		if (source == previousVersionButton)
26102827 		{
....@@ -3179,22 +3396,34 @@
31793396 		} else
31803397 		if (source == ungroupItem || source == ungroupButton)
31813398 		{
3182
-                    boolean hasRoot = false;
3399
+                    boolean canUngroup = true;
31833400                     
31843401                     for (int i=0; i<group.selection.size(); i++)
31853402                     {
3186
-                        if (group.selection.get(i) == group)
3403
+                        Object3D selectedItem = group.selection.get(i);
3404
+                        
3405
+                        if (selectedItem.Size() == 0)
31873406                         {
3188
-                            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;
31893416                             break;
31903417                         }
31913418                     }
31923419 
3193
-                    if (!hasRoot)
3420
+                    if (canUngroup)
31943421                     {
31953422                         for (int i=0; i<group.selection.size(); i++)
31963423                         {
3197
-                            Ungroup(group.selection.get(i));
3424
+                            Object3D selectedItem = group.selection.get(i);
3425
+                            
3426
+                            Ungroup(selectedItem);
31983427                         }
31993428 
32003429                         ClearSelection(false);
....@@ -3245,6 +3474,10 @@
32453474 		if (source == clearMaterialsItem)
32463475                 {
32473476 			ClearMaterials();
3477
+		} else
3478
+		if (source == clearVersionsItem)
3479
+                {
3480
+			ClearVersions();
32483481 		} else
32493482 		if (source == liveleavesItem)
32503483                 {
....@@ -3385,6 +3618,18 @@
33853618 		if (source == transformChildrenItem)
33863619 		{
33873620                         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);
33883633 		} else
33893634 		if (source == resetTransformItem)
33903635 		{
....@@ -3557,38 +3802,7 @@
35573802                     if (CameraPane.FULLSCREEN)
35583803                         fullscreenLayout = radio.layout;
35593804                     
3560
-                    // bug
3561
-                    //gridPanel.setDividerLocation(1.0);
3562
-                    //bigPanel.setDividerLocation(0.0);
3563
-//                    bigThree.remove(scenePanel);
3564
-//                    bigThree.remove(centralPanel);
3565
-//                    bigThree.remove(XYZPanel);
3566
-//                    aWindowConstraints.gridx = 0;
3567
-//                    aWindowConstraints.gridy = 0;
3568
-//                    aWindowConstraints.gridwidth = 1;
3569
-//            //        aConstraints.gridheight = 3;
3570
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3571
-//                    aWindowConstraints.weightx = 0;
3572
-//                    aWindowConstraints.weighty = 1;
3573
-//                    //bigThree.add(jtp, aWindowConstraints);
3574
-//                    aWindowConstraints.weightx = 1;
3575
-//                    aWindowConstraints.gridwidth = 3;
3576
-//            //        aConstraints.gridheight = 3;
3577
-//                    aWindowConstraints.gridx = 1;
3578
-//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
3579
-//                    bigThree.add(centralPanel, aWindowConstraints);
3580
-//                    aWindowConstraints.weightx = 0;
3581
-//                    aWindowConstraints.gridx = 4;
3582
-//                    aWindowConstraints.gridwidth = 1;
3583
-//            //        aConstraints.gridheight = 3;
3584
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3585
-//                    //bigThree.add(XYZPanel, aWindowConstraints);
3586
-//                    scenePanel.setVisible(false);
3587
-//                    centralPanel.setVisible(true);
3588
-//                    XYZPanel.setVisible(false);
3589
-                    bigThree.ClearUI();
3590
-                    bigThree.add(centralPanel);
3591
-                    bigThree.FlushUI();
3805
+                    Show3DView();
35923806                     
35933807                     cameraView.requestFocusInWindow();
35943808                     
....@@ -3774,6 +3988,7 @@
37743988                 } else
37753989 		if (source == rootButton)
37763990 		{
3991
+                    Replace();
37773992                     Object3D obj;
37783993                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
37793994                     {
....@@ -3788,6 +4003,9 @@
37884003 		if (source == closeButton)
37894004 		{
37904005 //System.out.println("CLOSE: " + buttonGroup.getSelection());
4006
+                    if (copy.versionlist != null)
4007
+                        Replace();
4008
+                    
37914009                     cRadio ab;
37924010                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
37934011                     {
....@@ -3886,6 +4104,9 @@
38864104 		} else
38874105                 if(source instanceof cRadio)
38884106 		{
4107
+                    if (copy.versionlist != null)
4108
+                        Replace();
4109
+                    
38894110                     group.parent = keepparent;
38904111                         group.attributes = 0;
38914112                     //group.editWindow = null;
....@@ -3910,8 +4131,6 @@
39104131                     
39114132                     copy = group;
39124133                     
3913
-                    SetUndoStates();
3914
-
39154134                     //Globals.theRenderer.object = group;
39164135                     if(!useclient)
39174136                     {
....@@ -3939,6 +4158,31 @@
39394158                      */
39404159                     radio.layout.doClick();
39414160                     
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
+
39424186                     ClearUnpinned();
39434187                     
39444188                     //Grafreed.Assert(group != null);
....@@ -4052,6 +4296,18 @@
40524296             refreshContents();
40534297         }
40544298         
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
+        
40554311         void ResetTransform()
40564312         {
40574313             ResetTransform(-1);
....@@ -4067,42 +4323,8 @@
40674323                     if (obj.toParent == null)
40684324                         continue;
40694325                     
4070
-                    if (mask == -1)
4071
-                    {
4072
-                        if (obj instanceof Camera) // jan 2014
4073
-                        {
4074
-                            LA.matIdentity(obj.toParent);
4075
-                            LA.matIdentity(obj.fromParent);
4076
-                        }
4077
-                        else
4078
-                        {
4079
-                            obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4080
-                            obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4081
-                        }
4082
-                        TouchTransform(obj);
4083
-                        continue;
4084
-                    }
4085
-                    if ((mask&2) != 0) // Scale
4086
-                    {
4087
-                        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4088
-                        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4089
-                        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4090
-                        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4091
-                        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4092
-                        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4093
-                    }
4094
-                    if ((mask&4) != 0) // Rotation
4095
-                    {
4096
-                        // ?
4097
-                    }
4098
-                    if ((mask&1) != 0) // Translation
4099
-                    {
4100
-                        if (obj.toParent != null)
4101
-                        {
4102
-                            obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4103
-                            obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4104
-                        }
4105
-                    }
4326
+                    obj.ResetTransform(mask);
4327
+                    
41064328                     if (obj.parent == null)
41074329                     {
41084330                         System.out.println("NULL PARENT!");
....@@ -4611,6 +4833,12 @@
46114833             {
46124834 		Object3D obj = group.selection.get(i);
46134835                 
4836
+                if (obj.toParent == null)
4837
+                {
4838
+                    obj.toParent = LA.newMatrix();
4839
+                    obj.fromParent = LA.newMatrix();
4840
+                }
4841
+                
46144842                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
46154843                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
46164844             }
....@@ -4902,6 +5130,12 @@
49025130 		refreshContents();
49035131 	}
49045132 	
5133
+	void ClearVersions()
5134
+	{
5135
+		group.selection.ClearVersions();
5136
+		refreshContents();
5137
+	}
5138
+	
49055139 	void FlipV(boolean flip)
49065140 	{
49075141 		group.selection.FlipV(flip);
....@@ -5169,15 +5403,31 @@
51695403         {
51705404             editButton.setEnabled(enabled);
51715405             uneditButton.setEnabled(enabled);
5172
-            unselectButton.setEnabled(enabled);
5406
+            //unselectButton.setEnabled(enabled);
51735407             flashSelectionButton.setEnabled(enabled);
51745408             
51755409             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);
51765425         }
51775426 
51785427         void refreshContents(boolean cp)
51795428         {
5180
-            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5429
+            if (Globals.ADVANCED)
5430
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
51815431             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
51825432             {
51835433                 objEditor.ClearInfo(); // .GetMaterial());
....@@ -5187,7 +5437,7 @@
51875437                     Object3D child = (Object3D) group.selection.get(i);
51885438 
51895439                     objEditor.AddInfo(child, this, true);
5190
-    System.err.println("info : " + child.GetPath());
5440
+//    System.err.println("info : " + child.GetPath());
51915441                 }
51925442 
51935443                 objEditor.SetText(); // jan 2014
....@@ -6070,11 +6320,11 @@
60706320 	private MenuItem lookAtItem;
60716321 	private MenuItem lookFromItem;
60726322 	private MenuItem switchViewItem;
6073
-	private MenuItem cutItem;
6323
+	private JMenuItem cutItem;
60746324 	private MenuItem undoItem;
60756325 	private MenuItem redoItem;
60766326 	private JMenuItem duplicateItem;
6077
-	private MenuItem cloneItem;
6327
+	private JMenuItem cloneItem;
60786328 	private MenuItem cloneSupportItem;
60796329 	private MenuItem overwriteGeoItem;
60806330 	private MenuItem overwriteMatItem;
....@@ -6095,13 +6345,13 @@
60956345 	private MenuItem cloneGeometriesItem;
60966346 	private MenuItem shareGeometriesItem;
60976347 	private MenuItem mergeGeometriesItem;
6098
-	private MenuItem copyItem;
6348
+	private JMenuItem copyItem;
60996349 	private MenuItem pasteItem;
6100
-	private MenuItem pasteIntoItem;
6101
-	private MenuItem pasteLinkItem;
6102
-	private MenuItem pasteCloneItem;
6103
-	private MenuItem pasteExpandItem;
6104
-	private MenuItem deleteItem;
6350
+	private JMenuItem pasteIntoItem;
6351
+	private JMenuItem pasteLinkItem;
6352
+	private JMenuItem pasteCloneItem;
6353
+	private JMenuItem pasteExpandItem;
6354
+	private JMenuItem deleteItem;
61056355 	private MenuItem clearAllItem;
61066356 	private MenuItem genUVItem;
61076357 	private MenuItem genNormalsMESHItem;
....@@ -6127,6 +6377,7 @@
61276377 	private MenuItem clipMeshItem;
61286378 	private MenuItem smoothMeshItem;
61296379 	private MenuItem clearMaterialsItem;
6380
+	private MenuItem clearVersionsItem;
61306381         
61316382 	private MenuItem liveleavesItem;
61326383 	private MenuItem unliveleavesItem;
....@@ -6150,13 +6401,16 @@
61506401 	private MenuItem maxTexturesItem;
61516402 	private MenuItem panoTexturesItem;
61526403         
6404
+	private MenuItem textureRatioRItem;
6405
+	private MenuItem textureRatioGItem;
6406
+	private MenuItem textureRatioBItem;
61536407 	private MenuItem resetCentroidItem;
61546408 	private MenuItem resetCentroidXZItem;
61556409 	private MenuItem resetTransformItem;
61566410 	private MenuItem transformGeometryItem;
61576411 	private MenuItem transformChildrenItem;
61586412 	private MenuItem hideItem;
6159
-	private MenuItem grabItem;
6413
+	private JMenuItem grabItem;
61606414 	private MenuItem backItem;
61616415 	private MenuItem frontItem;
61626416 	private MenuItem cameraItem;
....@@ -6169,7 +6423,7 @@
61696423 	private MenuItem switchTransfoItem;
61706424 	private MenuItem morphItem;
61716425 	private MenuItem linkerItem;
6172
-	private MenuItem ungroupItem;
6426
+	private JMenuItem ungroupItem;
61736427 	private MenuItem editItem;
61746428 	private MenuItem openWindowItem;
61756429 	private MenuItem editLeafItem;