Proto version slider.

Normand Briere

2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a

 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);
..
..
@@ -406,11 +415,15 @@
406
415
 		this.copy = this.group = group;
407
416
 		//selectees = this.group.selectees;
408
417
 		
409
-        if (copy.versionlist == null)
410
-        {
411
-            copy.versionlist = new Object3D[100];
412
-            copy.versionindex = -1;
413
-        }
418
+                assert(false);
419
+                
420
+//        if (copy.versionlist == null)
421
+//        {
422
+//            copy.versionlist = new Object3D[100];
423
+//            copy.versionindex = -1;
424
+//            
425
+//            //Save(true);
426
+//        }
414
427
         
415
428
 		if(ui)
416
429
                     SetupUI(objEditor);
..
..
@@ -433,13 +446,13 @@
433
446
                 
434
447
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
435
448
                 
436
-        if (copy.versionlist == null)
437
-        {
438
-            copy.versionlist = new Object3D[100];
439
-            copy.versionindex = -1;
440
-            
441
-            Save(true);
442
-        }
449
+//        if (copy.versionlist == null)
450
+//        {
451
+//            copy.versionlist = new Object3D[100];
452
+//            copy.versionindex = -1;
453
+//            
454
+//            //Save(true);
455
+//        }
443
456
 	}
444
457
 
445
458
     void CloneSelection(boolean supports)
..
..
@@ -529,33 +542,35 @@
529
542
 //		menu.add("-");
530
543
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
531
544
 		duplicateItem.addActionListener(this);
532
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
533
547
 		cloneItem.addActionListener(this);
534
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
535
549
         {
536
550
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
537
551
 		cloneSupportItem.addActionListener(this);
538
552
         }
553
+                oe.jTree.popup.addSeparator();
539
554
 		menu.add("-");
540
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
541
556
 		cutItem.addActionListener(this);
542
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
543
558
 		copyItem.addActionListener(this);
544
559
 		pasteItem = menu.add(new MenuItem("Paste"));
545
560
 		pasteItem.addActionListener(this);
546
561
                 
547
-		menu.add("-");
548
-		pasteIntoItem = menu.add(new MenuItem("Paste into"));
562
+                oe.jTree.popup.addSeparator();
563
+		//menu.add("-");
564
+		pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
549
565
 		pasteIntoItem.addActionListener(this);
550
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
551
567
 		pasteLinkItem.addActionListener(this);
552
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
553
569
 		pasteCloneItem.addActionListener(this);
554
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
555
571
 //		pasteExpandItem.addActionListener(this);
556
-		menu.add("-");
557
-		deleteItem = menu.add(new MenuItem("Delete"));
558
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
559
574
                 
560
575
         if (Globals.ADVANCED)
561
576
         {
..
..
@@ -641,11 +656,9 @@
641
656
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
642
657
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
643
658
 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
644
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
645
659
 		oe.cameraMenu.add("-");
646
660
 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
647
661
 		openWindowItem.addActionListener(this);
648
-		editLeafItem.addActionListener(this);
649
662
 		lookAtItem.addActionListener(this);
650
663
 		//lookFromItem.addActinoListener(this);
651
664
 		//switchViewItem.addActionListener(this);
..
..
@@ -692,9 +705,8 @@
692
705
 		setMasterItem.addActionListener(this);
693
706
         }
694
707
                 
695
-		oe.menuBar.add(menu = new Menu("Group"));
696
-//		grabItem = menu.add(new MenuItem("Grab"));
697
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
698
710
 		backItem = menu.add(new MenuItem("Back"));
699
711
 		backItem.addActionListener(this);
700
712
 		frontItem = menu.add(new MenuItem("Front"));
..
..
@@ -702,13 +714,21 @@
702
714
 //		compositeItem = menu.add(new MenuItem("Composite"));
703
715
 //		compositeItem.addActionListener(this);
704
716
                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
705
720
         if (Globals.ADVANCED)
706
721
         {
707
722
 		hideItem = menu.add(new MenuItem("Hidden Group"));
708
723
 		hideItem.addActionListener(this);
709
724
         }
710
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711
726
 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
712
732
                 
713
733
 //		menu.add("-");
714
734
 //                
..
..
@@ -745,11 +765,11 @@
745
765
 		shadowYItem.addActionListener(this);
746
766
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
747
767
 		shadowZItem.addActionListener(this);
748
-		attributeItem = menu.add(new MenuItem("Attribute"));
749
-		attributeItem.addActionListener(this);
750
768
                 
751
769
         if (Globals.ADVANCED)
752
770
         {
771
+		attributeItem = menu.add(new MenuItem("Attribute"));
772
+		attributeItem.addActionListener(this);
753
773
 		menu.add("-");
754
774
 		linkerItem = menu.add(new MenuItem("Linker"));
755
775
 		linkerItem.addActionListener(this);
..
..
@@ -759,11 +779,18 @@
759
779
 		pointflowItem.addActionListener(this);
760
780
         }
761
781
 		menu.add("-");
782
+		textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
783
+		textureRatioRItem.addActionListener(this);
784
+		textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
785
+		textureRatioGItem.addActionListener(this);
786
+		textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
787
+		textureRatioBItem.addActionListener(this);
788
+		menu.add("-");
762
789
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
763
790
 		resetTransformItem.addActionListener(this);
764
791
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
765
792
 		resetCentroidItem.addActionListener(this);
766
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
793
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
767
794
 		resetCentroidXZItem.addActionListener(this);
768
795
 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
769
796
 		transformGeometryItem.addActionListener(this);
..
..
@@ -815,6 +842,8 @@
815
842
         }
816
843
 
817
844
                 oe.menuBar.add(menu = new Menu("Attributes"));
845
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
846
+		clearVersionsItem.addActionListener(this);
818
847
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
819
848
 		clearMaterialsItem.addActionListener(this);
820
849
                 resetAllItem = menu.add(new MenuItem("Reset All"));
..
..
@@ -837,9 +866,9 @@
837
866
 		hideleavesItem.addActionListener(this);
838
867
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
839
868
 		showleavesItem.addActionListener(this);
840
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
869
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
841
870
 		markleavesItem.addActionListener(this);
842
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
871
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
843
872
 		unmarkleavesItem.addActionListener(this);
844
873
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
845
874
 		rewindleavesItem.addActionListener(this);
..
..
@@ -893,6 +922,9 @@
893
922
 		shareGeometriesItem.addActionListener(this);
894
923
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
895
924
 		mergeGeometriesItem.addActionListener(this);
925
+		menu.add("-");
926
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
927
+		editLeafItem.addActionListener(this);
896
928
         if (Globals.ADVANCED)
897
929
         {
898
930
             // Pretty much the same as duplicate and clone.
..
..
@@ -911,8 +943,10 @@
911
943
 	
912
944
         JTabbedPane resourcecontainer;
913
945
         cGridBag currenttab;
914
-        boolean added; // patch for jar
946
+        //boolean added; // patch for jar
915
947
                 
948
+        int totalcount = 0;
949
+        
916
950
         int tabcount = 0;
917
951
         int colcount = 0;
918
952
         int rowcount = 0;
..
..
@@ -928,28 +962,30 @@
928
962
 //        System.out.println();
929
963
         
930
964
         if (//rowcount == 0 ||
931
-                path.length == 1)
965
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
932
966
         {
933
967
             currenttab = new cGridBag();
934
-            added = false;
935
968
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
936
969
             currenttab.setName(tabname);
970
+            //added = false;
971
+            resourcecontainer.add(currenttab);
972
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
937
973
             rowcount = 1;
938
974
             colcount = 0;
939
975
             texturecount = 0;
940
976
         }
941
977
         
942
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
978
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
943
979
         {
944
-            if (!added)
980
+            //if (!added)
945
981
             {
946
-                added = true;
947
-                resourcecontainer.add(currenttab);
982
+                //added = true;
948
983
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
949
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
984
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
950
985
             }
951
986
             
952
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
987
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
988
+            totalcount++;
953
989
             
954
990
             if (++colcount >= columns)
955
991
             {
..
..
@@ -975,6 +1011,8 @@
975
1011
             container.add(resourcecontainer);
976
1012
             
977
1013
             Grafreed.ParseResources("textures", this);
1014
+            
1015
+            // 935. System.out.println("Total = " + totalcount);
978
1016
         }
979
1017
         
980
1018
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1014,9 +1052,9 @@
1014
1052
         oe.radioPanel.add(dummyButton);
1015
1053
         oe.buttonGroup.add(dummyButton);
1016
1054
          */
1017
-                cGridBag copyOptionsPanel = new cGridBag();
1055
+                cGridBag versionManagerPanel = new cGridBag();
1018
1056
                                         
1019
-                copyOptionsPanel.preferredHeight = 2;
1057
+                versionManagerPanel.preferredHeight = 4;
1020
1058
                 
1021
1059
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1022
1060
                 
..
..
@@ -1026,42 +1064,42 @@
1026
1064
                 
1027
1065
                 if (Globals.ADVANCED)
1028
1066
                 {
1029
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030
-                    maxButton.setToolTipText("Maximize window");
1031
-                    maxButton.addActionListener(this);
1067
+//                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+//                    maxButton.setToolTipText("Maximize window");
1069
+//                    maxButton.addActionListener(this);
1032
1070
                 }
1033
1071
                 
1034
1072
                 cButton gcButton;
1035
1073
                 
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
-        });
1074
+//		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
+//                gcButton.setToolTipText("Garbage collect");
1076
+//                gcButton.addActionListener(new ActionListener()
1077
+//                {
1078
+//                        public void actionPerformed(ActionEvent e)
1079
+//                        {
1080
+//                            System.gc();
1081
+//                        }
1082
+//                });
1045
1083
                 
1046
-		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1084
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1047
1085
                 collapseButton.setToolTipText("Collapse toolbar");
1048
1086
 		collapseButton.addActionListener(this);
1049
1087
                 
1050
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1088
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1051
1089
                 maximize3DButton.setToolTipText("Maximize 3D view");
1052
1090
 		maximize3DButton.addActionListener(this);
1053
1091
                 
1054
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1092
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1055
1093
                 twoButton.setToolTipText("Show 3D view only");
1056
1094
 		twoButton.addActionListener(this);
1057
1095
                 this.fullscreenLayout = twoButton;
1058
1096
                 
1059
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1097
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1060
1098
                 threeButton.setToolTipText("Show controls and 3D view");
1061
1099
 		threeButton.addActionListener(this);
1062
1100
                 if (Globals.ADVANCED)
1063
1101
                 {
1064
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1102
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1065
1103
                 sixButton.setToolTipText("Show 3D view and controls");
1066
1104
 		sixButton.addActionListener(this);
1067
1105
                 }
..
..
@@ -1070,50 +1108,51 @@
1070
1108
 //		sevenButton.addActionListener(this);
1071
1109
                 //
1072
1110
                 
1073
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1111
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1074
1112
                 fullButton.setToolTipText("Full-screen window");
1075
1113
 		fullButton.addActionListener(this);
1076
1114
                 
1077
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1078
1116
                 screenfitButton.setToolTipText("Screen fit");
1079
1117
 		screenfitButton.addActionListener(this);
1080
1118
 
1081
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1119
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
1120
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1083
1121
 		restoreCameraButton.addActionListener(this);
1084
1122
                 
1085
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1086
1124
                 saveVersionButton.setToolTipText("Duplicate current version");
1087
1125
 		saveVersionButton.addActionListener(this);
1088
1126
                                                 
1089
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1127
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1090
1128
                 deleteVersionButton.setToolTipText("Delete current version");
1091
1129
 		deleteVersionButton.addActionListener(this);
1130
+                deleteVersionButton.setEnabled(false);
1092
1131
                                                 
1093
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1132
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1094
1133
                 previousVersionButton.setToolTipText("Previous version");
1095
1134
 		previousVersionButton.addActionListener(this);
1096
1135
                 previousVersionButton.setEnabled(false);
1097
1136
                 
1098
1137
                 cGridBag updown = new cGridBag().setVertical(true);
1099
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1138
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1100
1139
                 restoreButton.setToolTipText("Undo (restore current version)");
1101
1140
 		restoreButton.addActionListener(this);
1102
-                //restoreButton.setEnabled(false);
1141
+                restoreButton.setEnabled(false);
1103
1142
                 
1104
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1143
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1105
1144
                 replaceButton.setToolTipText("Save (replace current version)");
1106
1145
 		replaceButton.addActionListener(this);
1107
-                //replaceButton.setEnabled(false);
1146
+                replaceButton.setEnabled(false);
1108
1147
                 
1109
-                copyOptionsPanel.add(updown);
1148
+                versionManagerPanel.add(updown);
1110
1149
                 
1111
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1150
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1151
                 nextVersionButton.setToolTipText("Next version");
1113
1152
 		nextVersionButton.addActionListener(this);
1114
1153
                 nextVersionButton.setEnabled(false);
1115
1154
                 
1116
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1155
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1156
                 oneStepButton.setToolTipText("Animate one step forward");
1118
1157
 		oneStepButton.addActionListener(this);
1119
1158
                 
..
..
@@ -1136,11 +1175,11 @@
1136
1175
 
1137
1176
                 if (Globals.ADVANCED)
1138
1177
                 {
1139
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1178
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1140
1179
                         snapobjectButton.addActionListener(this);
1141
1180
                         snapobjectButton.setToolTipText("Snap Object");
1142
1181
                         
1143
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1182
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144
1183
 		fourButton.addActionListener(this);
1145
1184
                 fourButton.setToolTipText("Show control panel only");
1146
1185
                 }
..
..
@@ -1148,11 +1187,11 @@
1148
1187
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1149
1188
                 
1150
1189
 
1151
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1190
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1152
1191
                 rootButton.setToolTipText("Open selection in new tab");
1153
1192
 		rootButton.addActionListener(this);
1154
1193
 
1155
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1156
1195
                 closeButton.setToolTipText("Close tab");
1157
1196
 		closeButton.addActionListener(this);
1158
1197
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1161,38 +1200,38 @@
1161
1200
                 cGridBag row1 = new cGridBag();
1162
1201
                 
1163
1202
                 // INSERT
1164
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1165
-                gridButton.setToolTipText("Create grid");
1203
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204
+                gridButton.setToolTipText("Create ground");
1166
1205
                                 gridButton.addActionListener(this);
1167
1206
 
1168
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1207
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1169
1208
                 boxButton.setToolTipText("Create box");
1170
1209
                                 boxButton.addActionListener(this);
1171
1210
 
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);
1211
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1185
1212
                 superButton.setToolTipText("Create superellipsoid");
1186
1213
                                 superButton.addActionListener(this);
1187
1214
 
1188
-                if (Globals.ADVANCED)
1215
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
+                sphereButton.setToolTipText("Create sphere");
1217
+                                sphereButton.addActionListener(this);
1218
+
1219
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
+                coneButton.setToolTipText("Create cone");
1221
+                                coneButton.addActionListener(this);
1222
+
1223
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
+                torusButton.setToolTipText("Create torus");
1225
+                                torusButton.addActionListener(this);
1226
+
1227
+                if (false) //Globals.ADVANCED)
1189
1228
                 {
1190
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1229
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191
1230
                     kleinButton.setToolTipText("Create Klein bottle");
1192
1231
                                     kleinButton.addActionListener(this);
1193
1232
                 }
1194
1233
                 
1195
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1234
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1196
1235
                 particlesButton.setToolTipText("Create particle system");
1197
1236
                                particlesButton.addActionListener(this);
1198
1237
 
..
..
@@ -1200,31 +1239,31 @@
1200
1239
                 
1201
1240
                 cGridBag row2 = new cGridBag();
1202
1241
                 
1203
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1242
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204
1243
                 groupButton.setToolTipText("Create group");
1205
1244
                                groupButton.addActionListener(this);
1206
1245
 
1207
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1246
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1247
                 compositeButton.setToolTipText("Create composite");
1209
1248
                                compositeButton.addActionListener(this);
1210
1249
 
1211
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1250
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1212
1251
                 switchButton.setToolTipText("Create item switcher");
1213
1252
                                switchButton.addActionListener(this);
1214
1253
 
1215
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1254
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
1255
                 loopButton.setToolTipText("Create loop");
1217
1256
                                loopButton.addActionListener(this);
1218
1257
 
1219
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1258
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
1259
                 textureButton.setToolTipText("Create texture");
1221
1260
                                textureButton.addActionListener(this);
1222
1261
 
1223
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1262
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
1263
                 overlayButton.setToolTipText("Create overlay");
1225
1264
                                overlayButton.addActionListener(this);
1226
1265
 
1227
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1266
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
1267
                 lightButton.setToolTipText("Create light");
1229
1268
                                lightButton.addActionListener(this);
1230
1269
 
..
..
@@ -1234,6 +1273,11 @@
1234
1273
                 
1235
1274
                 CreateTexturePanel(textures);
1236
1275
                 
1276
+                int tabCount = resourcecontainer.getTabCount();
1277
+                
1278
+                if (tabCount > 0)
1279
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1280
+                
1237
1281
                 oe.toolboxPanel.add(textures);
1238
1282
                 
1239
1283
                 textures.preferredHeight = 100;
..
..
@@ -1241,11 +1285,11 @@
1241
1285
                 CreateSkyboxPanel(oe.skyboxPanel);
1242
1286
                 
1243
1287
                 // EDIT panel
1244
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1288
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1245
1289
                 editButton.setToolTipText("Pin selection controls");
1246
1290
 		editButton.addActionListener(this);
1247
1291
 
1248
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1292
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1249
1293
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1250
1294
 		uneditButton.addActionListener(this);
1251
1295
 
..
..
@@ -1253,7 +1297,7 @@
1253
1297
                 allParamsButton.setToolTipText("Show all controls");
1254
1298
 		allParamsButton.addActionListener(this);
1255
1299
 
1256
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1300
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1257
1301
                 clearPanelButton.setToolTipText("Clear all controls");
1258
1302
 		clearPanelButton.addActionListener(this);
1259
1303
 
..
..
@@ -1261,7 +1305,7 @@
1261
1305
                 //unselectButton.setToolTipText("Unselect");
1262
1306
 		//unselectButton.addActionListener(this);
1263
1307
 
1264
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1308
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1265
1309
                 flashSelectionButton.setToolTipText("Highlight selection");
1266
1310
 		flashSelectionButton.addActionListener(this);
1267
1311
                 
..
..
@@ -1284,6 +1328,8 @@
1284
1328
                 
1285
1329
                 cGridBag jSPPanel = new cGridBag();
1286
1330
 
1331
+            jSPPanel.preferredHeight = 20;
1332
+            
1287
1333
                 JScrollPane jSP;
1288
1334
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1289
1335
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1292,11 +1338,11 @@
1292
1338
                 oe.treePanel.add(jSPPanel);
1293
1339
                 oe.treePanel.Return();
1294
1340
 
1295
-                oe.treePanel.add(copyOptionsPanel);
1341
+                oe.treePanel.add(versionManagerPanel);
1296
1342
                 oe.treePanel.Return();
1297
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1298
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1299
-            sliderPane.preferredHeight = 1;
1343
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1344
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1345
+            versionSliderPane.preferredHeight = 3;
1300
1346
                 
1301
1347
 //        mainPanel.setDividerLocation(0.1); //1.0);
1302
1348
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1454,6 +1500,14 @@
1454
1500
 	
1455
1501
         void EditObject(Object3D obj)
1456
1502
         {
1503
+            //assert(obj instanceof Composite);
1504
+            
1505
+//            if (obj.versionlist == null)
1506
+//            {
1507
+//                obj.versionlist = new Object3D[100];
1508
+//                obj.versionindex = -1;
1509
+//            }
1510
+            
1457
1511
             cRadio radioButton = new cRadio(obj.name);
1458
1512
             
1459
1513
             // June 2019. Patch to avoid bug with transparency.
..
..
@@ -1478,6 +1532,7 @@
1478
1532
                     
1479
1533
             oe.SetupViews();
1480
1534
             
1535
+        if (Globals.DEBUG)
1481
1536
 		System.out.println("SetupViews");
1482
1537
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1483
1538
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2081,24 +2136,24 @@
2081
2136
             switch(axis)
2082
2137
             {
2083
2138
                 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;
2139
+                    vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2140
+                    vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2141
+                    vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2142
+                    vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2088
2143
                     norm = cVector.X;
2089
2144
                     break;
2090
2145
                 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;
2146
+                    vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2147
+                    vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2148
+                    vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2149
+                    vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2095
2150
                     norm = cVector.Y;
2096
2151
                     break;
2097
2152
                 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;
2153
+                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2154
+                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2155
+                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2156
+                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2102
2157
                     norm = cVector.Z;
2103
2158
                     break;
2104
2159
             }
..
..
@@ -2139,7 +2194,11 @@
2139
2194
             shadow.material = new cMaterial(obj.material);
2140
2195
             shadow.material.diffuse = 0.0001f;
2141
2196
             shadow.material.specular = 0.0001f;
2142
-            //shadow.projectedVertices[1].x = 300;
2197
+            shadow.material.opacity = 0.75f;
2198
+            
2199
+            AllocProjectedVertices(shadow);
2200
+        
2201
+            shadow.projectedVertices[1].x = 300;
2143
2202
             
2144
2203
             makeSomething(shadow);
2145
2204
         }
..
..
@@ -2660,27 +2719,35 @@
2660
2719
 		} else
2661
2720
 		if (source == loopItem || source == loopButton)
2662
2721
 		{
2722
+                    if (!group.selection.isEmpty())
2723
+                    {
2663
2724
                         Composite csg = new GroupLeaf();
2664
2725
                         csg.count = 5;
2665
-			group(csg);
2666
2726
                         Composite child = new cGroup("Branch");
2667
2727
                         csg.addChild(child);
2668
2728
                         child.addChild(csg);
2729
+			group(csg);
2730
+                    }
2669
2731
 		} else
2670
2732
 		if (source == doubleItem)
2671
2733
 		{
2734
+                    if (!group.selection.isEmpty())
2735
+                    {
2672
2736
                         Composite csg = new GroupLeaf("Fork");
2673
2737
                         csg.count = 5;
2674
-			group(csg);
2675
2738
                         Composite child = new cGroup("Branch A");
2676
2739
                         csg.addChild(child);
2677
2740
                         child.addChild(csg);
2678
2741
                         child = new cGroup("Branch B");
2679
2742
                         csg.addChild(child);
2680
2743
                         child.addChild(csg);
2744
+			group(csg);
2745
+                    }
2681
2746
 		} else
2682
2747
 		if (source == tripleItem)
2683
2748
 		{
2749
+                    if (!group.selection.isEmpty())
2750
+                    {
2684
2751
                         Composite csg = new GroupLeaf("Trident");
2685
2752
                         csg.count = 4;
2686
2753
 			group(csg);
..
..
@@ -2693,6 +2760,7 @@
2693
2760
                         child = new cGroup();
2694
2761
                         csg.addChild(child);
2695
2762
                         child.addChild(csg);
2763
+                    }
2696
2764
 		} else
2697
2765
 		if (source == computeAOItem)
2698
2766
 		{
..
..
@@ -3328,22 +3396,34 @@
3328
3396
 		} else
3329
3397
 		if (source == ungroupItem || source == ungroupButton)
3330
3398
 		{
3331
-                    boolean hasRoot = false;
3399
+                    boolean canUngroup = true;
3332
3400
                     
3333
3401
                     for (int i=0; i<group.selection.size(); i++)
3334
3402
                     {
3335
-                        if (group.selection.get(i) == group)
3403
+                        Object3D selectedItem = group.selection.get(i);
3404
+                        
3405
+                        if (selectedItem.Size() == 0)
3336
3406
                         {
3337
-                            hasRoot = true;
3407
+                            // Cannot ungroup leaves
3408
+                            canUngroup = false;
3409
+                            break;
3410
+                        }
3411
+                                
3412
+                        if (selectedItem == group)
3413
+                        {
3414
+                            // Cannot ungroup root
3415
+                            canUngroup = false;
3338
3416
                             break;
3339
3417
                         }
3340
3418
                     }
3341
3419
 
3342
-                    if (!hasRoot)
3420
+                    if (canUngroup)
3343
3421
                     {
3344
3422
                         for (int i=0; i<group.selection.size(); i++)
3345
3423
                         {
3346
-                            Ungroup(group.selection.get(i));
3424
+                            Object3D selectedItem = group.selection.get(i);
3425
+                            
3426
+                            Ungroup(selectedItem);
3347
3427
                         }
3348
3428
 
3349
3429
                         ClearSelection(false);
..
..
@@ -3394,6 +3474,10 @@
3394
3474
 		if (source == clearMaterialsItem)
3395
3475
                 {
3396
3476
 			ClearMaterials();
3477
+		} else
3478
+		if (source == clearVersionsItem)
3479
+                {
3480
+			ClearVersions();
3397
3481
 		} else
3398
3482
 		if (source == liveleavesItem)
3399
3483
                 {
..
..
@@ -3534,6 +3618,18 @@
3534
3618
 		if (source == transformChildrenItem)
3535
3619
 		{
3536
3620
                         TransformChildren();
3621
+		} else
3622
+		if (source == textureRatioRItem)
3623
+		{
3624
+                        TextureRatio(0);
3625
+		} else
3626
+		if (source == textureRatioGItem)
3627
+		{
3628
+                        TextureRatio(1);
3629
+		} else
3630
+		if (source == textureRatioBItem)
3631
+		{
3632
+                        TextureRatio(2);
3537
3633
 		} else
3538
3634
 		if (source == resetTransformItem)
3539
3635
 		{
..
..
@@ -3892,6 +3988,7 @@
3892
3988
                 } else
3893
3989
 		if (source == rootButton)
3894
3990
 		{
3991
+                    Replace();
3895
3992
                     Object3D obj;
3896
3993
                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3897
3994
                     {
..
..
@@ -3906,6 +4003,9 @@
3906
4003
 		if (source == closeButton)
3907
4004
 		{
3908
4005
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
4006
+                    if (copy.versionlist != null)
4007
+                        Replace();
4008
+                    
3909
4009
                     cRadio ab;
3910
4010
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3911
4011
                     {
..
..
@@ -4004,6 +4104,9 @@
4004
4104
 		} else
4005
4105
                 if(source instanceof cRadio)
4006
4106
 		{
4107
+                    if (copy.versionlist != null)
4108
+                        Replace();
4109
+                    
4007
4110
                     group.parent = keepparent;
4008
4111
                         group.attributes = 0;
4009
4112
                     //group.editWindow = null;
..
..
@@ -4028,8 +4131,6 @@
4028
4131
                     
4029
4132
                     copy = group;
4030
4133
                     
4031
-                    SetUndoStates();
4032
-
4033
4134
                     //Globals.theRenderer.object = group;
4034
4135
                     if(!useclient)
4035
4136
                     {
..
..
@@ -4057,6 +4158,31 @@
4057
4158
                      */
4058
4159
                     radio.layout.doClick();
4059
4160
                     
4161
+                    //assert(copy instanceof Composite);
4162
+                    
4163
+        if (copy.versionlist == null)
4164
+        {
4165
+            copy.versionindex = -1;
4166
+            
4167
+            // Cannot work with loops
4168
+            // To fix this issue, we first mark all nodes above the root,
4169
+            // and check if any of these nodes are reachable below the root.
4170
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4171
+            
4172
+            if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
4173
+            {
4174
+                copy.versionlist = new Object3D[100];
4175
+                
4176
+                //Save(true);
4177
+            }
4178
+            else
4179
+                copy.versionindex = -2;
4180
+            
4181
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4182
+        }
4183
+        
4184
+                    SetVersionStates();
4185
+
4060
4186
                     ClearUnpinned();
4061
4187
                     
4062
4188
                     //Grafreed.Assert(group != null);
..
..
@@ -4170,6 +4296,18 @@
4170
4296
             refreshContents();
4171
4297
         }
4172
4298
         
4299
+        void TextureRatio(int axis)
4300
+        {
4301
+            Object3D obj;
4302
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4303
+            {
4304
+                    obj = (Object3D)e.nextElement();
4305
+                    obj.TextureRatio(axis);
4306
+            }
4307
+
4308
+            refreshContents();
4309
+        }
4310
+        
4173
4311
         void ResetTransform()
4174
4312
         {
4175
4313
             ResetTransform(-1);
..
..
@@ -4185,42 +4323,8 @@
4185
4323
                     if (obj.toParent == null)
4186
4324
                         continue;
4187
4325
                     
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
-                    }
4326
+                    obj.ResetTransform(mask);
4327
+                    
4224
4328
                     if (obj.parent == null)
4225
4329
                     {
4226
4330
                         System.out.println("NULL PARENT!");
..
..
@@ -4729,6 +4833,12 @@
4729
4833
             {
4730
4834
 		Object3D obj = group.selection.get(i);
4731
4835
                 
4836
+                if (obj.toParent == null)
4837
+                {
4838
+                    obj.toParent = LA.newMatrix();
4839
+                    obj.fromParent = LA.newMatrix();
4840
+                }
4841
+                
4732
4842
                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
4733
4843
                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4734
4844
             }
..
..
@@ -5020,6 +5130,12 @@
5020
5130
 		refreshContents();
5021
5131
 	}
5022
5132
 	
5133
+	void ClearVersions()
5134
+	{
5135
+		group.selection.ClearVersions();
5136
+		refreshContents();
5137
+	}
5138
+	
5023
5139
 	void FlipV(boolean flip)
5024
5140
 	{
5025
5141
 		group.selection.FlipV(flip);
..
..
@@ -5291,10 +5407,26 @@
5291
5407
             flashSelectionButton.setEnabled(enabled);
5292
5408
             
5293
5409
             clearPanelButton.setEnabled(!listUI.isEmpty());
5410
+            
5411
+            boolean allComposites = true;
5412
+            
5413
+            if (group.selection != null)
5414
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5415
+            {
5416
+                    Object next = e.nextElement();
5417
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5418
+                    {
5419
+                        allComposites = false;
5420
+                        break;
5421
+                    }
5422
+            }
5423
+            
5424
+            rootButton.setEnabled(true); // allComposites);
5294
5425
         }
5295
5426
 
5296
5427
         void refreshContents(boolean cp)
5297
5428
         {
5429
+            if (Globals.ADVANCED)
5298
5430
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5299
5431
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5300
5432
             {
..
..
@@ -6188,11 +6320,11 @@
6188
6320
 	private MenuItem lookAtItem;
6189
6321
 	private MenuItem lookFromItem;
6190
6322
 	private MenuItem switchViewItem;
6191
-	private MenuItem cutItem;
6323
+	private JMenuItem cutItem;
6192
6324
 	private MenuItem undoItem;
6193
6325
 	private MenuItem redoItem;
6194
6326
 	private JMenuItem duplicateItem;
6195
-	private MenuItem cloneItem;
6327
+	private JMenuItem cloneItem;
6196
6328
 	private MenuItem cloneSupportItem;
6197
6329
 	private MenuItem overwriteGeoItem;
6198
6330
 	private MenuItem overwriteMatItem;
..
..
@@ -6213,13 +6345,13 @@
6213
6345
 	private MenuItem cloneGeometriesItem;
6214
6346
 	private MenuItem shareGeometriesItem;
6215
6347
 	private MenuItem mergeGeometriesItem;
6216
-	private MenuItem copyItem;
6348
+	private JMenuItem copyItem;
6217
6349
 	private MenuItem pasteItem;
6218
-	private MenuItem pasteIntoItem;
6219
-	private MenuItem pasteLinkItem;
6220
-	private MenuItem pasteCloneItem;
6221
-	private MenuItem pasteExpandItem;
6222
-	private MenuItem deleteItem;
6350
+	private JMenuItem pasteIntoItem;
6351
+	private JMenuItem pasteLinkItem;
6352
+	private JMenuItem pasteCloneItem;
6353
+	private JMenuItem pasteExpandItem;
6354
+	private JMenuItem deleteItem;
6223
6355
 	private MenuItem clearAllItem;
6224
6356
 	private MenuItem genUVItem;
6225
6357
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6245,6 +6377,7 @@
6245
6377
 	private MenuItem clipMeshItem;
6246
6378
 	private MenuItem smoothMeshItem;
6247
6379
 	private MenuItem clearMaterialsItem;
6380
+	private MenuItem clearVersionsItem;
6248
6381
         
6249
6382
 	private MenuItem liveleavesItem;
6250
6383
 	private MenuItem unliveleavesItem;
..
..
@@ -6268,13 +6401,16 @@
6268
6401
 	private MenuItem maxTexturesItem;
6269
6402
 	private MenuItem panoTexturesItem;
6270
6403
         
6404
+	private MenuItem textureRatioRItem;
6405
+	private MenuItem textureRatioGItem;
6406
+	private MenuItem textureRatioBItem;
6271
6407
 	private MenuItem resetCentroidItem;
6272
6408
 	private MenuItem resetCentroidXZItem;
6273
6409
 	private MenuItem resetTransformItem;
6274
6410
 	private MenuItem transformGeometryItem;
6275
6411
 	private MenuItem transformChildrenItem;
6276
6412
 	private MenuItem hideItem;
6277
-	private MenuItem grabItem;
6413
+	private JMenuItem grabItem;
6278
6414
 	private MenuItem backItem;
6279
6415
 	private MenuItem frontItem;
6280
6416
 	private MenuItem cameraItem;
..
..
@@ -6287,7 +6423,7 @@
6287
6423
 	private MenuItem switchTransfoItem;
6288
6424
 	private MenuItem morphItem;
6289
6425
 	private MenuItem linkerItem;
6290
-	private MenuItem ungroupItem;
6426
+	private JMenuItem ungroupItem;
6291
6427
 	private MenuItem editItem;
6292
6428
 	private MenuItem openWindowItem;
6293
6429
 	private MenuItem editLeafItem;