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
 
..
..
@@ -569,9 +571,6 @@
569
571
 //		pasteExpandItem.addActionListener(this);
570
572
 		//menu.add("-");
571
573
                 oe.jTree.popup.addSeparator();
572
-                
573
-		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
574
-		deleteItem.addActionListener(this);
575
574
                 
576
575
         if (Globals.ADVANCED)
577
576
         {
..
..
@@ -706,15 +705,17 @@
706
705
 		setMasterItem.addActionListener(this);
707
706
         }
708
707
                 
709
-		oe.menuBar.add(menu = new Menu("Group"));
710
-//		grabItem = menu.add(new MenuItem("Grab"));
711
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
712
710
 		backItem = menu.add(new MenuItem("Back"));
713
711
 		backItem.addActionListener(this);
714
712
 		frontItem = menu.add(new MenuItem("Front"));
715
713
 		frontItem.addActionListener(this);
716
714
 //		compositeItem = menu.add(new MenuItem("Composite"));
717
715
 //		compositeItem.addActionListener(this);
716
+                
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
718
719
                 
719
720
         if (Globals.ADVANCED)
720
721
         {
..
..
@@ -723,6 +724,11 @@
723
724
         }
724
725
 		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
725
726
 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
726
732
                 
727
733
 //		menu.add("-");
728
734
 //                
..
..
@@ -851,9 +857,9 @@
851
857
 		hideleavesItem.addActionListener(this);
852
858
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
853
859
 		showleavesItem.addActionListener(this);
854
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
855
861
 		markleavesItem.addActionListener(this);
856
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
857
863
 		unmarkleavesItem.addActionListener(this);
858
864
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
859
865
 		rewindleavesItem.addActionListener(this);
..
..
@@ -928,8 +934,10 @@
928
934
 	
929
935
         JTabbedPane resourcecontainer;
930
936
         cGridBag currenttab;
931
-        boolean added; // patch for jar
937
+        //boolean added; // patch for jar
932
938
                 
939
+        int totalcount = 0;
940
+        
933
941
         int tabcount = 0;
934
942
         int colcount = 0;
935
943
         int rowcount = 0;
..
..
@@ -940,33 +948,35 @@
940
948
         
941
949
     public void ResourceCallBack(String[] path)
942
950
     {
943
-        for (int i = 0; i < path.length; i++)
944
-            System.out.print(path[i] + "/");
945
-        System.out.println();
951
+//        for (int i = 0; i < path.length; i++)
952
+//            System.out.print(path[i] + "/");
953
+//        System.out.println();
946
954
         
947
955
         if (//rowcount == 0 ||
948
-                path.length == 1)
956
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
949
957
         {
950
958
             currenttab = new cGridBag();
951
-            added = false;
952
959
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
953
960
             currenttab.setName(tabname);
961
+            //added = false;
962
+            resourcecontainer.add(currenttab);
963
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
954
964
             rowcount = 1;
955
965
             colcount = 0;
956
966
             texturecount = 0;
957
967
         }
958
968
         
959
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
969
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
960
970
         {
961
-            if (!added)
971
+            //if (!added)
962
972
             {
963
-                added = true;
964
-                resourcecontainer.add(currenttab);
973
+                //added = true;
965
974
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
966
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
975
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
967
976
             }
968
977
             
969
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
978
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
979
+            totalcount++;
970
980
             
971
981
             if (++colcount >= columns)
972
982
             {
..
..
@@ -992,6 +1002,8 @@
992
1002
             container.add(resourcecontainer);
993
1003
             
994
1004
             Grafreed.ParseResources("textures", this);
1005
+            
1006
+            // 935. System.out.println("Total = " + totalcount);
995
1007
         }
996
1008
         
997
1009
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1031,9 +1043,9 @@
1031
1043
         oe.radioPanel.add(dummyButton);
1032
1044
         oe.buttonGroup.add(dummyButton);
1033
1045
          */
1034
-                cGridBag copyOptionsPanel = new cGridBag();
1046
+                cGridBag versionManagerPanel = new cGridBag();
1035
1047
                                         
1036
-                copyOptionsPanel.preferredHeight = 2;
1048
+                versionManagerPanel.preferredHeight = 4;
1037
1049
                 
1038
1050
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1039
1051
                 
..
..
@@ -1060,25 +1072,25 @@
1060
1072
 //                        }
1061
1073
 //                });
1062
1074
                 
1063
-		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);
1064
1076
                 collapseButton.setToolTipText("Collapse toolbar");
1065
1077
 		collapseButton.addActionListener(this);
1066
1078
                 
1067
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1079
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1068
1080
                 maximize3DButton.setToolTipText("Maximize 3D view");
1069
1081
 		maximize3DButton.addActionListener(this);
1070
1082
                 
1071
-		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);
1072
1084
                 twoButton.setToolTipText("Show 3D view only");
1073
1085
 		twoButton.addActionListener(this);
1074
1086
                 this.fullscreenLayout = twoButton;
1075
1087
                 
1076
-		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);
1077
1089
                 threeButton.setToolTipText("Show controls and 3D view");
1078
1090
 		threeButton.addActionListener(this);
1079
1091
                 if (Globals.ADVANCED)
1080
1092
                 {
1081
-		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);
1082
1094
                 sixButton.setToolTipText("Show 3D view and controls");
1083
1095
 		sixButton.addActionListener(this);
1084
1096
                 }
..
..
@@ -1087,50 +1099,51 @@
1087
1099
 //		sevenButton.addActionListener(this);
1088
1100
                 //
1089
1101
                 
1090
-		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);
1091
1103
                 fullButton.setToolTipText("Full-screen window");
1092
1104
 		fullButton.addActionListener(this);
1093
1105
                 
1094
-		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);
1095
1107
                 screenfitButton.setToolTipText("Screen fit");
1096
1108
 		screenfitButton.addActionListener(this);
1097
1109
 
1098
-		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);
1099
1111
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1100
1112
 		restoreCameraButton.addActionListener(this);
1101
1113
                 
1102
-		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);
1103
1115
                 saveVersionButton.setToolTipText("Duplicate current version");
1104
1116
 		saveVersionButton.addActionListener(this);
1105
1117
                                                 
1106
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1107
1119
                 deleteVersionButton.setToolTipText("Delete current version");
1108
1120
 		deleteVersionButton.addActionListener(this);
1121
+                deleteVersionButton.setEnabled(false);
1109
1122
                                                 
1110
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1111
1124
                 previousVersionButton.setToolTipText("Previous version");
1112
1125
 		previousVersionButton.addActionListener(this);
1113
1126
                 previousVersionButton.setEnabled(false);
1114
1127
                 
1115
1128
                 cGridBag updown = new cGridBag().setVertical(true);
1116
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1130
                 restoreButton.setToolTipText("Undo (restore current version)");
1118
1131
 		restoreButton.addActionListener(this);
1119
-                //restoreButton.setEnabled(false);
1132
+                restoreButton.setEnabled(false);
1120
1133
                 
1121
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1122
1135
                 replaceButton.setToolTipText("Save (replace current version)");
1123
1136
 		replaceButton.addActionListener(this);
1124
-                //replaceButton.setEnabled(false);
1137
+                replaceButton.setEnabled(false);
1125
1138
                 
1126
-                copyOptionsPanel.add(updown);
1139
+                versionManagerPanel.add(updown);
1127
1140
                 
1128
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1141
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1129
1142
                 nextVersionButton.setToolTipText("Next version");
1130
1143
 		nextVersionButton.addActionListener(this);
1131
1144
                 nextVersionButton.setEnabled(false);
1132
1145
                 
1133
-		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);
1134
1147
                 oneStepButton.setToolTipText("Animate one step forward");
1135
1148
 		oneStepButton.addActionListener(this);
1136
1149
                 
..
..
@@ -1153,11 +1166,11 @@
1153
1166
 
1154
1167
                 if (Globals.ADVANCED)
1155
1168
                 {
1156
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1157
1170
                         snapobjectButton.addActionListener(this);
1158
1171
                         snapobjectButton.setToolTipText("Snap Object");
1159
1172
                         
1160
-		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);
1161
1174
 		fourButton.addActionListener(this);
1162
1175
                 fourButton.setToolTipText("Show control panel only");
1163
1176
                 }
..
..
@@ -1165,11 +1178,11 @@
1165
1178
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1166
1179
                 
1167
1180
 
1168
-		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);
1169
1182
                 rootButton.setToolTipText("Open selection in new tab");
1170
1183
 		rootButton.addActionListener(this);
1171
1184
 
1172
-                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);
1173
1186
                 closeButton.setToolTipText("Close tab");
1174
1187
 		closeButton.addActionListener(this);
1175
1188
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1178,38 +1191,38 @@
1178
1191
                 cGridBag row1 = new cGridBag();
1179
1192
                 
1180
1193
                 // INSERT
1181
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1182
1195
                 gridButton.setToolTipText("Create ground");
1183
1196
                                 gridButton.addActionListener(this);
1184
1197
 
1185
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1186
1199
                 boxButton.setToolTipText("Create box");
1187
1200
                                 boxButton.addActionListener(this);
1188
1201
 
1189
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1190
-                sphereButton.setToolTipText("Create sphere");
1191
-                                sphereButton.addActionListener(this);
1192
-
1193
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
-                coneButton.setToolTipText("Create cone");
1195
-                                coneButton.addActionListener(this);
1196
-
1197
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
-                torusButton.setToolTipText("Create torus");
1199
-                                torusButton.addActionListener(this);
1200
-
1201
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1202
1203
                 superButton.setToolTipText("Create superellipsoid");
1203
1204
                                 superButton.addActionListener(this);
1204
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
+
1205
1218
                 if (Globals.ADVANCED)
1206
1219
                 {
1207
-                    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);
1208
1221
                     kleinButton.setToolTipText("Create Klein bottle");
1209
1222
                                     kleinButton.addActionListener(this);
1210
1223
                 }
1211
1224
                 
1212
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1225
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
1226
                 particlesButton.setToolTipText("Create particle system");
1214
1227
                                particlesButton.addActionListener(this);
1215
1228
 
..
..
@@ -1217,31 +1230,31 @@
1217
1230
                 
1218
1231
                 cGridBag row2 = new cGridBag();
1219
1232
                 
1220
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1221
1234
                 groupButton.setToolTipText("Create group");
1222
1235
                                groupButton.addActionListener(this);
1223
1236
 
1224
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1225
1238
                 compositeButton.setToolTipText("Create composite");
1226
1239
                                compositeButton.addActionListener(this);
1227
1240
 
1228
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1229
1242
                 switchButton.setToolTipText("Create item switcher");
1230
1243
                                switchButton.addActionListener(this);
1231
1244
 
1232
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1233
1246
                 loopButton.setToolTipText("Create loop");
1234
1247
                                loopButton.addActionListener(this);
1235
1248
 
1236
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1237
1250
                 textureButton.setToolTipText("Create texture");
1238
1251
                                textureButton.addActionListener(this);
1239
1252
 
1240
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1253
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1241
1254
                 overlayButton.setToolTipText("Create overlay");
1242
1255
                                overlayButton.addActionListener(this);
1243
1256
 
1244
-                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);
1245
1258
                 lightButton.setToolTipText("Create light");
1246
1259
                                lightButton.addActionListener(this);
1247
1260
 
..
..
@@ -1251,6 +1264,11 @@
1251
1264
                 
1252
1265
                 CreateTexturePanel(textures);
1253
1266
                 
1267
+                int tabCount = resourcecontainer.getTabCount();
1268
+                
1269
+                if (tabCount > 0)
1270
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1271
+                
1254
1272
                 oe.toolboxPanel.add(textures);
1255
1273
                 
1256
1274
                 textures.preferredHeight = 100;
..
..
@@ -1258,11 +1276,11 @@
1258
1276
                 CreateSkyboxPanel(oe.skyboxPanel);
1259
1277
                 
1260
1278
                 // EDIT panel
1261
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1262
1280
                 editButton.setToolTipText("Pin selection controls");
1263
1281
 		editButton.addActionListener(this);
1264
1282
 
1265
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1266
1284
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1267
1285
 		uneditButton.addActionListener(this);
1268
1286
 
..
..
@@ -1270,7 +1288,7 @@
1270
1288
                 allParamsButton.setToolTipText("Show all controls");
1271
1289
 		allParamsButton.addActionListener(this);
1272
1290
 
1273
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1291
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1274
1292
                 clearPanelButton.setToolTipText("Clear all controls");
1275
1293
 		clearPanelButton.addActionListener(this);
1276
1294
 
..
..
@@ -1278,7 +1296,7 @@
1278
1296
                 //unselectButton.setToolTipText("Unselect");
1279
1297
 		//unselectButton.addActionListener(this);
1280
1298
 
1281
-		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);
1282
1300
                 flashSelectionButton.setToolTipText("Highlight selection");
1283
1301
 		flashSelectionButton.addActionListener(this);
1284
1302
                 
..
..
@@ -1301,6 +1319,8 @@
1301
1319
                 
1302
1320
                 cGridBag jSPPanel = new cGridBag();
1303
1321
 
1322
+            jSPPanel.preferredHeight = 20;
1323
+            
1304
1324
                 JScrollPane jSP;
1305
1325
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1306
1326
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1309,11 +1329,11 @@
1309
1329
                 oe.treePanel.add(jSPPanel);
1310
1330
                 oe.treePanel.Return();
1311
1331
 
1312
-                oe.treePanel.add(copyOptionsPanel);
1332
+                oe.treePanel.add(versionManagerPanel);
1313
1333
                 oe.treePanel.Return();
1314
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1315
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1316
-            sliderPane.preferredHeight = 1;
1334
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336
+            versionSliderPane.preferredHeight = 3;
1317
1337
                 
1318
1338
 //        mainPanel.setDividerLocation(0.1); //1.0);
1319
1339
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1503,6 +1523,7 @@
1503
1523
                     
1504
1524
             oe.SetupViews();
1505
1525
             
1526
+        if (Globals.DEBUG)
1506
1527
 		System.out.println("SetupViews");
1507
1528
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1508
1529
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2164,7 +2185,11 @@
2164
2185
             shadow.material = new cMaterial(obj.material);
2165
2186
             shadow.material.diffuse = 0.0001f;
2166
2187
             shadow.material.specular = 0.0001f;
2167
-            //shadow.projectedVertices[1].x = 300;
2188
+            shadow.material.opacity = 0.75f;
2189
+            
2190
+            AllocProjectedVertices(shadow);
2191
+        
2192
+            shadow.projectedVertices[1].x = 300;
2168
2193
             
2169
2194
             makeSomething(shadow);
2170
2195
         }
..
..
@@ -3953,6 +3978,8 @@
3953
3978
 		if (source == closeButton)
3954
3979
 		{
3955
3980
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3981
+                    Replace();
3982
+                    
3956
3983
                     cRadio ab;
3957
3984
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3958
3985
                     {
..
..
@@ -4051,6 +4078,8 @@
4051
4078
 		} else
4052
4079
                 if(source instanceof cRadio)
4053
4080
 		{
4081
+                    Replace();
4082
+                    
4054
4083
                     group.parent = keepparent;
4055
4084
                         group.attributes = 0;
4056
4085
                     //group.editWindow = null;
..
..
@@ -4106,10 +4135,21 @@
4106
4135
                     
4107
4136
         if (copy.versionlist == null)
4108
4137
         {
4109
-            copy.versionlist = new Object3D[100];
4110
4138
             copy.versionindex = -1;
4111
4139
             
4112
-            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);
4113
4153
         }
4114
4154
         
4115
4155
                     SetVersionStates();
..
..
@@ -4257,7 +4297,7 @@
4257
4297
                         TouchTransform(obj);
4258
4298
                         continue;
4259
4299
                     }
4260
-                    if ((mask&2) != 0) // Scale
4300
+                    if ((mask&2) != 0) // Scale/rotation
4261
4301
                     {
4262
4302
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4263
4303
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4265,10 +4305,6 @@
4265
4305
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4266
4306
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4267
4307
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4268
-                    }
4269
-                    if ((mask&4) != 0) // Rotation
4270
-                    {
4271
-                        // ?
4272
4308
                     }
4273
4309
                     if ((mask&1) != 0) // Translation
4274
4310
                     {
..
..
@@ -5354,7 +5390,8 @@
5354
5390
             if (group.selection != null)
5355
5391
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5356
5392
             {
5357
-                    if (!(e.nextElement() instanceof Composite))
5393
+                    Object next = e.nextElement();
5394
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5358
5395
                     {
5359
5396
                         allComposites = false;
5360
5397
                         break;
..
..
@@ -5366,6 +5403,7 @@
5366
5403
 
5367
5404
         void refreshContents(boolean cp)
5368
5405
         {
5406
+            if (Globals.ADVANCED)
5369
5407
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5370
5408
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5371
5409
             {
..
..
@@ -6345,7 +6383,7 @@
6345
6383
 	private MenuItem transformGeometryItem;
6346
6384
 	private MenuItem transformChildrenItem;
6347
6385
 	private MenuItem hideItem;
6348
-	private MenuItem grabItem;
6386
+	private JMenuItem grabItem;
6349
6387
 	private MenuItem backItem;
6350
6388
 	private MenuItem frontItem;
6351
6389
 	private MenuItem cameraItem;