Minor tuning

Normand Briere

2019-08-22 6a145f6c81dfcbe0653eda27d042efb48daa7512

 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);
..
..
@@ -415,12 +415,14 @@
415
415
 		this.copy = this.group = group;
416
416
 		//selectees = this.group.selectees;
417
417
 		
418
+                assert(false);
419
+                
418
420
         if (copy.versionlist == null)
419
421
         {
420
422
             copy.versionlist = new Object3D[100];
421
423
             copy.versionindex = -1;
422
424
             
423
-            Save(true);
425
+            //Save(true);
424
426
         }
425
427
         
426
428
 		if(ui)
..
..
@@ -449,7 +451,7 @@
449
451
             copy.versionlist = new Object3D[100];
450
452
             copy.versionindex = -1;
451
453
             
452
-            Save(true);
454
+            //Save(true);
453
455
         }
454
456
 	}
455
457
 
..
..
@@ -540,33 +542,35 @@
540
542
 //		menu.add("-");
541
543
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
542
544
 		duplicateItem.addActionListener(this);
543
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
544
547
 		cloneItem.addActionListener(this);
545
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
546
549
         {
547
550
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
548
551
 		cloneSupportItem.addActionListener(this);
549
552
         }
553
+                oe.jTree.popup.addSeparator();
550
554
 		menu.add("-");
551
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
552
556
 		cutItem.addActionListener(this);
553
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
554
558
 		copyItem.addActionListener(this);
555
559
 		pasteItem = menu.add(new MenuItem("Paste"));
556
560
 		pasteItem.addActionListener(this);
557
561
                 
558
-		menu.add("-");
559
-		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"));
560
565
 		pasteIntoItem.addActionListener(this);
561
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
562
567
 		pasteLinkItem.addActionListener(this);
563
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
564
569
 		pasteCloneItem.addActionListener(this);
565
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
566
571
 //		pasteExpandItem.addActionListener(this);
567
-		menu.add("-");
568
-		deleteItem = menu.add(new MenuItem("Delete"));
569
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
570
574
                 
571
575
         if (Globals.ADVANCED)
572
576
         {
..
..
@@ -701,9 +705,8 @@
701
705
 		setMasterItem.addActionListener(this);
702
706
         }
703
707
                 
704
-		oe.menuBar.add(menu = new Menu("Group"));
705
-//		grabItem = menu.add(new MenuItem("Grab"));
706
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
707
710
 		backItem = menu.add(new MenuItem("Back"));
708
711
 		backItem.addActionListener(this);
709
712
 		frontItem = menu.add(new MenuItem("Front"));
..
..
@@ -711,13 +714,21 @@
711
714
 //		compositeItem = menu.add(new MenuItem("Composite"));
712
715
 //		compositeItem.addActionListener(this);
713
716
                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
714
720
         if (Globals.ADVANCED)
715
721
         {
716
722
 		hideItem = menu.add(new MenuItem("Hidden Group"));
717
723
 		hideItem.addActionListener(this);
718
724
         }
719
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
720
726
 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
721
732
                 
722
733
 //		menu.add("-");
723
734
 //                
..
..
@@ -846,9 +857,9 @@
846
857
 		hideleavesItem.addActionListener(this);
847
858
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
848
859
 		showleavesItem.addActionListener(this);
849
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
850
861
 		markleavesItem.addActionListener(this);
851
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
852
863
 		unmarkleavesItem.addActionListener(this);
853
864
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
854
865
 		rewindleavesItem.addActionListener(this);
..
..
@@ -923,8 +934,10 @@
923
934
 	
924
935
         JTabbedPane resourcecontainer;
925
936
         cGridBag currenttab;
926
-        boolean added; // patch for jar
937
+        //boolean added; // patch for jar
927
938
                 
939
+        int totalcount = 0;
940
+        
928
941
         int tabcount = 0;
929
942
         int colcount = 0;
930
943
         int rowcount = 0;
..
..
@@ -940,28 +953,30 @@
940
953
 //        System.out.println();
941
954
         
942
955
         if (//rowcount == 0 ||
943
-                path.length == 1)
956
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
944
957
         {
945
958
             currenttab = new cGridBag();
946
-            added = false;
947
959
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
948
960
             currenttab.setName(tabname);
961
+            //added = false;
962
+            resourcecontainer.add(currenttab);
963
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
949
964
             rowcount = 1;
950
965
             colcount = 0;
951
966
             texturecount = 0;
952
967
         }
953
968
         
954
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
969
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
955
970
         {
956
-            if (!added)
971
+            //if (!added)
957
972
             {
958
-                added = true;
959
-                resourcecontainer.add(currenttab);
973
+                //added = true;
960
974
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
961
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
975
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
962
976
             }
963
977
             
964
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
978
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
979
+            totalcount++;
965
980
             
966
981
             if (++colcount >= columns)
967
982
             {
..
..
@@ -987,6 +1002,8 @@
987
1002
             container.add(resourcecontainer);
988
1003
             
989
1004
             Grafreed.ParseResources("textures", this);
1005
+            
1006
+            // 935. System.out.println("Total = " + totalcount);
990
1007
         }
991
1008
         
992
1009
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1026,9 +1043,9 @@
1026
1043
         oe.radioPanel.add(dummyButton);
1027
1044
         oe.buttonGroup.add(dummyButton);
1028
1045
          */
1029
-                cGridBag copyOptionsPanel = new cGridBag();
1046
+                cGridBag versionManagerPanel = new cGridBag();
1030
1047
                                         
1031
-                copyOptionsPanel.preferredHeight = 2;
1048
+                versionManagerPanel.preferredHeight = 4;
1032
1049
                 
1033
1050
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1034
1051
                 
..
..
@@ -1043,8 +1060,8 @@
1043
1060
 //                    maxButton.addActionListener(this);
1044
1061
                 }
1045
1062
                 
1046
-//                cButton gcButton;
1047
-//                
1063
+                cButton gcButton;
1064
+                
1048
1065
 //		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1049
1066
 //                gcButton.setToolTipText("Garbage collect");
1050
1067
 //                gcButton.addActionListener(new ActionListener()
..
..
@@ -1055,25 +1072,25 @@
1055
1072
 //                        }
1056
1073
 //                });
1057
1074
                 
1058
-		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1059
1076
                 collapseButton.setToolTipText("Collapse toolbar");
1060
1077
 		collapseButton.addActionListener(this);
1061
1078
                 
1062
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1079
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1063
1080
                 maximize3DButton.setToolTipText("Maximize 3D view");
1064
1081
 		maximize3DButton.addActionListener(this);
1065
1082
                 
1066
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1083
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1067
1084
                 twoButton.setToolTipText("Show 3D view only");
1068
1085
 		twoButton.addActionListener(this);
1069
1086
                 this.fullscreenLayout = twoButton;
1070
1087
                 
1071
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1088
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1072
1089
                 threeButton.setToolTipText("Show controls and 3D view");
1073
1090
 		threeButton.addActionListener(this);
1074
1091
                 if (Globals.ADVANCED)
1075
1092
                 {
1076
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1077
1094
                 sixButton.setToolTipText("Show 3D view and controls");
1078
1095
 		sixButton.addActionListener(this);
1079
1096
                 }
..
..
@@ -1082,50 +1099,51 @@
1082
1099
 //		sevenButton.addActionListener(this);
1083
1100
                 //
1084
1101
                 
1085
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1102
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1086
1103
                 fullButton.setToolTipText("Full-screen window");
1087
1104
 		fullButton.addActionListener(this);
1088
1105
                 
1089
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1090
1107
                 screenfitButton.setToolTipText("Screen fit");
1091
1108
 		screenfitButton.addActionListener(this);
1092
1109
 
1093
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1110
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1094
1111
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1095
1112
 		restoreCameraButton.addActionListener(this);
1096
1113
                 
1097
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1114
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1098
1115
                 saveVersionButton.setToolTipText("Duplicate current version");
1099
1116
 		saveVersionButton.addActionListener(this);
1100
1117
                                                 
1101
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1102
1119
                 deleteVersionButton.setToolTipText("Delete current version");
1103
1120
 		deleteVersionButton.addActionListener(this);
1121
+                deleteVersionButton.setEnabled(false);
1104
1122
                                                 
1105
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1106
1124
                 previousVersionButton.setToolTipText("Previous version");
1107
1125
 		previousVersionButton.addActionListener(this);
1108
1126
                 previousVersionButton.setEnabled(false);
1109
1127
                 
1110
1128
                 cGridBag updown = new cGridBag().setVertical(true);
1111
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1130
                 restoreButton.setToolTipText("Undo (restore current version)");
1113
1131
 		restoreButton.addActionListener(this);
1114
-                //restoreButton.setEnabled(false);
1132
+                restoreButton.setEnabled(false);
1115
1133
                 
1116
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1135
                 replaceButton.setToolTipText("Save (replace current version)");
1118
1136
 		replaceButton.addActionListener(this);
1119
-                //replaceButton.setEnabled(false);
1137
+                replaceButton.setEnabled(false);
1120
1138
                 
1121
-                copyOptionsPanel.add(updown);
1139
+                versionManagerPanel.add(updown);
1122
1140
                 
1123
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1141
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1124
1142
                 nextVersionButton.setToolTipText("Next version");
1125
1143
 		nextVersionButton.addActionListener(this);
1126
1144
                 nextVersionButton.setEnabled(false);
1127
1145
                 
1128
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1146
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1129
1147
                 oneStepButton.setToolTipText("Animate one step forward");
1130
1148
 		oneStepButton.addActionListener(this);
1131
1149
                 
..
..
@@ -1148,11 +1166,11 @@
1148
1166
 
1149
1167
                 if (Globals.ADVANCED)
1150
1168
                 {
1151
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1152
1170
                         snapobjectButton.addActionListener(this);
1153
1171
                         snapobjectButton.setToolTipText("Snap Object");
1154
1172
                         
1155
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1173
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1156
1174
 		fourButton.addActionListener(this);
1157
1175
                 fourButton.setToolTipText("Show control panel only");
1158
1176
                 }
..
..
@@ -1160,11 +1178,11 @@
1160
1178
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1161
1179
                 
1162
1180
 
1163
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1181
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1164
1182
                 rootButton.setToolTipText("Open selection in new tab");
1165
1183
 		rootButton.addActionListener(this);
1166
1184
 
1167
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1168
1186
                 closeButton.setToolTipText("Close tab");
1169
1187
 		closeButton.addActionListener(this);
1170
1188
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1173,38 +1191,38 @@
1173
1191
                 cGridBag row1 = new cGridBag();
1174
1192
                 
1175
1193
                 // INSERT
1176
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1177
1195
                 gridButton.setToolTipText("Create ground");
1178
1196
                                 gridButton.addActionListener(this);
1179
1197
 
1180
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1181
1199
                 boxButton.setToolTipText("Create box");
1182
1200
                                 boxButton.addActionListener(this);
1183
1201
 
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);
1202
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
1203
                 superButton.setToolTipText("Create superellipsoid");
1198
1204
                                 superButton.addActionListener(this);
1199
1205
 
1206
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207
+                sphereButton.setToolTipText("Create sphere");
1208
+                                sphereButton.addActionListener(this);
1209
+
1210
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1211
+                coneButton.setToolTipText("Create cone");
1212
+                                coneButton.addActionListener(this);
1213
+
1214
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1215
+                torusButton.setToolTipText("Create torus");
1216
+                                torusButton.addActionListener(this);
1217
+
1200
1218
                 if (Globals.ADVANCED)
1201
1219
                 {
1202
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1203
1221
                     kleinButton.setToolTipText("Create Klein bottle");
1204
1222
                                     kleinButton.addActionListener(this);
1205
1223
                 }
1206
1224
                 
1207
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1225
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1226
                 particlesButton.setToolTipText("Create particle system");
1209
1227
                                particlesButton.addActionListener(this);
1210
1228
 
..
..
@@ -1212,31 +1230,31 @@
1212
1230
                 
1213
1231
                 cGridBag row2 = new cGridBag();
1214
1232
                 
1215
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
1234
                 groupButton.setToolTipText("Create group");
1217
1235
                                groupButton.addActionListener(this);
1218
1236
 
1219
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
1238
                 compositeButton.setToolTipText("Create composite");
1221
1239
                                compositeButton.addActionListener(this);
1222
1240
 
1223
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
1242
                 switchButton.setToolTipText("Create item switcher");
1225
1243
                                switchButton.addActionListener(this);
1226
1244
 
1227
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
1246
                 loopButton.setToolTipText("Create loop");
1229
1247
                                loopButton.addActionListener(this);
1230
1248
 
1231
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1232
1250
                 textureButton.setToolTipText("Create texture");
1233
1251
                                textureButton.addActionListener(this);
1234
1252
 
1235
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1253
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
1254
                 overlayButton.setToolTipText("Create overlay");
1237
1255
                                overlayButton.addActionListener(this);
1238
1256
 
1239
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1257
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1240
1258
                 lightButton.setToolTipText("Create light");
1241
1259
                                lightButton.addActionListener(this);
1242
1260
 
..
..
@@ -1246,6 +1264,11 @@
1246
1264
                 
1247
1265
                 CreateTexturePanel(textures);
1248
1266
                 
1267
+                int tabCount = resourcecontainer.getTabCount();
1268
+                
1269
+                if (tabCount > 0)
1270
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1271
+                
1249
1272
                 oe.toolboxPanel.add(textures);
1250
1273
                 
1251
1274
                 textures.preferredHeight = 100;
..
..
@@ -1253,11 +1276,11 @@
1253
1276
                 CreateSkyboxPanel(oe.skyboxPanel);
1254
1277
                 
1255
1278
                 // EDIT panel
1256
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1257
1280
                 editButton.setToolTipText("Pin selection controls");
1258
1281
 		editButton.addActionListener(this);
1259
1282
 
1260
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1261
1284
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1262
1285
 		uneditButton.addActionListener(this);
1263
1286
 
..
..
@@ -1265,7 +1288,7 @@
1265
1288
                 allParamsButton.setToolTipText("Show all controls");
1266
1289
 		allParamsButton.addActionListener(this);
1267
1290
 
1268
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1291
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1269
1292
                 clearPanelButton.setToolTipText("Clear all controls");
1270
1293
 		clearPanelButton.addActionListener(this);
1271
1294
 
..
..
@@ -1273,7 +1296,7 @@
1273
1296
                 //unselectButton.setToolTipText("Unselect");
1274
1297
 		//unselectButton.addActionListener(this);
1275
1298
 
1276
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1299
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1277
1300
                 flashSelectionButton.setToolTipText("Highlight selection");
1278
1301
 		flashSelectionButton.addActionListener(this);
1279
1302
                 
..
..
@@ -1296,6 +1319,8 @@
1296
1319
                 
1297
1320
                 cGridBag jSPPanel = new cGridBag();
1298
1321
 
1322
+            jSPPanel.preferredHeight = 20;
1323
+            
1299
1324
                 JScrollPane jSP;
1300
1325
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1301
1326
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1304,11 +1329,11 @@
1304
1329
                 oe.treePanel.add(jSPPanel);
1305
1330
                 oe.treePanel.Return();
1306
1331
 
1307
-                oe.treePanel.add(copyOptionsPanel);
1332
+                oe.treePanel.add(versionManagerPanel);
1308
1333
                 oe.treePanel.Return();
1309
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1310
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1311
-            sliderPane.preferredHeight = 1;
1334
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336
+            versionSliderPane.preferredHeight = 3;
1312
1337
                 
1313
1338
 //        mainPanel.setDividerLocation(0.1); //1.0);
1314
1339
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1498,6 +1523,7 @@
1498
1523
                     
1499
1524
             oe.SetupViews();
1500
1525
             
1526
+        if (Globals.DEBUG)
1501
1527
 		System.out.println("SetupViews");
1502
1528
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1503
1529
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2159,7 +2185,11 @@
2159
2185
             shadow.material = new cMaterial(obj.material);
2160
2186
             shadow.material.diffuse = 0.0001f;
2161
2187
             shadow.material.specular = 0.0001f;
2162
-            //shadow.projectedVertices[1].x = 300;
2188
+            shadow.material.opacity = 0.75f;
2189
+            
2190
+            AllocProjectedVertices(shadow);
2191
+        
2192
+            shadow.projectedVertices[1].x = 300;
2163
2193
             
2164
2194
             makeSomething(shadow);
2165
2195
         }
..
..
@@ -2680,27 +2710,35 @@
2680
2710
 		} else
2681
2711
 		if (source == loopItem || source == loopButton)
2682
2712
 		{
2713
+                    if (!group.selection.isEmpty())
2714
+                    {
2683
2715
                         Composite csg = new GroupLeaf();
2684
2716
                         csg.count = 5;
2685
-			group(csg);
2686
2717
                         Composite child = new cGroup("Branch");
2687
2718
                         csg.addChild(child);
2688
2719
                         child.addChild(csg);
2720
+			group(csg);
2721
+                    }
2689
2722
 		} else
2690
2723
 		if (source == doubleItem)
2691
2724
 		{
2725
+                    if (!group.selection.isEmpty())
2726
+                    {
2692
2727
                         Composite csg = new GroupLeaf("Fork");
2693
2728
                         csg.count = 5;
2694
-			group(csg);
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
+			group(csg);
2736
+                    }
2701
2737
 		} else
2702
2738
 		if (source == tripleItem)
2703
2739
 		{
2740
+                    if (!group.selection.isEmpty())
2741
+                    {
2704
2742
                         Composite csg = new GroupLeaf("Trident");
2705
2743
                         csg.count = 4;
2706
2744
 			group(csg);
..
..
@@ -2713,6 +2751,7 @@
2713
2751
                         child = new cGroup();
2714
2752
                         csg.addChild(child);
2715
2753
                         child.addChild(csg);
2754
+                    }
2716
2755
 		} else
2717
2756
 		if (source == computeAOItem)
2718
2757
 		{
..
..
@@ -3348,22 +3387,34 @@
3348
3387
 		} else
3349
3388
 		if (source == ungroupItem || source == ungroupButton)
3350
3389
 		{
3351
-                    boolean hasRoot = false;
3390
+                    boolean canUngroup = true;
3352
3391
                     
3353
3392
                     for (int i=0; i<group.selection.size(); i++)
3354
3393
                     {
3355
-                        if (group.selection.get(i) == group)
3394
+                        Object3D selectedItem = group.selection.get(i);
3395
+                        
3396
+                        if (selectedItem.Size() == 0)
3356
3397
                         {
3357
-                            hasRoot = true;
3398
+                            // Cannot ungroup leaves
3399
+                            canUngroup = false;
3400
+                            break;
3401
+                        }
3402
+                                
3403
+                        if (selectedItem == group)
3404
+                        {
3405
+                            // Cannot ungroup root
3406
+                            canUngroup = false;
3358
3407
                             break;
3359
3408
                         }
3360
3409
                     }
3361
3410
 
3362
-                    if (!hasRoot)
3411
+                    if (canUngroup)
3363
3412
                     {
3364
3413
                         for (int i=0; i<group.selection.size(); i++)
3365
3414
                         {
3366
-                            Ungroup(group.selection.get(i));
3415
+                            Object3D selectedItem = group.selection.get(i);
3416
+                            
3417
+                            Ungroup(selectedItem);
3367
3418
                         }
3368
3419
 
3369
3420
                         ClearSelection(false);
..
..
@@ -3927,6 +3978,8 @@
3927
3978
 		if (source == closeButton)
3928
3979
 		{
3929
3980
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3981
+                    Replace();
3982
+                    
3930
3983
                     cRadio ab;
3931
3984
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3932
3985
                     {
..
..
@@ -4025,6 +4078,8 @@
4025
4078
 		} else
4026
4079
                 if(source instanceof cRadio)
4027
4080
 		{
4081
+                    Replace();
4082
+                    
4028
4083
                     group.parent = keepparent;
4029
4084
                         group.attributes = 0;
4030
4085
                     //group.editWindow = null;
..
..
@@ -4080,10 +4135,21 @@
4080
4135
                     
4081
4136
         if (copy.versionlist == null)
4082
4137
         {
4083
-            copy.versionlist = new Object3D[100];
4084
4138
             copy.versionindex = -1;
4085
4139
             
4086
-            Save(true);
4140
+            // Cannot work with loops
4141
+            // To fix this issue, we first mark all nodes above the root,
4142
+            // and check if any of these nodes are reachable below the root.
4143
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4144
+            
4145
+            if (!copy.HasTags())
4146
+            {
4147
+                copy.versionlist = new Object3D[100];
4148
+                
4149
+                Save(true);
4150
+            }
4151
+            
4152
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4087
4153
         }
4088
4154
         
4089
4155
                     SetVersionStates();
..
..
@@ -4231,7 +4297,7 @@
4231
4297
                         TouchTransform(obj);
4232
4298
                         continue;
4233
4299
                     }
4234
-                    if ((mask&2) != 0) // Scale
4300
+                    if ((mask&2) != 0) // Scale/rotation
4235
4301
                     {
4236
4302
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4237
4303
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4239,10 +4305,6 @@
4239
4305
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4240
4306
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4241
4307
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4242
-                    }
4243
-                    if ((mask&4) != 0) // Rotation
4244
-                    {
4245
-                        // ?
4246
4308
                     }
4247
4309
                     if ((mask&1) != 0) // Translation
4248
4310
                     {
..
..
@@ -5325,9 +5387,11 @@
5325
5387
             
5326
5388
             boolean allComposites = true;
5327
5389
             
5390
+            if (group.selection != null)
5328
5391
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5329
5392
             {
5330
-                    if (!(e.nextElement() instanceof Composite))
5393
+                    Object next = e.nextElement();
5394
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5331
5395
                     {
5332
5396
                         allComposites = false;
5333
5397
                         break;
..
..
@@ -5339,6 +5403,7 @@
5339
5403
 
5340
5404
         void refreshContents(boolean cp)
5341
5405
         {
5406
+            if (Globals.ADVANCED)
5342
5407
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5343
5408
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5344
5409
             {
..
..
@@ -6232,11 +6297,11 @@
6232
6297
 	private MenuItem lookAtItem;
6233
6298
 	private MenuItem lookFromItem;
6234
6299
 	private MenuItem switchViewItem;
6235
-	private MenuItem cutItem;
6300
+	private JMenuItem cutItem;
6236
6301
 	private MenuItem undoItem;
6237
6302
 	private MenuItem redoItem;
6238
6303
 	private JMenuItem duplicateItem;
6239
-	private MenuItem cloneItem;
6304
+	private JMenuItem cloneItem;
6240
6305
 	private MenuItem cloneSupportItem;
6241
6306
 	private MenuItem overwriteGeoItem;
6242
6307
 	private MenuItem overwriteMatItem;
..
..
@@ -6257,13 +6322,13 @@
6257
6322
 	private MenuItem cloneGeometriesItem;
6258
6323
 	private MenuItem shareGeometriesItem;
6259
6324
 	private MenuItem mergeGeometriesItem;
6260
-	private MenuItem copyItem;
6325
+	private JMenuItem copyItem;
6261
6326
 	private MenuItem pasteItem;
6262
-	private MenuItem pasteIntoItem;
6263
-	private MenuItem pasteLinkItem;
6264
-	private MenuItem pasteCloneItem;
6265
-	private MenuItem pasteExpandItem;
6266
-	private MenuItem deleteItem;
6327
+	private JMenuItem pasteIntoItem;
6328
+	private JMenuItem pasteLinkItem;
6329
+	private JMenuItem pasteCloneItem;
6330
+	private JMenuItem pasteExpandItem;
6331
+	private JMenuItem deleteItem;
6267
6332
 	private MenuItem clearAllItem;
6268
6333
 	private MenuItem genUVItem;
6269
6334
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6318,7 +6383,7 @@
6318
6383
 	private MenuItem transformGeometryItem;
6319
6384
 	private MenuItem transformChildrenItem;
6320
6385
 	private MenuItem hideItem;
6321
-	private MenuItem grabItem;
6386
+	private JMenuItem grabItem;
6322
6387
 	private MenuItem backItem;
6323
6388
 	private MenuItem frontItem;
6324
6389
 	private MenuItem cameraItem;
..
..
@@ -6331,7 +6396,7 @@
6331
6396
 	private MenuItem switchTransfoItem;
6332
6397
 	private MenuItem morphItem;
6333
6398
 	private MenuItem linkerItem;
6334
-	private MenuItem ungroupItem;
6399
+	private JMenuItem ungroupItem;
6335
6400
 	private MenuItem editItem;
6336
6401
 	private MenuItem openWindowItem;
6337
6402
 	private MenuItem editLeafItem;