Popup menu.

Normand Briere

2019-08-15 7f97054d681518416a4ee1c1548ad42cfb489a8f

 GroupEditor.java
..
..
@@ -31,7 +31,7 @@
31
31
         final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
32
         row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.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
..
..
@@ -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,10 +330,19 @@
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)
..
..
@@ -531,32 +540,37 @@
531
540
 //		menu.add("-");
532
541
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
533
542
 		duplicateItem.addActionListener(this);
534
-		cloneItem = menu.add(new MenuItem("Clone"));
543
+                
544
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
535
545
 		cloneItem.addActionListener(this);
536
-        if (Globals.ADVANCED)
546
+        //if (Globals.ADVANCED)
537
547
         {
538
548
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
539
549
 		cloneSupportItem.addActionListener(this);
540
550
         }
551
+                oe.jTree.popup.addSeparator();
541
552
 		menu.add("-");
542
-		cutItem = menu.add(new MenuItem("Cut"));
553
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
543
554
 		cutItem.addActionListener(this);
544
-		copyItem = menu.add(new MenuItem("Copy"));
555
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
545
556
 		copyItem.addActionListener(this);
546
557
 		pasteItem = menu.add(new MenuItem("Paste"));
547
558
 		pasteItem.addActionListener(this);
548
559
                 
549
-		menu.add("-");
550
-		pasteIntoItem = menu.add(new MenuItem("Paste into"));
560
+                oe.jTree.popup.addSeparator();
561
+		//menu.add("-");
562
+		pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
551
563
 		pasteIntoItem.addActionListener(this);
552
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
564
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
553
565
 		pasteLinkItem.addActionListener(this);
554
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
566
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
555
567
 		pasteCloneItem.addActionListener(this);
556
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
568
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
557
569
 //		pasteExpandItem.addActionListener(this);
558
-		menu.add("-");
559
-		deleteItem = menu.add(new MenuItem("Delete"));
570
+		//menu.add("-");
571
+                oe.jTree.popup.addSeparator();
572
+                
573
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
560
574
 		deleteItem.addActionListener(this);
561
575
                 
562
576
         if (Globals.ADVANCED)
..
..
@@ -707,7 +721,7 @@
707
721
 		hideItem = menu.add(new MenuItem("Hidden Group"));
708
722
 		hideItem.addActionListener(this);
709
723
         }
710
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
724
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711
725
 		ungroupItem.addActionListener(this);
712
726
                 
713
727
 //		menu.add("-");
..
..
@@ -926,9 +940,9 @@
926
940
         
927
941
     public void ResourceCallBack(String[] path)
928
942
     {
929
-//        for (int i = 0; i < path.length; i++)
930
-//            System.out.print(path[i] + "/");
931
-//        System.out.println();
943
+        for (int i = 0; i < path.length; i++)
944
+            System.out.print(path[i] + "/");
945
+        System.out.println();
932
946
         
933
947
         if (//rowcount == 0 ||
934
948
                 path.length == 1)
..
..
@@ -1034,8 +1048,8 @@
1034
1048
 //                    maxButton.addActionListener(this);
1035
1049
                 }
1036
1050
                 
1037
-//                cButton gcButton;
1038
-//                
1051
+                cButton gcButton;
1052
+                
1039
1053
 //		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040
1054
 //                gcButton.setToolTipText("Garbage collect");
1041
1055
 //                gcButton.addActionListener(new ActionListener()
..
..
@@ -1459,11 +1473,11 @@
1459
1473
         {
1460
1474
             assert(obj instanceof Composite);
1461
1475
             
1462
-            if (obj.versionlist == null)
1463
-            {
1464
-                obj.versionlist = new Object3D[100];
1465
-                obj.versionindex = -1;
1466
-            }
1476
+//            if (obj.versionlist == null)
1477
+//            {
1478
+//                obj.versionlist = new Object3D[100];
1479
+//                obj.versionindex = -1;
1480
+//            }
1467
1481
             
1468
1482
             cRadio radioButton = new cRadio(obj.name);
1469
1483
             
..
..
@@ -2671,27 +2685,35 @@
2671
2685
 		} else
2672
2686
 		if (source == loopItem || source == loopButton)
2673
2687
 		{
2688
+                    if (!group.selection.isEmpty())
2689
+                    {
2674
2690
                         Composite csg = new GroupLeaf();
2675
2691
                         csg.count = 5;
2676
-			group(csg);
2677
2692
                         Composite child = new cGroup("Branch");
2678
2693
                         csg.addChild(child);
2679
2694
                         child.addChild(csg);
2695
+			group(csg);
2696
+                    }
2680
2697
 		} else
2681
2698
 		if (source == doubleItem)
2682
2699
 		{
2700
+                    if (!group.selection.isEmpty())
2701
+                    {
2683
2702
                         Composite csg = new GroupLeaf("Fork");
2684
2703
                         csg.count = 5;
2685
-			group(csg);
2686
2704
                         Composite child = new cGroup("Branch A");
2687
2705
                         csg.addChild(child);
2688
2706
                         child.addChild(csg);
2689
2707
                         child = new cGroup("Branch B");
2690
2708
                         csg.addChild(child);
2691
2709
                         child.addChild(csg);
2710
+			group(csg);
2711
+                    }
2692
2712
 		} else
2693
2713
 		if (source == tripleItem)
2694
2714
 		{
2715
+                    if (!group.selection.isEmpty())
2716
+                    {
2695
2717
                         Composite csg = new GroupLeaf("Trident");
2696
2718
                         csg.count = 4;
2697
2719
 			group(csg);
..
..
@@ -2704,6 +2726,7 @@
2704
2726
                         child = new cGroup();
2705
2727
                         csg.addChild(child);
2706
2728
                         child.addChild(csg);
2729
+                    }
2707
2730
 		} else
2708
2731
 		if (source == computeAOItem)
2709
2732
 		{
..
..
@@ -3339,22 +3362,34 @@
3339
3362
 		} else
3340
3363
 		if (source == ungroupItem || source == ungroupButton)
3341
3364
 		{
3342
-                    boolean hasRoot = false;
3365
+                    boolean canUngroup = true;
3343
3366
                     
3344
3367
                     for (int i=0; i<group.selection.size(); i++)
3345
3368
                     {
3346
-                        if (group.selection.get(i) == group)
3369
+                        Object3D selectedItem = group.selection.get(i);
3370
+                        
3371
+                        if (selectedItem.Size() == 0)
3347
3372
                         {
3348
-                            hasRoot = true;
3373
+                            // Cannot ungroup leaves
3374
+                            canUngroup = false;
3375
+                            break;
3376
+                        }
3377
+                                
3378
+                        if (selectedItem == group)
3379
+                        {
3380
+                            // Cannot ungroup root
3381
+                            canUngroup = false;
3349
3382
                             break;
3350
3383
                         }
3351
3384
                     }
3352
3385
 
3353
-                    if (!hasRoot)
3386
+                    if (canUngroup)
3354
3387
                     {
3355
3388
                         for (int i=0; i<group.selection.size(); i++)
3356
3389
                         {
3357
-                            Ungroup(group.selection.get(i));
3390
+                            Object3D selectedItem = group.selection.get(i);
3391
+                            
3392
+                            Ungroup(selectedItem);
3358
3393
                         }
3359
3394
 
3360
3395
                         ClearSelection(false);
..
..
@@ -4067,7 +4102,17 @@
4067
4102
                      */
4068
4103
                     radio.layout.doClick();
4069
4104
                     
4070
-                    SetUndoStates();
4105
+                    assert(copy instanceof Composite);
4106
+                    
4107
+        if (copy.versionlist == null)
4108
+        {
4109
+            copy.versionlist = new Object3D[100];
4110
+            copy.versionindex = -1;
4111
+            
4112
+            Save(true);
4113
+        }
4114
+        
4115
+                    SetVersionStates();
4071
4116
 
4072
4117
                     ClearUnpinned();
4073
4118
                     
..
..
@@ -5306,6 +5351,7 @@
5306
5351
             
5307
5352
             boolean allComposites = true;
5308
5353
             
5354
+            if (group.selection != null)
5309
5355
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310
5356
             {
5311
5357
                     if (!(e.nextElement() instanceof Composite))
..
..
@@ -6213,11 +6259,11 @@
6213
6259
 	private MenuItem lookAtItem;
6214
6260
 	private MenuItem lookFromItem;
6215
6261
 	private MenuItem switchViewItem;
6216
-	private MenuItem cutItem;
6262
+	private JMenuItem cutItem;
6217
6263
 	private MenuItem undoItem;
6218
6264
 	private MenuItem redoItem;
6219
6265
 	private JMenuItem duplicateItem;
6220
-	private MenuItem cloneItem;
6266
+	private JMenuItem cloneItem;
6221
6267
 	private MenuItem cloneSupportItem;
6222
6268
 	private MenuItem overwriteGeoItem;
6223
6269
 	private MenuItem overwriteMatItem;
..
..
@@ -6238,13 +6284,13 @@
6238
6284
 	private MenuItem cloneGeometriesItem;
6239
6285
 	private MenuItem shareGeometriesItem;
6240
6286
 	private MenuItem mergeGeometriesItem;
6241
-	private MenuItem copyItem;
6287
+	private JMenuItem copyItem;
6242
6288
 	private MenuItem pasteItem;
6243
-	private MenuItem pasteIntoItem;
6244
-	private MenuItem pasteLinkItem;
6245
-	private MenuItem pasteCloneItem;
6246
-	private MenuItem pasteExpandItem;
6247
-	private MenuItem deleteItem;
6289
+	private JMenuItem pasteIntoItem;
6290
+	private JMenuItem pasteLinkItem;
6291
+	private JMenuItem pasteCloneItem;
6292
+	private JMenuItem pasteExpandItem;
6293
+	private JMenuItem deleteItem;
6248
6294
 	private MenuItem clearAllItem;
6249
6295
 	private MenuItem genUVItem;
6250
6296
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6312,7 +6358,7 @@
6312
6358
 	private MenuItem switchTransfoItem;
6313
6359
 	private MenuItem morphItem;
6314
6360
 	private MenuItem linkerItem;
6315
-	private MenuItem ungroupItem;
6361
+	private JMenuItem ungroupItem;
6316
6362
 	private MenuItem editItem;
6317
6363
 	private MenuItem openWindowItem;
6318
6364
 	private MenuItem editLeafItem;