Figure panel.

Normand Briere

2019-09-02 21ac57b36a9e3b909853c7d64ac29b7ad72490a3

 GroupEditor.java
..
..
@@ -29,7 +29,7 @@
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
34
         skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
35
         skyboxButton.addActionListener(new ActionListener()
..
..
@@ -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
         {
..
..
@@ -347,7 +347,7 @@
347
347
 
348
348
     public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
349
     {
350
-        JTabbedPane skyboxpane = new JTabbedPane();
350
+        JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
351
         
352
352
         AddSkyboxTab0(skyboxpane);
353
353
         AddSkyboxTab1(skyboxpane);
..
..
@@ -366,16 +366,6 @@
366
366
         }
367
367
        
368
368
         refreshContents();
369
-    }
370
-
371
-    public void Show3DView()
372
-    {
373
-        // bug
374
-        //gridPanel.setDividerLocation(1.0);
375
-        //bigPanel.setDividerLocation(0.0);
376
-        bigThree.ClearUI();
377
-        bigThree.add(centralPanel);
378
-        bigThree.FlushUI();
379
369
     }
380
370
 
381
371
     //ObjEditor objEditor;
..
..
@@ -415,13 +405,15 @@
415
405
 		this.copy = this.group = group;
416
406
 		//selectees = this.group.selectees;
417
407
 		
418
-        if (copy.versionlist == null)
419
-        {
420
-            copy.versionlist = new Object3D[100];
421
-            copy.versionindex = -1;
422
-            
423
-            Save(true);
424
-        }
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
+//        }
425
417
         
426
418
 		if(ui)
427
419
                     SetupUI(objEditor);
..
..
@@ -444,13 +436,13 @@
444
436
                 
445
437
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446
438
                 
447
-        if (copy.versionlist == null)
448
-        {
449
-            copy.versionlist = new Object3D[100];
450
-            copy.versionindex = -1;
451
-            
452
-            Save(true);
453
-        }
439
+//        if (copy.versionlist == null)
440
+//        {
441
+//            copy.versionlist = new Object3D[100];
442
+//            copy.versionindex = -1;
443
+//            
444
+//            //Save(true);
445
+//        }
454
446
 	}
455
447
 
456
448
     void CloneSelection(boolean supports)
..
..
@@ -540,33 +532,35 @@
540
532
 //		menu.add("-");
541
533
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
542
534
 		duplicateItem.addActionListener(this);
543
-		cloneItem = menu.add(new MenuItem("Clone"));
535
+                
536
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
544
537
 		cloneItem.addActionListener(this);
545
-        if (Globals.ADVANCED)
538
+        //if (Globals.ADVANCED)
546
539
         {
547
540
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
548
541
 		cloneSupportItem.addActionListener(this);
549
542
         }
543
+                oe.jTree.popup.addSeparator();
550
544
 		menu.add("-");
551
-		cutItem = menu.add(new MenuItem("Cut"));
545
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
552
546
 		cutItem.addActionListener(this);
553
-		copyItem = menu.add(new MenuItem("Copy"));
547
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
554
548
 		copyItem.addActionListener(this);
555
549
 		pasteItem = menu.add(new MenuItem("Paste"));
556
550
 		pasteItem.addActionListener(this);
557
551
                 
558
-		menu.add("-");
559
-		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"));
560
555
 		pasteIntoItem.addActionListener(this);
561
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
556
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
562
557
 		pasteLinkItem.addActionListener(this);
563
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
558
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
564
559
 		pasteCloneItem.addActionListener(this);
565
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
560
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
566
561
 //		pasteExpandItem.addActionListener(this);
567
-		menu.add("-");
568
-		deleteItem = menu.add(new MenuItem("Delete"));
569
-		deleteItem.addActionListener(this);
562
+		//menu.add("-");
563
+                oe.jTree.popup.addSeparator();
570
564
                 
571
565
         if (Globals.ADVANCED)
572
566
         {
..
..
@@ -701,9 +695,8 @@
701
695
 		setMasterItem.addActionListener(this);
702
696
         }
703
697
                 
704
-		oe.menuBar.add(menu = new Menu("Group"));
705
-//		grabItem = menu.add(new MenuItem("Grab"));
706
-//		grabItem.addActionListener(this);
698
+		oe.menuBar.add(menu = new Menu("Order"));
699
+                
707
700
 		backItem = menu.add(new MenuItem("Back"));
708
701
 		backItem.addActionListener(this);
709
702
 		frontItem = menu.add(new MenuItem("Front"));
..
..
@@ -711,13 +704,21 @@
711
704
 //		compositeItem = menu.add(new MenuItem("Composite"));
712
705
 //		compositeItem.addActionListener(this);
713
706
                 
707
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
708
+		grabItem.addActionListener(this);
709
+                
714
710
         if (Globals.ADVANCED)
715
711
         {
716
712
 		hideItem = menu.add(new MenuItem("Hidden Group"));
717
713
 		hideItem.addActionListener(this);
718
714
         }
719
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
715
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
720
716
 		ungroupItem.addActionListener(this);
717
+                
718
+                oe.jTree.popup.addSeparator();
719
+                
720
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
721
+		deleteItem.addActionListener(this);
721
722
                 
722
723
 //		menu.add("-");
723
724
 //                
..
..
@@ -754,9 +755,9 @@
754
755
 		shadowYItem.addActionListener(this);
755
756
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
756
757
 		shadowZItem.addActionListener(this);
758
+                
757
759
 		attributeItem = menu.add(new MenuItem("Attribute"));
758
760
 		attributeItem.addActionListener(this);
759
-                
760
761
         if (Globals.ADVANCED)
761
762
         {
762
763
 		menu.add("-");
..
..
@@ -768,11 +769,18 @@
768
769
 		pointflowItem.addActionListener(this);
769
770
         }
770
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("-");
771
779
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
772
780
 		resetTransformItem.addActionListener(this);
773
781
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
774
782
 		resetCentroidItem.addActionListener(this);
775
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
783
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
776
784
 		resetCentroidXZItem.addActionListener(this);
777
785
 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
778
786
 		transformGeometryItem.addActionListener(this);
..
..
@@ -824,6 +832,8 @@
824
832
         }
825
833
 
826
834
                 oe.menuBar.add(menu = new Menu("Attributes"));
835
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
836
+		clearVersionsItem.addActionListener(this);
827
837
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
828
838
 		clearMaterialsItem.addActionListener(this);
829
839
                 resetAllItem = menu.add(new MenuItem("Reset All"));
..
..
@@ -846,9 +856,9 @@
846
856
 		hideleavesItem.addActionListener(this);
847
857
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
848
858
 		showleavesItem.addActionListener(this);
849
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
859
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
850
860
 		markleavesItem.addActionListener(this);
851
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
861
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
852
862
 		unmarkleavesItem.addActionListener(this);
853
863
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
854
864
 		rewindleavesItem.addActionListener(this);
..
..
@@ -923,8 +933,10 @@
923
933
 	
924
934
         JTabbedPane resourcecontainer;
925
935
         cGridBag currenttab;
926
-        boolean added; // patch for jar
936
+        //boolean added; // patch for jar
927
937
                 
938
+        int totalcount = 0;
939
+        
928
940
         int tabcount = 0;
929
941
         int colcount = 0;
930
942
         int rowcount = 0;
..
..
@@ -940,28 +952,30 @@
940
952
 //        System.out.println();
941
953
         
942
954
         if (//rowcount == 0 ||
943
-                path.length == 1)
955
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
944
956
         {
945
957
             currenttab = new cGridBag();
946
-            added = false;
947
958
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
948
959
             currenttab.setName(tabname);
960
+            //added = false;
961
+            resourcecontainer.add(currenttab);
962
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
949
963
             rowcount = 1;
950
964
             colcount = 0;
951
965
             texturecount = 0;
952
966
         }
953
967
         
954
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
968
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
955
969
         {
956
-            if (!added)
970
+            //if (!added)
957
971
             {
958
-                added = true;
959
-                resourcecontainer.add(currenttab);
972
+                //added = true;
960
973
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
961
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
974
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
962
975
             }
963
976
             
964
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
977
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
978
+            totalcount++;
965
979
             
966
980
             if (++colcount >= columns)
967
981
             {
..
..
@@ -987,6 +1001,8 @@
987
1001
             container.add(resourcecontainer);
988
1002
             
989
1003
             Grafreed.ParseResources("textures", this);
1004
+            
1005
+            // 935. System.out.println("Total = " + totalcount);
990
1006
         }
991
1007
         
992
1008
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1026,9 +1042,9 @@
1026
1042
         oe.radioPanel.add(dummyButton);
1027
1043
         oe.buttonGroup.add(dummyButton);
1028
1044
          */
1029
-                cGridBag copyOptionsPanel = new cGridBag();
1045
+                cGridBag versionManagerPanel = new cGridBag();
1030
1046
                                         
1031
-                copyOptionsPanel.preferredHeight = 2;
1047
+                versionManagerPanel.preferredHeight = 4;
1032
1048
                 
1033
1049
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1034
1050
                 
..
..
@@ -1055,25 +1071,29 @@
1055
1071
 //                        }
1056
1072
 //                });
1057
1073
                 
1058
-		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);
1059
1079
                 collapseButton.setToolTipText("Collapse toolbar");
1060
1080
 		collapseButton.addActionListener(this);
1061
1081
                 
1062
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
-                maximize3DButton.setToolTipText("Maximize 3D view");
1064
-		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);
1065
1085
                 
1066
-		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);
1067
1087
                 twoButton.setToolTipText("Show 3D view only");
1068
1088
 		twoButton.addActionListener(this);
1069
1089
                 this.fullscreenLayout = twoButton;
1070
1090
                 
1071
-		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);
1072
1092
                 threeButton.setToolTipText("Show controls and 3D view");
1073
1093
 		threeButton.addActionListener(this);
1074
1094
                 if (Globals.ADVANCED)
1075
1095
                 {
1076
-		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);
1077
1097
                 sixButton.setToolTipText("Show 3D view and controls");
1078
1098
 		sixButton.addActionListener(this);
1079
1099
                 }
..
..
@@ -1082,50 +1102,47 @@
1082
1102
 //		sevenButton.addActionListener(this);
1083
1103
                 //
1084
1104
                 
1085
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1086
-                fullButton.setToolTipText("Full-screen window");
1087
-		fullButton.addActionListener(this);
1088
-                
1089
-		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);
1090
1106
                 screenfitButton.setToolTipText("Screen fit");
1091
1107
 		screenfitButton.addActionListener(this);
1092
1108
 
1093
-		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);
1094
1110
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1095
1111
 		restoreCameraButton.addActionListener(this);
1096
1112
                 
1097
-		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);
1098
1114
                 saveVersionButton.setToolTipText("Duplicate current version");
1099
1115
 		saveVersionButton.addActionListener(this);
1100
1116
                                                 
1101
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1117
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1102
1118
                 deleteVersionButton.setToolTipText("Delete current version");
1103
1119
 		deleteVersionButton.addActionListener(this);
1120
+                deleteVersionButton.setEnabled(false);
1104
1121
                                                 
1105
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1122
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1106
1123
                 previousVersionButton.setToolTipText("Previous version");
1107
1124
 		previousVersionButton.addActionListener(this);
1108
1125
                 previousVersionButton.setEnabled(false);
1109
1126
                 
1110
1127
                 cGridBag updown = new cGridBag().setVertical(true);
1111
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1128
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1129
                 restoreButton.setToolTipText("Undo (restore current version)");
1113
1130
 		restoreButton.addActionListener(this);
1114
-                //restoreButton.setEnabled(false);
1131
+                restoreButton.setEnabled(false);
1115
1132
                 
1116
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1133
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1134
                 replaceButton.setToolTipText("Save (replace current version)");
1118
1135
 		replaceButton.addActionListener(this);
1119
-                //replaceButton.setEnabled(false);
1136
+                replaceButton.setEnabled(false);
1120
1137
                 
1121
-                copyOptionsPanel.add(updown);
1138
+                versionManagerPanel.add(updown);
1122
1139
                 
1123
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1124
1141
                 nextVersionButton.setToolTipText("Next version");
1125
1142
 		nextVersionButton.addActionListener(this);
1126
1143
                 nextVersionButton.setEnabled(false);
1127
1144
                 
1128
-		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);
1129
1146
                 oneStepButton.setToolTipText("Animate one step forward");
1130
1147
 		oneStepButton.addActionListener(this);
1131
1148
                 
..
..
@@ -1148,11 +1165,11 @@
1148
1165
 
1149
1166
                 if (Globals.ADVANCED)
1150
1167
                 {
1151
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1152
1169
                         snapobjectButton.addActionListener(this);
1153
1170
                         snapobjectButton.setToolTipText("Snap Object");
1154
1171
                         
1155
-		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);
1156
1173
 		fourButton.addActionListener(this);
1157
1174
                 fourButton.setToolTipText("Show control panel only");
1158
1175
                 }
..
..
@@ -1160,11 +1177,11 @@
1160
1177
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1161
1178
                 
1162
1179
 
1163
-		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);
1164
1181
                 rootButton.setToolTipText("Open selection in new tab");
1165
1182
 		rootButton.addActionListener(this);
1166
1183
 
1167
-                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);
1168
1185
                 closeButton.setToolTipText("Close tab");
1169
1186
 		closeButton.addActionListener(this);
1170
1187
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1173,38 +1190,38 @@
1173
1190
                 cGridBag row1 = new cGridBag();
1174
1191
                 
1175
1192
                 // INSERT
1176
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1177
1194
                 gridButton.setToolTipText("Create ground");
1178
1195
                                 gridButton.addActionListener(this);
1179
1196
 
1180
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1181
1198
                 boxButton.setToolTipText("Create box");
1182
1199
                                 boxButton.addActionListener(this);
1183
1200
 
1184
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185
-                sphereButton.setToolTipText("Create sphere");
1186
-                                sphereButton.addActionListener(this);
1187
-
1188
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1189
-                coneButton.setToolTipText("Create cone");
1190
-                                coneButton.addActionListener(this);
1191
-
1192
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
-                torusButton.setToolTipText("Create torus");
1194
-                                torusButton.addActionListener(this);
1195
-
1196
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1201
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
1202
                 superButton.setToolTipText("Create superellipsoid");
1198
1203
                                 superButton.addActionListener(this);
1199
1204
 
1200
-                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)
1201
1218
                 {
1202
-                    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);
1203
1220
                     kleinButton.setToolTipText("Create Klein bottle");
1204
1221
                                     kleinButton.addActionListener(this);
1205
1222
                 }
1206
1223
                 
1207
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1224
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1225
                 particlesButton.setToolTipText("Create particle system");
1209
1226
                                particlesButton.addActionListener(this);
1210
1227
 
..
..
@@ -1212,31 +1229,31 @@
1212
1229
                 
1213
1230
                 cGridBag row2 = new cGridBag();
1214
1231
                 
1215
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
1233
                 groupButton.setToolTipText("Create group");
1217
1234
                                groupButton.addActionListener(this);
1218
1235
 
1219
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
1237
                 compositeButton.setToolTipText("Create composite");
1221
1238
                                compositeButton.addActionListener(this);
1222
1239
 
1223
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
1241
                 switchButton.setToolTipText("Create item switcher");
1225
1242
                                switchButton.addActionListener(this);
1226
1243
 
1227
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
1245
                 loopButton.setToolTipText("Create loop");
1229
1246
                                loopButton.addActionListener(this);
1230
1247
 
1231
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1232
1249
                 textureButton.setToolTipText("Create texture");
1233
1250
                                textureButton.addActionListener(this);
1234
1251
 
1235
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
1253
                 overlayButton.setToolTipText("Create overlay");
1237
1254
                                overlayButton.addActionListener(this);
1238
1255
 
1239
-                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);
1240
1257
                 lightButton.setToolTipText("Create light");
1241
1258
                                lightButton.addActionListener(this);
1242
1259
 
..
..
@@ -1246,6 +1263,11 @@
1246
1263
                 
1247
1264
                 CreateTexturePanel(textures);
1248
1265
                 
1266
+                int tabCount = resourcecontainer.getTabCount();
1267
+                
1268
+                if (tabCount > 0)
1269
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1270
+                
1249
1271
                 oe.toolboxPanel.add(textures);
1250
1272
                 
1251
1273
                 textures.preferredHeight = 100;
..
..
@@ -1253,11 +1275,11 @@
1253
1275
                 CreateSkyboxPanel(oe.skyboxPanel);
1254
1276
                 
1255
1277
                 // EDIT panel
1256
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1278
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1257
1279
                 editButton.setToolTipText("Pin selection controls");
1258
1280
 		editButton.addActionListener(this);
1259
1281
 
1260
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1282
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1261
1283
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1262
1284
 		uneditButton.addActionListener(this);
1263
1285
 
..
..
@@ -1265,7 +1287,7 @@
1265
1287
                 allParamsButton.setToolTipText("Show all controls");
1266
1288
 		allParamsButton.addActionListener(this);
1267
1289
 
1268
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1290
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1269
1291
                 clearPanelButton.setToolTipText("Clear all controls");
1270
1292
 		clearPanelButton.addActionListener(this);
1271
1293
 
..
..
@@ -1273,7 +1295,7 @@
1273
1295
                 //unselectButton.setToolTipText("Unselect");
1274
1296
 		//unselectButton.addActionListener(this);
1275
1297
 
1276
-		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);
1277
1299
                 flashSelectionButton.setToolTipText("Highlight selection");
1278
1300
 		flashSelectionButton.addActionListener(this);
1279
1301
                 
..
..
@@ -1296,6 +1318,8 @@
1296
1318
                 
1297
1319
                 cGridBag jSPPanel = new cGridBag();
1298
1320
 
1321
+            jSPPanel.preferredHeight = 20;
1322
+            
1299
1323
                 JScrollPane jSP;
1300
1324
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1301
1325
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1304,11 +1328,11 @@
1304
1328
                 oe.treePanel.add(jSPPanel);
1305
1329
                 oe.treePanel.Return();
1306
1330
 
1307
-                oe.treePanel.add(copyOptionsPanel);
1331
+                oe.treePanel.add(versionManagerPanel);
1308
1332
                 oe.treePanel.Return();
1309
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1310
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1311
-            sliderPane.preferredHeight = 1;
1333
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1334
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1335
+            versionSliderPane.preferredHeight = 3;
1312
1336
                 
1313
1337
 //        mainPanel.setDividerLocation(0.1); //1.0);
1314
1338
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1466,7 +1490,7 @@
1466
1490
 	
1467
1491
         void EditObject(Object3D obj)
1468
1492
         {
1469
-            assert(obj instanceof Composite);
1493
+            //assert(obj instanceof Composite);
1470
1494
             
1471
1495
 //            if (obj.versionlist == null)
1472
1496
 //            {
..
..
@@ -1498,6 +1522,7 @@
1498
1522
                     
1499
1523
             oe.SetupViews();
1500
1524
             
1525
+        if (Globals.DEBUG)
1501
1526
 		System.out.println("SetupViews");
1502
1527
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1503
1528
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2101,24 +2126,24 @@
2101
2126
             switch(axis)
2102
2127
             {
2103
2128
                 case 0 :
2104
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2105
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2106
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2107
-                    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;
2108
2133
                     norm = cVector.X;
2109
2134
                     break;
2110
2135
                 case 1 :
2111
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2112
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2113
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2114
-                    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;
2115
2140
                     norm = cVector.Y;
2116
2141
                     break;
2117
2142
                 case 2 :
2118
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2119
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2120
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2121
-                    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;
2122
2147
                     norm = cVector.Z;
2123
2148
                     break;
2124
2149
             }
..
..
@@ -2159,7 +2184,11 @@
2159
2184
             shadow.material = new cMaterial(obj.material);
2160
2185
             shadow.material.diffuse = 0.0001f;
2161
2186
             shadow.material.specular = 0.0001f;
2162
-            //shadow.projectedVertices[1].x = 300;
2187
+            shadow.material.opacity = 0.75f;
2188
+            
2189
+            AllocProjectedVertices(shadow);
2190
+        
2191
+            shadow.projectedVertices[1].x = 300;
2163
2192
             
2164
2193
             makeSomething(shadow);
2165
2194
         }
..
..
@@ -2680,27 +2709,35 @@
2680
2709
 		} else
2681
2710
 		if (source == loopItem || source == loopButton)
2682
2711
 		{
2712
+                    if (!group.selection.isEmpty())
2713
+                    {
2683
2714
                         Composite csg = new GroupLeaf();
2684
-                        csg.count = 5;
2685
2715
 			group(csg);
2716
+                        csg.count = 5;
2686
2717
                         Composite child = new cGroup("Branch");
2687
2718
                         csg.addChild(child);
2688
2719
                         child.addChild(csg);
2720
+                    }
2689
2721
 		} else
2690
2722
 		if (source == doubleItem)
2691
2723
 		{
2724
+                    if (!group.selection.isEmpty())
2725
+                    {
2692
2726
                         Composite csg = new GroupLeaf("Fork");
2693
-                        csg.count = 5;
2694
2727
 			group(csg);
2728
+                        csg.count = 5;
2695
2729
                         Composite child = new cGroup("Branch A");
2696
2730
                         csg.addChild(child);
2697
2731
                         child.addChild(csg);
2698
2732
                         child = new cGroup("Branch B");
2699
2733
                         csg.addChild(child);
2700
2734
                         child.addChild(csg);
2735
+                    }
2701
2736
 		} else
2702
2737
 		if (source == tripleItem)
2703
2738
 		{
2739
+                    if (!group.selection.isEmpty())
2740
+                    {
2704
2741
                         Composite csg = new GroupLeaf("Trident");
2705
2742
                         csg.count = 4;
2706
2743
 			group(csg);
..
..
@@ -2713,6 +2750,7 @@
2713
2750
                         child = new cGroup();
2714
2751
                         csg.addChild(child);
2715
2752
                         child.addChild(csg);
2753
+                    }
2716
2754
 		} else
2717
2755
 		if (source == computeAOItem)
2718
2756
 		{
..
..
@@ -2759,7 +2797,7 @@
2759
2797
 		{
2760
2798
 			Maximize();
2761
2799
 		} else
2762
-		if (source == fullButton)
2800
+		if (source == fullScreenButton)
2763
2801
 		{
2764
2802
 			ToggleFullScreen();
2765
2803
 		} else
..
..
@@ -2768,13 +2806,13 @@
2768
2806
                         this.expandedLayout = radio.layout;
2769
2807
 			CollapseToolbar();
2770
2808
 		} else
2771
-		if (source == maximize3DButton)
2772
-		{
2773
-                        this.expandedLayout = radio.layout;
2774
-                        radio.layout = twoButton;
2775
-                        Show3DView();
2776
-			CollapseToolbar();
2777
-		} else
2809
+//		if (source == maximize3DButton)
2810
+//		{
2811
+//                        this.expandedLayout = radio.layout;
2812
+//                        radio.layout = twoButton;
2813
+//			CollapseToolbar();
2814
+//                        Show3DView();
2815
+//		} else
2778
2816
 		if (source == previousVersionButton)
2779
2817
 		{
2780
2818
                         // Go to previous version
..
..
@@ -3348,22 +3386,34 @@
3348
3386
 		} else
3349
3387
 		if (source == ungroupItem || source == ungroupButton)
3350
3388
 		{
3351
-                    boolean hasRoot = false;
3389
+                    boolean canUngroup = true;
3352
3390
                     
3353
3391
                     for (int i=0; i<group.selection.size(); i++)
3354
3392
                     {
3355
-                        if (group.selection.get(i) == group)
3393
+                        Object3D selectedItem = group.selection.get(i);
3394
+                        
3395
+                        if (selectedItem.Size() == 0)
3356
3396
                         {
3357
-                            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;
3358
3406
                             break;
3359
3407
                         }
3360
3408
                     }
3361
3409
 
3362
-                    if (!hasRoot)
3410
+                    if (canUngroup)
3363
3411
                     {
3364
3412
                         for (int i=0; i<group.selection.size(); i++)
3365
3413
                         {
3366
-                            Ungroup(group.selection.get(i));
3414
+                            Object3D selectedItem = group.selection.get(i);
3415
+                            
3416
+                            Ungroup(selectedItem);
3367
3417
                         }
3368
3418
 
3369
3419
                         ClearSelection(false);
..
..
@@ -3414,6 +3464,10 @@
3414
3464
 		if (source == clearMaterialsItem)
3415
3465
                 {
3416
3466
 			ClearMaterials();
3467
+		} else
3468
+		if (source == clearVersionsItem)
3469
+                {
3470
+			ClearVersions();
3417
3471
 		} else
3418
3472
 		if (source == liveleavesItem)
3419
3473
                 {
..
..
@@ -3554,6 +3608,18 @@
3554
3608
 		if (source == transformChildrenItem)
3555
3609
 		{
3556
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);
3557
3623
 		} else
3558
3624
 		if (source == resetTransformItem)
3559
3625
 		{
..
..
@@ -3927,6 +3993,9 @@
3927
3993
 		if (source == closeButton)
3928
3994
 		{
3929
3995
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3996
+                    if (copy.versionlist != null)
3997
+                        Replace();
3998
+                    
3930
3999
                     cRadio ab;
3931
4000
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3932
4001
                     {
..
..
@@ -4025,6 +4094,9 @@
4025
4094
 		} else
4026
4095
                 if(source instanceof cRadio)
4027
4096
 		{
4097
+                    if (copy.versionlist != null)
4098
+                        Replace();
4099
+                    
4028
4100
                     group.parent = keepparent;
4029
4101
                         group.attributes = 0;
4030
4102
                     //group.editWindow = null;
..
..
@@ -4076,14 +4148,28 @@
4076
4148
                      */
4077
4149
                     radio.layout.doClick();
4078
4150
                     
4079
-                    assert(copy instanceof Composite);
4151
+                    //assert(copy instanceof Composite);
4080
4152
                     
4081
4153
         if (copy.versionlist == null)
4082
4154
         {
4083
-            copy.versionlist = new Object3D[100];
4084
4155
             copy.versionindex = -1;
4085
4156
             
4086
-            Save(true);
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);
4087
4173
         }
4088
4174
         
4089
4175
                     SetVersionStates();
..
..
@@ -4201,6 +4287,18 @@
4201
4287
             refreshContents();
4202
4288
         }
4203
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
+        
4204
4302
         void ResetTransform()
4205
4303
         {
4206
4304
             ResetTransform(-1);
..
..
@@ -4216,42 +4314,8 @@
4216
4314
                     if (obj.toParent == null)
4217
4315
                         continue;
4218
4316
                     
4219
-                    if (mask == -1)
4220
-                    {
4221
-                        if (obj instanceof Camera) // jan 2014
4222
-                        {
4223
-                            LA.matIdentity(obj.toParent);
4224
-                            LA.matIdentity(obj.fromParent);
4225
-                        }
4226
-                        else
4227
-                        {
4228
-                            obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4229
-                            obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4230
-                        }
4231
-                        TouchTransform(obj);
4232
-                        continue;
4233
-                    }
4234
-                    if ((mask&2) != 0) // Scale
4235
-                    {
4236
-                        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4237
-                        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4238
-                        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4239
-                        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4240
-                        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4241
-                        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4242
-                    }
4243
-                    if ((mask&4) != 0) // Rotation
4244
-                    {
4245
-                        // ?
4246
-                    }
4247
-                    if ((mask&1) != 0) // Translation
4248
-                    {
4249
-                        if (obj.toParent != null)
4250
-                        {
4251
-                            obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4252
-                            obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4253
-                        }
4254
-                    }
4317
+                    obj.ResetTransform(mask);
4318
+                    
4255
4319
                     if (obj.parent == null)
4256
4320
                     {
4257
4321
                         System.out.println("NULL PARENT!");
..
..
@@ -4760,6 +4824,12 @@
4760
4824
             {
4761
4825
 		Object3D obj = group.selection.get(i);
4762
4826
                 
4827
+                if (obj.toParent == null)
4828
+                {
4829
+                    obj.toParent = LA.newMatrix();
4830
+                    obj.fromParent = LA.newMatrix();
4831
+                }
4832
+                
4763
4833
                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
4764
4834
                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4765
4835
             }
..
..
@@ -5051,6 +5121,12 @@
5051
5121
 		refreshContents();
5052
5122
 	}
5053
5123
 	
5124
+	void ClearVersions()
5125
+	{
5126
+		group.selection.ClearVersions();
5127
+		refreshContents();
5128
+	}
5129
+	
5054
5130
 	void FlipV(boolean flip)
5055
5131
 	{
5056
5132
 		group.selection.FlipV(flip);
..
..
@@ -5289,7 +5365,7 @@
5289
5365
 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5290
5366
                             // a camera
5291
5367
                         {
5292
-                            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
5293
5369
                             {
5294
5370
                                 CameraPane.camerachangeframe = 0; // don't refuse it
5295
5371
                                 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..
..
@@ -5328,18 +5404,20 @@
5328
5404
             if (group.selection != null)
5329
5405
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5330
5406
             {
5331
-                    if (!(e.nextElement() instanceof Composite))
5407
+                    Object next = e.nextElement();
5408
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5332
5409
                     {
5333
5410
                         allComposites = false;
5334
5411
                         break;
5335
5412
                     }
5336
5413
             }
5337
5414
             
5338
-            rootButton.setEnabled(allComposites);
5415
+            rootButton.setEnabled(true); // allComposites);
5339
5416
         }
5340
5417
 
5341
5418
         void refreshContents(boolean cp)
5342
5419
         {
5420
+            if (Globals.SHOWINFO)
5343
5421
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5344
5422
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5345
5423
             {
..
..
@@ -6233,11 +6311,11 @@
6233
6311
 	private MenuItem lookAtItem;
6234
6312
 	private MenuItem lookFromItem;
6235
6313
 	private MenuItem switchViewItem;
6236
-	private MenuItem cutItem;
6314
+	private JMenuItem cutItem;
6237
6315
 	private MenuItem undoItem;
6238
6316
 	private MenuItem redoItem;
6239
6317
 	private JMenuItem duplicateItem;
6240
-	private MenuItem cloneItem;
6318
+	private JMenuItem cloneItem;
6241
6319
 	private MenuItem cloneSupportItem;
6242
6320
 	private MenuItem overwriteGeoItem;
6243
6321
 	private MenuItem overwriteMatItem;
..
..
@@ -6258,13 +6336,13 @@
6258
6336
 	private MenuItem cloneGeometriesItem;
6259
6337
 	private MenuItem shareGeometriesItem;
6260
6338
 	private MenuItem mergeGeometriesItem;
6261
-	private MenuItem copyItem;
6339
+	private JMenuItem copyItem;
6262
6340
 	private MenuItem pasteItem;
6263
-	private MenuItem pasteIntoItem;
6264
-	private MenuItem pasteLinkItem;
6265
-	private MenuItem pasteCloneItem;
6266
-	private MenuItem pasteExpandItem;
6267
-	private MenuItem deleteItem;
6341
+	private JMenuItem pasteIntoItem;
6342
+	private JMenuItem pasteLinkItem;
6343
+	private JMenuItem pasteCloneItem;
6344
+	private JMenuItem pasteExpandItem;
6345
+	private JMenuItem deleteItem;
6268
6346
 	private MenuItem clearAllItem;
6269
6347
 	private MenuItem genUVItem;
6270
6348
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6290,6 +6368,7 @@
6290
6368
 	private MenuItem clipMeshItem;
6291
6369
 	private MenuItem smoothMeshItem;
6292
6370
 	private MenuItem clearMaterialsItem;
6371
+	private MenuItem clearVersionsItem;
6293
6372
         
6294
6373
 	private MenuItem liveleavesItem;
6295
6374
 	private MenuItem unliveleavesItem;
..
..
@@ -6313,13 +6392,16 @@
6313
6392
 	private MenuItem maxTexturesItem;
6314
6393
 	private MenuItem panoTexturesItem;
6315
6394
         
6395
+	private MenuItem textureRatioRItem;
6396
+	private MenuItem textureRatioGItem;
6397
+	private MenuItem textureRatioBItem;
6316
6398
 	private MenuItem resetCentroidItem;
6317
6399
 	private MenuItem resetCentroidXZItem;
6318
6400
 	private MenuItem resetTransformItem;
6319
6401
 	private MenuItem transformGeometryItem;
6320
6402
 	private MenuItem transformChildrenItem;
6321
6403
 	private MenuItem hideItem;
6322
-	private MenuItem grabItem;
6404
+	private JMenuItem grabItem;
6323
6405
 	private MenuItem backItem;
6324
6406
 	private MenuItem frontItem;
6325
6407
 	private MenuItem cameraItem;
..
..
@@ -6332,7 +6414,7 @@
6332
6414
 	private MenuItem switchTransfoItem;
6333
6415
 	private MenuItem morphItem;
6334
6416
 	private MenuItem linkerItem;
6335
-	private MenuItem ungroupItem;
6417
+	private JMenuItem ungroupItem;
6336
6418
 	private MenuItem editItem;
6337
6419
 	private MenuItem openWindowItem;
6338
6420
 	private MenuItem editLeafItem;