Minor tuning

Normand Briere

2019-08-22 6a145f6c81dfcbe0653eda27d042efb48daa7512

 GroupEditor.java
..
..
@@ -16,7 +16,7 @@
16
16
 //import buoy.widget.BFileChooser;
17
17
 
18
18
 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
-    Grafreed.iResourceCallBack,
19
+        Grafreed.iResourceCallBack,
20
20
         ObjectUI,
21
21
         Runnable,
22
22
         ActionListener,
..
..
@@ -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
..
..
@@ -42,6 +42,22 @@
42
42
         });
43
43
     }
44
44
 
45
+    public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46
+    {
47
+        cButton textureButton;
48
+        final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+        row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
+        textureButton.setToolTipText(c + count);
51
+        textureButton.addActionListener(new ActionListener()
52
+        {
53
+                @Override
54
+                public void actionPerformed(ActionEvent e)
55
+                {
56
+                    ChangeTexture(path + t);
57
+                }
58
+        });
59
+    }
60
+    
45
61
     public void AddSkyboxTab0(JTabbedPane skyboxpanel)
46
62
     {
47
63
         cGridBag tab0 = new cGridBag().setVertical(true);
..
..
@@ -57,7 +73,7 @@
57
73
         cGridBag row5 = new cGridBag();
58
74
         cGridBag row6 = new cGridBag();
59
75
         
60
-        AddSkyboxButton("default", "rgb", row0);
76
+        AddSkyboxButton("default", "", row0);
61
77
         //AddSkyboxButton("default", "cornell", row0);
62
78
         AddSkyboxButton("penguins", "dust", row0);
63
79
         AddSkyboxButton("penguins", "tropic", row0);
..
..
@@ -312,26 +328,56 @@
312
328
         }
313
329
     }
314
330
         
315
-    public void CallBack(String[] path)
316
-    {
317
-        for (int i = 0; i < path.length; i++)
318
-        {
319
-            System.out.print(path[i] + "/");
320
-        }
321
-        
322
-        System.out.println();
323
-    }
324
-    
325
331
     public void ChangeSkybox(String skybox)
326
332
     {
327
-        //cameraView.envyoff = false;
328
-        group.skyboxname = skybox;
329
-        group.skyboxext = "jpg";
330
-        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
+        }
346
+    }
331
347
 
332
-        Grafreed.ParseResources("textures", this);
348
+    public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
+    {
350
+        JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
+        
352
+        AddSkyboxTab0(skyboxpane);
353
+        AddSkyboxTab1(skyboxpane);
354
+        AddSkyboxTab2(skyboxpane);
355
+        AddSkyboxTab3(skyboxpane);
356
+        
357
+        skyboxPanel.add(skyboxpane);
333
358
     }
334
359
     
360
+    public void ChangeTexture(String texture)
361
+    {
362
+        for (int i=0; i<group.selection.size(); i++)
363
+        {
364
+            Object3D obj = group.selection.get(i);
365
+            obj.SetPigmentTexture("@" + texture);
366
+        }
367
+       
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();
379
+    }
380
+
335
381
     //ObjEditor objEditor;
336
382
 	public void closeUI2()
337
383
 	{
..
..
@@ -369,10 +415,14 @@
369
415
 		this.copy = this.group = group;
370
416
 		//selectees = this.group.selectees;
371
417
 		
418
+                assert(false);
419
+                
372
420
         if (copy.versionlist == null)
373
421
         {
374
422
             copy.versionlist = new Object3D[100];
375
423
             copy.versionindex = -1;
424
+            
425
+            //Save(true);
376
426
         }
377
427
         
378
428
 		if(ui)
..
..
@@ -401,7 +451,7 @@
401
451
             copy.versionlist = new Object3D[100];
402
452
             copy.versionindex = -1;
403
453
             
404
-            Save(true);
454
+            //Save(true);
405
455
         }
406
456
 	}
407
457
 
..
..
@@ -492,33 +542,35 @@
492
542
 //		menu.add("-");
493
543
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
494
544
 		duplicateItem.addActionListener(this);
495
-		cloneItem = menu.add(new MenuItem("Clone"));
545
+                
546
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
496
547
 		cloneItem.addActionListener(this);
497
-        if (Globals.ADVANCED)
548
+        //if (Globals.ADVANCED)
498
549
         {
499
550
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
500
551
 		cloneSupportItem.addActionListener(this);
501
552
         }
553
+                oe.jTree.popup.addSeparator();
502
554
 		menu.add("-");
503
-		cutItem = menu.add(new MenuItem("Cut"));
555
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
504
556
 		cutItem.addActionListener(this);
505
-		copyItem = menu.add(new MenuItem("Copy"));
557
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
506
558
 		copyItem.addActionListener(this);
507
559
 		pasteItem = menu.add(new MenuItem("Paste"));
508
560
 		pasteItem.addActionListener(this);
509
561
                 
510
-		menu.add("-");
511
-		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"));
512
565
 		pasteIntoItem.addActionListener(this);
513
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
514
567
 		pasteLinkItem.addActionListener(this);
515
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
516
569
 		pasteCloneItem.addActionListener(this);
517
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
518
571
 //		pasteExpandItem.addActionListener(this);
519
-		menu.add("-");
520
-		deleteItem = menu.add(new MenuItem("Delete"));
521
-		deleteItem.addActionListener(this);
572
+		//menu.add("-");
573
+                oe.jTree.popup.addSeparator();
522
574
                 
523
575
         if (Globals.ADVANCED)
524
576
         {
..
..
@@ -604,11 +656,9 @@
604
656
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
605
657
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
606
658
 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
607
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
608
659
 		oe.cameraMenu.add("-");
609
660
 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
610
661
 		openWindowItem.addActionListener(this);
611
-		editLeafItem.addActionListener(this);
612
662
 		lookAtItem.addActionListener(this);
613
663
 		//lookFromItem.addActinoListener(this);
614
664
 		//switchViewItem.addActionListener(this);
..
..
@@ -655,9 +705,8 @@
655
705
 		setMasterItem.addActionListener(this);
656
706
         }
657
707
                 
658
-		oe.menuBar.add(menu = new Menu("Group"));
659
-//		grabItem = menu.add(new MenuItem("Grab"));
660
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
661
710
 		backItem = menu.add(new MenuItem("Back"));
662
711
 		backItem.addActionListener(this);
663
712
 		frontItem = menu.add(new MenuItem("Front"));
..
..
@@ -665,13 +714,21 @@
665
714
 //		compositeItem = menu.add(new MenuItem("Composite"));
666
715
 //		compositeItem.addActionListener(this);
667
716
                 
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
719
+                
668
720
         if (Globals.ADVANCED)
669
721
         {
670
722
 		hideItem = menu.add(new MenuItem("Hidden Group"));
671
723
 		hideItem.addActionListener(this);
672
724
         }
673
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
674
726
 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
675
732
                 
676
733
 //		menu.add("-");
677
734
 //                
..
..
@@ -800,9 +857,9 @@
800
857
 		hideleavesItem.addActionListener(this);
801
858
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
802
859
 		showleavesItem.addActionListener(this);
803
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
804
861
 		markleavesItem.addActionListener(this);
805
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
806
863
 		unmarkleavesItem.addActionListener(this);
807
864
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
808
865
 		rewindleavesItem.addActionListener(this);
..
..
@@ -856,6 +913,9 @@
856
913
 		shareGeometriesItem.addActionListener(this);
857
914
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
858
915
 		mergeGeometriesItem.addActionListener(this);
916
+		menu.add("-");
917
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+		editLeafItem.addActionListener(this);
859
919
         if (Globals.ADVANCED)
860
920
         {
861
921
             // Pretty much the same as duplicate and clone.
..
..
@@ -872,6 +932,79 @@
872
932
 		buildToolsMenu(menu);
873
933
 	}
874
934
 	
935
+        JTabbedPane resourcecontainer;
936
+        cGridBag currenttab;
937
+        //boolean added; // patch for jar
938
+                
939
+        int totalcount = 0;
940
+        
941
+        int tabcount = 0;
942
+        int colcount = 0;
943
+        int rowcount = 0;
944
+        int texturecount = 0;
945
+        
946
+        int columns = 5;
947
+        int rows = 7;
948
+        
949
+    public void ResourceCallBack(String[] path)
950
+    {
951
+//        for (int i = 0; i < path.length; i++)
952
+//            System.out.print(path[i] + "/");
953
+//        System.out.println();
954
+        
955
+        if (//rowcount == 0 ||
956
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
957
+        {
958
+            currenttab = new cGridBag();
959
+            String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
960
+            currenttab.setName(tabname);
961
+            //added = false;
962
+            resourcecontainer.add(currenttab);
963
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
964
+            rowcount = 1;
965
+            colcount = 0;
966
+            texturecount = 0;
967
+        }
968
+        
969
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
970
+        {
971
+            //if (!added)
972
+            {
973
+                //added = true;
974
+                String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
975
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
976
+            }
977
+            
978
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
979
+            totalcount++;
980
+            
981
+            if (++colcount >= columns)
982
+            {
983
+                colcount = 0;
984
+                currenttab.Return();
985
+                
986
+                if (rowcount++ >= rows)
987
+                {
988
+                    rowcount = 0;
989
+                }
990
+            }
991
+        }
992
+        else
993
+        {
994
+//            if (!path[path.length-1].equals("icons"))
995
+//                resourcecontainer.Return();
996
+        }
997
+    }
998
+    
999
+        void CreateTexturePanel(cGridBag container)
1000
+        {
1001
+            resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1002
+            container.add(resourcecontainer);
1003
+            
1004
+            Grafreed.ParseResources("textures", this);
1005
+            
1006
+            // 935. System.out.println("Total = " + totalcount);
1007
+        }
875
1008
         
876
1009
 	void SetupUI2(ObjEditor oe)
877
1010
 	{
..
..
@@ -890,11 +1023,6 @@
890
1023
             //new Exception().printStackTrace();
891
1024
                 
892
1025
         oe.radioPanel = new JPanel(new GridBagLayout());
893
-	oe.aConstraints.weightx = 1;
894
-	oe.aConstraints.weighty = 0;
895
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
896
-	oe.aConstraints.gridwidth = 100;
897
-	oe.aConstraints.gridheight = 1;
898
1026
 //        oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
899
1027
         
900
1028
         oe.buttonGroup = new ButtonGroup();
..
..
@@ -915,9 +1043,9 @@
915
1043
         oe.radioPanel.add(dummyButton);
916
1044
         oe.buttonGroup.add(dummyButton);
917
1045
          */
918
-                cGridBag copyOptionsPanel = new cGridBag();
1046
+                cGridBag versionManagerPanel = new cGridBag();
919
1047
                                         
920
-                copyOptionsPanel.preferredHeight = 2;
1048
+                versionManagerPanel.preferredHeight = 4;
921
1049
                 
922
1050
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
923
1051
                 
..
..
@@ -927,62 +1055,102 @@
927
1055
                 
928
1056
                 if (Globals.ADVANCED)
929
1057
                 {
930
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
-                    maxButton.setToolTipText("Maximize window");
932
-                    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);
933
1061
                 }
934
1062
                 
935
-		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);
936
1103
                 fullButton.setToolTipText("Full-screen window");
937
1104
 		fullButton.addActionListener(this);
938
1105
                 
939
-		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);
940
1107
                 screenfitButton.setToolTipText("Screen fit");
941
1108
 		screenfitButton.addActionListener(this);
942
1109
 
943
-		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);
944
1111
                 restoreCameraButton.setToolTipText("Restore viewpoint");
945
1112
 		restoreCameraButton.addActionListener(this);
946
1113
                 
947
-		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);
948
1115
                 saveVersionButton.setToolTipText("Duplicate current version");
949
1116
 		saveVersionButton.addActionListener(this);
950
1117
                                                 
951
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
952
1119
                 deleteVersionButton.setToolTipText("Delete current version");
953
1120
 		deleteVersionButton.addActionListener(this);
1121
+                deleteVersionButton.setEnabled(false);
954
1122
                                                 
955
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
956
1124
                 previousVersionButton.setToolTipText("Previous version");
957
1125
 		previousVersionButton.addActionListener(this);
958
1126
                 previousVersionButton.setEnabled(false);
959
1127
                 
960
1128
                 cGridBag updown = new cGridBag().setVertical(true);
961
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
962
1130
                 restoreButton.setToolTipText("Undo (restore current version)");
963
1131
 		restoreButton.addActionListener(this);
964
-                //restoreButton.setEnabled(false);
1132
+                restoreButton.setEnabled(false);
965
1133
                 
966
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
967
1135
                 replaceButton.setToolTipText("Save (replace current version)");
968
1136
 		replaceButton.addActionListener(this);
969
-                //replaceButton.setEnabled(false);
1137
+                replaceButton.setEnabled(false);
970
1138
                 
971
-                copyOptionsPanel.add(updown);
1139
+                versionManagerPanel.add(updown);
972
1140
                 
973
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1141
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
974
1142
                 nextVersionButton.setToolTipText("Next version");
975
1143
 		nextVersionButton.addActionListener(this);
976
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);
977
1149
                 
978
1150
                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
979
1151
                 liveCB.setToolTipText("Enable animation");
980
1152
                                 liveCB.addItemListener(this);
981
1153
 
982
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
983
-                oneStepButton.setToolTipText("Animate one step forward");
984
-		oneStepButton.addActionListener(this);
985
-                
986
1154
                 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
987
1155
                 fastCB.setToolTipText("Fast mode");
988
1156
                                 fastCB.addItemListener(this);
..
..
@@ -998,38 +1166,23 @@
998
1166
 
999
1167
                 if (Globals.ADVANCED)
1000
1168
                 {
1001
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1002
1170
                         snapobjectButton.addActionListener(this);
1003
1171
                         snapobjectButton.setToolTipText("Snap Object");
1004
1172
                         
1005
-		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);
1006
1174
 		fourButton.addActionListener(this);
1007
1175
                 fourButton.setToolTipText("Show control panel only");
1008
1176
                 }
1009
1177
 
1010
1178
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1011
1179
                 
1012
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013
-                twoButton.setToolTipText("Show 3D view only");
1014
-		twoButton.addActionListener(this);
1015
-                this.fullscreenLayout = twoButton;
1016
-                
1017
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018
-                threeButton.setToolTipText("Show controls and 3D view");
1019
-		threeButton.addActionListener(this);
1020
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1021
-                sixButton.setToolTipText("Show 3D view and controls");
1022
-		sixButton.addActionListener(this);
1023
-//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1024
-//                sevenButton.setToolTipText("3-column layout");
1025
-//		sevenButton.addActionListener(this);
1026
-                //
1027
1180
 
1028
-		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);
1029
1182
                 rootButton.setToolTipText("Open selection in new tab");
1030
1183
 		rootButton.addActionListener(this);
1031
1184
 
1032
-                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);
1033
1186
                 closeButton.setToolTipText("Close tab");
1034
1187
 		closeButton.addActionListener(this);
1035
1188
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1038,38 +1191,38 @@
1038
1191
                 cGridBag row1 = new cGridBag();
1039
1192
                 
1040
1193
                 // INSERT
1041
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1042
-                gridButton.setToolTipText("Create grid");
1194
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195
+                gridButton.setToolTipText("Create ground");
1043
1196
                                 gridButton.addActionListener(this);
1044
1197
 
1045
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1046
1199
                 boxButton.setToolTipText("Create box");
1047
1200
                                 boxButton.addActionListener(this);
1048
1201
 
1049
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050
-                sphereButton.setToolTipText("Create sphere");
1051
-                                sphereButton.addActionListener(this);
1052
-
1053
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
-                coneButton.setToolTipText("Create cone");
1055
-                                coneButton.addActionListener(this);
1056
-
1057
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
-                torusButton.setToolTipText("Create torus");
1059
-                                torusButton.addActionListener(this);
1060
-
1061
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1062
1203
                 superButton.setToolTipText("Create superellipsoid");
1063
1204
                                 superButton.addActionListener(this);
1064
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
+
1065
1218
                 if (Globals.ADVANCED)
1066
1219
                 {
1067
-                    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);
1068
1221
                     kleinButton.setToolTipText("Create Klein bottle");
1069
1222
                                     kleinButton.addActionListener(this);
1070
1223
                 }
1071
1224
                 
1072
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1225
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1073
1226
                 particlesButton.setToolTipText("Create particle system");
1074
1227
                                particlesButton.addActionListener(this);
1075
1228
 
..
..
@@ -1077,72 +1230,73 @@
1077
1230
                 
1078
1231
                 cGridBag row2 = new cGridBag();
1079
1232
                 
1080
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1081
1234
                 groupButton.setToolTipText("Create group");
1082
1235
                                groupButton.addActionListener(this);
1083
1236
 
1084
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1085
1238
                 compositeButton.setToolTipText("Create composite");
1086
1239
                                compositeButton.addActionListener(this);
1087
1240
 
1088
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
1242
                 switchButton.setToolTipText("Create item switcher");
1090
1243
                                switchButton.addActionListener(this);
1091
1244
 
1092
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1093
1246
                 loopButton.setToolTipText("Create loop");
1094
1247
                                loopButton.addActionListener(this);
1095
1248
 
1096
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1097
1250
                 textureButton.setToolTipText("Create texture");
1098
1251
                                textureButton.addActionListener(this);
1099
1252
 
1100
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1253
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1101
1254
                 overlayButton.setToolTipText("Create overlay");
1102
1255
                                overlayButton.addActionListener(this);
1103
1256
 
1104
-                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);
1105
1258
                 lightButton.setToolTipText("Create light");
1106
1259
                                lightButton.addActionListener(this);
1107
1260
 
1108
1261
                 oe.toolboxPanel.add(row2);
1109
1262
                 
1110
-                // ENVYMAPS
1111
-                cGridBag skyboxpane = new cGridBag();
1112
-                skyboxpane.preferredHeight = 100;
1263
+                cGridBag textures = new cGridBag();
1113
1264
                 
1114
-                oe.skyboxPanel.add(skyboxpane);
1265
+                CreateTexturePanel(textures);
1115
1266
                 
1116
-                JTabbedPane skyboxpanel = new JTabbedPane();
1117
-                skyboxpane.add(skyboxpanel);
1267
+                int tabCount = resourcecontainer.getTabCount();
1118
1268
                 
1119
-                AddSkyboxTab0(skyboxpanel);
1120
-                AddSkyboxTab1(skyboxpanel);
1121
-                AddSkyboxTab2(skyboxpanel);
1122
-                AddSkyboxTab3(skyboxpanel);
1269
+                if (tabCount > 0)
1270
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1271
+                
1272
+                oe.toolboxPanel.add(textures);
1273
+                
1274
+                textures.preferredHeight = 100;
1275
+                
1276
+                CreateSkyboxPanel(oe.skyboxPanel);
1123
1277
                 
1124
1278
                 // EDIT panel
1125
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1126
1280
                 editButton.setToolTipText("Pin selection controls");
1127
1281
 		editButton.addActionListener(this);
1128
1282
 
1129
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
1284
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1131
1285
 		uneditButton.addActionListener(this);
1132
1286
 
1133
1287
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1134
-                allParamsButton.setToolTipText("Show all controle");
1288
+                allParamsButton.setToolTipText("Show all controls");
1135
1289
 		allParamsButton.addActionListener(this);
1136
1290
 
1137
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1138
-                clearPanelButton.setToolTipText("Clear edit panel");
1291
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1292
+                clearPanelButton.setToolTipText("Clear all controls");
1139
1293
 		clearPanelButton.addActionListener(this);
1140
1294
 
1141
1295
 		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1142
1296
                 //unselectButton.setToolTipText("Unselect");
1143
1297
 		//unselectButton.addActionListener(this);
1144
1298
 
1145
-		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);
1146
1300
                 flashSelectionButton.setToolTipText("Highlight selection");
1147
1301
 		flashSelectionButton.addActionListener(this);
1148
1302
                 
..
..
@@ -1165,6 +1319,8 @@
1165
1319
                 
1166
1320
                 cGridBag jSPPanel = new cGridBag();
1167
1321
 
1322
+            jSPPanel.preferredHeight = 20;
1323
+            
1168
1324
                 JScrollPane jSP;
1169
1325
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1170
1326
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1173,11 +1329,11 @@
1173
1329
                 oe.treePanel.add(jSPPanel);
1174
1330
                 oe.treePanel.Return();
1175
1331
 
1176
-                oe.treePanel.add(copyOptionsPanel);
1332
+                oe.treePanel.add(versionManagerPanel);
1177
1333
                 oe.treePanel.Return();
1178
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1179
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1180
-            sliderPane.preferredHeight = 1;
1334
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336
+            versionSliderPane.preferredHeight = 3;
1181
1337
                 
1182
1338
 //        mainPanel.setDividerLocation(0.1); //1.0);
1183
1339
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1335,6 +1491,14 @@
1335
1491
 	
1336
1492
         void EditObject(Object3D obj)
1337
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
+            
1338
1502
             cRadio radioButton = new cRadio(obj.name);
1339
1503
             
1340
1504
             // June 2019. Patch to avoid bug with transparency.
..
..
@@ -1359,6 +1523,7 @@
1359
1523
                     
1360
1524
             oe.SetupViews();
1361
1525
             
1526
+        if (Globals.DEBUG)
1362
1527
 		System.out.println("SetupViews");
1363
1528
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1364
1529
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -1725,7 +1890,12 @@
1725
1890
   TreePath path;
1726
1891
 
1727
1892
   public TransferableTreePath(TreePath tp) {
1728
-    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);
1729
1899
   }
1730
1900
 
1731
1901
   public synchronized DataFlavor[] getTransferDataFlavors() {
..
..
@@ -2015,7 +2185,11 @@
2015
2185
             shadow.material = new cMaterial(obj.material);
2016
2186
             shadow.material.diffuse = 0.0001f;
2017
2187
             shadow.material.specular = 0.0001f;
2018
-            //shadow.projectedVertices[1].x = 300;
2188
+            shadow.material.opacity = 0.75f;
2189
+            
2190
+            AllocProjectedVertices(shadow);
2191
+        
2192
+            shadow.projectedVertices[1].x = 300;
2019
2193
             
2020
2194
             makeSomething(shadow);
2021
2195
         }
..
..
@@ -2536,27 +2710,35 @@
2536
2710
 		} else
2537
2711
 		if (source == loopItem || source == loopButton)
2538
2712
 		{
2713
+                    if (!group.selection.isEmpty())
2714
+                    {
2539
2715
                         Composite csg = new GroupLeaf();
2540
2716
                         csg.count = 5;
2541
-			group(csg);
2542
2717
                         Composite child = new cGroup("Branch");
2543
2718
                         csg.addChild(child);
2544
2719
                         child.addChild(csg);
2720
+			group(csg);
2721
+                    }
2545
2722
 		} else
2546
2723
 		if (source == doubleItem)
2547
2724
 		{
2725
+                    if (!group.selection.isEmpty())
2726
+                    {
2548
2727
                         Composite csg = new GroupLeaf("Fork");
2549
2728
                         csg.count = 5;
2550
-			group(csg);
2551
2729
                         Composite child = new cGroup("Branch A");
2552
2730
                         csg.addChild(child);
2553
2731
                         child.addChild(csg);
2554
2732
                         child = new cGroup("Branch B");
2555
2733
                         csg.addChild(child);
2556
2734
                         child.addChild(csg);
2735
+			group(csg);
2736
+                    }
2557
2737
 		} else
2558
2738
 		if (source == tripleItem)
2559
2739
 		{
2740
+                    if (!group.selection.isEmpty())
2741
+                    {
2560
2742
                         Composite csg = new GroupLeaf("Trident");
2561
2743
                         csg.count = 4;
2562
2744
 			group(csg);
..
..
@@ -2569,6 +2751,7 @@
2569
2751
                         child = new cGroup();
2570
2752
                         csg.addChild(child);
2571
2753
                         child.addChild(csg);
2754
+                    }
2572
2755
 		} else
2573
2756
 		if (source == computeAOItem)
2574
2757
 		{
..
..
@@ -2618,6 +2801,18 @@
2618
2801
 		if (source == fullButton)
2619
2802
 		{
2620
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();
2621
2816
 		} else
2622
2817
 		if (source == previousVersionButton)
2623
2818
 		{
..
..
@@ -3192,22 +3387,34 @@
3192
3387
 		} else
3193
3388
 		if (source == ungroupItem || source == ungroupButton)
3194
3389
 		{
3195
-                    boolean hasRoot = false;
3390
+                    boolean canUngroup = true;
3196
3391
                     
3197
3392
                     for (int i=0; i<group.selection.size(); i++)
3198
3393
                     {
3199
-                        if (group.selection.get(i) == group)
3394
+                        Object3D selectedItem = group.selection.get(i);
3395
+                        
3396
+                        if (selectedItem.Size() == 0)
3200
3397
                         {
3201
-                            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;
3202
3407
                             break;
3203
3408
                         }
3204
3409
                     }
3205
3410
 
3206
-                    if (!hasRoot)
3411
+                    if (canUngroup)
3207
3412
                     {
3208
3413
                         for (int i=0; i<group.selection.size(); i++)
3209
3414
                         {
3210
-                            Ungroup(group.selection.get(i));
3415
+                            Object3D selectedItem = group.selection.get(i);
3416
+                            
3417
+                            Ungroup(selectedItem);
3211
3418
                         }
3212
3419
 
3213
3420
                         ClearSelection(false);
..
..
@@ -3570,38 +3777,7 @@
3570
3777
                     if (CameraPane.FULLSCREEN)
3571
3778
                         fullscreenLayout = radio.layout;
3572
3779
                     
3573
-                    // bug
3574
-                    //gridPanel.setDividerLocation(1.0);
3575
-                    //bigPanel.setDividerLocation(0.0);
3576
-//                    bigThree.remove(scenePanel);
3577
-//                    bigThree.remove(centralPanel);
3578
-//                    bigThree.remove(XYZPanel);
3579
-//                    aWindowConstraints.gridx = 0;
3580
-//                    aWindowConstraints.gridy = 0;
3581
-//                    aWindowConstraints.gridwidth = 1;
3582
-//            //        aConstraints.gridheight = 3;
3583
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3584
-//                    aWindowConstraints.weightx = 0;
3585
-//                    aWindowConstraints.weighty = 1;
3586
-//                    //bigThree.add(jtp, aWindowConstraints);
3587
-//                    aWindowConstraints.weightx = 1;
3588
-//                    aWindowConstraints.gridwidth = 3;
3589
-//            //        aConstraints.gridheight = 3;
3590
-//                    aWindowConstraints.gridx = 1;
3591
-//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
3592
-//                    bigThree.add(centralPanel, aWindowConstraints);
3593
-//                    aWindowConstraints.weightx = 0;
3594
-//                    aWindowConstraints.gridx = 4;
3595
-//                    aWindowConstraints.gridwidth = 1;
3596
-//            //        aConstraints.gridheight = 3;
3597
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3598
-//                    //bigThree.add(XYZPanel, aWindowConstraints);
3599
-//                    scenePanel.setVisible(false);
3600
-//                    centralPanel.setVisible(true);
3601
-//                    XYZPanel.setVisible(false);
3602
-                    bigThree.ClearUI();
3603
-                    bigThree.add(centralPanel);
3604
-                    bigThree.FlushUI();
3780
+                    Show3DView();
3605
3781
                     
3606
3782
                     cameraView.requestFocusInWindow();
3607
3783
                     
..
..
@@ -3787,6 +3963,7 @@
3787
3963
                 } else
3788
3964
 		if (source == rootButton)
3789
3965
 		{
3966
+                    Replace();
3790
3967
                     Object3D obj;
3791
3968
                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3792
3969
                     {
..
..
@@ -3801,6 +3978,8 @@
3801
3978
 		if (source == closeButton)
3802
3979
 		{
3803
3980
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3981
+                    Replace();
3982
+                    
3804
3983
                     cRadio ab;
3805
3984
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3806
3985
                     {
..
..
@@ -3899,6 +4078,8 @@
3899
4078
 		} else
3900
4079
                 if(source instanceof cRadio)
3901
4080
 		{
4081
+                    Replace();
4082
+                    
3902
4083
                     group.parent = keepparent;
3903
4084
                         group.attributes = 0;
3904
4085
                     //group.editWindow = null;
..
..
@@ -3923,8 +4104,6 @@
3923
4104
                     
3924
4105
                     copy = group;
3925
4106
                     
3926
-                    SetUndoStates();
3927
-
3928
4107
                     //Globals.theRenderer.object = group;
3929
4108
                     if(!useclient)
3930
4109
                     {
..
..
@@ -3952,6 +4131,29 @@
3952
4131
                      */
3953
4132
                     radio.layout.doClick();
3954
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
+
3955
4157
                     ClearUnpinned();
3956
4158
                     
3957
4159
                     //Grafreed.Assert(group != null);
..
..
@@ -4095,7 +4297,7 @@
4095
4297
                         TouchTransform(obj);
4096
4298
                         continue;
4097
4299
                     }
4098
-                    if ((mask&2) != 0) // Scale
4300
+                    if ((mask&2) != 0) // Scale/rotation
4099
4301
                     {
4100
4302
                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4101
4303
                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..
..
@@ -4103,10 +4305,6 @@
4103
4305
                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4104
4306
                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4105
4307
                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4106
-                    }
4107
-                    if ((mask&4) != 0) // Rotation
4108
-                    {
4109
-                        // ?
4110
4308
                     }
4111
4309
                     if ((mask&1) != 0) // Translation
4112
4310
                     {
..
..
@@ -5186,10 +5384,26 @@
5186
5384
             flashSelectionButton.setEnabled(enabled);
5187
5385
             
5188
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);
5189
5402
         }
5190
5403
 
5191
5404
         void refreshContents(boolean cp)
5192
5405
         {
5406
+            if (Globals.ADVANCED)
5193
5407
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5194
5408
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5195
5409
             {
..
..
@@ -5200,7 +5414,7 @@
5200
5414
                     Object3D child = (Object3D) group.selection.get(i);
5201
5415
 
5202
5416
                     objEditor.AddInfo(child, this, true);
5203
-    System.err.println("info : " + child.GetPath());
5417
+//    System.err.println("info : " + child.GetPath());
5204
5418
                 }
5205
5419
 
5206
5420
                 objEditor.SetText(); // jan 2014
..
..
@@ -6083,11 +6297,11 @@
6083
6297
 	private MenuItem lookAtItem;
6084
6298
 	private MenuItem lookFromItem;
6085
6299
 	private MenuItem switchViewItem;
6086
-	private MenuItem cutItem;
6300
+	private JMenuItem cutItem;
6087
6301
 	private MenuItem undoItem;
6088
6302
 	private MenuItem redoItem;
6089
6303
 	private JMenuItem duplicateItem;
6090
-	private MenuItem cloneItem;
6304
+	private JMenuItem cloneItem;
6091
6305
 	private MenuItem cloneSupportItem;
6092
6306
 	private MenuItem overwriteGeoItem;
6093
6307
 	private MenuItem overwriteMatItem;
..
..
@@ -6108,13 +6322,13 @@
6108
6322
 	private MenuItem cloneGeometriesItem;
6109
6323
 	private MenuItem shareGeometriesItem;
6110
6324
 	private MenuItem mergeGeometriesItem;
6111
-	private MenuItem copyItem;
6325
+	private JMenuItem copyItem;
6112
6326
 	private MenuItem pasteItem;
6113
-	private MenuItem pasteIntoItem;
6114
-	private MenuItem pasteLinkItem;
6115
-	private MenuItem pasteCloneItem;
6116
-	private MenuItem pasteExpandItem;
6117
-	private MenuItem deleteItem;
6327
+	private JMenuItem pasteIntoItem;
6328
+	private JMenuItem pasteLinkItem;
6329
+	private JMenuItem pasteCloneItem;
6330
+	private JMenuItem pasteExpandItem;
6331
+	private JMenuItem deleteItem;
6118
6332
 	private MenuItem clearAllItem;
6119
6333
 	private MenuItem genUVItem;
6120
6334
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6169,7 +6383,7 @@
6169
6383
 	private MenuItem transformGeometryItem;
6170
6384
 	private MenuItem transformChildrenItem;
6171
6385
 	private MenuItem hideItem;
6172
-	private MenuItem grabItem;
6386
+	private JMenuItem grabItem;
6173
6387
 	private MenuItem backItem;
6174
6388
 	private MenuItem frontItem;
6175
6389
 	private MenuItem cameraItem;
..
..
@@ -6182,7 +6396,7 @@
6182
6396
 	private MenuItem switchTransfoItem;
6183
6397
 	private MenuItem morphItem;
6184
6398
 	private MenuItem linkerItem;
6185
-	private MenuItem ungroupItem;
6399
+	private JMenuItem ungroupItem;
6186
6400
 	private MenuItem editItem;
6187
6401
 	private MenuItem openWindowItem;
6188
6402
 	private MenuItem editLeafItem;