blame | history | patch | commit | commitdiff
Normand Briere
2019-09-02 21ac57b36a9e3b909853c7d64ac29b7ad72490a3 
 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,46 @@
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
+
335371     //ObjEditor objEditor;
336372 	public void closeUI2()
337373 	{
....@@ -369,11 +405,15 @@
369405 		this.copy = this.group = group;
370406 		//selectees = this.group.selectees;
371407 		
372
-        if (copy.versionlist == null)
373
-        {
374
-            copy.versionlist = new Object3D[100];
375
-            copy.versionindex = -1;
376
-        }
408
+                assert(false);
409
+                
410
+//        if (copy.versionlist == null)
411
+//        {
412
+//            copy.versionlist = new Object3D[100];
413
+//            copy.versionindex = -1;
414
+//            
415
+//            //Save(true);
416
+//        }
377417         
378418 		if(ui)
379419                     SetupUI(objEditor);
....@@ -396,13 +436,13 @@
396436                 
397437                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
398438                 
399
-        if (copy.versionlist == null)
400
-        {
401
-            copy.versionlist = new Object3D[100];
402
-            copy.versionindex = -1;
403
-            
404
-            Save(true);
405
-        }
439
+//        if (copy.versionlist == null)
440
+//        {
441
+//            copy.versionlist = new Object3D[100];
442
+//            copy.versionindex = -1;
443
+//            
444
+//            //Save(true);
445
+//        }
406446 	}
407447 
408448     void CloneSelection(boolean supports)
....@@ -492,33 +532,35 @@
492532 //		menu.add("-");
493533 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
494534 		duplicateItem.addActionListener(this);
495
-		cloneItem = menu.add(new MenuItem("Clone"));
535
+                
536
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
496537 		cloneItem.addActionListener(this);
497
-        if (Globals.ADVANCED)
538
+        //if (Globals.ADVANCED)
498539         {
499540 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
500541 		cloneSupportItem.addActionListener(this);
501542         }
543
+                oe.jTree.popup.addSeparator();
502544 		menu.add("-");
503
-		cutItem = menu.add(new MenuItem("Cut"));
545
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
504546 		cutItem.addActionListener(this);
505
-		copyItem = menu.add(new MenuItem("Copy"));
547
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
506548 		copyItem.addActionListener(this);
507549 		pasteItem = menu.add(new MenuItem("Paste"));
508550 		pasteItem.addActionListener(this);
509551                 
510
-		menu.add("-");
511
-		pasteIntoItem = menu.add(new MenuItem("Paste into"));
552
+                oe.jTree.popup.addSeparator();
553
+		//menu.add("-");
554
+		pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
512555 		pasteIntoItem.addActionListener(this);
513
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
556
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
514557 		pasteLinkItem.addActionListener(this);
515
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
558
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
516559 		pasteCloneItem.addActionListener(this);
517
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
560
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
518561 //		pasteExpandItem.addActionListener(this);
519
-		menu.add("-");
520
-		deleteItem = menu.add(new MenuItem("Delete"));
521
-		deleteItem.addActionListener(this);
562
+		//menu.add("-");
563
+                oe.jTree.popup.addSeparator();
522564                 
523565         if (Globals.ADVANCED)
524566         {
....@@ -604,11 +646,9 @@
604646 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
605647 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
606648 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
607
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
608649 		oe.cameraMenu.add("-");
609650 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
610651 		openWindowItem.addActionListener(this);
611
-		editLeafItem.addActionListener(this);
612652 		lookAtItem.addActionListener(this);
613653 		//lookFromItem.addActinoListener(this);
614654 		//switchViewItem.addActionListener(this);
....@@ -655,9 +695,8 @@
655695 		setMasterItem.addActionListener(this);
656696         }
657697                 
658
-		oe.menuBar.add(menu = new Menu("Group"));
659
-//		grabItem = menu.add(new MenuItem("Grab"));
660
-//		grabItem.addActionListener(this);
698
+		oe.menuBar.add(menu = new Menu("Order"));
699
+                
661700 		backItem = menu.add(new MenuItem("Back"));
662701 		backItem.addActionListener(this);
663702 		frontItem = menu.add(new MenuItem("Front"));
....@@ -665,13 +704,21 @@
665704 //		compositeItem = menu.add(new MenuItem("Composite"));
666705 //		compositeItem.addActionListener(this);
667706                 
707
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
708
+		grabItem.addActionListener(this);
709
+                
668710         if (Globals.ADVANCED)
669711         {
670712 		hideItem = menu.add(new MenuItem("Hidden Group"));
671713 		hideItem.addActionListener(this);
672714         }
673
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
715
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
674716 		ungroupItem.addActionListener(this);
717
+                
718
+                oe.jTree.popup.addSeparator();
719
+                
720
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
721
+		deleteItem.addActionListener(this);
675722                 
676723 //		menu.add("-");
677724 //                
....@@ -708,9 +755,9 @@
708755 		shadowYItem.addActionListener(this);
709756                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
710757 		shadowZItem.addActionListener(this);
758
+                
711759 		attributeItem = menu.add(new MenuItem("Attribute"));
712760 		attributeItem.addActionListener(this);
713
-                
714761         if (Globals.ADVANCED)
715762         {
716763 		menu.add("-");
....@@ -722,11 +769,18 @@
722769 		pointflowItem.addActionListener(this);
723770         }
724771 		menu.add("-");
772
+		textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
773
+		textureRatioRItem.addActionListener(this);
774
+		textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
775
+		textureRatioGItem.addActionListener(this);
776
+		textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
777
+		textureRatioBItem.addActionListener(this);
778
+		menu.add("-");
725779 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
726780 		resetTransformItem.addActionListener(this);
727781 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
728782 		resetCentroidItem.addActionListener(this);
729
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
783
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
730784 		resetCentroidXZItem.addActionListener(this);
731785 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
732786 		transformGeometryItem.addActionListener(this);
....@@ -778,6 +832,8 @@
778832         }
779833 
780834                 oe.menuBar.add(menu = new Menu("Attributes"));
835
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
836
+		clearVersionsItem.addActionListener(this);
781837 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
782838 		clearMaterialsItem.addActionListener(this);
783839                 resetAllItem = menu.add(new MenuItem("Reset All"));
....@@ -800,9 +856,9 @@
800856 		hideleavesItem.addActionListener(this);
801857 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
802858 		showleavesItem.addActionListener(this);
803
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
859
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
804860 		markleavesItem.addActionListener(this);
805
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
861
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
806862 		unmarkleavesItem.addActionListener(this);
807863 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
808864 		rewindleavesItem.addActionListener(this);
....@@ -856,6 +912,9 @@
856912 		shareGeometriesItem.addActionListener(this);
857913 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
858914 		mergeGeometriesItem.addActionListener(this);
915
+		menu.add("-");
916
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
917
+		editLeafItem.addActionListener(this);
859918         if (Globals.ADVANCED)
860919         {
861920             // Pretty much the same as duplicate and clone.
....@@ -872,6 +931,79 @@
872931 		buildToolsMenu(menu);
873932 	}
874933 	
934
+        JTabbedPane resourcecontainer;
935
+        cGridBag currenttab;
936
+        //boolean added; // patch for jar
937
+                
938
+        int totalcount = 0;
939
+        
940
+        int tabcount = 0;
941
+        int colcount = 0;
942
+        int rowcount = 0;
943
+        int texturecount = 0;
944
+        
945
+        int columns = 5;
946
+        int rows = 7;
947
+        
948
+    public void ResourceCallBack(String[] path)
949
+    {
950
+//        for (int i = 0; i < path.length; i++)
951
+//            System.out.print(path[i] + "/");
952
+//        System.out.println();
953
+        
954
+        if (//rowcount == 0 ||
955
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
956
+        {
957
+            currenttab = new cGridBag();
958
+            String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
959
+            currenttab.setName(tabname);
960
+            //added = false;
961
+            resourcecontainer.add(currenttab);
962
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
963
+            rowcount = 1;
964
+            colcount = 0;
965
+            texturecount = 0;
966
+        }
967
+        
968
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
969
+        {
970
+            //if (!added)
971
+            {
972
+                //added = true;
973
+                String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
974
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
975
+            }
976
+            
977
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
978
+            totalcount++;
979
+            
980
+            if (++colcount >= columns)
981
+            {
982
+                colcount = 0;
983
+                currenttab.Return();
984
+                
985
+                if (rowcount++ >= rows)
986
+                {
987
+                    rowcount = 0;
988
+                }
989
+            }
990
+        }
991
+        else
992
+        {
993
+//            if (!path[path.length-1].equals("icons"))
994
+//                resourcecontainer.Return();
995
+        }
996
+    }
997
+    
998
+        void CreateTexturePanel(cGridBag container)
999
+        {
1000
+            resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1001
+            container.add(resourcecontainer);
1002
+            
1003
+            Grafreed.ParseResources("textures", this);
1004
+            
1005
+            // 935. System.out.println("Total = " + totalcount);
1006
+        }
8751007         
8761008 	void SetupUI2(ObjEditor oe)
8771009 	{
....@@ -890,11 +1022,6 @@
8901022             //new Exception().printStackTrace();
8911023                 
8921024         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;
8981025 //        oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8991026         
9001027         oe.buttonGroup = new ButtonGroup();
....@@ -915,9 +1042,9 @@
9151042         oe.radioPanel.add(dummyButton);
9161043         oe.buttonGroup.add(dummyButton);
9171044          */
918
-                cGridBag copyOptionsPanel = new cGridBag();
1045
+                cGridBag versionManagerPanel = new cGridBag();
9191046                                         
920
-                copyOptionsPanel.preferredHeight = 2;
1047
+                versionManagerPanel.preferredHeight = 4;
9211048                 
9221049                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
9231050                 
....@@ -927,62 +1054,102 @@
9271054                 
9281055                 if (Globals.ADVANCED)
9291056                 {
930
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
-                    maxButton.setToolTipText("Maximize window");
932
-                    maxButton.addActionListener(this);
1057
+//                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
+//                    maxButton.setToolTipText("Maximize window");
1059
+//                    maxButton.addActionListener(this);
9331060                 }
9341061                 
935
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
936
-                fullButton.setToolTipText("Full-screen window");
937
-		fullButton.addActionListener(this);
1062
+                cButton gcButton;
9381063                 
939
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1064
+//		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065
+//                gcButton.setToolTipText("Garbage collect");
1066
+//                gcButton.addActionListener(new ActionListener()
1067
+//                {
1068
+//                        public void actionPerformed(ActionEvent e)
1069
+//                        {
1070
+//                            System.gc();
1071
+//                        }
1072
+//                });
1073
+                
1074
+		oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1075
+                fullScreenButton.setToolTipText("Full-screen window");
1076
+		fullScreenButton.addActionListener(this);
1077
+                
1078
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1079
+                collapseButton.setToolTipText("Collapse toolbar");
1080
+		collapseButton.addActionListener(this);
1081
+                
1082
+//		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1083
+//                maximize3DButton.setToolTipText("Maximize 3D view");
1084
+//		maximize3DButton.addActionListener(this);
1085
+                
1086
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1087
+                twoButton.setToolTipText("Show 3D view only");
1088
+		twoButton.addActionListener(this);
1089
+                this.fullscreenLayout = twoButton;
1090
+                
1091
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1092
+                threeButton.setToolTipText("Show controls and 3D view");
1093
+		threeButton.addActionListener(this);
1094
+                if (Globals.ADVANCED)
1095
+                {
1096
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1097
+                sixButton.setToolTipText("Show 3D view and controls");
1098
+		sixButton.addActionListener(this);
1099
+                }
1100
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1101
+//                sevenButton.setToolTipText("3-column layout");
1102
+//		sevenButton.addActionListener(this);
1103
+                //
1104
+                
1105
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9401106                 screenfitButton.setToolTipText("Screen fit");
9411107 		screenfitButton.addActionListener(this);
9421108 
943
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1109
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9441110                 restoreCameraButton.setToolTipText("Restore viewpoint");
9451111 		restoreCameraButton.addActionListener(this);
9461112                 
947
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9481114                 saveVersionButton.setToolTipText("Duplicate current version");
9491115 		saveVersionButton.addActionListener(this);
9501116                                                 
951
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1117
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9521118                 deleteVersionButton.setToolTipText("Delete current version");
9531119 		deleteVersionButton.addActionListener(this);
1120
+                deleteVersionButton.setEnabled(false);
9541121                                                 
955
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1122
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9561123                 previousVersionButton.setToolTipText("Previous version");
9571124 		previousVersionButton.addActionListener(this);
9581125                 previousVersionButton.setEnabled(false);
9591126                 
9601127                 cGridBag updown = new cGridBag().setVertical(true);
961
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1128
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9621129                 restoreButton.setToolTipText("Undo (restore current version)");
9631130 		restoreButton.addActionListener(this);
964
-                //restoreButton.setEnabled(false);
1131
+                restoreButton.setEnabled(false);
9651132                 
966
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1133
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9671134                 replaceButton.setToolTipText("Save (replace current version)");
9681135 		replaceButton.addActionListener(this);
969
-                //replaceButton.setEnabled(false);
1136
+                replaceButton.setEnabled(false);
9701137                 
971
-                copyOptionsPanel.add(updown);
1138
+                versionManagerPanel.add(updown);
9721139                 
973
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9741141                 nextVersionButton.setToolTipText("Next version");
9751142 		nextVersionButton.addActionListener(this);
9761143                 nextVersionButton.setEnabled(false);
1144
+                
1145
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1146
+                oneStepButton.setToolTipText("Animate one step forward");
1147
+		oneStepButton.addActionListener(this);
9771148                 
9781149                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
9791150                 liveCB.setToolTipText("Enable animation");
9801151                                 liveCB.addItemListener(this);
9811152 
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
-                
9861153                 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
9871154                 fastCB.setToolTipText("Fast mode");
9881155                                 fastCB.addItemListener(this);
....@@ -998,38 +1165,23 @@
9981165 
9991166                 if (Globals.ADVANCED)
10001167                 {
1001
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10021169                         snapobjectButton.addActionListener(this);
10031170                         snapobjectButton.setToolTipText("Snap Object");
10041171                         
1005
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1172
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10061173 		fourButton.addActionListener(this);
10071174                 fourButton.setToolTipText("Show control panel only");
10081175                 }
10091176 
10101177 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
10111178                 
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
-                //
10271179 
1028
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10291181                 rootButton.setToolTipText("Open selection in new tab");
10301182 		rootButton.addActionListener(this);
10311183 
1032
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10331185                 closeButton.setToolTipText("Close tab");
10341186 		closeButton.addActionListener(this);
10351187 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -1038,38 +1190,38 @@
10381190                 cGridBag row1 = new cGridBag();
10391191                 
10401192                 // INSERT
1041
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1042
-                gridButton.setToolTipText("Create grid");
1193
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1194
+                gridButton.setToolTipText("Create ground");
10431195                                 gridButton.addActionListener(this);
10441196 
1045
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10461198                 boxButton.setToolTipText("Create box");
10471199                                 boxButton.addActionListener(this);
10481200 
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);
1201
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10621202                 superButton.setToolTipText("Create superellipsoid");
10631203                                 superButton.addActionListener(this);
10641204 
1065
-                if (Globals.ADVANCED)
1205
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1206
+                sphereButton.setToolTipText("Create sphere");
1207
+                                sphereButton.addActionListener(this);
1208
+
1209
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1210
+                coneButton.setToolTipText("Create cone");
1211
+                                coneButton.addActionListener(this);
1212
+
1213
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1214
+                torusButton.setToolTipText("Create torus");
1215
+                                torusButton.addActionListener(this);
1216
+
1217
+                if (false) //Globals.ADVANCED)
10661218                 {
1067
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1219
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10681220                     kleinButton.setToolTipText("Create Klein bottle");
10691221                                     kleinButton.addActionListener(this);
10701222                 }
10711223                 
1072
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1224
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10731225                 particlesButton.setToolTipText("Create particle system");
10741226                                particlesButton.addActionListener(this);
10751227 
....@@ -1077,72 +1229,73 @@
10771229                 
10781230                 cGridBag row2 = new cGridBag();
10791231                 
1080
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10811233                 groupButton.setToolTipText("Create group");
10821234                                groupButton.addActionListener(this);
10831235 
1084
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10851237                 compositeButton.setToolTipText("Create composite");
10861238                                compositeButton.addActionListener(this);
10871239 
1088
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10891241                 switchButton.setToolTipText("Create item switcher");
10901242                                switchButton.addActionListener(this);
10911243 
1092
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10931245                 loopButton.setToolTipText("Create loop");
10941246                                loopButton.addActionListener(this);
10951247 
1096
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10971249                 textureButton.setToolTipText("Create texture");
10981250                                textureButton.addActionListener(this);
10991251 
1100
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11011253                 overlayButton.setToolTipText("Create overlay");
11021254                                overlayButton.addActionListener(this);
11031255 
1104
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1256
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11051257                 lightButton.setToolTipText("Create light");
11061258                                lightButton.addActionListener(this);
11071259 
11081260                 oe.toolboxPanel.add(row2);
11091261                 
1110
-                // ENVYMAPS
1111
-                cGridBag skyboxpane = new cGridBag();
1112
-                skyboxpane.preferredHeight = 100;
1262
+                cGridBag textures = new cGridBag();
11131263                 
1114
-                oe.skyboxPanel.add(skyboxpane);
1264
+                CreateTexturePanel(textures);
11151265                 
1116
-                JTabbedPane skyboxpanel = new JTabbedPane();
1117
-                skyboxpane.add(skyboxpanel);
1266
+                int tabCount = resourcecontainer.getTabCount();
11181267                 
1119
-                AddSkyboxTab0(skyboxpanel);
1120
-                AddSkyboxTab1(skyboxpanel);
1121
-                AddSkyboxTab2(skyboxpanel);
1122
-                AddSkyboxTab3(skyboxpanel);
1268
+                if (tabCount > 0)
1269
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1270
+                
1271
+                oe.toolboxPanel.add(textures);
1272
+                
1273
+                textures.preferredHeight = 100;
1274
+                
1275
+                CreateSkyboxPanel(oe.skyboxPanel);
11231276                 
11241277                 // EDIT panel
1125
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1278
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11261279                 editButton.setToolTipText("Pin selection controls");
11271280 		editButton.addActionListener(this);
11281281 
1129
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1282
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11301283                 uneditButton.setToolTipText("Unpin and remove selection controls");
11311284 		uneditButton.addActionListener(this);
11321285 
11331286 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1134
-                allParamsButton.setToolTipText("Show all controle");
1287
+                allParamsButton.setToolTipText("Show all controls");
11351288 		allParamsButton.addActionListener(this);
11361289 
1137
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1138
-                clearPanelButton.setToolTipText("Clear edit panel");
1290
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1291
+                clearPanelButton.setToolTipText("Clear all controls");
11391292 		clearPanelButton.addActionListener(this);
11401293 
11411294 		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11421295                 //unselectButton.setToolTipText("Unselect");
11431296 		//unselectButton.addActionListener(this);
11441297 
1145
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1298
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11461299                 flashSelectionButton.setToolTipText("Highlight selection");
11471300 		flashSelectionButton.addActionListener(this);
11481301                 
....@@ -1165,6 +1318,8 @@
11651318                 
11661319                 cGridBag jSPPanel = new cGridBag();
11671320 
1321
+            jSPPanel.preferredHeight = 20;
1322
+            
11681323                 JScrollPane jSP;
11691324 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
11701325 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1173,11 +1328,11 @@
11731328                 oe.treePanel.add(jSPPanel);
11741329                 oe.treePanel.Return();
11751330 
1176
-                oe.treePanel.add(copyOptionsPanel);
1331
+                oe.treePanel.add(versionManagerPanel);
11771332                 oe.treePanel.Return();
1178
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1179
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1180
-            sliderPane.preferredHeight = 1;
1333
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1334
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1335
+            versionSliderPane.preferredHeight = 3;
11811336                 
11821337 //        mainPanel.setDividerLocation(0.1); //1.0);
11831338         mainPanel.setResizeWeight(0.4);
....@@ -1335,6 +1490,14 @@
13351490 	
13361491         void EditObject(Object3D obj)
13371492         {
1493
+            //assert(obj instanceof Composite);
1494
+            
1495
+//            if (obj.versionlist == null)
1496
+//            {
1497
+//                obj.versionlist = new Object3D[100];
1498
+//                obj.versionindex = -1;
1499
+//            }
1500
+            
13381501             cRadio radioButton = new cRadio(obj.name);
13391502             
13401503             // June 2019. Patch to avoid bug with transparency.
....@@ -1359,6 +1522,7 @@
13591522                     
13601523             oe.SetupViews();
13611524             
1525
+        if (Globals.DEBUG)
13621526 		System.out.println("SetupViews");
13631527             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
13641528                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1725,7 +1889,12 @@
17251889   TreePath path;
17261890 
17271891   public TransferableTreePath(TreePath tp) {
1728
-    path = tp;
1892
+      Object[] objs = new Object[tp.getPathCount()];
1893
+      for (int i=0; i<objs.length; i++)
1894
+      {
1895
+          objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1896
+      }
1897
+    path = new TreePath(objs);
17291898   }
17301899 
17311900   public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1957,24 +2126,24 @@
19572126             switch(axis)
19582127             {
19592128                 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;
2129
+                    vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2130
+                    vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2131
+                    vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2132
+                    vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
19642133                     norm = cVector.X;
19652134                     break;
19662135                 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;
2136
+                    vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2137
+                    vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2138
+                    vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2139
+                    vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
19712140                     norm = cVector.Y;
19722141                     break;
19732142                 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;
2143
+                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2144
+                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2145
+                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2146
+                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
19782147                     norm = cVector.Z;
19792148                     break;
19802149             }
....@@ -2015,7 +2184,11 @@
20152184             shadow.material = new cMaterial(obj.material);
20162185             shadow.material.diffuse = 0.0001f;
20172186             shadow.material.specular = 0.0001f;
2018
-            //shadow.projectedVertices[1].x = 300;
2187
+            shadow.material.opacity = 0.75f;
2188
+            
2189
+            AllocProjectedVertices(shadow);
2190
+        
2191
+            shadow.projectedVertices[1].x = 300;
20192192             
20202193             makeSomething(shadow);
20212194         }
....@@ -2536,27 +2709,35 @@
25362709 		} else
25372710 		if (source == loopItem || source == loopButton)
25382711 		{
2712
+                    if (!group.selection.isEmpty())
2713
+                    {
25392714                         Composite csg = new GroupLeaf();
2540
-                        csg.count = 5;
25412715 			group(csg);
2716
+                        csg.count = 5;
25422717                         Composite child = new cGroup("Branch");
25432718                         csg.addChild(child);
25442719                         child.addChild(csg);
2720
+                    }
25452721 		} else
25462722 		if (source == doubleItem)
25472723 		{
2724
+                    if (!group.selection.isEmpty())
2725
+                    {
25482726                         Composite csg = new GroupLeaf("Fork");
2549
-                        csg.count = 5;
25502727 			group(csg);
2728
+                        csg.count = 5;
25512729                         Composite child = new cGroup("Branch A");
25522730                         csg.addChild(child);
25532731                         child.addChild(csg);
25542732                         child = new cGroup("Branch B");
25552733                         csg.addChild(child);
25562734                         child.addChild(csg);
2735
+                    }
25572736 		} else
25582737 		if (source == tripleItem)
25592738 		{
2739
+                    if (!group.selection.isEmpty())
2740
+                    {
25602741                         Composite csg = new GroupLeaf("Trident");
25612742                         csg.count = 4;
25622743 			group(csg);
....@@ -2569,6 +2750,7 @@
25692750                         child = new cGroup();
25702751                         csg.addChild(child);
25712752                         child.addChild(csg);
2753
+                    }
25722754 		} else
25732755 		if (source == computeAOItem)
25742756 		{
....@@ -2615,10 +2797,22 @@
26152797 		{
26162798 			Maximize();
26172799 		} else
2618
-		if (source == fullButton)
2800
+		if (source == fullScreenButton)
26192801 		{
26202802 			ToggleFullScreen();
26212803 		} else
2804
+		if (source == collapseButton)
2805
+		{
2806
+                        this.expandedLayout = radio.layout;
2807
+			CollapseToolbar();
2808
+		} else
2809
+//		if (source == maximize3DButton)
2810
+//		{
2811
+//                        this.expandedLayout = radio.layout;
2812
+//                        radio.layout = twoButton;
2813
+//			CollapseToolbar();
2814
+//                        Show3DView();
2815
+//		} else
26222816 		if (source == previousVersionButton)
26232817 		{
26242818                         // Go to previous version
....@@ -3192,22 +3386,34 @@
31923386 		} else
31933387 		if (source == ungroupItem || source == ungroupButton)
31943388 		{
3195
-                    boolean hasRoot = false;
3389
+                    boolean canUngroup = true;
31963390                     
31973391                     for (int i=0; i<group.selection.size(); i++)
31983392                     {
3199
-                        if (group.selection.get(i) == group)
3393
+                        Object3D selectedItem = group.selection.get(i);
3394
+                        
3395
+                        if (selectedItem.Size() == 0)
32003396                         {
3201
-                            hasRoot = true;
3397
+                            // Cannot ungroup leaves
3398
+                            canUngroup = false;
3399
+                            break;
3400
+                        }
3401
+                                
3402
+                        if (selectedItem == group)
3403
+                        {
3404
+                            // Cannot ungroup root
3405
+                            canUngroup = false;
32023406                             break;
32033407                         }
32043408                     }
32053409 
3206
-                    if (!hasRoot)
3410
+                    if (canUngroup)
32073411                     {
32083412                         for (int i=0; i<group.selection.size(); i++)
32093413                         {
3210
-                            Ungroup(group.selection.get(i));
3414
+                            Object3D selectedItem = group.selection.get(i);
3415
+                            
3416
+                            Ungroup(selectedItem);
32113417                         }
32123418 
32133419                         ClearSelection(false);
....@@ -3258,6 +3464,10 @@
32583464 		if (source == clearMaterialsItem)
32593465                 {
32603466 			ClearMaterials();
3467
+		} else
3468
+		if (source == clearVersionsItem)
3469
+                {
3470
+			ClearVersions();
32613471 		} else
32623472 		if (source == liveleavesItem)
32633473                 {
....@@ -3398,6 +3608,18 @@
33983608 		if (source == transformChildrenItem)
33993609 		{
34003610                         TransformChildren();
3611
+		} else
3612
+		if (source == textureRatioRItem)
3613
+		{
3614
+                        TextureRatio(0);
3615
+		} else
3616
+		if (source == textureRatioGItem)
3617
+		{
3618
+                        TextureRatio(1);
3619
+		} else
3620
+		if (source == textureRatioBItem)
3621
+		{
3622
+                        TextureRatio(2);
34013623 		} else
34023624 		if (source == resetTransformItem)
34033625 		{
....@@ -3570,38 +3792,7 @@
35703792                     if (CameraPane.FULLSCREEN)
35713793                         fullscreenLayout = radio.layout;
35723794                     
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();
3795
+                    Show3DView();
36053796                     
36063797                     cameraView.requestFocusInWindow();
36073798                     
....@@ -3787,6 +3978,7 @@
37873978                 } else
37883979 		if (source == rootButton)
37893980 		{
3981
+                    Replace();
37903982                     Object3D obj;
37913983                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
37923984                     {
....@@ -3801,6 +3993,9 @@
38013993 		if (source == closeButton)
38023994 		{
38033995 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3996
+                    if (copy.versionlist != null)
3997
+                        Replace();
3998
+                    
38043999                     cRadio ab;
38054000                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
38064001                     {
....@@ -3899,6 +4094,9 @@
38994094 		} else
39004095                 if(source instanceof cRadio)
39014096 		{
4097
+                    if (copy.versionlist != null)
4098
+                        Replace();
4099
+                    
39024100                     group.parent = keepparent;
39034101                         group.attributes = 0;
39044102                     //group.editWindow = null;
....@@ -3923,8 +4121,6 @@
39234121                     
39244122                     copy = group;
39254123                     
3926
-                    SetUndoStates();
3927
-
39284124                     //Globals.theRenderer.object = group;
39294125                     if(!useclient)
39304126                     {
....@@ -3952,6 +4148,32 @@
39524148                      */
39534149                     radio.layout.doClick();
39544150                     
4151
+                    //assert(copy instanceof Composite);
4152
+                    
4153
+        if (copy.versionlist == null)
4154
+        {
4155
+            copy.versionindex = -1;
4156
+            
4157
+            // Cannot work with loops
4158
+            // To fix this issue, we first mark all nodes above the root,
4159
+            // and check if any of these nodes are reachable below the root.
4160
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4161
+            
4162
+            if (copy instanceof Composite && !copy.HasTags())
4163
+            {
4164
+                if (copy.versionlist == null)
4165
+                    copy.versionlist = new Object3D[100];
4166
+                
4167
+                //Save(true);
4168
+            }
4169
+            else
4170
+                copy.versionindex = -2;
4171
+            
4172
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4173
+        }
4174
+        
4175
+                    SetVersionStates();
4176
+
39554177                     ClearUnpinned();
39564178                     
39574179                     //Grafreed.Assert(group != null);
....@@ -4065,6 +4287,18 @@
40654287             refreshContents();
40664288         }
40674289         
4290
+        void TextureRatio(int axis)
4291
+        {
4292
+            Object3D obj;
4293
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4294
+            {
4295
+                    obj = (Object3D)e.nextElement();
4296
+                    obj.TextureRatio(axis);
4297
+            }
4298
+
4299
+            refreshContents();
4300
+        }
4301
+        
40684302         void ResetTransform()
40694303         {
40704304             ResetTransform(-1);
....@@ -4080,42 +4314,8 @@
40804314                     if (obj.toParent == null)
40814315                         continue;
40824316                     
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
-                    }
4317
+                    obj.ResetTransform(mask);
4318
+                    
41194319                     if (obj.parent == null)
41204320                     {
41214321                         System.out.println("NULL PARENT!");
....@@ -4624,6 +4824,12 @@
46244824             {
46254825 		Object3D obj = group.selection.get(i);
46264826                 
4827
+                if (obj.toParent == null)
4828
+                {
4829
+                    obj.toParent = LA.newMatrix();
4830
+                    obj.fromParent = LA.newMatrix();
4831
+                }
4832
+                
46274833                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
46284834                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
46294835             }
....@@ -4915,6 +5121,12 @@
49155121 		refreshContents();
49165122 	}
49175123 	
5124
+	void ClearVersions()
5125
+	{
5126
+		group.selection.ClearVersions();
5127
+		refreshContents();
5128
+	}
5129
+	
49185130 	void FlipV(boolean flip)
49195131 	{
49205132 		group.selection.FlipV(flip);
....@@ -5153,7 +5365,7 @@
51535365 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
51545366                             // a camera
51555367                         {
5156
-                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5368
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
51575369                             {
51585370                                 CameraPane.camerachangeframe = 0; // don't refuse it
51595371                                 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
....@@ -5186,10 +5398,26 @@
51865398             flashSelectionButton.setEnabled(enabled);
51875399             
51885400             clearPanelButton.setEnabled(!listUI.isEmpty());
5401
+            
5402
+            boolean allComposites = true;
5403
+            
5404
+            if (group.selection != null)
5405
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5406
+            {
5407
+                    Object next = e.nextElement();
5408
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5409
+                    {
5410
+                        allComposites = false;
5411
+                        break;
5412
+                    }
5413
+            }
5414
+            
5415
+            rootButton.setEnabled(true); // allComposites);
51895416         }
51905417 
51915418         void refreshContents(boolean cp)
51925419         {
5420
+            if (Globals.SHOWINFO)
51935421             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
51945422             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
51955423             {
....@@ -5200,7 +5428,7 @@
52005428                     Object3D child = (Object3D) group.selection.get(i);
52015429 
52025430                     objEditor.AddInfo(child, this, true);
5203
-    System.err.println("info : " + child.GetPath());
5431
+//    System.err.println("info : " + child.GetPath());
52045432                 }
52055433 
52065434                 objEditor.SetText(); // jan 2014
....@@ -6083,11 +6311,11 @@
60836311 	private MenuItem lookAtItem;
60846312 	private MenuItem lookFromItem;
60856313 	private MenuItem switchViewItem;
6086
-	private MenuItem cutItem;
6314
+	private JMenuItem cutItem;
60876315 	private MenuItem undoItem;
60886316 	private MenuItem redoItem;
60896317 	private JMenuItem duplicateItem;
6090
-	private MenuItem cloneItem;
6318
+	private JMenuItem cloneItem;
60916319 	private MenuItem cloneSupportItem;
60926320 	private MenuItem overwriteGeoItem;
60936321 	private MenuItem overwriteMatItem;
....@@ -6108,13 +6336,13 @@
61086336 	private MenuItem cloneGeometriesItem;
61096337 	private MenuItem shareGeometriesItem;
61106338 	private MenuItem mergeGeometriesItem;
6111
-	private MenuItem copyItem;
6339
+	private JMenuItem copyItem;
61126340 	private MenuItem pasteItem;
6113
-	private MenuItem pasteIntoItem;
6114
-	private MenuItem pasteLinkItem;
6115
-	private MenuItem pasteCloneItem;
6116
-	private MenuItem pasteExpandItem;
6117
-	private MenuItem deleteItem;
6341
+	private JMenuItem pasteIntoItem;
6342
+	private JMenuItem pasteLinkItem;
6343
+	private JMenuItem pasteCloneItem;
6344
+	private JMenuItem pasteExpandItem;
6345
+	private JMenuItem deleteItem;
61186346 	private MenuItem clearAllItem;
61196347 	private MenuItem genUVItem;
61206348 	private MenuItem genNormalsMESHItem;
....@@ -6140,6 +6368,7 @@
61406368 	private MenuItem clipMeshItem;
61416369 	private MenuItem smoothMeshItem;
61426370 	private MenuItem clearMaterialsItem;
6371
+	private MenuItem clearVersionsItem;
61436372         
61446373 	private MenuItem liveleavesItem;
61456374 	private MenuItem unliveleavesItem;
....@@ -6163,13 +6392,16 @@
61636392 	private MenuItem maxTexturesItem;
61646393 	private MenuItem panoTexturesItem;
61656394         
6395
+	private MenuItem textureRatioRItem;
6396
+	private MenuItem textureRatioGItem;
6397
+	private MenuItem textureRatioBItem;
61666398 	private MenuItem resetCentroidItem;
61676399 	private MenuItem resetCentroidXZItem;
61686400 	private MenuItem resetTransformItem;
61696401 	private MenuItem transformGeometryItem;
61706402 	private MenuItem transformChildrenItem;
61716403 	private MenuItem hideItem;
6172
-	private MenuItem grabItem;
6404
+	private JMenuItem grabItem;
61736405 	private MenuItem backItem;
61746406 	private MenuItem frontItem;
61756407 	private MenuItem cameraItem;
....@@ -6182,7 +6414,7 @@
61826414 	private MenuItem switchTransfoItem;
61836415 	private MenuItem morphItem;
61846416 	private MenuItem linkerItem;
6185
-	private MenuItem ungroupItem;
6417
+	private JMenuItem ungroupItem;
61866418 	private MenuItem editItem;
61876419 	private MenuItem openWindowItem;
61886420 	private MenuItem editLeafItem;