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
 
..
..
@@ -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,7 +934,7 @@
923
934
 	
924
935
         JTabbedPane resourcecontainer;
925
936
         cGridBag currenttab;
926
-        boolean added; // patch for jar
937
+        //boolean added; // patch for jar
927
938
                 
928
939
         int tabcount = 0;
929
940
         int colcount = 0;
..
..
@@ -940,28 +951,29 @@
940
951
 //        System.out.println();
941
952
         
942
953
         if (//rowcount == 0 ||
943
-                path.length == 1)
954
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
944
955
         {
945
956
             currenttab = new cGridBag();
946
-            added = false;
947
957
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
948
958
             currenttab.setName(tabname);
959
+            //added = false;
960
+            resourcecontainer.add(currenttab);
961
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
949
962
             rowcount = 1;
950
963
             colcount = 0;
951
964
             texturecount = 0;
952
965
         }
953
966
         
954
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
967
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
955
968
         {
956
-            if (!added)
969
+            //if (!added)
957
970
             {
958
-                added = true;
959
-                resourcecontainer.add(currenttab);
971
+                //added = true;
960
972
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
961
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
973
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
962
974
             }
963
975
             
964
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
976
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
965
977
             
966
978
             if (++colcount >= columns)
967
979
             {
..
..
@@ -1026,9 +1038,9 @@
1026
1038
         oe.radioPanel.add(dummyButton);
1027
1039
         oe.buttonGroup.add(dummyButton);
1028
1040
          */
1029
-                cGridBag copyOptionsPanel = new cGridBag();
1041
+                cGridBag versionManagerPanel = new cGridBag();
1030
1042
                                         
1031
-                copyOptionsPanel.preferredHeight = 2;
1043
+                versionManagerPanel.preferredHeight = 4;
1032
1044
                 
1033
1045
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1034
1046
                 
..
..
@@ -1055,25 +1067,25 @@
1055
1067
 //                        }
1056
1068
 //                });
1057
1069
                 
1058
-		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);
1059
1071
                 collapseButton.setToolTipText("Collapse toolbar");
1060
1072
 		collapseButton.addActionListener(this);
1061
1073
                 
1062
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1074
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1063
1075
                 maximize3DButton.setToolTipText("Maximize 3D view");
1064
1076
 		maximize3DButton.addActionListener(this);
1065
1077
                 
1066
-		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);
1067
1079
                 twoButton.setToolTipText("Show 3D view only");
1068
1080
 		twoButton.addActionListener(this);
1069
1081
                 this.fullscreenLayout = twoButton;
1070
1082
                 
1071
-		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);
1072
1084
                 threeButton.setToolTipText("Show controls and 3D view");
1073
1085
 		threeButton.addActionListener(this);
1074
1086
                 if (Globals.ADVANCED)
1075
1087
                 {
1076
-		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);
1077
1089
                 sixButton.setToolTipText("Show 3D view and controls");
1078
1090
 		sixButton.addActionListener(this);
1079
1091
                 }
..
..
@@ -1082,50 +1094,51 @@
1082
1094
 //		sevenButton.addActionListener(this);
1083
1095
                 //
1084
1096
                 
1085
-		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);
1086
1098
                 fullButton.setToolTipText("Full-screen window");
1087
1099
 		fullButton.addActionListener(this);
1088
1100
                 
1089
-		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);
1090
1102
                 screenfitButton.setToolTipText("Screen fit");
1091
1103
 		screenfitButton.addActionListener(this);
1092
1104
 
1093
-		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);
1094
1106
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1095
1107
 		restoreCameraButton.addActionListener(this);
1096
1108
                 
1097
-		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);
1098
1110
                 saveVersionButton.setToolTipText("Duplicate current version");
1099
1111
 		saveVersionButton.addActionListener(this);
1100
1112
                                                 
1101
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1102
1114
                 deleteVersionButton.setToolTipText("Delete current version");
1103
1115
 		deleteVersionButton.addActionListener(this);
1116
+                deleteVersionButton.setEnabled(false);
1104
1117
                                                 
1105
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1106
1119
                 previousVersionButton.setToolTipText("Previous version");
1107
1120
 		previousVersionButton.addActionListener(this);
1108
1121
                 previousVersionButton.setEnabled(false);
1109
1122
                 
1110
1123
                 cGridBag updown = new cGridBag().setVertical(true);
1111
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1125
                 restoreButton.setToolTipText("Undo (restore current version)");
1113
1126
 		restoreButton.addActionListener(this);
1114
-                //restoreButton.setEnabled(false);
1127
+                restoreButton.setEnabled(false);
1115
1128
                 
1116
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1130
                 replaceButton.setToolTipText("Save (replace current version)");
1118
1131
 		replaceButton.addActionListener(this);
1119
-                //replaceButton.setEnabled(false);
1132
+                replaceButton.setEnabled(false);
1120
1133
                 
1121
-                copyOptionsPanel.add(updown);
1134
+                versionManagerPanel.add(updown);
1122
1135
                 
1123
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1124
1137
                 nextVersionButton.setToolTipText("Next version");
1125
1138
 		nextVersionButton.addActionListener(this);
1126
1139
                 nextVersionButton.setEnabled(false);
1127
1140
                 
1128
-		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);
1129
1142
                 oneStepButton.setToolTipText("Animate one step forward");
1130
1143
 		oneStepButton.addActionListener(this);
1131
1144
                 
..
..
@@ -1148,11 +1161,11 @@
1148
1161
 
1149
1162
                 if (Globals.ADVANCED)
1150
1163
                 {
1151
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1152
1165
                         snapobjectButton.addActionListener(this);
1153
1166
                         snapobjectButton.setToolTipText("Snap Object");
1154
1167
                         
1155
-		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);
1156
1169
 		fourButton.addActionListener(this);
1157
1170
                 fourButton.setToolTipText("Show control panel only");
1158
1171
                 }
..
..
@@ -1160,11 +1173,11 @@
1160
1173
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1161
1174
                 
1162
1175
 
1163
-		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);
1164
1177
                 rootButton.setToolTipText("Open selection in new tab");
1165
1178
 		rootButton.addActionListener(this);
1166
1179
 
1167
-                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);
1168
1181
                 closeButton.setToolTipText("Close tab");
1169
1182
 		closeButton.addActionListener(this);
1170
1183
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1173,38 +1186,38 @@
1173
1186
                 cGridBag row1 = new cGridBag();
1174
1187
                 
1175
1188
                 // INSERT
1176
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1189
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1177
1190
                 gridButton.setToolTipText("Create ground");
1178
1191
                                 gridButton.addActionListener(this);
1179
1192
 
1180
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1181
1194
                 boxButton.setToolTipText("Create box");
1182
1195
                                 boxButton.addActionListener(this);
1183
1196
 
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);
1197
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
1198
                 superButton.setToolTipText("Create superellipsoid");
1198
1199
                                 superButton.addActionListener(this);
1199
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
+
1200
1213
                 if (Globals.ADVANCED)
1201
1214
                 {
1202
-                    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);
1203
1216
                     kleinButton.setToolTipText("Create Klein bottle");
1204
1217
                                     kleinButton.addActionListener(this);
1205
1218
                 }
1206
1219
                 
1207
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1221
                 particlesButton.setToolTipText("Create particle system");
1209
1222
                                particlesButton.addActionListener(this);
1210
1223
 
..
..
@@ -1212,31 +1225,31 @@
1212
1225
                 
1213
1226
                 cGridBag row2 = new cGridBag();
1214
1227
                 
1215
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1228
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
1229
                 groupButton.setToolTipText("Create group");
1217
1230
                                groupButton.addActionListener(this);
1218
1231
 
1219
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
1233
                 compositeButton.setToolTipText("Create composite");
1221
1234
                                compositeButton.addActionListener(this);
1222
1235
 
1223
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
1237
                 switchButton.setToolTipText("Create item switcher");
1225
1238
                                switchButton.addActionListener(this);
1226
1239
 
1227
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
1241
                 loopButton.setToolTipText("Create loop");
1229
1242
                                loopButton.addActionListener(this);
1230
1243
 
1231
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1232
1245
                 textureButton.setToolTipText("Create texture");
1233
1246
                                textureButton.addActionListener(this);
1234
1247
 
1235
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
1249
                 overlayButton.setToolTipText("Create overlay");
1237
1250
                                overlayButton.addActionListener(this);
1238
1251
 
1239
-                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);
1240
1253
                 lightButton.setToolTipText("Create light");
1241
1254
                                lightButton.addActionListener(this);
1242
1255
 
..
..
@@ -1246,6 +1259,11 @@
1246
1259
                 
1247
1260
                 CreateTexturePanel(textures);
1248
1261
                 
1262
+                int tabCount = resourcecontainer.getTabCount();
1263
+                
1264
+                if (tabCount > 0)
1265
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1266
+                
1249
1267
                 oe.toolboxPanel.add(textures);
1250
1268
                 
1251
1269
                 textures.preferredHeight = 100;
..
..
@@ -1253,11 +1271,11 @@
1253
1271
                 CreateSkyboxPanel(oe.skyboxPanel);
1254
1272
                 
1255
1273
                 // EDIT panel
1256
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1274
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1257
1275
                 editButton.setToolTipText("Pin selection controls");
1258
1276
 		editButton.addActionListener(this);
1259
1277
 
1260
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1278
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1261
1279
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1262
1280
 		uneditButton.addActionListener(this);
1263
1281
 
..
..
@@ -1265,7 +1283,7 @@
1265
1283
                 allParamsButton.setToolTipText("Show all controls");
1266
1284
 		allParamsButton.addActionListener(this);
1267
1285
 
1268
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1286
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1269
1287
                 clearPanelButton.setToolTipText("Clear all controls");
1270
1288
 		clearPanelButton.addActionListener(this);
1271
1289
 
..
..
@@ -1273,7 +1291,7 @@
1273
1291
                 //unselectButton.setToolTipText("Unselect");
1274
1292
 		//unselectButton.addActionListener(this);
1275
1293
 
1276
-		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);
1277
1295
                 flashSelectionButton.setToolTipText("Highlight selection");
1278
1296
 		flashSelectionButton.addActionListener(this);
1279
1297
                 
..
..
@@ -1296,6 +1314,8 @@
1296
1314
                 
1297
1315
                 cGridBag jSPPanel = new cGridBag();
1298
1316
 
1317
+            jSPPanel.preferredHeight = 20;
1318
+            
1299
1319
                 JScrollPane jSP;
1300
1320
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1301
1321
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1304,11 +1324,11 @@
1304
1324
                 oe.treePanel.add(jSPPanel);
1305
1325
                 oe.treePanel.Return();
1306
1326
 
1307
-                oe.treePanel.add(copyOptionsPanel);
1327
+                oe.treePanel.add(versionManagerPanel);
1308
1328
                 oe.treePanel.Return();
1309
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1310
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1311
-            sliderPane.preferredHeight = 1;
1329
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1330
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1331
+            versionSliderPane.preferredHeight = 3;
1312
1332
                 
1313
1333
 //        mainPanel.setDividerLocation(0.1); //1.0);
1314
1334
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1498,6 +1518,7 @@
1498
1518
                     
1499
1519
             oe.SetupViews();
1500
1520
             
1521
+        if (Globals.DEBUG)
1501
1522
 		System.out.println("SetupViews");
1502
1523
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1503
1524
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2159,7 +2180,11 @@
2159
2180
             shadow.material = new cMaterial(obj.material);
2160
2181
             shadow.material.diffuse = 0.0001f;
2161
2182
             shadow.material.specular = 0.0001f;
2162
-            //shadow.projectedVertices[1].x = 300;
2183
+            shadow.material.opacity = 0.75f;
2184
+            
2185
+            AllocProjectedVertices(shadow);
2186
+        
2187
+            shadow.projectedVertices[1].x = 300;
2163
2188
             
2164
2189
             makeSomething(shadow);
2165
2190
         }
..
..
@@ -2680,27 +2705,35 @@
2680
2705
 		} else
2681
2706
 		if (source == loopItem || source == loopButton)
2682
2707
 		{
2708
+                    if (!group.selection.isEmpty())
2709
+                    {
2683
2710
                         Composite csg = new GroupLeaf();
2684
2711
                         csg.count = 5;
2685
-			group(csg);
2686
2712
                         Composite child = new cGroup("Branch");
2687
2713
                         csg.addChild(child);
2688
2714
                         child.addChild(csg);
2715
+			group(csg);
2716
+                    }
2689
2717
 		} else
2690
2718
 		if (source == doubleItem)
2691
2719
 		{
2720
+                    if (!group.selection.isEmpty())
2721
+                    {
2692
2722
                         Composite csg = new GroupLeaf("Fork");
2693
2723
                         csg.count = 5;
2694
-			group(csg);
2695
2724
                         Composite child = new cGroup("Branch A");
2696
2725
                         csg.addChild(child);
2697
2726
                         child.addChild(csg);
2698
2727
                         child = new cGroup("Branch B");
2699
2728
                         csg.addChild(child);
2700
2729
                         child.addChild(csg);
2730
+			group(csg);
2731
+                    }
2701
2732
 		} else
2702
2733
 		if (source == tripleItem)
2703
2734
 		{
2735
+                    if (!group.selection.isEmpty())
2736
+                    {
2704
2737
                         Composite csg = new GroupLeaf("Trident");
2705
2738
                         csg.count = 4;
2706
2739
 			group(csg);
..
..
@@ -2713,6 +2746,7 @@
2713
2746
                         child = new cGroup();
2714
2747
                         csg.addChild(child);
2715
2748
                         child.addChild(csg);
2749
+                    }
2716
2750
 		} else
2717
2751
 		if (source == computeAOItem)
2718
2752
 		{
..
..
@@ -3348,22 +3382,34 @@
3348
3382
 		} else
3349
3383
 		if (source == ungroupItem || source == ungroupButton)
3350
3384
 		{
3351
-                    boolean hasRoot = false;
3385
+                    boolean canUngroup = true;
3352
3386
                     
3353
3387
                     for (int i=0; i<group.selection.size(); i++)
3354
3388
                     {
3355
-                        if (group.selection.get(i) == group)
3389
+                        Object3D selectedItem = group.selection.get(i);
3390
+                        
3391
+                        if (selectedItem.Size() == 0)
3356
3392
                         {
3357
-                            hasRoot = true;
3393
+                            // Cannot ungroup leaves
3394
+                            canUngroup = false;
3395
+                            break;
3396
+                        }
3397
+                                
3398
+                        if (selectedItem == group)
3399
+                        {
3400
+                            // Cannot ungroup root
3401
+                            canUngroup = false;
3358
3402
                             break;
3359
3403
                         }
3360
3404
                     }
3361
3405
 
3362
-                    if (!hasRoot)
3406
+                    if (canUngroup)
3363
3407
                     {
3364
3408
                         for (int i=0; i<group.selection.size(); i++)
3365
3409
                         {
3366
-                            Ungroup(group.selection.get(i));
3410
+                            Object3D selectedItem = group.selection.get(i);
3411
+                            
3412
+                            Ungroup(selectedItem);
3367
3413
                         }
3368
3414
 
3369
3415
                         ClearSelection(false);
..
..
@@ -3927,6 +3973,8 @@
3927
3973
 		if (source == closeButton)
3928
3974
 		{
3929
3975
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3976
+                    Replace();
3977
+                    
3930
3978
                     cRadio ab;
3931
3979
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3932
3980
                     {
..
..
@@ -4025,6 +4073,8 @@
4025
4073
 		} else
4026
4074
                 if(source instanceof cRadio)
4027
4075
 		{
4076
+                    Replace();
4077
+                    
4028
4078
                     group.parent = keepparent;
4029
4079
                         group.attributes = 0;
4030
4080
                     //group.editWindow = null;
..
..
@@ -4080,10 +4130,21 @@
4080
4130
                     
4081
4131
         if (copy.versionlist == null)
4082
4132
         {
4083
-            copy.versionlist = new Object3D[100];
4084
4133
             copy.versionindex = -1;
4085
4134
             
4086
-            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);
4087
4148
         }
4088
4149
         
4089
4150
                     SetVersionStates();
..
..
@@ -4231,7 +4292,7 @@
4231
4292
                         TouchTransform(obj);
4232
4293
                         continue;
4233
4294
                     }
4234
-                    if ((mask&2) != 0) // Scale
4295
+                    if ((mask&2) != 0) // Scale/rotation
4235
4296
                     {
4236
4297
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4237
4298
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4239,10 +4300,6 @@
4239
4300
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4240
4301
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4241
4302
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4242
-                    }
4243
-                    if ((mask&4) != 0) // Rotation
4244
-                    {
4245
-                        // ?
4246
4303
                     }
4247
4304
                     if ((mask&1) != 0) // Translation
4248
4305
                     {
..
..
@@ -5328,7 +5385,8 @@
5328
5385
             if (group.selection != null)
5329
5386
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5330
5387
             {
5331
-                    if (!(e.nextElement() instanceof Composite))
5388
+                    Object next = e.nextElement();
5389
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5332
5390
                     {
5333
5391
                         allComposites = false;
5334
5392
                         break;
..
..
@@ -5340,6 +5398,7 @@
5340
5398
 
5341
5399
         void refreshContents(boolean cp)
5342
5400
         {
5401
+            if (Globals.ADVANCED)
5343
5402
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5344
5403
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5345
5404
             {
..
..
@@ -6233,11 +6292,11 @@
6233
6292
 	private MenuItem lookAtItem;
6234
6293
 	private MenuItem lookFromItem;
6235
6294
 	private MenuItem switchViewItem;
6236
-	private MenuItem cutItem;
6295
+	private JMenuItem cutItem;
6237
6296
 	private MenuItem undoItem;
6238
6297
 	private MenuItem redoItem;
6239
6298
 	private JMenuItem duplicateItem;
6240
-	private MenuItem cloneItem;
6299
+	private JMenuItem cloneItem;
6241
6300
 	private MenuItem cloneSupportItem;
6242
6301
 	private MenuItem overwriteGeoItem;
6243
6302
 	private MenuItem overwriteMatItem;
..
..
@@ -6258,13 +6317,13 @@
6258
6317
 	private MenuItem cloneGeometriesItem;
6259
6318
 	private MenuItem shareGeometriesItem;
6260
6319
 	private MenuItem mergeGeometriesItem;
6261
-	private MenuItem copyItem;
6320
+	private JMenuItem copyItem;
6262
6321
 	private MenuItem pasteItem;
6263
-	private MenuItem pasteIntoItem;
6264
-	private MenuItem pasteLinkItem;
6265
-	private MenuItem pasteCloneItem;
6266
-	private MenuItem pasteExpandItem;
6267
-	private MenuItem deleteItem;
6322
+	private JMenuItem pasteIntoItem;
6323
+	private JMenuItem pasteLinkItem;
6324
+	private JMenuItem pasteCloneItem;
6325
+	private JMenuItem pasteExpandItem;
6326
+	private JMenuItem deleteItem;
6268
6327
 	private MenuItem clearAllItem;
6269
6328
 	private MenuItem genUVItem;
6270
6329
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6319,7 +6378,7 @@
6319
6378
 	private MenuItem transformGeometryItem;
6320
6379
 	private MenuItem transformChildrenItem;
6321
6380
 	private MenuItem hideItem;
6322
-	private MenuItem grabItem;
6381
+	private JMenuItem grabItem;
6323
6382
 	private MenuItem backItem;
6324
6383
 	private MenuItem frontItem;
6325
6384
 	private MenuItem cameraItem;
..
..
@@ -6332,7 +6391,7 @@
6332
6391
 	private MenuItem switchTransfoItem;
6333
6392
 	private MenuItem morphItem;
6334
6393
 	private MenuItem linkerItem;
6335
-	private MenuItem ungroupItem;
6394
+	private JMenuItem ungroupItem;
6336
6395
 	private MenuItem editItem;
6337
6396
 	private MenuItem openWindowItem;
6338
6397
 	private MenuItem editLeafItem;