Figure panel.

Normand Briere

2019-09-02 21ac57b36a9e3b909853c7d64ac29b7ad72490a3

 GroupEditor.java
..
..
@@ -29,9 +29,9 @@
29
29
     {
30
30
         cButton skyboxButton;
31
31
         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));
33
33
         //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
-        skyboxButton.setToolTipText(s);
34
+        skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
35
         skyboxButton.addActionListener(new ActionListener()
36
36
         {
37
37
                 @Override
..
..
@@ -46,7 +46,7 @@
46
46
     {
47
47
         cButton textureButton;
48
48
         final String path = "textures/" + f + "/" + c + "/"; // + t;
49
-        row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
49
+        row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
50
         textureButton.setToolTipText(c + count);
51
51
         textureButton.addActionListener(new ActionListener()
52
52
         {
..
..
@@ -73,7 +73,7 @@
73
73
         cGridBag row5 = new cGridBag();
74
74
         cGridBag row6 = new cGridBag();
75
75
         
76
-        AddSkyboxButton("default", "rgb", row0);
76
+        AddSkyboxButton("default", "", row0);
77
77
         //AddSkyboxButton("default", "cornell", row0);
78
78
         AddSkyboxButton("penguins", "dust", row0);
79
79
         AddSkyboxButton("penguins", "tropic", row0);
..
..
@@ -330,15 +330,24 @@
330
330
         
331
331
     public void ChangeSkybox(String skybox)
332
332
     {
333
-        //cameraView.envyoff = false;
334
-        group.skyboxname = skybox;
335
-        group.skyboxext = "jpg";
336
-        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
+        }
337
346
     }
338
347
 
339
348
     public void CreateSkyboxPanel(cGridBag skyboxPanel)
340
349
     {
341
-        JTabbedPane skyboxpane = new JTabbedPane();
350
+        JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
342
351
         
343
352
         AddSkyboxTab0(skyboxpane);
344
353
         AddSkyboxTab1(skyboxpane);
..
..
@@ -357,16 +366,6 @@
357
366
         }
358
367
        
359
368
         refreshContents();
360
-    }
361
-
362
-    public void Show3DView()
363
-    {
364
-        // bug
365
-        //gridPanel.setDividerLocation(1.0);
366
-        //bigPanel.setDividerLocation(0.0);
367
-        bigThree.ClearUI();
368
-        bigThree.add(centralPanel);
369
-        bigThree.FlushUI();
370
369
     }
371
370
 
372
371
     //ObjEditor objEditor;
..
..
@@ -406,11 +405,15 @@
406
405
 		this.copy = this.group = group;
407
406
 		//selectees = this.group.selectees;
408
407
 		
409
-        if (copy.versionlist == null)
410
-        {
411
-            copy.versionlist = new Object3D[100];
412
-            copy.versionindex = -1;
413
-        }
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
+//        }
414
417
         
415
418
 		if(ui)
416
419
                     SetupUI(objEditor);
..
..
@@ -433,13 +436,13 @@
433
436
                 
434
437
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
435
438
                 
436
-        if (copy.versionlist == null)
437
-        {
438
-            copy.versionlist = new Object3D[100];
439
-            copy.versionindex = -1;
440
-            
441
-            Save(true);
442
-        }
439
+//        if (copy.versionlist == null)
440
+//        {
441
+//            copy.versionlist = new Object3D[100];
442
+//            copy.versionindex = -1;
443
+//            
444
+//            //Save(true);
445
+//        }
443
446
 	}
444
447
 
445
448
     void CloneSelection(boolean supports)
..
..
@@ -529,33 +532,35 @@
529
532
 //		menu.add("-");
530
533
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
531
534
 		duplicateItem.addActionListener(this);
532
-		cloneItem = menu.add(new MenuItem("Clone"));
535
+                
536
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
533
537
 		cloneItem.addActionListener(this);
534
-        if (Globals.ADVANCED)
538
+        //if (Globals.ADVANCED)
535
539
         {
536
540
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
537
541
 		cloneSupportItem.addActionListener(this);
538
542
         }
543
+                oe.jTree.popup.addSeparator();
539
544
 		menu.add("-");
540
-		cutItem = menu.add(new MenuItem("Cut"));
545
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
541
546
 		cutItem.addActionListener(this);
542
-		copyItem = menu.add(new MenuItem("Copy"));
547
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
543
548
 		copyItem.addActionListener(this);
544
549
 		pasteItem = menu.add(new MenuItem("Paste"));
545
550
 		pasteItem.addActionListener(this);
546
551
                 
547
-		menu.add("-");
548
-		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"));
549
555
 		pasteIntoItem.addActionListener(this);
550
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
556
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
551
557
 		pasteLinkItem.addActionListener(this);
552
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
558
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
553
559
 		pasteCloneItem.addActionListener(this);
554
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
560
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
555
561
 //		pasteExpandItem.addActionListener(this);
556
-		menu.add("-");
557
-		deleteItem = menu.add(new MenuItem("Delete"));
558
-		deleteItem.addActionListener(this);
562
+		//menu.add("-");
563
+                oe.jTree.popup.addSeparator();
559
564
                 
560
565
         if (Globals.ADVANCED)
561
566
         {
..
..
@@ -641,11 +646,9 @@
641
646
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
642
647
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
643
648
 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
644
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
645
649
 		oe.cameraMenu.add("-");
646
650
 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
647
651
 		openWindowItem.addActionListener(this);
648
-		editLeafItem.addActionListener(this);
649
652
 		lookAtItem.addActionListener(this);
650
653
 		//lookFromItem.addActinoListener(this);
651
654
 		//switchViewItem.addActionListener(this);
..
..
@@ -692,9 +695,8 @@
692
695
 		setMasterItem.addActionListener(this);
693
696
         }
694
697
                 
695
-		oe.menuBar.add(menu = new Menu("Group"));
696
-//		grabItem = menu.add(new MenuItem("Grab"));
697
-//		grabItem.addActionListener(this);
698
+		oe.menuBar.add(menu = new Menu("Order"));
699
+                
698
700
 		backItem = menu.add(new MenuItem("Back"));
699
701
 		backItem.addActionListener(this);
700
702
 		frontItem = menu.add(new MenuItem("Front"));
..
..
@@ -702,13 +704,21 @@
702
704
 //		compositeItem = menu.add(new MenuItem("Composite"));
703
705
 //		compositeItem.addActionListener(this);
704
706
                 
707
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
708
+		grabItem.addActionListener(this);
709
+                
705
710
         if (Globals.ADVANCED)
706
711
         {
707
712
 		hideItem = menu.add(new MenuItem("Hidden Group"));
708
713
 		hideItem.addActionListener(this);
709
714
         }
710
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
715
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711
716
 		ungroupItem.addActionListener(this);
717
+                
718
+                oe.jTree.popup.addSeparator();
719
+                
720
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
721
+		deleteItem.addActionListener(this);
712
722
                 
713
723
 //		menu.add("-");
714
724
 //                
..
..
@@ -745,9 +755,9 @@
745
755
 		shadowYItem.addActionListener(this);
746
756
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
747
757
 		shadowZItem.addActionListener(this);
758
+                
748
759
 		attributeItem = menu.add(new MenuItem("Attribute"));
749
760
 		attributeItem.addActionListener(this);
750
-                
751
761
         if (Globals.ADVANCED)
752
762
         {
753
763
 		menu.add("-");
..
..
@@ -759,11 +769,18 @@
759
769
 		pointflowItem.addActionListener(this);
760
770
         }
761
771
 		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("-");
762
779
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
763
780
 		resetTransformItem.addActionListener(this);
764
781
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
765
782
 		resetCentroidItem.addActionListener(this);
766
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
783
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
767
784
 		resetCentroidXZItem.addActionListener(this);
768
785
 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
769
786
 		transformGeometryItem.addActionListener(this);
..
..
@@ -815,6 +832,8 @@
815
832
         }
816
833
 
817
834
                 oe.menuBar.add(menu = new Menu("Attributes"));
835
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
836
+		clearVersionsItem.addActionListener(this);
818
837
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
819
838
 		clearMaterialsItem.addActionListener(this);
820
839
                 resetAllItem = menu.add(new MenuItem("Reset All"));
..
..
@@ -837,9 +856,9 @@
837
856
 		hideleavesItem.addActionListener(this);
838
857
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
839
858
 		showleavesItem.addActionListener(this);
840
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
859
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
841
860
 		markleavesItem.addActionListener(this);
842
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
861
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
843
862
 		unmarkleavesItem.addActionListener(this);
844
863
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
845
864
 		rewindleavesItem.addActionListener(this);
..
..
@@ -893,6 +912,9 @@
893
912
 		shareGeometriesItem.addActionListener(this);
894
913
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
895
914
 		mergeGeometriesItem.addActionListener(this);
915
+		menu.add("-");
916
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
917
+		editLeafItem.addActionListener(this);
896
918
         if (Globals.ADVANCED)
897
919
         {
898
920
             // Pretty much the same as duplicate and clone.
..
..
@@ -911,8 +933,10 @@
911
933
 	
912
934
         JTabbedPane resourcecontainer;
913
935
         cGridBag currenttab;
914
-        boolean added; // patch for jar
936
+        //boolean added; // patch for jar
915
937
                 
938
+        int totalcount = 0;
939
+        
916
940
         int tabcount = 0;
917
941
         int colcount = 0;
918
942
         int rowcount = 0;
..
..
@@ -928,28 +952,30 @@
928
952
 //        System.out.println();
929
953
         
930
954
         if (//rowcount == 0 ||
931
-                path.length == 1)
955
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
932
956
         {
933
957
             currenttab = new cGridBag();
934
-            added = false;
935
958
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
936
959
             currenttab.setName(tabname);
960
+            //added = false;
961
+            resourcecontainer.add(currenttab);
962
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
937
963
             rowcount = 1;
938
964
             colcount = 0;
939
965
             texturecount = 0;
940
966
         }
941
967
         
942
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
968
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
943
969
         {
944
-            if (!added)
970
+            //if (!added)
945
971
             {
946
-                added = true;
947
-                resourcecontainer.add(currenttab);
972
+                //added = true;
948
973
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
949
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
974
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
950
975
             }
951
976
             
952
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
977
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
978
+            totalcount++;
953
979
             
954
980
             if (++colcount >= columns)
955
981
             {
..
..
@@ -975,6 +1001,8 @@
975
1001
             container.add(resourcecontainer);
976
1002
             
977
1003
             Grafreed.ParseResources("textures", this);
1004
+            
1005
+            // 935. System.out.println("Total = " + totalcount);
978
1006
         }
979
1007
         
980
1008
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1014,9 +1042,9 @@
1014
1042
         oe.radioPanel.add(dummyButton);
1015
1043
         oe.buttonGroup.add(dummyButton);
1016
1044
          */
1017
-                cGridBag copyOptionsPanel = new cGridBag();
1045
+                cGridBag versionManagerPanel = new cGridBag();
1018
1046
                                         
1019
-                copyOptionsPanel.preferredHeight = 2;
1047
+                versionManagerPanel.preferredHeight = 4;
1020
1048
                 
1021
1049
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1022
1050
                 
..
..
@@ -1026,42 +1054,46 @@
1026
1054
                 
1027
1055
                 if (Globals.ADVANCED)
1028
1056
                 {
1029
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030
-                    maxButton.setToolTipText("Maximize window");
1031
-                    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);
1032
1060
                 }
1033
1061
                 
1034
1062
                 cButton gcButton;
1035
1063
                 
1036
-		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037
-                gcButton.setToolTipText("Garbage collect");
1038
-        gcButton.addActionListener(new ActionListener()
1039
-        {
1040
-                public void actionPerformed(ActionEvent e)
1041
-                {
1042
-                    System.gc();
1043
-                }
1044
-        });
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
+//                });
1045
1073
                 
1046
-		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
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);
1047
1079
                 collapseButton.setToolTipText("Collapse toolbar");
1048
1080
 		collapseButton.addActionListener(this);
1049
1081
                 
1050
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1051
-                maximize3DButton.setToolTipText("Maximize 3D view");
1052
-		maximize3DButton.addActionListener(this);
1082
+//		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1083
+//                maximize3DButton.setToolTipText("Maximize 3D view");
1084
+//		maximize3DButton.addActionListener(this);
1053
1085
                 
1054
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1086
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1055
1087
                 twoButton.setToolTipText("Show 3D view only");
1056
1088
 		twoButton.addActionListener(this);
1057
1089
                 this.fullscreenLayout = twoButton;
1058
1090
                 
1059
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1091
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1060
1092
                 threeButton.setToolTipText("Show controls and 3D view");
1061
1093
 		threeButton.addActionListener(this);
1062
1094
                 if (Globals.ADVANCED)
1063
1095
                 {
1064
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1096
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1065
1097
                 sixButton.setToolTipText("Show 3D view and controls");
1066
1098
 		sixButton.addActionListener(this);
1067
1099
                 }
..
..
@@ -1070,50 +1102,47 @@
1070
1102
 //		sevenButton.addActionListener(this);
1071
1103
                 //
1072
1104
                 
1073
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1074
-                fullButton.setToolTipText("Full-screen window");
1075
-		fullButton.addActionListener(this);
1076
-                
1077
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1078
1106
                 screenfitButton.setToolTipText("Screen fit");
1079
1107
 		screenfitButton.addActionListener(this);
1080
1108
 
1081
-		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);
1082
1110
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1083
1111
 		restoreCameraButton.addActionListener(this);
1084
1112
                 
1085
-		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);
1086
1114
                 saveVersionButton.setToolTipText("Duplicate current version");
1087
1115
 		saveVersionButton.addActionListener(this);
1088
1116
                                                 
1089
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1117
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1090
1118
                 deleteVersionButton.setToolTipText("Delete current version");
1091
1119
 		deleteVersionButton.addActionListener(this);
1120
+                deleteVersionButton.setEnabled(false);
1092
1121
                                                 
1093
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1122
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1094
1123
                 previousVersionButton.setToolTipText("Previous version");
1095
1124
 		previousVersionButton.addActionListener(this);
1096
1125
                 previousVersionButton.setEnabled(false);
1097
1126
                 
1098
1127
                 cGridBag updown = new cGridBag().setVertical(true);
1099
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1128
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1100
1129
                 restoreButton.setToolTipText("Undo (restore current version)");
1101
1130
 		restoreButton.addActionListener(this);
1102
-                //restoreButton.setEnabled(false);
1131
+                restoreButton.setEnabled(false);
1103
1132
                 
1104
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1133
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1105
1134
                 replaceButton.setToolTipText("Save (replace current version)");
1106
1135
 		replaceButton.addActionListener(this);
1107
-                //replaceButton.setEnabled(false);
1136
+                replaceButton.setEnabled(false);
1108
1137
                 
1109
-                copyOptionsPanel.add(updown);
1138
+                versionManagerPanel.add(updown);
1110
1139
                 
1111
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1141
                 nextVersionButton.setToolTipText("Next version");
1113
1142
 		nextVersionButton.addActionListener(this);
1114
1143
                 nextVersionButton.setEnabled(false);
1115
1144
                 
1116
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1145
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1146
                 oneStepButton.setToolTipText("Animate one step forward");
1118
1147
 		oneStepButton.addActionListener(this);
1119
1148
                 
..
..
@@ -1136,11 +1165,11 @@
1136
1165
 
1137
1166
                 if (Globals.ADVANCED)
1138
1167
                 {
1139
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1140
1169
                         snapobjectButton.addActionListener(this);
1141
1170
                         snapobjectButton.setToolTipText("Snap Object");
1142
1171
                         
1143
-		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);
1144
1173
 		fourButton.addActionListener(this);
1145
1174
                 fourButton.setToolTipText("Show control panel only");
1146
1175
                 }
..
..
@@ -1148,11 +1177,11 @@
1148
1177
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1149
1178
                 
1150
1179
 
1151
-		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);
1152
1181
                 rootButton.setToolTipText("Open selection in new tab");
1153
1182
 		rootButton.addActionListener(this);
1154
1183
 
1155
-                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);
1156
1185
                 closeButton.setToolTipText("Close tab");
1157
1186
 		closeButton.addActionListener(this);
1158
1187
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1161,38 +1190,38 @@
1161
1190
                 cGridBag row1 = new cGridBag();
1162
1191
                 
1163
1192
                 // INSERT
1164
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1165
-                gridButton.setToolTipText("Create grid");
1193
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1194
+                gridButton.setToolTipText("Create ground");
1166
1195
                                 gridButton.addActionListener(this);
1167
1196
 
1168
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1169
1198
                 boxButton.setToolTipText("Create box");
1170
1199
                                 boxButton.addActionListener(this);
1171
1200
 
1172
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1173
-                sphereButton.setToolTipText("Create sphere");
1174
-                                sphereButton.addActionListener(this);
1175
-
1176
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1177
-                coneButton.setToolTipText("Create cone");
1178
-                                coneButton.addActionListener(this);
1179
-
1180
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1181
-                torusButton.setToolTipText("Create torus");
1182
-                                torusButton.addActionListener(this);
1183
-
1184
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1201
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1185
1202
                 superButton.setToolTipText("Create superellipsoid");
1186
1203
                                 superButton.addActionListener(this);
1187
1204
 
1188
-                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)
1189
1218
                 {
1190
-                    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);
1191
1220
                     kleinButton.setToolTipText("Create Klein bottle");
1192
1221
                                     kleinButton.addActionListener(this);
1193
1222
                 }
1194
1223
                 
1195
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1224
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1196
1225
                 particlesButton.setToolTipText("Create particle system");
1197
1226
                                particlesButton.addActionListener(this);
1198
1227
 
..
..
@@ -1200,31 +1229,31 @@
1200
1229
                 
1201
1230
                 cGridBag row2 = new cGridBag();
1202
1231
                 
1203
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204
1233
                 groupButton.setToolTipText("Create group");
1205
1234
                                groupButton.addActionListener(this);
1206
1235
 
1207
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1237
                 compositeButton.setToolTipText("Create composite");
1209
1238
                                compositeButton.addActionListener(this);
1210
1239
 
1211
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1212
1241
                 switchButton.setToolTipText("Create item switcher");
1213
1242
                                switchButton.addActionListener(this);
1214
1243
 
1215
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
1245
                 loopButton.setToolTipText("Create loop");
1217
1246
                                loopButton.addActionListener(this);
1218
1247
 
1219
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
1249
                 textureButton.setToolTipText("Create texture");
1221
1250
                                textureButton.addActionListener(this);
1222
1251
 
1223
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
1253
                 overlayButton.setToolTipText("Create overlay");
1225
1254
                                overlayButton.addActionListener(this);
1226
1255
 
1227
-                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);
1228
1257
                 lightButton.setToolTipText("Create light");
1229
1258
                                lightButton.addActionListener(this);
1230
1259
 
..
..
@@ -1234,6 +1263,11 @@
1234
1263
                 
1235
1264
                 CreateTexturePanel(textures);
1236
1265
                 
1266
+                int tabCount = resourcecontainer.getTabCount();
1267
+                
1268
+                if (tabCount > 0)
1269
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1270
+                
1237
1271
                 oe.toolboxPanel.add(textures);
1238
1272
                 
1239
1273
                 textures.preferredHeight = 100;
..
..
@@ -1241,11 +1275,11 @@
1241
1275
                 CreateSkyboxPanel(oe.skyboxPanel);
1242
1276
                 
1243
1277
                 // EDIT panel
1244
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1278
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1245
1279
                 editButton.setToolTipText("Pin selection controls");
1246
1280
 		editButton.addActionListener(this);
1247
1281
 
1248
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1282
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1249
1283
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1250
1284
 		uneditButton.addActionListener(this);
1251
1285
 
..
..
@@ -1253,7 +1287,7 @@
1253
1287
                 allParamsButton.setToolTipText("Show all controls");
1254
1288
 		allParamsButton.addActionListener(this);
1255
1289
 
1256
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1290
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1257
1291
                 clearPanelButton.setToolTipText("Clear all controls");
1258
1292
 		clearPanelButton.addActionListener(this);
1259
1293
 
..
..
@@ -1261,7 +1295,7 @@
1261
1295
                 //unselectButton.setToolTipText("Unselect");
1262
1296
 		//unselectButton.addActionListener(this);
1263
1297
 
1264
-		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);
1265
1299
                 flashSelectionButton.setToolTipText("Highlight selection");
1266
1300
 		flashSelectionButton.addActionListener(this);
1267
1301
                 
..
..
@@ -1284,6 +1318,8 @@
1284
1318
                 
1285
1319
                 cGridBag jSPPanel = new cGridBag();
1286
1320
 
1321
+            jSPPanel.preferredHeight = 20;
1322
+            
1287
1323
                 JScrollPane jSP;
1288
1324
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1289
1325
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1292,11 +1328,11 @@
1292
1328
                 oe.treePanel.add(jSPPanel);
1293
1329
                 oe.treePanel.Return();
1294
1330
 
1295
-                oe.treePanel.add(copyOptionsPanel);
1331
+                oe.treePanel.add(versionManagerPanel);
1296
1332
                 oe.treePanel.Return();
1297
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1298
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1299
-            sliderPane.preferredHeight = 1;
1333
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1334
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1335
+            versionSliderPane.preferredHeight = 3;
1300
1336
                 
1301
1337
 //        mainPanel.setDividerLocation(0.1); //1.0);
1302
1338
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1454,6 +1490,14 @@
1454
1490
 	
1455
1491
         void EditObject(Object3D obj)
1456
1492
         {
1493
+            //assert(obj instanceof Composite);
1494
+            
1495
+//            if (obj.versionlist == null)
1496
+//            {
1497
+//                obj.versionlist = new Object3D[100];
1498
+//                obj.versionindex = -1;
1499
+//            }
1500
+            
1457
1501
             cRadio radioButton = new cRadio(obj.name);
1458
1502
             
1459
1503
             // June 2019. Patch to avoid bug with transparency.
..
..
@@ -1478,6 +1522,7 @@
1478
1522
                     
1479
1523
             oe.SetupViews();
1480
1524
             
1525
+        if (Globals.DEBUG)
1481
1526
 		System.out.println("SetupViews");
1482
1527
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1483
1528
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2081,24 +2126,24 @@
2081
2126
             switch(axis)
2082
2127
             {
2083
2128
                 case 0 :
2084
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2085
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2086
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2087
-                    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;
2088
2133
                     norm = cVector.X;
2089
2134
                     break;
2090
2135
                 case 1 :
2091
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2092
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2093
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2094
-                    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;
2095
2140
                     norm = cVector.Y;
2096
2141
                     break;
2097
2142
                 case 2 :
2098
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2099
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2100
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2101
-                    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;
2102
2147
                     norm = cVector.Z;
2103
2148
                     break;
2104
2149
             }
..
..
@@ -2139,7 +2184,11 @@
2139
2184
             shadow.material = new cMaterial(obj.material);
2140
2185
             shadow.material.diffuse = 0.0001f;
2141
2186
             shadow.material.specular = 0.0001f;
2142
-            //shadow.projectedVertices[1].x = 300;
2187
+            shadow.material.opacity = 0.75f;
2188
+            
2189
+            AllocProjectedVertices(shadow);
2190
+        
2191
+            shadow.projectedVertices[1].x = 300;
2143
2192
             
2144
2193
             makeSomething(shadow);
2145
2194
         }
..
..
@@ -2660,27 +2709,35 @@
2660
2709
 		} else
2661
2710
 		if (source == loopItem || source == loopButton)
2662
2711
 		{
2712
+                    if (!group.selection.isEmpty())
2713
+                    {
2663
2714
                         Composite csg = new GroupLeaf();
2664
-                        csg.count = 5;
2665
2715
 			group(csg);
2716
+                        csg.count = 5;
2666
2717
                         Composite child = new cGroup("Branch");
2667
2718
                         csg.addChild(child);
2668
2719
                         child.addChild(csg);
2720
+                    }
2669
2721
 		} else
2670
2722
 		if (source == doubleItem)
2671
2723
 		{
2724
+                    if (!group.selection.isEmpty())
2725
+                    {
2672
2726
                         Composite csg = new GroupLeaf("Fork");
2673
-                        csg.count = 5;
2674
2727
 			group(csg);
2728
+                        csg.count = 5;
2675
2729
                         Composite child = new cGroup("Branch A");
2676
2730
                         csg.addChild(child);
2677
2731
                         child.addChild(csg);
2678
2732
                         child = new cGroup("Branch B");
2679
2733
                         csg.addChild(child);
2680
2734
                         child.addChild(csg);
2735
+                    }
2681
2736
 		} else
2682
2737
 		if (source == tripleItem)
2683
2738
 		{
2739
+                    if (!group.selection.isEmpty())
2740
+                    {
2684
2741
                         Composite csg = new GroupLeaf("Trident");
2685
2742
                         csg.count = 4;
2686
2743
 			group(csg);
..
..
@@ -2693,6 +2750,7 @@
2693
2750
                         child = new cGroup();
2694
2751
                         csg.addChild(child);
2695
2752
                         child.addChild(csg);
2753
+                    }
2696
2754
 		} else
2697
2755
 		if (source == computeAOItem)
2698
2756
 		{
..
..
@@ -2739,7 +2797,7 @@
2739
2797
 		{
2740
2798
 			Maximize();
2741
2799
 		} else
2742
-		if (source == fullButton)
2800
+		if (source == fullScreenButton)
2743
2801
 		{
2744
2802
 			ToggleFullScreen();
2745
2803
 		} else
..
..
@@ -2748,13 +2806,13 @@
2748
2806
                         this.expandedLayout = radio.layout;
2749
2807
 			CollapseToolbar();
2750
2808
 		} else
2751
-		if (source == maximize3DButton)
2752
-		{
2753
-                        this.expandedLayout = radio.layout;
2754
-                        radio.layout = twoButton;
2755
-                        Show3DView();
2756
-			CollapseToolbar();
2757
-		} else
2809
+//		if (source == maximize3DButton)
2810
+//		{
2811
+//                        this.expandedLayout = radio.layout;
2812
+//                        radio.layout = twoButton;
2813
+//			CollapseToolbar();
2814
+//                        Show3DView();
2815
+//		} else
2758
2816
 		if (source == previousVersionButton)
2759
2817
 		{
2760
2818
                         // Go to previous version
..
..
@@ -3328,22 +3386,34 @@
3328
3386
 		} else
3329
3387
 		if (source == ungroupItem || source == ungroupButton)
3330
3388
 		{
3331
-                    boolean hasRoot = false;
3389
+                    boolean canUngroup = true;
3332
3390
                     
3333
3391
                     for (int i=0; i<group.selection.size(); i++)
3334
3392
                     {
3335
-                        if (group.selection.get(i) == group)
3393
+                        Object3D selectedItem = group.selection.get(i);
3394
+                        
3395
+                        if (selectedItem.Size() == 0)
3336
3396
                         {
3337
-                            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;
3338
3406
                             break;
3339
3407
                         }
3340
3408
                     }
3341
3409
 
3342
-                    if (!hasRoot)
3410
+                    if (canUngroup)
3343
3411
                     {
3344
3412
                         for (int i=0; i<group.selection.size(); i++)
3345
3413
                         {
3346
-                            Ungroup(group.selection.get(i));
3414
+                            Object3D selectedItem = group.selection.get(i);
3415
+                            
3416
+                            Ungroup(selectedItem);
3347
3417
                         }
3348
3418
 
3349
3419
                         ClearSelection(false);
..
..
@@ -3394,6 +3464,10 @@
3394
3464
 		if (source == clearMaterialsItem)
3395
3465
                 {
3396
3466
 			ClearMaterials();
3467
+		} else
3468
+		if (source == clearVersionsItem)
3469
+                {
3470
+			ClearVersions();
3397
3471
 		} else
3398
3472
 		if (source == liveleavesItem)
3399
3473
                 {
..
..
@@ -3534,6 +3608,18 @@
3534
3608
 		if (source == transformChildrenItem)
3535
3609
 		{
3536
3610
                         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);
3537
3623
 		} else
3538
3624
 		if (source == resetTransformItem)
3539
3625
 		{
..
..
@@ -3892,6 +3978,7 @@
3892
3978
                 } else
3893
3979
 		if (source == rootButton)
3894
3980
 		{
3981
+                    Replace();
3895
3982
                     Object3D obj;
3896
3983
                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3897
3984
                     {
..
..
@@ -3906,6 +3993,9 @@
3906
3993
 		if (source == closeButton)
3907
3994
 		{
3908
3995
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3996
+                    if (copy.versionlist != null)
3997
+                        Replace();
3998
+                    
3909
3999
                     cRadio ab;
3910
4000
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3911
4001
                     {
..
..
@@ -4004,6 +4094,9 @@
4004
4094
 		} else
4005
4095
                 if(source instanceof cRadio)
4006
4096
 		{
4097
+                    if (copy.versionlist != null)
4098
+                        Replace();
4099
+                    
4007
4100
                     group.parent = keepparent;
4008
4101
                         group.attributes = 0;
4009
4102
                     //group.editWindow = null;
..
..
@@ -4028,8 +4121,6 @@
4028
4121
                     
4029
4122
                     copy = group;
4030
4123
                     
4031
-                    SetUndoStates();
4032
-
4033
4124
                     //Globals.theRenderer.object = group;
4034
4125
                     if(!useclient)
4035
4126
                     {
..
..
@@ -4057,6 +4148,32 @@
4057
4148
                      */
4058
4149
                     radio.layout.doClick();
4059
4150
                     
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
+
4060
4177
                     ClearUnpinned();
4061
4178
                     
4062
4179
                     //Grafreed.Assert(group != null);
..
..
@@ -4170,6 +4287,18 @@
4170
4287
             refreshContents();
4171
4288
         }
4172
4289
         
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
+        
4173
4302
         void ResetTransform()
4174
4303
         {
4175
4304
             ResetTransform(-1);
..
..
@@ -4185,42 +4314,8 @@
4185
4314
                     if (obj.toParent == null)
4186
4315
                         continue;
4187
4316
                     
4188
-                    if (mask == -1)
4189
-                    {
4190
-                        if (obj instanceof Camera) // jan 2014
4191
-                        {
4192
-                            LA.matIdentity(obj.toParent);
4193
-                            LA.matIdentity(obj.fromParent);
4194
-                        }
4195
-                        else
4196
-                        {
4197
-                            obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4198
-                            obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4199
-                        }
4200
-                        TouchTransform(obj);
4201
-                        continue;
4202
-                    }
4203
-                    if ((mask&2) != 0) // Scale
4204
-                    {
4205
-                        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4206
-                        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4207
-                        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4208
-                        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4209
-                        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4210
-                        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4211
-                    }
4212
-                    if ((mask&4) != 0) // Rotation
4213
-                    {
4214
-                        // ?
4215
-                    }
4216
-                    if ((mask&1) != 0) // Translation
4217
-                    {
4218
-                        if (obj.toParent != null)
4219
-                        {
4220
-                            obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4221
-                            obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4222
-                        }
4223
-                    }
4317
+                    obj.ResetTransform(mask);
4318
+                    
4224
4319
                     if (obj.parent == null)
4225
4320
                     {
4226
4321
                         System.out.println("NULL PARENT!");
..
..
@@ -4729,6 +4824,12 @@
4729
4824
             {
4730
4825
 		Object3D obj = group.selection.get(i);
4731
4826
                 
4827
+                if (obj.toParent == null)
4828
+                {
4829
+                    obj.toParent = LA.newMatrix();
4830
+                    obj.fromParent = LA.newMatrix();
4831
+                }
4832
+                
4732
4833
                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
4733
4834
                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4734
4835
             }
..
..
@@ -5020,6 +5121,12 @@
5020
5121
 		refreshContents();
5021
5122
 	}
5022
5123
 	
5124
+	void ClearVersions()
5125
+	{
5126
+		group.selection.ClearVersions();
5127
+		refreshContents();
5128
+	}
5129
+	
5023
5130
 	void FlipV(boolean flip)
5024
5131
 	{
5025
5132
 		group.selection.FlipV(flip);
..
..
@@ -5258,7 +5365,7 @@
5258
5365
 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5259
5366
                             // a camera
5260
5367
                         {
5261
-                            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
5262
5369
                             {
5263
5370
                                 CameraPane.camerachangeframe = 0; // don't refuse it
5264
5371
                                 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..
..
@@ -5291,10 +5398,26 @@
5291
5398
             flashSelectionButton.setEnabled(enabled);
5292
5399
             
5293
5400
             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);
5294
5416
         }
5295
5417
 
5296
5418
         void refreshContents(boolean cp)
5297
5419
         {
5420
+            if (Globals.SHOWINFO)
5298
5421
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5299
5422
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5300
5423
             {
..
..
@@ -6188,11 +6311,11 @@
6188
6311
 	private MenuItem lookAtItem;
6189
6312
 	private MenuItem lookFromItem;
6190
6313
 	private MenuItem switchViewItem;
6191
-	private MenuItem cutItem;
6314
+	private JMenuItem cutItem;
6192
6315
 	private MenuItem undoItem;
6193
6316
 	private MenuItem redoItem;
6194
6317
 	private JMenuItem duplicateItem;
6195
-	private MenuItem cloneItem;
6318
+	private JMenuItem cloneItem;
6196
6319
 	private MenuItem cloneSupportItem;
6197
6320
 	private MenuItem overwriteGeoItem;
6198
6321
 	private MenuItem overwriteMatItem;
..
..
@@ -6213,13 +6336,13 @@
6213
6336
 	private MenuItem cloneGeometriesItem;
6214
6337
 	private MenuItem shareGeometriesItem;
6215
6338
 	private MenuItem mergeGeometriesItem;
6216
-	private MenuItem copyItem;
6339
+	private JMenuItem copyItem;
6217
6340
 	private MenuItem pasteItem;
6218
-	private MenuItem pasteIntoItem;
6219
-	private MenuItem pasteLinkItem;
6220
-	private MenuItem pasteCloneItem;
6221
-	private MenuItem pasteExpandItem;
6222
-	private MenuItem deleteItem;
6341
+	private JMenuItem pasteIntoItem;
6342
+	private JMenuItem pasteLinkItem;
6343
+	private JMenuItem pasteCloneItem;
6344
+	private JMenuItem pasteExpandItem;
6345
+	private JMenuItem deleteItem;
6223
6346
 	private MenuItem clearAllItem;
6224
6347
 	private MenuItem genUVItem;
6225
6348
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6245,6 +6368,7 @@
6245
6368
 	private MenuItem clipMeshItem;
6246
6369
 	private MenuItem smoothMeshItem;
6247
6370
 	private MenuItem clearMaterialsItem;
6371
+	private MenuItem clearVersionsItem;
6248
6372
         
6249
6373
 	private MenuItem liveleavesItem;
6250
6374
 	private MenuItem unliveleavesItem;
..
..
@@ -6268,13 +6392,16 @@
6268
6392
 	private MenuItem maxTexturesItem;
6269
6393
 	private MenuItem panoTexturesItem;
6270
6394
         
6395
+	private MenuItem textureRatioRItem;
6396
+	private MenuItem textureRatioGItem;
6397
+	private MenuItem textureRatioBItem;
6271
6398
 	private MenuItem resetCentroidItem;
6272
6399
 	private MenuItem resetCentroidXZItem;
6273
6400
 	private MenuItem resetTransformItem;
6274
6401
 	private MenuItem transformGeometryItem;
6275
6402
 	private MenuItem transformChildrenItem;
6276
6403
 	private MenuItem hideItem;
6277
-	private MenuItem grabItem;
6404
+	private JMenuItem grabItem;
6278
6405
 	private MenuItem backItem;
6279
6406
 	private MenuItem frontItem;
6280
6407
 	private MenuItem cameraItem;
..
..
@@ -6287,7 +6414,7 @@
6287
6414
 	private MenuItem switchTransfoItem;
6288
6415
 	private MenuItem morphItem;
6289
6416
 	private MenuItem linkerItem;
6290
-	private MenuItem ungroupItem;
6417
+	private JMenuItem ungroupItem;
6291
6418
 	private MenuItem editItem;
6292
6419
 	private MenuItem openWindowItem;
6293
6420
 	private MenuItem editLeafItem;