Min shader.

Normand Briere

2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314

 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,13 +415,15 @@
415
415
 		this.copy = this.group = group;
416
416
 		//selectees = this.group.selectees;
417
417
 		
418
-        if (copy.versionlist == null)
419
-        {
420
-            copy.versionlist = new Object3D[100];
421
-            copy.versionindex = -1;
422
-            
423
-            Save(true);
424
-        }
418
+                assert(false);
419
+                
420
+//        if (copy.versionlist == null)
421
+//        {
422
+//            copy.versionlist = new Object3D[100];
423
+//            copy.versionindex = -1;
424
+//            
425
+//            //Save(true);
426
+//        }
425
427
         
426
428
 		if(ui)
427
429
                     SetupUI(objEditor);
..
..
@@ -444,13 +446,13 @@
444
446
                 
445
447
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446
448
                 
447
-        if (copy.versionlist == null)
448
-        {
449
-            copy.versionlist = new Object3D[100];
450
-            copy.versionindex = -1;
451
-            
452
-            Save(true);
453
-        }
449
+//        if (copy.versionlist == null)
450
+//        {
451
+//            copy.versionlist = new Object3D[100];
452
+//            copy.versionindex = -1;
453
+//            
454
+//            //Save(true);
455
+//        }
454
456
 	}
455
457
 
456
458
     void CloneSelection(boolean supports)
..
..
@@ -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
 //                
..
..
@@ -824,6 +835,8 @@
824
835
         }
825
836
 
826
837
                 oe.menuBar.add(menu = new Menu("Attributes"));
838
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
839
+		clearVersionsItem.addActionListener(this);
827
840
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
828
841
 		clearMaterialsItem.addActionListener(this);
829
842
                 resetAllItem = menu.add(new MenuItem("Reset All"));
..
..
@@ -846,9 +859,9 @@
846
859
 		hideleavesItem.addActionListener(this);
847
860
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
848
861
 		showleavesItem.addActionListener(this);
849
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
862
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
850
863
 		markleavesItem.addActionListener(this);
851
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
864
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
852
865
 		unmarkleavesItem.addActionListener(this);
853
866
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
854
867
 		rewindleavesItem.addActionListener(this);
..
..
@@ -923,8 +936,10 @@
923
936
 	
924
937
         JTabbedPane resourcecontainer;
925
938
         cGridBag currenttab;
926
-        boolean added; // patch for jar
939
+        //boolean added; // patch for jar
927
940
                 
941
+        int totalcount = 0;
942
+        
928
943
         int tabcount = 0;
929
944
         int colcount = 0;
930
945
         int rowcount = 0;
..
..
@@ -940,28 +955,30 @@
940
955
 //        System.out.println();
941
956
         
942
957
         if (//rowcount == 0 ||
943
-                path.length == 1)
958
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
944
959
         {
945
960
             currenttab = new cGridBag();
946
-            added = false;
947
961
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
948
962
             currenttab.setName(tabname);
963
+            //added = false;
964
+            resourcecontainer.add(currenttab);
965
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
949
966
             rowcount = 1;
950
967
             colcount = 0;
951
968
             texturecount = 0;
952
969
         }
953
970
         
954
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
971
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
955
972
         {
956
-            if (!added)
973
+            //if (!added)
957
974
             {
958
-                added = true;
959
-                resourcecontainer.add(currenttab);
975
+                //added = true;
960
976
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
961
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
977
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
962
978
             }
963
979
             
964
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
980
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
981
+            totalcount++;
965
982
             
966
983
             if (++colcount >= columns)
967
984
             {
..
..
@@ -987,6 +1004,8 @@
987
1004
             container.add(resourcecontainer);
988
1005
             
989
1006
             Grafreed.ParseResources("textures", this);
1007
+            
1008
+            // 935. System.out.println("Total = " + totalcount);
990
1009
         }
991
1010
         
992
1011
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1026,9 +1045,9 @@
1026
1045
         oe.radioPanel.add(dummyButton);
1027
1046
         oe.buttonGroup.add(dummyButton);
1028
1047
          */
1029
-                cGridBag copyOptionsPanel = new cGridBag();
1048
+                cGridBag versionManagerPanel = new cGridBag();
1030
1049
                                         
1031
-                copyOptionsPanel.preferredHeight = 2;
1050
+                versionManagerPanel.preferredHeight = 4;
1032
1051
                 
1033
1052
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1034
1053
                 
..
..
@@ -1055,25 +1074,25 @@
1055
1074
 //                        }
1056
1075
 //                });
1057
1076
                 
1058
-		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1059
1078
                 collapseButton.setToolTipText("Collapse toolbar");
1060
1079
 		collapseButton.addActionListener(this);
1061
1080
                 
1062
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1081
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1063
1082
                 maximize3DButton.setToolTipText("Maximize 3D view");
1064
1083
 		maximize3DButton.addActionListener(this);
1065
1084
                 
1066
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1085
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1067
1086
                 twoButton.setToolTipText("Show 3D view only");
1068
1087
 		twoButton.addActionListener(this);
1069
1088
                 this.fullscreenLayout = twoButton;
1070
1089
                 
1071
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1090
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1072
1091
                 threeButton.setToolTipText("Show controls and 3D view");
1073
1092
 		threeButton.addActionListener(this);
1074
1093
                 if (Globals.ADVANCED)
1075
1094
                 {
1076
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1077
1096
                 sixButton.setToolTipText("Show 3D view and controls");
1078
1097
 		sixButton.addActionListener(this);
1079
1098
                 }
..
..
@@ -1082,50 +1101,51 @@
1082
1101
 //		sevenButton.addActionListener(this);
1083
1102
                 //
1084
1103
                 
1085
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1104
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1086
1105
                 fullButton.setToolTipText("Full-screen window");
1087
1106
 		fullButton.addActionListener(this);
1088
1107
                 
1089
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1090
1109
                 screenfitButton.setToolTipText("Screen fit");
1091
1110
 		screenfitButton.addActionListener(this);
1092
1111
 
1093
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1094
1113
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1095
1114
 		restoreCameraButton.addActionListener(this);
1096
1115
                 
1097
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1116
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1098
1117
                 saveVersionButton.setToolTipText("Duplicate current version");
1099
1118
 		saveVersionButton.addActionListener(this);
1100
1119
                                                 
1101
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1120
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1102
1121
                 deleteVersionButton.setToolTipText("Delete current version");
1103
1122
 		deleteVersionButton.addActionListener(this);
1123
+                deleteVersionButton.setEnabled(false);
1104
1124
                                                 
1105
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1106
1126
                 previousVersionButton.setToolTipText("Previous version");
1107
1127
 		previousVersionButton.addActionListener(this);
1108
1128
                 previousVersionButton.setEnabled(false);
1109
1129
                 
1110
1130
                 cGridBag updown = new cGridBag().setVertical(true);
1111
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1131
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1132
                 restoreButton.setToolTipText("Undo (restore current version)");
1113
1133
 		restoreButton.addActionListener(this);
1114
-                //restoreButton.setEnabled(false);
1134
+                restoreButton.setEnabled(false);
1115
1135
                 
1116
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1137
                 replaceButton.setToolTipText("Save (replace current version)");
1118
1138
 		replaceButton.addActionListener(this);
1119
-                //replaceButton.setEnabled(false);
1139
+                replaceButton.setEnabled(false);
1120
1140
                 
1121
-                copyOptionsPanel.add(updown);
1141
+                versionManagerPanel.add(updown);
1122
1142
                 
1123
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1143
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1124
1144
                 nextVersionButton.setToolTipText("Next version");
1125
1145
 		nextVersionButton.addActionListener(this);
1126
1146
                 nextVersionButton.setEnabled(false);
1127
1147
                 
1128
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1148
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1129
1149
                 oneStepButton.setToolTipText("Animate one step forward");
1130
1150
 		oneStepButton.addActionListener(this);
1131
1151
                 
..
..
@@ -1148,11 +1168,11 @@
1148
1168
 
1149
1169
                 if (Globals.ADVANCED)
1150
1170
                 {
1151
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1171
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1152
1172
                         snapobjectButton.addActionListener(this);
1153
1173
                         snapobjectButton.setToolTipText("Snap Object");
1154
1174
                         
1155
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1175
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1156
1176
 		fourButton.addActionListener(this);
1157
1177
                 fourButton.setToolTipText("Show control panel only");
1158
1178
                 }
..
..
@@ -1160,11 +1180,11 @@
1160
1180
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1161
1181
                 
1162
1182
 
1163
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1183
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1164
1184
                 rootButton.setToolTipText("Open selection in new tab");
1165
1185
 		rootButton.addActionListener(this);
1166
1186
 
1167
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1187
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1168
1188
                 closeButton.setToolTipText("Close tab");
1169
1189
 		closeButton.addActionListener(this);
1170
1190
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1173,38 +1193,38 @@
1173
1193
                 cGridBag row1 = new cGridBag();
1174
1194
                 
1175
1195
                 // INSERT
1176
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1196
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1177
1197
                 gridButton.setToolTipText("Create ground");
1178
1198
                                 gridButton.addActionListener(this);
1179
1199
 
1180
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1200
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1181
1201
                 boxButton.setToolTipText("Create box");
1182
1202
                                 boxButton.addActionListener(this);
1183
1203
 
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);
1204
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
1205
                 superButton.setToolTipText("Create superellipsoid");
1198
1206
                                 superButton.addActionListener(this);
1199
1207
 
1208
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1209
+                sphereButton.setToolTipText("Create sphere");
1210
+                                sphereButton.addActionListener(this);
1211
+
1212
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
+                coneButton.setToolTipText("Create cone");
1214
+                                coneButton.addActionListener(this);
1215
+
1216
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1217
+                torusButton.setToolTipText("Create torus");
1218
+                                torusButton.addActionListener(this);
1219
+
1200
1220
                 if (Globals.ADVANCED)
1201
1221
                 {
1202
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1222
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1203
1223
                     kleinButton.setToolTipText("Create Klein bottle");
1204
1224
                                     kleinButton.addActionListener(this);
1205
1225
                 }
1206
1226
                 
1207
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1227
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1228
                 particlesButton.setToolTipText("Create particle system");
1209
1229
                                particlesButton.addActionListener(this);
1210
1230
 
..
..
@@ -1212,31 +1232,31 @@
1212
1232
                 
1213
1233
                 cGridBag row2 = new cGridBag();
1214
1234
                 
1215
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1235
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
1236
                 groupButton.setToolTipText("Create group");
1217
1237
                                groupButton.addActionListener(this);
1218
1238
 
1219
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1239
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
1240
                 compositeButton.setToolTipText("Create composite");
1221
1241
                                compositeButton.addActionListener(this);
1222
1242
 
1223
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1243
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
1244
                 switchButton.setToolTipText("Create item switcher");
1225
1245
                                switchButton.addActionListener(this);
1226
1246
 
1227
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1247
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
1248
                 loopButton.setToolTipText("Create loop");
1229
1249
                                loopButton.addActionListener(this);
1230
1250
 
1231
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1251
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1232
1252
                 textureButton.setToolTipText("Create texture");
1233
1253
                                textureButton.addActionListener(this);
1234
1254
 
1235
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1255
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
1256
                 overlayButton.setToolTipText("Create overlay");
1237
1257
                                overlayButton.addActionListener(this);
1238
1258
 
1239
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1259
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1240
1260
                 lightButton.setToolTipText("Create light");
1241
1261
                                lightButton.addActionListener(this);
1242
1262
 
..
..
@@ -1246,6 +1266,11 @@
1246
1266
                 
1247
1267
                 CreateTexturePanel(textures);
1248
1268
                 
1269
+                int tabCount = resourcecontainer.getTabCount();
1270
+                
1271
+                if (tabCount > 0)
1272
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1273
+                
1249
1274
                 oe.toolboxPanel.add(textures);
1250
1275
                 
1251
1276
                 textures.preferredHeight = 100;
..
..
@@ -1253,11 +1278,11 @@
1253
1278
                 CreateSkyboxPanel(oe.skyboxPanel);
1254
1279
                 
1255
1280
                 // EDIT panel
1256
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1281
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1257
1282
                 editButton.setToolTipText("Pin selection controls");
1258
1283
 		editButton.addActionListener(this);
1259
1284
 
1260
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1285
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1261
1286
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1262
1287
 		uneditButton.addActionListener(this);
1263
1288
 
..
..
@@ -1265,7 +1290,7 @@
1265
1290
                 allParamsButton.setToolTipText("Show all controls");
1266
1291
 		allParamsButton.addActionListener(this);
1267
1292
 
1268
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1293
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1269
1294
                 clearPanelButton.setToolTipText("Clear all controls");
1270
1295
 		clearPanelButton.addActionListener(this);
1271
1296
 
..
..
@@ -1273,7 +1298,7 @@
1273
1298
                 //unselectButton.setToolTipText("Unselect");
1274
1299
 		//unselectButton.addActionListener(this);
1275
1300
 
1276
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1301
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1277
1302
                 flashSelectionButton.setToolTipText("Highlight selection");
1278
1303
 		flashSelectionButton.addActionListener(this);
1279
1304
                 
..
..
@@ -1296,6 +1321,8 @@
1296
1321
                 
1297
1322
                 cGridBag jSPPanel = new cGridBag();
1298
1323
 
1324
+            jSPPanel.preferredHeight = 20;
1325
+            
1299
1326
                 JScrollPane jSP;
1300
1327
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1301
1328
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1304,11 +1331,11 @@
1304
1331
                 oe.treePanel.add(jSPPanel);
1305
1332
                 oe.treePanel.Return();
1306
1333
 
1307
-                oe.treePanel.add(copyOptionsPanel);
1334
+                oe.treePanel.add(versionManagerPanel);
1308
1335
                 oe.treePanel.Return();
1309
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1310
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1311
-            sliderPane.preferredHeight = 1;
1336
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1337
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1338
+            versionSliderPane.preferredHeight = 3;
1312
1339
                 
1313
1340
 //        mainPanel.setDividerLocation(0.1); //1.0);
1314
1341
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1498,6 +1525,7 @@
1498
1525
                     
1499
1526
             oe.SetupViews();
1500
1527
             
1528
+        if (Globals.DEBUG)
1501
1529
 		System.out.println("SetupViews");
1502
1530
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1503
1531
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2101,24 +2129,24 @@
2101
2129
             switch(axis)
2102
2130
             {
2103
2131
                 case 0 :
2104
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2105
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2106
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2107
-                    vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2132
+                    vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2133
+                    vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2134
+                    vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2135
+                    vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2108
2136
                     norm = cVector.X;
2109
2137
                     break;
2110
2138
                 case 1 :
2111
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2112
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2113
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2114
-                    vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2139
+                    vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2140
+                    vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2141
+                    vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2142
+                    vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2115
2143
                     norm = cVector.Y;
2116
2144
                     break;
2117
2145
                 case 2 :
2118
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2119
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2120
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2121
-                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2146
+                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2147
+                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2148
+                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2149
+                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2122
2150
                     norm = cVector.Z;
2123
2151
                     break;
2124
2152
             }
..
..
@@ -2159,7 +2187,11 @@
2159
2187
             shadow.material = new cMaterial(obj.material);
2160
2188
             shadow.material.diffuse = 0.0001f;
2161
2189
             shadow.material.specular = 0.0001f;
2162
-            //shadow.projectedVertices[1].x = 300;
2190
+            shadow.material.opacity = 0.75f;
2191
+            
2192
+            AllocProjectedVertices(shadow);
2193
+        
2194
+            shadow.projectedVertices[1].x = 300;
2163
2195
             
2164
2196
             makeSomething(shadow);
2165
2197
         }
..
..
@@ -2680,27 +2712,35 @@
2680
2712
 		} else
2681
2713
 		if (source == loopItem || source == loopButton)
2682
2714
 		{
2715
+                    if (!group.selection.isEmpty())
2716
+                    {
2683
2717
                         Composite csg = new GroupLeaf();
2684
2718
                         csg.count = 5;
2685
-			group(csg);
2686
2719
                         Composite child = new cGroup("Branch");
2687
2720
                         csg.addChild(child);
2688
2721
                         child.addChild(csg);
2722
+			group(csg);
2723
+                    }
2689
2724
 		} else
2690
2725
 		if (source == doubleItem)
2691
2726
 		{
2727
+                    if (!group.selection.isEmpty())
2728
+                    {
2692
2729
                         Composite csg = new GroupLeaf("Fork");
2693
2730
                         csg.count = 5;
2694
-			group(csg);
2695
2731
                         Composite child = new cGroup("Branch A");
2696
2732
                         csg.addChild(child);
2697
2733
                         child.addChild(csg);
2698
2734
                         child = new cGroup("Branch B");
2699
2735
                         csg.addChild(child);
2700
2736
                         child.addChild(csg);
2737
+			group(csg);
2738
+                    }
2701
2739
 		} else
2702
2740
 		if (source == tripleItem)
2703
2741
 		{
2742
+                    if (!group.selection.isEmpty())
2743
+                    {
2704
2744
                         Composite csg = new GroupLeaf("Trident");
2705
2745
                         csg.count = 4;
2706
2746
 			group(csg);
..
..
@@ -2713,6 +2753,7 @@
2713
2753
                         child = new cGroup();
2714
2754
                         csg.addChild(child);
2715
2755
                         child.addChild(csg);
2756
+                    }
2716
2757
 		} else
2717
2758
 		if (source == computeAOItem)
2718
2759
 		{
..
..
@@ -3348,22 +3389,34 @@
3348
3389
 		} else
3349
3390
 		if (source == ungroupItem || source == ungroupButton)
3350
3391
 		{
3351
-                    boolean hasRoot = false;
3392
+                    boolean canUngroup = true;
3352
3393
                     
3353
3394
                     for (int i=0; i<group.selection.size(); i++)
3354
3395
                     {
3355
-                        if (group.selection.get(i) == group)
3396
+                        Object3D selectedItem = group.selection.get(i);
3397
+                        
3398
+                        if (selectedItem.Size() == 0)
3356
3399
                         {
3357
-                            hasRoot = true;
3400
+                            // Cannot ungroup leaves
3401
+                            canUngroup = false;
3402
+                            break;
3403
+                        }
3404
+                                
3405
+                        if (selectedItem == group)
3406
+                        {
3407
+                            // Cannot ungroup root
3408
+                            canUngroup = false;
3358
3409
                             break;
3359
3410
                         }
3360
3411
                     }
3361
3412
 
3362
-                    if (!hasRoot)
3413
+                    if (canUngroup)
3363
3414
                     {
3364
3415
                         for (int i=0; i<group.selection.size(); i++)
3365
3416
                         {
3366
-                            Ungroup(group.selection.get(i));
3417
+                            Object3D selectedItem = group.selection.get(i);
3418
+                            
3419
+                            Ungroup(selectedItem);
3367
3420
                         }
3368
3421
 
3369
3422
                         ClearSelection(false);
..
..
@@ -3414,6 +3467,10 @@
3414
3467
 		if (source == clearMaterialsItem)
3415
3468
                 {
3416
3469
 			ClearMaterials();
3470
+		} else
3471
+		if (source == clearVersionsItem)
3472
+                {
3473
+			ClearVersions();
3417
3474
 		} else
3418
3475
 		if (source == liveleavesItem)
3419
3476
                 {
..
..
@@ -3927,6 +3984,8 @@
3927
3984
 		if (source == closeButton)
3928
3985
 		{
3929
3986
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3987
+                    Replace();
3988
+                    
3930
3989
                     cRadio ab;
3931
3990
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3932
3991
                     {
..
..
@@ -4025,6 +4084,8 @@
4025
4084
 		} else
4026
4085
                 if(source instanceof cRadio)
4027
4086
 		{
4087
+                    Replace();
4088
+                    
4028
4089
                     group.parent = keepparent;
4029
4090
                         group.attributes = 0;
4030
4091
                     //group.editWindow = null;
..
..
@@ -4080,10 +4141,23 @@
4080
4141
                     
4081
4142
         if (copy.versionlist == null)
4082
4143
         {
4083
-            copy.versionlist = new Object3D[100];
4084
4144
             copy.versionindex = -1;
4085
4145
             
4086
-            Save(true);
4146
+            // Cannot work with loops
4147
+            // To fix this issue, we first mark all nodes above the root,
4148
+            // and check if any of these nodes are reachable below the root.
4149
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4150
+            
4151
+            if (copy.versionlist == null && !copy.HasTags())
4152
+            {
4153
+                copy.versionlist = new Object3D[100];
4154
+                
4155
+                //Save(true);
4156
+            }
4157
+            else
4158
+                copy.versionindex = -2;
4159
+            
4160
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4087
4161
         }
4088
4162
         
4089
4163
                     SetVersionStates();
..
..
@@ -4231,7 +4305,7 @@
4231
4305
                         TouchTransform(obj);
4232
4306
                         continue;
4233
4307
                     }
4234
-                    if ((mask&2) != 0) // Scale
4308
+                    if ((mask&2) != 0) // Scale/rotation
4235
4309
                     {
4236
4310
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4237
4311
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4239,10 +4313,6 @@
4239
4313
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4240
4314
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4241
4315
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4242
-                    }
4243
-                    if ((mask&4) != 0) // Rotation
4244
-                    {
4245
-                        // ?
4246
4316
                     }
4247
4317
                     if ((mask&1) != 0) // Translation
4248
4318
                     {
..
..
@@ -5051,6 +5121,12 @@
5051
5121
 		refreshContents();
5052
5122
 	}
5053
5123
 	
5124
+	void ClearVersions()
5125
+	{
5126
+		group.selection.ClearVersions();
5127
+		refreshContents();
5128
+	}
5129
+	
5054
5130
 	void FlipV(boolean flip)
5055
5131
 	{
5056
5132
 		group.selection.FlipV(flip);
..
..
@@ -5328,7 +5404,8 @@
5328
5404
             if (group.selection != null)
5329
5405
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5330
5406
             {
5331
-                    if (!(e.nextElement() instanceof Composite))
5407
+                    Object next = e.nextElement();
5408
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5332
5409
                     {
5333
5410
                         allComposites = false;
5334
5411
                         break;
..
..
@@ -5340,6 +5417,7 @@
5340
5417
 
5341
5418
         void refreshContents(boolean cp)
5342
5419
         {
5420
+            if (Globals.ADVANCED)
5343
5421
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5344
5422
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5345
5423
             {
..
..
@@ -6233,11 +6311,11 @@
6233
6311
 	private MenuItem lookAtItem;
6234
6312
 	private MenuItem lookFromItem;
6235
6313
 	private MenuItem switchViewItem;
6236
-	private MenuItem cutItem;
6314
+	private JMenuItem cutItem;
6237
6315
 	private MenuItem undoItem;
6238
6316
 	private MenuItem redoItem;
6239
6317
 	private JMenuItem duplicateItem;
6240
-	private MenuItem cloneItem;
6318
+	private JMenuItem cloneItem;
6241
6319
 	private MenuItem cloneSupportItem;
6242
6320
 	private MenuItem overwriteGeoItem;
6243
6321
 	private MenuItem overwriteMatItem;
..
..
@@ -6258,13 +6336,13 @@
6258
6336
 	private MenuItem cloneGeometriesItem;
6259
6337
 	private MenuItem shareGeometriesItem;
6260
6338
 	private MenuItem mergeGeometriesItem;
6261
-	private MenuItem copyItem;
6339
+	private JMenuItem copyItem;
6262
6340
 	private MenuItem pasteItem;
6263
-	private MenuItem pasteIntoItem;
6264
-	private MenuItem pasteLinkItem;
6265
-	private MenuItem pasteCloneItem;
6266
-	private MenuItem pasteExpandItem;
6267
-	private MenuItem deleteItem;
6341
+	private JMenuItem pasteIntoItem;
6342
+	private JMenuItem pasteLinkItem;
6343
+	private JMenuItem pasteCloneItem;
6344
+	private JMenuItem pasteExpandItem;
6345
+	private JMenuItem deleteItem;
6268
6346
 	private MenuItem clearAllItem;
6269
6347
 	private MenuItem genUVItem;
6270
6348
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6290,6 +6368,7 @@
6290
6368
 	private MenuItem clipMeshItem;
6291
6369
 	private MenuItem smoothMeshItem;
6292
6370
 	private MenuItem clearMaterialsItem;
6371
+	private MenuItem clearVersionsItem;
6293
6372
         
6294
6373
 	private MenuItem liveleavesItem;
6295
6374
 	private MenuItem unliveleavesItem;
..
..
@@ -6319,7 +6398,7 @@
6319
6398
 	private MenuItem transformGeometryItem;
6320
6399
 	private MenuItem transformChildrenItem;
6321
6400
 	private MenuItem hideItem;
6322
-	private MenuItem grabItem;
6401
+	private JMenuItem grabItem;
6323
6402
 	private MenuItem backItem;
6324
6403
 	private MenuItem frontItem;
6325
6404
 	private MenuItem cameraItem;
..
..
@@ -6332,7 +6411,7 @@
6332
6411
 	private MenuItem switchTransfoItem;
6333
6412
 	private MenuItem morphItem;
6334
6413
 	private MenuItem linkerItem;
6335
-	private MenuItem ungroupItem;
6414
+	private JMenuItem ungroupItem;
6336
6415
 	private MenuItem editItem;
6337
6416
 	private MenuItem openWindowItem;
6338
6417
 	private MenuItem editLeafItem;