Parallax presets

Normand Briere

2019-08-22 6a823ffbfcda4c843f46e02e83c869d5bc323e25

 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);
..
..
@@ -357,6 +366,16 @@
357
366
         }
358
367
        
359
368
         refreshContents();
369
+    }
370
+
371
+    public void Show3DView()
372
+    {
373
+        // bug
374
+        //gridPanel.setDividerLocation(1.0);
375
+        //bigPanel.setDividerLocation(0.0);
376
+        bigThree.ClearUI();
377
+        bigThree.add(centralPanel);
378
+        bigThree.FlushUI();
360
379
     }
361
380
 
362
381
     //ObjEditor objEditor;
..
..
@@ -396,10 +415,14 @@
396
415
 		this.copy = this.group = group;
397
416
 		//selectees = this.group.selectees;
398
417
 		
418
+                assert(false);
419
+                
399
420
         if (copy.versionlist == null)
400
421
         {
401
422
             copy.versionlist = new Object3D[100];
402
423
             copy.versionindex = -1;
424
+            
425
+            //Save(true);
403
426
         }
404
427
         
405
428
 		if(ui)
..
..
@@ -428,7 +451,7 @@
428
451
             copy.versionlist = new Object3D[100];
429
452
             copy.versionindex = -1;
430
453
             
431
-            Save(true);
454
+            //Save(true);
432
455
         }
433
456
 	}
434
457
 
..
..
@@ -519,33 +542,35 @@
519
542
 //		menu.add("-");
520
543
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
521
544
 		duplicateItem.addActionListener(this);
522
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
523
547
 		cloneItem.addActionListener(this);
524
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
525
549
         {
526
550
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
527
551
 		cloneSupportItem.addActionListener(this);
528
552
         }
553
+                oe.jTree.popup.addSeparator();
529
554
 		menu.add("-");
530
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
531
556
 		cutItem.addActionListener(this);
532
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
533
558
 		copyItem.addActionListener(this);
534
559
 		pasteItem = menu.add(new MenuItem("Paste"));
535
560
 		pasteItem.addActionListener(this);
536
561
                 
537
-		menu.add("-");
538
-		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"));
539
565
 		pasteIntoItem.addActionListener(this);
540
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
541
567
 		pasteLinkItem.addActionListener(this);
542
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
543
569
 		pasteCloneItem.addActionListener(this);
544
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
545
571
 //		pasteExpandItem.addActionListener(this);
546
-		menu.add("-");
547
-		deleteItem = menu.add(new MenuItem("Delete"));
548
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
549
574
                 
550
575
         if (Globals.ADVANCED)
551
576
         {
..
..
@@ -631,11 +656,9 @@
631
656
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
632
657
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
633
658
 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
634
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
635
659
 		oe.cameraMenu.add("-");
636
660
 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
637
661
 		openWindowItem.addActionListener(this);
638
-		editLeafItem.addActionListener(this);
639
662
 		lookAtItem.addActionListener(this);
640
663
 		//lookFromItem.addActinoListener(this);
641
664
 		//switchViewItem.addActionListener(this);
..
..
@@ -682,9 +705,8 @@
682
705
 		setMasterItem.addActionListener(this);
683
706
         }
684
707
                 
685
-		oe.menuBar.add(menu = new Menu("Group"));
686
-//		grabItem = menu.add(new MenuItem("Grab"));
687
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
688
710
 		backItem = menu.add(new MenuItem("Back"));
689
711
 		backItem.addActionListener(this);
690
712
 		frontItem = menu.add(new MenuItem("Front"));
..
..
@@ -692,13 +714,21 @@
692
714
 //		compositeItem = menu.add(new MenuItem("Composite"));
693
715
 //		compositeItem.addActionListener(this);
694
716
                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
695
720
         if (Globals.ADVANCED)
696
721
         {
697
722
 		hideItem = menu.add(new MenuItem("Hidden Group"));
698
723
 		hideItem.addActionListener(this);
699
724
         }
700
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
701
726
 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
702
732
                 
703
733
 //		menu.add("-");
704
734
 //                
..
..
@@ -827,9 +857,9 @@
827
857
 		hideleavesItem.addActionListener(this);
828
858
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
829
859
 		showleavesItem.addActionListener(this);
830
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
831
861
 		markleavesItem.addActionListener(this);
832
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
833
863
 		unmarkleavesItem.addActionListener(this);
834
864
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
835
865
 		rewindleavesItem.addActionListener(this);
..
..
@@ -883,6 +913,9 @@
883
913
 		shareGeometriesItem.addActionListener(this);
884
914
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
885
915
 		mergeGeometriesItem.addActionListener(this);
916
+		menu.add("-");
917
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+		editLeafItem.addActionListener(this);
886
919
         if (Globals.ADVANCED)
887
920
         {
888
921
             // Pretty much the same as duplicate and clone.
..
..
@@ -901,8 +934,10 @@
901
934
 	
902
935
         JTabbedPane resourcecontainer;
903
936
         cGridBag currenttab;
904
-        boolean added; // patch for jar
937
+        //boolean added; // patch for jar
905
938
                 
939
+        int totalcount = 0;
940
+        
906
941
         int tabcount = 0;
907
942
         int colcount = 0;
908
943
         int rowcount = 0;
..
..
@@ -918,28 +953,30 @@
918
953
 //        System.out.println();
919
954
         
920
955
         if (//rowcount == 0 ||
921
-                path.length == 1)
956
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
922
957
         {
923
958
             currenttab = new cGridBag();
924
-            added = false;
925
959
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
926
960
             currenttab.setName(tabname);
961
+            //added = false;
962
+            resourcecontainer.add(currenttab);
963
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
927
964
             rowcount = 1;
928
965
             colcount = 0;
929
966
             texturecount = 0;
930
967
         }
931
968
         
932
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
969
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
933
970
         {
934
-            if (!added)
971
+            //if (!added)
935
972
             {
936
-                added = true;
937
-                resourcecontainer.add(currenttab);
973
+                //added = true;
938
974
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
975
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
940
976
             }
941
977
             
942
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
978
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
979
+            totalcount++;
943
980
             
944
981
             if (++colcount >= columns)
945
982
             {
..
..
@@ -965,6 +1002,8 @@
965
1002
             container.add(resourcecontainer);
966
1003
             
967
1004
             Grafreed.ParseResources("textures", this);
1005
+            
1006
+            // 935. System.out.println("Total = " + totalcount);
968
1007
         }
969
1008
         
970
1009
 	void SetupUI2(ObjEditor oe)
..
..
@@ -984,11 +1023,6 @@
984
1023
             //new Exception().printStackTrace();
985
1024
                 
986
1025
         oe.radioPanel = new JPanel(new GridBagLayout());
987
-	oe.aConstraints.weightx = 1;
988
-	oe.aConstraints.weighty = 0;
989
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
990
-	oe.aConstraints.gridwidth = 100;
991
-	oe.aConstraints.gridheight = 1;
992
1026
 //        oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
993
1027
         
994
1028
         oe.buttonGroup = new ButtonGroup();
..
..
@@ -1009,9 +1043,9 @@
1009
1043
         oe.radioPanel.add(dummyButton);
1010
1044
         oe.buttonGroup.add(dummyButton);
1011
1045
          */
1012
-                cGridBag copyOptionsPanel = new cGridBag();
1046
+                cGridBag versionManagerPanel = new cGridBag();
1013
1047
                                         
1014
-                copyOptionsPanel.preferredHeight = 2;
1048
+                versionManagerPanel.preferredHeight = 4;
1015
1049
                 
1016
1050
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1017
1051
                 
..
..
@@ -1021,62 +1055,102 @@
1021
1055
                 
1022
1056
                 if (Globals.ADVANCED)
1023
1057
                 {
1024
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025
-                    maxButton.setToolTipText("Maximize window");
1026
-                    maxButton.addActionListener(this);
1058
+//                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+//                    maxButton.setToolTipText("Maximize window");
1060
+//                    maxButton.addActionListener(this);
1027
1061
                 }
1028
1062
                 
1029
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
+                cButton gcButton;
1064
+                
1065
+//		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1066
+//                gcButton.setToolTipText("Garbage collect");
1067
+//                gcButton.addActionListener(new ActionListener()
1068
+//                {
1069
+//                        public void actionPerformed(ActionEvent e)
1070
+//                        {
1071
+//                            System.gc();
1072
+//                        }
1073
+//                });
1074
+                
1075
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1076
+                collapseButton.setToolTipText("Collapse toolbar");
1077
+		collapseButton.addActionListener(this);
1078
+                
1079
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1080
+                maximize3DButton.setToolTipText("Maximize 3D view");
1081
+		maximize3DButton.addActionListener(this);
1082
+                
1083
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084
+                twoButton.setToolTipText("Show 3D view only");
1085
+		twoButton.addActionListener(this);
1086
+                this.fullscreenLayout = twoButton;
1087
+                
1088
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
+                threeButton.setToolTipText("Show controls and 3D view");
1090
+		threeButton.addActionListener(this);
1091
+                if (Globals.ADVANCED)
1092
+                {
1093
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1094
+                sixButton.setToolTipText("Show 3D view and controls");
1095
+		sixButton.addActionListener(this);
1096
+                }
1097
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1098
+//                sevenButton.setToolTipText("3-column layout");
1099
+//		sevenButton.addActionListener(this);
1100
+                //
1101
+                
1102
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1030
1103
                 fullButton.setToolTipText("Full-screen window");
1031
1104
 		fullButton.addActionListener(this);
1032
1105
                 
1033
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1034
1107
                 screenfitButton.setToolTipText("Screen fit");
1035
1108
 		screenfitButton.addActionListener(this);
1036
1109
 
1037
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1110
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1038
1111
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1039
1112
 		restoreCameraButton.addActionListener(this);
1040
1113
                 
1041
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1114
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1042
1115
                 saveVersionButton.setToolTipText("Duplicate current version");
1043
1116
 		saveVersionButton.addActionListener(this);
1044
1117
                                                 
1045
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1046
1119
                 deleteVersionButton.setToolTipText("Delete current version");
1047
1120
 		deleteVersionButton.addActionListener(this);
1121
+                deleteVersionButton.setEnabled(false);
1048
1122
                                                 
1049
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1050
1124
                 previousVersionButton.setToolTipText("Previous version");
1051
1125
 		previousVersionButton.addActionListener(this);
1052
1126
                 previousVersionButton.setEnabled(false);
1053
1127
                 
1054
1128
                 cGridBag updown = new cGridBag().setVertical(true);
1055
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1056
1130
                 restoreButton.setToolTipText("Undo (restore current version)");
1057
1131
 		restoreButton.addActionListener(this);
1058
-                //restoreButton.setEnabled(false);
1132
+                restoreButton.setEnabled(false);
1059
1133
                 
1060
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1061
1135
                 replaceButton.setToolTipText("Save (replace current version)");
1062
1136
 		replaceButton.addActionListener(this);
1063
-                //replaceButton.setEnabled(false);
1137
+                replaceButton.setEnabled(false);
1064
1138
                 
1065
-                copyOptionsPanel.add(updown);
1139
+                versionManagerPanel.add(updown);
1066
1140
                 
1067
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1141
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1068
1142
                 nextVersionButton.setToolTipText("Next version");
1069
1143
 		nextVersionButton.addActionListener(this);
1070
1144
                 nextVersionButton.setEnabled(false);
1145
+                
1146
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1147
+                oneStepButton.setToolTipText("Animate one step forward");
1148
+		oneStepButton.addActionListener(this);
1071
1149
                 
1072
1150
                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1073
1151
                 liveCB.setToolTipText("Enable animation");
1074
1152
                                 liveCB.addItemListener(this);
1075
1153
 
1076
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
-                oneStepButton.setToolTipText("Animate one step forward");
1078
-		oneStepButton.addActionListener(this);
1079
-                
1080
1154
                 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1081
1155
                 fastCB.setToolTipText("Fast mode");
1082
1156
                                 fastCB.addItemListener(this);
..
..
@@ -1092,38 +1166,23 @@
1092
1166
 
1093
1167
                 if (Globals.ADVANCED)
1094
1168
                 {
1095
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096
1170
                         snapobjectButton.addActionListener(this);
1097
1171
                         snapobjectButton.setToolTipText("Snap Object");
1098
1172
                         
1099
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1173
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1100
1174
 		fourButton.addActionListener(this);
1101
1175
                 fourButton.setToolTipText("Show control panel only");
1102
1176
                 }
1103
1177
 
1104
1178
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1105
1179
                 
1106
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1107
-                twoButton.setToolTipText("Show 3D view only");
1108
-		twoButton.addActionListener(this);
1109
-                this.fullscreenLayout = twoButton;
1110
-                
1111
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
-                threeButton.setToolTipText("Show controls and 3D view");
1113
-		threeButton.addActionListener(this);
1114
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115
-                sixButton.setToolTipText("Show 3D view and controls");
1116
-		sixButton.addActionListener(this);
1117
-//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
-//                sevenButton.setToolTipText("3-column layout");
1119
-//		sevenButton.addActionListener(this);
1120
-                //
1121
1180
 
1122
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1181
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1123
1182
                 rootButton.setToolTipText("Open selection in new tab");
1124
1183
 		rootButton.addActionListener(this);
1125
1184
 
1126
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1127
1186
                 closeButton.setToolTipText("Close tab");
1128
1187
 		closeButton.addActionListener(this);
1129
1188
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1132,38 +1191,38 @@
1132
1191
                 cGridBag row1 = new cGridBag();
1133
1192
                 
1134
1193
                 // INSERT
1135
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
-                gridButton.setToolTipText("Create grid");
1194
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195
+                gridButton.setToolTipText("Create ground");
1137
1196
                                 gridButton.addActionListener(this);
1138
1197
 
1139
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1140
1199
                 boxButton.setToolTipText("Create box");
1141
1200
                                 boxButton.addActionListener(this);
1142
1201
 
1143
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144
-                sphereButton.setToolTipText("Create sphere");
1145
-                                sphereButton.addActionListener(this);
1146
-
1147
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1148
-                coneButton.setToolTipText("Create cone");
1149
-                                coneButton.addActionListener(this);
1150
-
1151
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152
-                torusButton.setToolTipText("Create torus");
1153
-                                torusButton.addActionListener(this);
1154
-
1155
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1156
1203
                 superButton.setToolTipText("Create superellipsoid");
1157
1204
                                 superButton.addActionListener(this);
1158
1205
 
1206
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207
+                sphereButton.setToolTipText("Create sphere");
1208
+                                sphereButton.addActionListener(this);
1209
+
1210
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1211
+                coneButton.setToolTipText("Create cone");
1212
+                                coneButton.addActionListener(this);
1213
+
1214
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1215
+                torusButton.setToolTipText("Create torus");
1216
+                                torusButton.addActionListener(this);
1217
+
1159
1218
                 if (Globals.ADVANCED)
1160
1219
                 {
1161
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1162
1221
                     kleinButton.setToolTipText("Create Klein bottle");
1163
1222
                                     kleinButton.addActionListener(this);
1164
1223
                 }
1165
1224
                 
1166
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1225
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1167
1226
                 particlesButton.setToolTipText("Create particle system");
1168
1227
                                particlesButton.addActionListener(this);
1169
1228
 
..
..
@@ -1171,31 +1230,31 @@
1171
1230
                 
1172
1231
                 cGridBag row2 = new cGridBag();
1173
1232
                 
1174
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1175
1234
                 groupButton.setToolTipText("Create group");
1176
1235
                                groupButton.addActionListener(this);
1177
1236
 
1178
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1179
1238
                 compositeButton.setToolTipText("Create composite");
1180
1239
                                compositeButton.addActionListener(this);
1181
1240
 
1182
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183
1242
                 switchButton.setToolTipText("Create item switcher");
1184
1243
                                switchButton.addActionListener(this);
1185
1244
 
1186
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187
1246
                 loopButton.setToolTipText("Create loop");
1188
1247
                                loopButton.addActionListener(this);
1189
1248
 
1190
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191
1250
                 textureButton.setToolTipText("Create texture");
1192
1251
                                textureButton.addActionListener(this);
1193
1252
 
1194
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1253
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195
1254
                 overlayButton.setToolTipText("Create overlay");
1196
1255
                                overlayButton.addActionListener(this);
1197
1256
 
1198
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1257
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1199
1258
                 lightButton.setToolTipText("Create light");
1200
1259
                                lightButton.addActionListener(this);
1201
1260
 
..
..
@@ -1205,6 +1264,11 @@
1205
1264
                 
1206
1265
                 CreateTexturePanel(textures);
1207
1266
                 
1267
+                int tabCount = resourcecontainer.getTabCount();
1268
+                
1269
+                if (tabCount > 0)
1270
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1271
+                
1208
1272
                 oe.toolboxPanel.add(textures);
1209
1273
                 
1210
1274
                 textures.preferredHeight = 100;
..
..
@@ -1212,11 +1276,11 @@
1212
1276
                 CreateSkyboxPanel(oe.skyboxPanel);
1213
1277
                 
1214
1278
                 // EDIT panel
1215
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
1280
                 editButton.setToolTipText("Pin selection controls");
1217
1281
 		editButton.addActionListener(this);
1218
1282
 
1219
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
1284
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1221
1285
 		uneditButton.addActionListener(this);
1222
1286
 
..
..
@@ -1224,7 +1288,7 @@
1224
1288
                 allParamsButton.setToolTipText("Show all controls");
1225
1289
 		allParamsButton.addActionListener(this);
1226
1290
 
1227
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1291
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
1292
                 clearPanelButton.setToolTipText("Clear all controls");
1229
1293
 		clearPanelButton.addActionListener(this);
1230
1294
 
..
..
@@ -1232,7 +1296,7 @@
1232
1296
                 //unselectButton.setToolTipText("Unselect");
1233
1297
 		//unselectButton.addActionListener(this);
1234
1298
 
1235
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1299
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
1300
                 flashSelectionButton.setToolTipText("Highlight selection");
1237
1301
 		flashSelectionButton.addActionListener(this);
1238
1302
                 
..
..
@@ -1255,6 +1319,8 @@
1255
1319
                 
1256
1320
                 cGridBag jSPPanel = new cGridBag();
1257
1321
 
1322
+            jSPPanel.preferredHeight = 20;
1323
+            
1258
1324
                 JScrollPane jSP;
1259
1325
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1260
1326
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1263,11 +1329,11 @@
1263
1329
                 oe.treePanel.add(jSPPanel);
1264
1330
                 oe.treePanel.Return();
1265
1331
 
1266
-                oe.treePanel.add(copyOptionsPanel);
1332
+                oe.treePanel.add(versionManagerPanel);
1267
1333
                 oe.treePanel.Return();
1268
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1269
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1270
-            sliderPane.preferredHeight = 1;
1334
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336
+            versionSliderPane.preferredHeight = 3;
1271
1337
                 
1272
1338
 //        mainPanel.setDividerLocation(0.1); //1.0);
1273
1339
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1425,6 +1491,14 @@
1425
1491
 	
1426
1492
         void EditObject(Object3D obj)
1427
1493
         {
1494
+            assert(obj instanceof Composite);
1495
+            
1496
+//            if (obj.versionlist == null)
1497
+//            {
1498
+//                obj.versionlist = new Object3D[100];
1499
+//                obj.versionindex = -1;
1500
+//            }
1501
+            
1428
1502
             cRadio radioButton = new cRadio(obj.name);
1429
1503
             
1430
1504
             // June 2019. Patch to avoid bug with transparency.
..
..
@@ -1449,6 +1523,7 @@
1449
1523
                     
1450
1524
             oe.SetupViews();
1451
1525
             
1526
+        if (Globals.DEBUG)
1452
1527
 		System.out.println("SetupViews");
1453
1528
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1454
1529
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -1815,7 +1890,12 @@
1815
1890
   TreePath path;
1816
1891
 
1817
1892
   public TransferableTreePath(TreePath tp) {
1818
-    path = tp;
1893
+      Object[] objs = new Object[tp.getPathCount()];
1894
+      for (int i=0; i<objs.length; i++)
1895
+      {
1896
+          objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1897
+      }
1898
+    path = new TreePath(objs);
1819
1899
   }
1820
1900
 
1821
1901
   public synchronized DataFlavor[] getTransferDataFlavors() {
..
..
@@ -2105,7 +2185,11 @@
2105
2185
             shadow.material = new cMaterial(obj.material);
2106
2186
             shadow.material.diffuse = 0.0001f;
2107
2187
             shadow.material.specular = 0.0001f;
2108
-            //shadow.projectedVertices[1].x = 300;
2188
+            shadow.material.opacity = 0.75f;
2189
+            
2190
+            AllocProjectedVertices(shadow);
2191
+        
2192
+            shadow.projectedVertices[1].x = 300;
2109
2193
             
2110
2194
             makeSomething(shadow);
2111
2195
         }
..
..
@@ -2626,27 +2710,35 @@
2626
2710
 		} else
2627
2711
 		if (source == loopItem || source == loopButton)
2628
2712
 		{
2713
+                    if (!group.selection.isEmpty())
2714
+                    {
2629
2715
                         Composite csg = new GroupLeaf();
2630
2716
                         csg.count = 5;
2631
-			group(csg);
2632
2717
                         Composite child = new cGroup("Branch");
2633
2718
                         csg.addChild(child);
2634
2719
                         child.addChild(csg);
2720
+			group(csg);
2721
+                    }
2635
2722
 		} else
2636
2723
 		if (source == doubleItem)
2637
2724
 		{
2725
+                    if (!group.selection.isEmpty())
2726
+                    {
2638
2727
                         Composite csg = new GroupLeaf("Fork");
2639
2728
                         csg.count = 5;
2640
-			group(csg);
2641
2729
                         Composite child = new cGroup("Branch A");
2642
2730
                         csg.addChild(child);
2643
2731
                         child.addChild(csg);
2644
2732
                         child = new cGroup("Branch B");
2645
2733
                         csg.addChild(child);
2646
2734
                         child.addChild(csg);
2735
+			group(csg);
2736
+                    }
2647
2737
 		} else
2648
2738
 		if (source == tripleItem)
2649
2739
 		{
2740
+                    if (!group.selection.isEmpty())
2741
+                    {
2650
2742
                         Composite csg = new GroupLeaf("Trident");
2651
2743
                         csg.count = 4;
2652
2744
 			group(csg);
..
..
@@ -2659,6 +2751,7 @@
2659
2751
                         child = new cGroup();
2660
2752
                         csg.addChild(child);
2661
2753
                         child.addChild(csg);
2754
+                    }
2662
2755
 		} else
2663
2756
 		if (source == computeAOItem)
2664
2757
 		{
..
..
@@ -2708,6 +2801,18 @@
2708
2801
 		if (source == fullButton)
2709
2802
 		{
2710
2803
 			ToggleFullScreen();
2804
+		} else
2805
+		if (source == collapseButton)
2806
+		{
2807
+                        this.expandedLayout = radio.layout;
2808
+			CollapseToolbar();
2809
+		} else
2810
+		if (source == maximize3DButton)
2811
+		{
2812
+                        this.expandedLayout = radio.layout;
2813
+                        radio.layout = twoButton;
2814
+                        Show3DView();
2815
+			CollapseToolbar();
2711
2816
 		} else
2712
2817
 		if (source == previousVersionButton)
2713
2818
 		{
..
..
@@ -3282,22 +3387,34 @@
3282
3387
 		} else
3283
3388
 		if (source == ungroupItem || source == ungroupButton)
3284
3389
 		{
3285
-                    boolean hasRoot = false;
3390
+                    boolean canUngroup = true;
3286
3391
                     
3287
3392
                     for (int i=0; i<group.selection.size(); i++)
3288
3393
                     {
3289
-                        if (group.selection.get(i) == group)
3394
+                        Object3D selectedItem = group.selection.get(i);
3395
+                        
3396
+                        if (selectedItem.Size() == 0)
3290
3397
                         {
3291
-                            hasRoot = true;
3398
+                            // Cannot ungroup leaves
3399
+                            canUngroup = false;
3400
+                            break;
3401
+                        }
3402
+                                
3403
+                        if (selectedItem == group)
3404
+                        {
3405
+                            // Cannot ungroup root
3406
+                            canUngroup = false;
3292
3407
                             break;
3293
3408
                         }
3294
3409
                     }
3295
3410
 
3296
-                    if (!hasRoot)
3411
+                    if (canUngroup)
3297
3412
                     {
3298
3413
                         for (int i=0; i<group.selection.size(); i++)
3299
3414
                         {
3300
-                            Ungroup(group.selection.get(i));
3415
+                            Object3D selectedItem = group.selection.get(i);
3416
+                            
3417
+                            Ungroup(selectedItem);
3301
3418
                         }
3302
3419
 
3303
3420
                         ClearSelection(false);
..
..
@@ -3660,38 +3777,7 @@
3660
3777
                     if (CameraPane.FULLSCREEN)
3661
3778
                         fullscreenLayout = radio.layout;
3662
3779
                     
3663
-                    // bug
3664
-                    //gridPanel.setDividerLocation(1.0);
3665
-                    //bigPanel.setDividerLocation(0.0);
3666
-//                    bigThree.remove(scenePanel);
3667
-//                    bigThree.remove(centralPanel);
3668
-//                    bigThree.remove(XYZPanel);
3669
-//                    aWindowConstraints.gridx = 0;
3670
-//                    aWindowConstraints.gridy = 0;
3671
-//                    aWindowConstraints.gridwidth = 1;
3672
-//            //        aConstraints.gridheight = 3;
3673
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3674
-//                    aWindowConstraints.weightx = 0;
3675
-//                    aWindowConstraints.weighty = 1;
3676
-//                    //bigThree.add(jtp, aWindowConstraints);
3677
-//                    aWindowConstraints.weightx = 1;
3678
-//                    aWindowConstraints.gridwidth = 3;
3679
-//            //        aConstraints.gridheight = 3;
3680
-//                    aWindowConstraints.gridx = 1;
3681
-//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
3682
-//                    bigThree.add(centralPanel, aWindowConstraints);
3683
-//                    aWindowConstraints.weightx = 0;
3684
-//                    aWindowConstraints.gridx = 4;
3685
-//                    aWindowConstraints.gridwidth = 1;
3686
-//            //        aConstraints.gridheight = 3;
3687
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3688
-//                    //bigThree.add(XYZPanel, aWindowConstraints);
3689
-//                    scenePanel.setVisible(false);
3690
-//                    centralPanel.setVisible(true);
3691
-//                    XYZPanel.setVisible(false);
3692
-                    bigThree.ClearUI();
3693
-                    bigThree.add(centralPanel);
3694
-                    bigThree.FlushUI();
3780
+                    Show3DView();
3695
3781
                     
3696
3782
                     cameraView.requestFocusInWindow();
3697
3783
                     
..
..
@@ -3877,6 +3963,7 @@
3877
3963
                 } else
3878
3964
 		if (source == rootButton)
3879
3965
 		{
3966
+                    Replace();
3880
3967
                     Object3D obj;
3881
3968
                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3882
3969
                     {
..
..
@@ -3891,6 +3978,8 @@
3891
3978
 		if (source == closeButton)
3892
3979
 		{
3893
3980
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3981
+                    Replace();
3982
+                    
3894
3983
                     cRadio ab;
3895
3984
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3896
3985
                     {
..
..
@@ -3989,6 +4078,8 @@
3989
4078
 		} else
3990
4079
                 if(source instanceof cRadio)
3991
4080
 		{
4081
+                    Replace();
4082
+                    
3992
4083
                     group.parent = keepparent;
3993
4084
                         group.attributes = 0;
3994
4085
                     //group.editWindow = null;
..
..
@@ -4013,8 +4104,6 @@
4013
4104
                     
4014
4105
                     copy = group;
4015
4106
                     
4016
-                    SetUndoStates();
4017
-
4018
4107
                     //Globals.theRenderer.object = group;
4019
4108
                     if(!useclient)
4020
4109
                     {
..
..
@@ -4042,6 +4131,29 @@
4042
4131
                      */
4043
4132
                     radio.layout.doClick();
4044
4133
                     
4134
+                    assert(copy instanceof Composite);
4135
+                    
4136
+        if (copy.versionlist == null)
4137
+        {
4138
+            copy.versionindex = -1;
4139
+            
4140
+            // Cannot work with loops
4141
+            // To fix this issue, we first mark all nodes above the root,
4142
+            // and check if any of these nodes are reachable below the root.
4143
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4144
+            
4145
+            if (!copy.HasTags())
4146
+            {
4147
+                copy.versionlist = new Object3D[100];
4148
+                
4149
+                Save(true);
4150
+            }
4151
+            
4152
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4153
+        }
4154
+        
4155
+                    SetVersionStates();
4156
+
4045
4157
                     ClearUnpinned();
4046
4158
                     
4047
4159
                     //Grafreed.Assert(group != null);
..
..
@@ -4185,7 +4297,7 @@
4185
4297
                         TouchTransform(obj);
4186
4298
                         continue;
4187
4299
                     }
4188
-                    if ((mask&2) != 0) // Scale
4300
+                    if ((mask&2) != 0) // Scale/rotation
4189
4301
                     {
4190
4302
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4191
4303
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4193,10 +4305,6 @@
4193
4305
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4194
4306
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4195
4307
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4196
-                    }
4197
-                    if ((mask&4) != 0) // Rotation
4198
-                    {
4199
-                        // ?
4200
4308
                     }
4201
4309
                     if ((mask&1) != 0) // Translation
4202
4310
                     {
..
..
@@ -5276,10 +5384,26 @@
5276
5384
             flashSelectionButton.setEnabled(enabled);
5277
5385
             
5278
5386
             clearPanelButton.setEnabled(!listUI.isEmpty());
5387
+            
5388
+            boolean allComposites = true;
5389
+            
5390
+            if (group.selection != null)
5391
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5392
+            {
5393
+                    Object next = e.nextElement();
5394
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5395
+                    {
5396
+                        allComposites = false;
5397
+                        break;
5398
+                    }
5399
+            }
5400
+            
5401
+            rootButton.setEnabled(allComposites);
5279
5402
         }
5280
5403
 
5281
5404
         void refreshContents(boolean cp)
5282
5405
         {
5406
+            if (Globals.ADVANCED)
5283
5407
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5284
5408
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5285
5409
             {
..
..
@@ -5290,7 +5414,7 @@
5290
5414
                     Object3D child = (Object3D) group.selection.get(i);
5291
5415
 
5292
5416
                     objEditor.AddInfo(child, this, true);
5293
-    System.err.println("info : " + child.GetPath());
5417
+//    System.err.println("info : " + child.GetPath());
5294
5418
                 }
5295
5419
 
5296
5420
                 objEditor.SetText(); // jan 2014
..
..
@@ -6173,11 +6297,11 @@
6173
6297
 	private MenuItem lookAtItem;
6174
6298
 	private MenuItem lookFromItem;
6175
6299
 	private MenuItem switchViewItem;
6176
-	private MenuItem cutItem;
6300
+	private JMenuItem cutItem;
6177
6301
 	private MenuItem undoItem;
6178
6302
 	private MenuItem redoItem;
6179
6303
 	private JMenuItem duplicateItem;
6180
-	private MenuItem cloneItem;
6304
+	private JMenuItem cloneItem;
6181
6305
 	private MenuItem cloneSupportItem;
6182
6306
 	private MenuItem overwriteGeoItem;
6183
6307
 	private MenuItem overwriteMatItem;
..
..
@@ -6198,13 +6322,13 @@
6198
6322
 	private MenuItem cloneGeometriesItem;
6199
6323
 	private MenuItem shareGeometriesItem;
6200
6324
 	private MenuItem mergeGeometriesItem;
6201
-	private MenuItem copyItem;
6325
+	private JMenuItem copyItem;
6202
6326
 	private MenuItem pasteItem;
6203
-	private MenuItem pasteIntoItem;
6204
-	private MenuItem pasteLinkItem;
6205
-	private MenuItem pasteCloneItem;
6206
-	private MenuItem pasteExpandItem;
6207
-	private MenuItem deleteItem;
6327
+	private JMenuItem pasteIntoItem;
6328
+	private JMenuItem pasteLinkItem;
6329
+	private JMenuItem pasteCloneItem;
6330
+	private JMenuItem pasteExpandItem;
6331
+	private JMenuItem deleteItem;
6208
6332
 	private MenuItem clearAllItem;
6209
6333
 	private MenuItem genUVItem;
6210
6334
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6259,7 +6383,7 @@
6259
6383
 	private MenuItem transformGeometryItem;
6260
6384
 	private MenuItem transformChildrenItem;
6261
6385
 	private MenuItem hideItem;
6262
-	private MenuItem grabItem;
6386
+	private JMenuItem grabItem;
6263
6387
 	private MenuItem backItem;
6264
6388
 	private MenuItem frontItem;
6265
6389
 	private MenuItem cameraItem;
..
..
@@ -6272,7 +6396,7 @@
6272
6396
 	private MenuItem switchTransfoItem;
6273
6397
 	private MenuItem morphItem;
6274
6398
 	private MenuItem linkerItem;
6275
-	private MenuItem ungroupItem;
6399
+	private JMenuItem ungroupItem;
6276
6400
 	private MenuItem editItem;
6277
6401
 	private MenuItem openWindowItem;
6278
6402
 	private MenuItem editLeafItem;