Faster JPG reader.

Normand Briere

2019-08-20 537f4ac57ae2b34f0a04fa63874c8ca6534c9a6d

 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,7 +934,7 @@
928
934
 	
929
935
         JTabbedPane resourcecontainer;
930
936
         cGridBag currenttab;
931
-        boolean added; // patch for jar
937
+        //boolean added; // patch for jar
932
938
                 
933
939
         int tabcount = 0;
934
940
         int colcount = 0;
..
..
@@ -940,33 +946,34 @@
940
946
         
941
947
     public void ResourceCallBack(String[] path)
942
948
     {
943
-        for (int i = 0; i < path.length; i++)
944
-            System.out.print(path[i] + "/");
945
-        System.out.println();
949
+//        for (int i = 0; i < path.length; i++)
950
+//            System.out.print(path[i] + "/");
951
+//        System.out.println();
946
952
         
947
953
         if (//rowcount == 0 ||
948
-                path.length == 1)
954
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
949
955
         {
950
956
             currenttab = new cGridBag();
951
-            added = false;
952
957
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
953
958
             currenttab.setName(tabname);
959
+            //added = false;
960
+            resourcecontainer.add(currenttab);
961
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
954
962
             rowcount = 1;
955
963
             colcount = 0;
956
964
             texturecount = 0;
957
965
         }
958
966
         
959
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
967
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
960
968
         {
961
-            if (!added)
969
+            //if (!added)
962
970
             {
963
-                added = true;
964
-                resourcecontainer.add(currenttab);
971
+                //added = true;
965
972
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
966
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
973
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
967
974
             }
968
975
             
969
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
976
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
970
977
             
971
978
             if (++colcount >= columns)
972
979
             {
..
..
@@ -1031,9 +1038,9 @@
1031
1038
         oe.radioPanel.add(dummyButton);
1032
1039
         oe.buttonGroup.add(dummyButton);
1033
1040
          */
1034
-                cGridBag copyOptionsPanel = new cGridBag();
1041
+                cGridBag versionManagerPanel = new cGridBag();
1035
1042
                                         
1036
-                copyOptionsPanel.preferredHeight = 2;
1043
+                versionManagerPanel.preferredHeight = 4;
1037
1044
                 
1038
1045
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1039
1046
                 
..
..
@@ -1060,25 +1067,25 @@
1060
1067
 //                        }
1061
1068
 //                });
1062
1069
                 
1063
-		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1070
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1064
1071
                 collapseButton.setToolTipText("Collapse toolbar");
1065
1072
 		collapseButton.addActionListener(this);
1066
1073
                 
1067
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1074
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1068
1075
                 maximize3DButton.setToolTipText("Maximize 3D view");
1069
1076
 		maximize3DButton.addActionListener(this);
1070
1077
                 
1071
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1078
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1072
1079
                 twoButton.setToolTipText("Show 3D view only");
1073
1080
 		twoButton.addActionListener(this);
1074
1081
                 this.fullscreenLayout = twoButton;
1075
1082
                 
1076
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1083
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1077
1084
                 threeButton.setToolTipText("Show controls and 3D view");
1078
1085
 		threeButton.addActionListener(this);
1079
1086
                 if (Globals.ADVANCED)
1080
1087
                 {
1081
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1088
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
1089
                 sixButton.setToolTipText("Show 3D view and controls");
1083
1090
 		sixButton.addActionListener(this);
1084
1091
                 }
..
..
@@ -1087,50 +1094,51 @@
1087
1094
 //		sevenButton.addActionListener(this);
1088
1095
                 //
1089
1096
                 
1090
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1097
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1091
1098
                 fullButton.setToolTipText("Full-screen window");
1092
1099
 		fullButton.addActionListener(this);
1093
1100
                 
1094
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1101
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1095
1102
                 screenfitButton.setToolTipText("Screen fit");
1096
1103
 		screenfitButton.addActionListener(this);
1097
1104
 
1098
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1099
1106
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1100
1107
 		restoreCameraButton.addActionListener(this);
1101
1108
                 
1102
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1109
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1103
1110
                 saveVersionButton.setToolTipText("Duplicate current version");
1104
1111
 		saveVersionButton.addActionListener(this);
1105
1112
                                                 
1106
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1107
1114
                 deleteVersionButton.setToolTipText("Delete current version");
1108
1115
 		deleteVersionButton.addActionListener(this);
1116
+                deleteVersionButton.setEnabled(false);
1109
1117
                                                 
1110
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1111
1119
                 previousVersionButton.setToolTipText("Previous version");
1112
1120
 		previousVersionButton.addActionListener(this);
1113
1121
                 previousVersionButton.setEnabled(false);
1114
1122
                 
1115
1123
                 cGridBag updown = new cGridBag().setVertical(true);
1116
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1125
                 restoreButton.setToolTipText("Undo (restore current version)");
1118
1126
 		restoreButton.addActionListener(this);
1119
-                //restoreButton.setEnabled(false);
1127
+                restoreButton.setEnabled(false);
1120
1128
                 
1121
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1122
1130
                 replaceButton.setToolTipText("Save (replace current version)");
1123
1131
 		replaceButton.addActionListener(this);
1124
-                //replaceButton.setEnabled(false);
1132
+                replaceButton.setEnabled(false);
1125
1133
                 
1126
-                copyOptionsPanel.add(updown);
1134
+                versionManagerPanel.add(updown);
1127
1135
                 
1128
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1129
1137
                 nextVersionButton.setToolTipText("Next version");
1130
1138
 		nextVersionButton.addActionListener(this);
1131
1139
                 nextVersionButton.setEnabled(false);
1132
1140
                 
1133
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1141
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1134
1142
                 oneStepButton.setToolTipText("Animate one step forward");
1135
1143
 		oneStepButton.addActionListener(this);
1136
1144
                 
..
..
@@ -1153,11 +1161,11 @@
1153
1161
 
1154
1162
                 if (Globals.ADVANCED)
1155
1163
                 {
1156
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1157
1165
                         snapobjectButton.addActionListener(this);
1158
1166
                         snapobjectButton.setToolTipText("Snap Object");
1159
1167
                         
1160
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1161
1169
 		fourButton.addActionListener(this);
1162
1170
                 fourButton.setToolTipText("Show control panel only");
1163
1171
                 }
..
..
@@ -1165,11 +1173,11 @@
1165
1173
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1166
1174
                 
1167
1175
 
1168
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1169
1177
                 rootButton.setToolTipText("Open selection in new tab");
1170
1178
 		rootButton.addActionListener(this);
1171
1179
 
1172
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1173
1181
                 closeButton.setToolTipText("Close tab");
1174
1182
 		closeButton.addActionListener(this);
1175
1183
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1178,38 +1186,38 @@
1178
1186
                 cGridBag row1 = new cGridBag();
1179
1187
                 
1180
1188
                 // INSERT
1181
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1189
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1182
1190
                 gridButton.setToolTipText("Create ground");
1183
1191
                                 gridButton.addActionListener(this);
1184
1192
 
1185
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1186
1194
                 boxButton.setToolTipText("Create box");
1187
1195
                                 boxButton.addActionListener(this);
1188
1196
 
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);
1197
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1202
1198
                 superButton.setToolTipText("Create superellipsoid");
1203
1199
                                 superButton.addActionListener(this);
1204
1200
 
1201
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1202
+                sphereButton.setToolTipText("Create sphere");
1203
+                                sphereButton.addActionListener(this);
1204
+
1205
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1206
+                coneButton.setToolTipText("Create cone");
1207
+                                coneButton.addActionListener(this);
1208
+
1209
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1210
+                torusButton.setToolTipText("Create torus");
1211
+                                torusButton.addActionListener(this);
1212
+
1205
1213
                 if (Globals.ADVANCED)
1206
1214
                 {
1207
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1215
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1216
                     kleinButton.setToolTipText("Create Klein bottle");
1209
1217
                                     kleinButton.addActionListener(this);
1210
1218
                 }
1211
1219
                 
1212
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
1221
                 particlesButton.setToolTipText("Create particle system");
1214
1222
                                particlesButton.addActionListener(this);
1215
1223
 
..
..
@@ -1217,31 +1225,31 @@
1217
1225
                 
1218
1226
                 cGridBag row2 = new cGridBag();
1219
1227
                 
1220
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1228
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1221
1229
                 groupButton.setToolTipText("Create group");
1222
1230
                                groupButton.addActionListener(this);
1223
1231
 
1224
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1225
1233
                 compositeButton.setToolTipText("Create composite");
1226
1234
                                compositeButton.addActionListener(this);
1227
1235
 
1228
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1229
1237
                 switchButton.setToolTipText("Create item switcher");
1230
1238
                                switchButton.addActionListener(this);
1231
1239
 
1232
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1233
1241
                 loopButton.setToolTipText("Create loop");
1234
1242
                                loopButton.addActionListener(this);
1235
1243
 
1236
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1237
1245
                 textureButton.setToolTipText("Create texture");
1238
1246
                                textureButton.addActionListener(this);
1239
1247
 
1240
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1241
1249
                 overlayButton.setToolTipText("Create overlay");
1242
1250
                                overlayButton.addActionListener(this);
1243
1251
 
1244
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1245
1253
                 lightButton.setToolTipText("Create light");
1246
1254
                                lightButton.addActionListener(this);
1247
1255
 
..
..
@@ -1251,6 +1259,11 @@
1251
1259
                 
1252
1260
                 CreateTexturePanel(textures);
1253
1261
                 
1262
+                int tabCount = resourcecontainer.getTabCount();
1263
+                
1264
+                if (tabCount > 0)
1265
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1266
+                
1254
1267
                 oe.toolboxPanel.add(textures);
1255
1268
                 
1256
1269
                 textures.preferredHeight = 100;
..
..
@@ -1258,11 +1271,11 @@
1258
1271
                 CreateSkyboxPanel(oe.skyboxPanel);
1259
1272
                 
1260
1273
                 // EDIT panel
1261
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1274
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1262
1275
                 editButton.setToolTipText("Pin selection controls");
1263
1276
 		editButton.addActionListener(this);
1264
1277
 
1265
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1278
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1266
1279
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1267
1280
 		uneditButton.addActionListener(this);
1268
1281
 
..
..
@@ -1270,7 +1283,7 @@
1270
1283
                 allParamsButton.setToolTipText("Show all controls");
1271
1284
 		allParamsButton.addActionListener(this);
1272
1285
 
1273
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1286
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1274
1287
                 clearPanelButton.setToolTipText("Clear all controls");
1275
1288
 		clearPanelButton.addActionListener(this);
1276
1289
 
..
..
@@ -1278,7 +1291,7 @@
1278
1291
                 //unselectButton.setToolTipText("Unselect");
1279
1292
 		//unselectButton.addActionListener(this);
1280
1293
 
1281
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1294
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1282
1295
                 flashSelectionButton.setToolTipText("Highlight selection");
1283
1296
 		flashSelectionButton.addActionListener(this);
1284
1297
                 
..
..
@@ -1301,6 +1314,8 @@
1301
1314
                 
1302
1315
                 cGridBag jSPPanel = new cGridBag();
1303
1316
 
1317
+            jSPPanel.preferredHeight = 20;
1318
+            
1304
1319
                 JScrollPane jSP;
1305
1320
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1306
1321
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1309,11 +1324,11 @@
1309
1324
                 oe.treePanel.add(jSPPanel);
1310
1325
                 oe.treePanel.Return();
1311
1326
 
1312
-                oe.treePanel.add(copyOptionsPanel);
1327
+                oe.treePanel.add(versionManagerPanel);
1313
1328
                 oe.treePanel.Return();
1314
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1315
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1316
-            sliderPane.preferredHeight = 1;
1329
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1330
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1331
+            versionSliderPane.preferredHeight = 3;
1317
1332
                 
1318
1333
 //        mainPanel.setDividerLocation(0.1); //1.0);
1319
1334
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1503,6 +1518,7 @@
1503
1518
                     
1504
1519
             oe.SetupViews();
1505
1520
             
1521
+        if (Globals.DEBUG)
1506
1522
 		System.out.println("SetupViews");
1507
1523
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1508
1524
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2164,7 +2180,11 @@
2164
2180
             shadow.material = new cMaterial(obj.material);
2165
2181
             shadow.material.diffuse = 0.0001f;
2166
2182
             shadow.material.specular = 0.0001f;
2167
-            //shadow.projectedVertices[1].x = 300;
2183
+            shadow.material.opacity = 0.75f;
2184
+            
2185
+            AllocProjectedVertices(shadow);
2186
+        
2187
+            shadow.projectedVertices[1].x = 300;
2168
2188
             
2169
2189
             makeSomething(shadow);
2170
2190
         }
..
..
@@ -3953,6 +3973,8 @@
3953
3973
 		if (source == closeButton)
3954
3974
 		{
3955
3975
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3976
+                    Replace();
3977
+                    
3956
3978
                     cRadio ab;
3957
3979
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3958
3980
                     {
..
..
@@ -4051,6 +4073,8 @@
4051
4073
 		} else
4052
4074
                 if(source instanceof cRadio)
4053
4075
 		{
4076
+                    Replace();
4077
+                    
4054
4078
                     group.parent = keepparent;
4055
4079
                         group.attributes = 0;
4056
4080
                     //group.editWindow = null;
..
..
@@ -4106,10 +4130,21 @@
4106
4130
                     
4107
4131
         if (copy.versionlist == null)
4108
4132
         {
4109
-            copy.versionlist = new Object3D[100];
4110
4133
             copy.versionindex = -1;
4111
4134
             
4112
-            Save(true);
4135
+            // Cannot work with loops
4136
+            // To fix this issue, we first mark all nodes above the root,
4137
+            // and check if any of these nodes are reachable below the root.
4138
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4139
+            
4140
+            if (!copy.HasTags())
4141
+            {
4142
+                copy.versionlist = new Object3D[100];
4143
+                
4144
+                Save(true);
4145
+            }
4146
+            
4147
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4113
4148
         }
4114
4149
         
4115
4150
                     SetVersionStates();
..
..
@@ -4257,7 +4292,7 @@
4257
4292
                         TouchTransform(obj);
4258
4293
                         continue;
4259
4294
                     }
4260
-                    if ((mask&2) != 0) // Scale
4295
+                    if ((mask&2) != 0) // Scale/rotation
4261
4296
                     {
4262
4297
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4263
4298
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4265,10 +4300,6 @@
4265
4300
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4266
4301
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4267
4302
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4268
-                    }
4269
-                    if ((mask&4) != 0) // Rotation
4270
-                    {
4271
-                        // ?
4272
4303
                     }
4273
4304
                     if ((mask&1) != 0) // Translation
4274
4305
                     {
..
..
@@ -5354,7 +5385,8 @@
5354
5385
             if (group.selection != null)
5355
5386
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5356
5387
             {
5357
-                    if (!(e.nextElement() instanceof Composite))
5388
+                    Object next = e.nextElement();
5389
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5358
5390
                     {
5359
5391
                         allComposites = false;
5360
5392
                         break;
..
..
@@ -5366,6 +5398,7 @@
5366
5398
 
5367
5399
         void refreshContents(boolean cp)
5368
5400
         {
5401
+            if (Globals.ADVANCED)
5369
5402
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5370
5403
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5371
5404
             {
..
..
@@ -6345,7 +6378,7 @@
6345
6378
 	private MenuItem transformGeometryItem;
6346
6379
 	private MenuItem transformChildrenItem;
6347
6380
 	private MenuItem hideItem;
6348
-	private MenuItem grabItem;
6381
+	private JMenuItem grabItem;
6349
6382
 	private MenuItem backItem;
6350
6383
 	private MenuItem frontItem;
6351
6384
 	private MenuItem cameraItem;