Faster JPG reader.

Normand Briere

2019-08-20 537f4ac57ae2b34f0a04fa63874c8ca6534c9a6d

 GroupEditor.java
..
..
@@ -29,9 +29,9 @@
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
-        skyboxButton.setToolTipText(s);
34
+        skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
35
         skyboxButton.addActionListener(new ActionListener()
36
36
         {
37
37
                 @Override
..
..
@@ -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
         {
..
..
@@ -73,7 +73,7 @@
73
73
         cGridBag row5 = new cGridBag();
74
74
         cGridBag row6 = new cGridBag();
75
75
         
76
-        AddSkyboxButton("default", "rgb", row0);
76
+        AddSkyboxButton("default", "", row0);
77
77
         //AddSkyboxButton("default", "cornell", row0);
78
78
         AddSkyboxButton("penguins", "dust", row0);
79
79
         AddSkyboxButton("penguins", "tropic", row0);
..
..
@@ -330,15 +330,24 @@
330
330
         
331
331
     public void ChangeSkybox(String skybox)
332
332
     {
333
-        //cameraView.envyoff = false;
334
-        group.skyboxname = skybox;
335
-        group.skyboxext = "jpg";
336
-        cameraView.repaint();
333
+        if (skybox.endsWith("/"))
334
+        {
335
+            group.skyboxname = null;
336
+            group.skyboxext = null;
337
+            cameraView.repaint();
338
+        }
339
+        else
340
+        {
341
+            //cameraView.envyoff = false;
342
+            group.skyboxname = skybox;
343
+            group.skyboxext = "jpg";
344
+            cameraView.repaint();
345
+        }
337
346
     }
338
347
 
339
348
     public void CreateSkyboxPanel(cGridBag skyboxPanel)
340
349
     {
341
-        JTabbedPane skyboxpane = new JTabbedPane();
350
+        JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
342
351
         
343
352
         AddSkyboxTab0(skyboxpane);
344
353
         AddSkyboxTab1(skyboxpane);
..
..
@@ -406,12 +415,14 @@
406
415
 		this.copy = this.group = group;
407
416
 		//selectees = this.group.selectees;
408
417
 		
418
+                assert(false);
419
+                
409
420
         if (copy.versionlist == null)
410
421
         {
411
422
             copy.versionlist = new Object3D[100];
412
423
             copy.versionindex = -1;
413
424
             
414
-            Save(true);
425
+            //Save(true);
415
426
         }
416
427
         
417
428
 		if(ui)
..
..
@@ -440,7 +451,7 @@
440
451
             copy.versionlist = new Object3D[100];
441
452
             copy.versionindex = -1;
442
453
             
443
-            Save(true);
454
+            //Save(true);
444
455
         }
445
456
 	}
446
457
 
..
..
@@ -531,33 +542,35 @@
531
542
 //		menu.add("-");
532
543
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
533
544
 		duplicateItem.addActionListener(this);
534
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
535
547
 		cloneItem.addActionListener(this);
536
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
537
549
         {
538
550
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
539
551
 		cloneSupportItem.addActionListener(this);
540
552
         }
553
+                oe.jTree.popup.addSeparator();
541
554
 		menu.add("-");
542
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
543
556
 		cutItem.addActionListener(this);
544
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
545
558
 		copyItem.addActionListener(this);
546
559
 		pasteItem = menu.add(new MenuItem("Paste"));
547
560
 		pasteItem.addActionListener(this);
548
561
                 
549
-		menu.add("-");
550
-		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"));
551
565
 		pasteIntoItem.addActionListener(this);
552
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
553
567
 		pasteLinkItem.addActionListener(this);
554
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
555
569
 		pasteCloneItem.addActionListener(this);
556
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
557
571
 //		pasteExpandItem.addActionListener(this);
558
-		menu.add("-");
559
-		deleteItem = menu.add(new MenuItem("Delete"));
560
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
561
574
                 
562
575
         if (Globals.ADVANCED)
563
576
         {
..
..
@@ -692,9 +705,8 @@
692
705
 		setMasterItem.addActionListener(this);
693
706
         }
694
707
                 
695
-		oe.menuBar.add(menu = new Menu("Group"));
696
-//		grabItem = menu.add(new MenuItem("Grab"));
697
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
698
710
 		backItem = menu.add(new MenuItem("Back"));
699
711
 		backItem.addActionListener(this);
700
712
 		frontItem = menu.add(new MenuItem("Front"));
..
..
@@ -702,13 +714,21 @@
702
714
 //		compositeItem = menu.add(new MenuItem("Composite"));
703
715
 //		compositeItem.addActionListener(this);
704
716
                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
705
720
         if (Globals.ADVANCED)
706
721
         {
707
722
 		hideItem = menu.add(new MenuItem("Hidden Group"));
708
723
 		hideItem.addActionListener(this);
709
724
         }
710
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711
726
 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
712
732
                 
713
733
 //		menu.add("-");
714
734
 //                
..
..
@@ -837,9 +857,9 @@
837
857
 		hideleavesItem.addActionListener(this);
838
858
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
839
859
 		showleavesItem.addActionListener(this);
840
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
841
861
 		markleavesItem.addActionListener(this);
842
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
843
863
 		unmarkleavesItem.addActionListener(this);
844
864
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
845
865
 		rewindleavesItem.addActionListener(this);
..
..
@@ -914,7 +934,7 @@
914
934
 	
915
935
         JTabbedPane resourcecontainer;
916
936
         cGridBag currenttab;
917
-        boolean added; // patch for jar
937
+        //boolean added; // patch for jar
918
938
                 
919
939
         int tabcount = 0;
920
940
         int colcount = 0;
..
..
@@ -931,28 +951,29 @@
931
951
 //        System.out.println();
932
952
         
933
953
         if (//rowcount == 0 ||
934
-                path.length == 1)
954
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
935
955
         {
936
956
             currenttab = new cGridBag();
937
-            added = false;
938
957
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939
958
             currenttab.setName(tabname);
959
+            //added = false;
960
+            resourcecontainer.add(currenttab);
961
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
940
962
             rowcount = 1;
941
963
             colcount = 0;
942
964
             texturecount = 0;
943
965
         }
944
966
         
945
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
967
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
946
968
         {
947
-            if (!added)
969
+            //if (!added)
948
970
             {
949
-                added = true;
950
-                resourcecontainer.add(currenttab);
971
+                //added = true;
951
972
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
952
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
973
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
953
974
             }
954
975
             
955
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
976
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
956
977
             
957
978
             if (++colcount >= columns)
958
979
             {
..
..
@@ -1017,9 +1038,9 @@
1017
1038
         oe.radioPanel.add(dummyButton);
1018
1039
         oe.buttonGroup.add(dummyButton);
1019
1040
          */
1020
-                cGridBag copyOptionsPanel = new cGridBag();
1041
+                cGridBag versionManagerPanel = new cGridBag();
1021
1042
                                         
1022
-                copyOptionsPanel.preferredHeight = 2;
1043
+                versionManagerPanel.preferredHeight = 4;
1023
1044
                 
1024
1045
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1025
1046
                 
..
..
@@ -1034,8 +1055,8 @@
1034
1055
 //                    maxButton.addActionListener(this);
1035
1056
                 }
1036
1057
                 
1037
-//                cButton gcButton;
1038
-//                
1058
+                cButton gcButton;
1059
+                
1039
1060
 //		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040
1061
 //                gcButton.setToolTipText("Garbage collect");
1041
1062
 //                gcButton.addActionListener(new ActionListener()
..
..
@@ -1046,25 +1067,25 @@
1046
1067
 //                        }
1047
1068
 //                });
1048
1069
                 
1049
-		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);
1050
1071
                 collapseButton.setToolTipText("Collapse toolbar");
1051
1072
 		collapseButton.addActionListener(this);
1052
1073
                 
1053
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1074
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1054
1075
                 maximize3DButton.setToolTipText("Maximize 3D view");
1055
1076
 		maximize3DButton.addActionListener(this);
1056
1077
                 
1057
-		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);
1058
1079
                 twoButton.setToolTipText("Show 3D view only");
1059
1080
 		twoButton.addActionListener(this);
1060
1081
                 this.fullscreenLayout = twoButton;
1061
1082
                 
1062
-		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);
1063
1084
                 threeButton.setToolTipText("Show controls and 3D view");
1064
1085
 		threeButton.addActionListener(this);
1065
1086
                 if (Globals.ADVANCED)
1066
1087
                 {
1067
-		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);
1068
1089
                 sixButton.setToolTipText("Show 3D view and controls");
1069
1090
 		sixButton.addActionListener(this);
1070
1091
                 }
..
..
@@ -1073,50 +1094,51 @@
1073
1094
 //		sevenButton.addActionListener(this);
1074
1095
                 //
1075
1096
                 
1076
-		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);
1077
1098
                 fullButton.setToolTipText("Full-screen window");
1078
1099
 		fullButton.addActionListener(this);
1079
1100
                 
1080
-		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);
1081
1102
                 screenfitButton.setToolTipText("Screen fit");
1082
1103
 		screenfitButton.addActionListener(this);
1083
1104
 
1084
-		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);
1085
1106
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1086
1107
 		restoreCameraButton.addActionListener(this);
1087
1108
                 
1088
-		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);
1089
1110
                 saveVersionButton.setToolTipText("Duplicate current version");
1090
1111
 		saveVersionButton.addActionListener(this);
1091
1112
                                                 
1092
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1093
1114
                 deleteVersionButton.setToolTipText("Delete current version");
1094
1115
 		deleteVersionButton.addActionListener(this);
1116
+                deleteVersionButton.setEnabled(false);
1095
1117
                                                 
1096
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1097
1119
                 previousVersionButton.setToolTipText("Previous version");
1098
1120
 		previousVersionButton.addActionListener(this);
1099
1121
                 previousVersionButton.setEnabled(false);
1100
1122
                 
1101
1123
                 cGridBag updown = new cGridBag().setVertical(true);
1102
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1103
1125
                 restoreButton.setToolTipText("Undo (restore current version)");
1104
1126
 		restoreButton.addActionListener(this);
1105
-                //restoreButton.setEnabled(false);
1127
+                restoreButton.setEnabled(false);
1106
1128
                 
1107
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1108
1130
                 replaceButton.setToolTipText("Save (replace current version)");
1109
1131
 		replaceButton.addActionListener(this);
1110
-                //replaceButton.setEnabled(false);
1132
+                replaceButton.setEnabled(false);
1111
1133
                 
1112
-                copyOptionsPanel.add(updown);
1134
+                versionManagerPanel.add(updown);
1113
1135
                 
1114
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1115
1137
                 nextVersionButton.setToolTipText("Next version");
1116
1138
 		nextVersionButton.addActionListener(this);
1117
1139
                 nextVersionButton.setEnabled(false);
1118
1140
                 
1119
-		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);
1120
1142
                 oneStepButton.setToolTipText("Animate one step forward");
1121
1143
 		oneStepButton.addActionListener(this);
1122
1144
                 
..
..
@@ -1139,11 +1161,11 @@
1139
1161
 
1140
1162
                 if (Globals.ADVANCED)
1141
1163
                 {
1142
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1143
1165
                         snapobjectButton.addActionListener(this);
1144
1166
                         snapobjectButton.setToolTipText("Snap Object");
1145
1167
                         
1146
-		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);
1147
1169
 		fourButton.addActionListener(this);
1148
1170
                 fourButton.setToolTipText("Show control panel only");
1149
1171
                 }
..
..
@@ -1151,11 +1173,11 @@
1151
1173
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1152
1174
                 
1153
1175
 
1154
-		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);
1155
1177
                 rootButton.setToolTipText("Open selection in new tab");
1156
1178
 		rootButton.addActionListener(this);
1157
1179
 
1158
-                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);
1159
1181
                 closeButton.setToolTipText("Close tab");
1160
1182
 		closeButton.addActionListener(this);
1161
1183
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1164,38 +1186,38 @@
1164
1186
                 cGridBag row1 = new cGridBag();
1165
1187
                 
1166
1188
                 // INSERT
1167
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1189
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1168
1190
                 gridButton.setToolTipText("Create ground");
1169
1191
                                 gridButton.addActionListener(this);
1170
1192
 
1171
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1172
1194
                 boxButton.setToolTipText("Create box");
1173
1195
                                 boxButton.addActionListener(this);
1174
1196
 
1175
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176
-                sphereButton.setToolTipText("Create sphere");
1177
-                                sphereButton.addActionListener(this);
1178
-
1179
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
-                coneButton.setToolTipText("Create cone");
1181
-                                coneButton.addActionListener(this);
1182
-
1183
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184
-                torusButton.setToolTipText("Create torus");
1185
-                                torusButton.addActionListener(this);
1186
-
1187
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1188
1198
                 superButton.setToolTipText("Create superellipsoid");
1189
1199
                                 superButton.addActionListener(this);
1190
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
+
1191
1213
                 if (Globals.ADVANCED)
1192
1214
                 {
1193
-                    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);
1194
1216
                     kleinButton.setToolTipText("Create Klein bottle");
1195
1217
                                     kleinButton.addActionListener(this);
1196
1218
                 }
1197
1219
                 
1198
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1199
1221
                 particlesButton.setToolTipText("Create particle system");
1200
1222
                                particlesButton.addActionListener(this);
1201
1223
 
..
..
@@ -1203,31 +1225,31 @@
1203
1225
                 
1204
1226
                 cGridBag row2 = new cGridBag();
1205
1227
                 
1206
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1228
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207
1229
                 groupButton.setToolTipText("Create group");
1208
1230
                                groupButton.addActionListener(this);
1209
1231
 
1210
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1211
1233
                 compositeButton.setToolTipText("Create composite");
1212
1234
                                compositeButton.addActionListener(this);
1213
1235
 
1214
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1215
1237
                 switchButton.setToolTipText("Create item switcher");
1216
1238
                                switchButton.addActionListener(this);
1217
1239
 
1218
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1219
1241
                 loopButton.setToolTipText("Create loop");
1220
1242
                                loopButton.addActionListener(this);
1221
1243
 
1222
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1223
1245
                 textureButton.setToolTipText("Create texture");
1224
1246
                                textureButton.addActionListener(this);
1225
1247
 
1226
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1227
1249
                 overlayButton.setToolTipText("Create overlay");
1228
1250
                                overlayButton.addActionListener(this);
1229
1251
 
1230
-                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);
1231
1253
                 lightButton.setToolTipText("Create light");
1232
1254
                                lightButton.addActionListener(this);
1233
1255
 
..
..
@@ -1237,6 +1259,11 @@
1237
1259
                 
1238
1260
                 CreateTexturePanel(textures);
1239
1261
                 
1262
+                int tabCount = resourcecontainer.getTabCount();
1263
+                
1264
+                if (tabCount > 0)
1265
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1266
+                
1240
1267
                 oe.toolboxPanel.add(textures);
1241
1268
                 
1242
1269
                 textures.preferredHeight = 100;
..
..
@@ -1244,11 +1271,11 @@
1244
1271
                 CreateSkyboxPanel(oe.skyboxPanel);
1245
1272
                 
1246
1273
                 // EDIT panel
1247
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1274
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1248
1275
                 editButton.setToolTipText("Pin selection controls");
1249
1276
 		editButton.addActionListener(this);
1250
1277
 
1251
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1278
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1252
1279
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1253
1280
 		uneditButton.addActionListener(this);
1254
1281
 
..
..
@@ -1256,7 +1283,7 @@
1256
1283
                 allParamsButton.setToolTipText("Show all controls");
1257
1284
 		allParamsButton.addActionListener(this);
1258
1285
 
1259
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1286
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1260
1287
                 clearPanelButton.setToolTipText("Clear all controls");
1261
1288
 		clearPanelButton.addActionListener(this);
1262
1289
 
..
..
@@ -1264,7 +1291,7 @@
1264
1291
                 //unselectButton.setToolTipText("Unselect");
1265
1292
 		//unselectButton.addActionListener(this);
1266
1293
 
1267
-		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);
1268
1295
                 flashSelectionButton.setToolTipText("Highlight selection");
1269
1296
 		flashSelectionButton.addActionListener(this);
1270
1297
                 
..
..
@@ -1287,6 +1314,8 @@
1287
1314
                 
1288
1315
                 cGridBag jSPPanel = new cGridBag();
1289
1316
 
1317
+            jSPPanel.preferredHeight = 20;
1318
+            
1290
1319
                 JScrollPane jSP;
1291
1320
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1292
1321
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1295,11 +1324,11 @@
1295
1324
                 oe.treePanel.add(jSPPanel);
1296
1325
                 oe.treePanel.Return();
1297
1326
 
1298
-                oe.treePanel.add(copyOptionsPanel);
1327
+                oe.treePanel.add(versionManagerPanel);
1299
1328
                 oe.treePanel.Return();
1300
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1301
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1302
-            sliderPane.preferredHeight = 1;
1329
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1330
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1331
+            versionSliderPane.preferredHeight = 3;
1303
1332
                 
1304
1333
 //        mainPanel.setDividerLocation(0.1); //1.0);
1305
1334
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1459,11 +1488,11 @@
1459
1488
         {
1460
1489
             assert(obj instanceof Composite);
1461
1490
             
1462
-            if (obj.versionlist == null)
1463
-            {
1464
-                obj.versionlist = new Object3D[100];
1465
-                obj.versionindex = -1;
1466
-            }
1491
+//            if (obj.versionlist == null)
1492
+//            {
1493
+//                obj.versionlist = new Object3D[100];
1494
+//                obj.versionindex = -1;
1495
+//            }
1467
1496
             
1468
1497
             cRadio radioButton = new cRadio(obj.name);
1469
1498
             
..
..
@@ -1489,6 +1518,7 @@
1489
1518
                     
1490
1519
             oe.SetupViews();
1491
1520
             
1521
+        if (Globals.DEBUG)
1492
1522
 		System.out.println("SetupViews");
1493
1523
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1494
1524
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2150,7 +2180,11 @@
2150
2180
             shadow.material = new cMaterial(obj.material);
2151
2181
             shadow.material.diffuse = 0.0001f;
2152
2182
             shadow.material.specular = 0.0001f;
2153
-            //shadow.projectedVertices[1].x = 300;
2183
+            shadow.material.opacity = 0.75f;
2184
+            
2185
+            AllocProjectedVertices(shadow);
2186
+        
2187
+            shadow.projectedVertices[1].x = 300;
2154
2188
             
2155
2189
             makeSomething(shadow);
2156
2190
         }
..
..
@@ -2671,27 +2705,35 @@
2671
2705
 		} else
2672
2706
 		if (source == loopItem || source == loopButton)
2673
2707
 		{
2708
+                    if (!group.selection.isEmpty())
2709
+                    {
2674
2710
                         Composite csg = new GroupLeaf();
2675
2711
                         csg.count = 5;
2676
-			group(csg);
2677
2712
                         Composite child = new cGroup("Branch");
2678
2713
                         csg.addChild(child);
2679
2714
                         child.addChild(csg);
2715
+			group(csg);
2716
+                    }
2680
2717
 		} else
2681
2718
 		if (source == doubleItem)
2682
2719
 		{
2720
+                    if (!group.selection.isEmpty())
2721
+                    {
2683
2722
                         Composite csg = new GroupLeaf("Fork");
2684
2723
                         csg.count = 5;
2685
-			group(csg);
2686
2724
                         Composite child = new cGroup("Branch A");
2687
2725
                         csg.addChild(child);
2688
2726
                         child.addChild(csg);
2689
2727
                         child = new cGroup("Branch B");
2690
2728
                         csg.addChild(child);
2691
2729
                         child.addChild(csg);
2730
+			group(csg);
2731
+                    }
2692
2732
 		} else
2693
2733
 		if (source == tripleItem)
2694
2734
 		{
2735
+                    if (!group.selection.isEmpty())
2736
+                    {
2695
2737
                         Composite csg = new GroupLeaf("Trident");
2696
2738
                         csg.count = 4;
2697
2739
 			group(csg);
..
..
@@ -2704,6 +2746,7 @@
2704
2746
                         child = new cGroup();
2705
2747
                         csg.addChild(child);
2706
2748
                         child.addChild(csg);
2749
+                    }
2707
2750
 		} else
2708
2751
 		if (source == computeAOItem)
2709
2752
 		{
..
..
@@ -3339,22 +3382,34 @@
3339
3382
 		} else
3340
3383
 		if (source == ungroupItem || source == ungroupButton)
3341
3384
 		{
3342
-                    boolean hasRoot = false;
3385
+                    boolean canUngroup = true;
3343
3386
                     
3344
3387
                     for (int i=0; i<group.selection.size(); i++)
3345
3388
                     {
3346
-                        if (group.selection.get(i) == group)
3389
+                        Object3D selectedItem = group.selection.get(i);
3390
+                        
3391
+                        if (selectedItem.Size() == 0)
3347
3392
                         {
3348
-                            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;
3349
3402
                             break;
3350
3403
                         }
3351
3404
                     }
3352
3405
 
3353
-                    if (!hasRoot)
3406
+                    if (canUngroup)
3354
3407
                     {
3355
3408
                         for (int i=0; i<group.selection.size(); i++)
3356
3409
                         {
3357
-                            Ungroup(group.selection.get(i));
3410
+                            Object3D selectedItem = group.selection.get(i);
3411
+                            
3412
+                            Ungroup(selectedItem);
3358
3413
                         }
3359
3414
 
3360
3415
                         ClearSelection(false);
..
..
@@ -3918,6 +3973,8 @@
3918
3973
 		if (source == closeButton)
3919
3974
 		{
3920
3975
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3976
+                    Replace();
3977
+                    
3921
3978
                     cRadio ab;
3922
3979
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3923
3980
                     {
..
..
@@ -4016,6 +4073,8 @@
4016
4073
 		} else
4017
4074
                 if(source instanceof cRadio)
4018
4075
 		{
4076
+                    Replace();
4077
+                    
4019
4078
                     group.parent = keepparent;
4020
4079
                         group.attributes = 0;
4021
4080
                     //group.editWindow = null;
..
..
@@ -4067,7 +4126,28 @@
4067
4126
                      */
4068
4127
                     radio.layout.doClick();
4069
4128
                     
4070
-                    SetUndoStates();
4129
+                    assert(copy instanceof Composite);
4130
+                    
4131
+        if (copy.versionlist == null)
4132
+        {
4133
+            copy.versionindex = -1;
4134
+            
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);
4148
+        }
4149
+        
4150
+                    SetVersionStates();
4071
4151
 
4072
4152
                     ClearUnpinned();
4073
4153
                     
..
..
@@ -4212,7 +4292,7 @@
4212
4292
                         TouchTransform(obj);
4213
4293
                         continue;
4214
4294
                     }
4215
-                    if ((mask&2) != 0) // Scale
4295
+                    if ((mask&2) != 0) // Scale/rotation
4216
4296
                     {
4217
4297
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4218
4298
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4220,10 +4300,6 @@
4220
4300
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4221
4301
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4222
4302
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4223
-                    }
4224
-                    if ((mask&4) != 0) // Rotation
4225
-                    {
4226
-                        // ?
4227
4303
                     }
4228
4304
                     if ((mask&1) != 0) // Translation
4229
4305
                     {
..
..
@@ -5306,9 +5382,11 @@
5306
5382
             
5307
5383
             boolean allComposites = true;
5308
5384
             
5385
+            if (group.selection != null)
5309
5386
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310
5387
             {
5311
-                    if (!(e.nextElement() instanceof Composite))
5388
+                    Object next = e.nextElement();
5389
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5312
5390
                     {
5313
5391
                         allComposites = false;
5314
5392
                         break;
..
..
@@ -5320,6 +5398,7 @@
5320
5398
 
5321
5399
         void refreshContents(boolean cp)
5322
5400
         {
5401
+            if (Globals.ADVANCED)
5323
5402
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5324
5403
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5325
5404
             {
..
..
@@ -6213,11 +6292,11 @@
6213
6292
 	private MenuItem lookAtItem;
6214
6293
 	private MenuItem lookFromItem;
6215
6294
 	private MenuItem switchViewItem;
6216
-	private MenuItem cutItem;
6295
+	private JMenuItem cutItem;
6217
6296
 	private MenuItem undoItem;
6218
6297
 	private MenuItem redoItem;
6219
6298
 	private JMenuItem duplicateItem;
6220
-	private MenuItem cloneItem;
6299
+	private JMenuItem cloneItem;
6221
6300
 	private MenuItem cloneSupportItem;
6222
6301
 	private MenuItem overwriteGeoItem;
6223
6302
 	private MenuItem overwriteMatItem;
..
..
@@ -6238,13 +6317,13 @@
6238
6317
 	private MenuItem cloneGeometriesItem;
6239
6318
 	private MenuItem shareGeometriesItem;
6240
6319
 	private MenuItem mergeGeometriesItem;
6241
-	private MenuItem copyItem;
6320
+	private JMenuItem copyItem;
6242
6321
 	private MenuItem pasteItem;
6243
-	private MenuItem pasteIntoItem;
6244
-	private MenuItem pasteLinkItem;
6245
-	private MenuItem pasteCloneItem;
6246
-	private MenuItem pasteExpandItem;
6247
-	private MenuItem deleteItem;
6322
+	private JMenuItem pasteIntoItem;
6323
+	private JMenuItem pasteLinkItem;
6324
+	private JMenuItem pasteCloneItem;
6325
+	private JMenuItem pasteExpandItem;
6326
+	private JMenuItem deleteItem;
6248
6327
 	private MenuItem clearAllItem;
6249
6328
 	private MenuItem genUVItem;
6250
6329
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6299,7 +6378,7 @@
6299
6378
 	private MenuItem transformGeometryItem;
6300
6379
 	private MenuItem transformChildrenItem;
6301
6380
 	private MenuItem hideItem;
6302
-	private MenuItem grabItem;
6381
+	private JMenuItem grabItem;
6303
6382
 	private MenuItem backItem;
6304
6383
 	private MenuItem frontItem;
6305
6384
 	private MenuItem cameraItem;
..
..
@@ -6312,7 +6391,7 @@
6312
6391
 	private MenuItem switchTransfoItem;
6313
6392
 	private MenuItem morphItem;
6314
6393
 	private MenuItem linkerItem;
6315
-	private MenuItem ungroupItem;
6394
+	private JMenuItem ungroupItem;
6316
6395
 	private MenuItem editItem;
6317
6396
 	private MenuItem openWindowItem;
6318
6397
 	private MenuItem editLeafItem;