Popup menu.

Normand Briere

2019-08-15 7f97054d681518416a4ee1c1548ad42cfb489a8f

Popup menu.

 Camera.java
..
..
@@ -71,7 +71,7 @@
71
71
             perspective = false;
72
72
             break;
73
73
         case 4: // Default light
74
-            location = LA.newVector(10, 30, 20);
74
+            location = LA.newVector(-10, 30, 20);
75
75
             perspective = false;
76
76
             break;
77
77
         }
 Grafreed.java
..
..
@@ -928,6 +928,9 @@
928
928
         grafreed.universe = new cGroup();
929
929
         grafreed.universe.name = "Grafreed";
930
930
         grafreed.universe.material = new cMaterial();
931
+        grafreed.universe.skyboxname = "cubemaps/penguins-skyboxes/tropic";
932
+        grafreed.universe.skyboxext = "jpg";
933
+        
931
934
         //   theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
932
935
 
933
936
         grafreed.universe.root = true;
 GroupEditor.java
..
..
@@ -540,32 +540,37 @@
540
540
 //		menu.add("-");
541
541
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
542
542
 		duplicateItem.addActionListener(this);
543
-		cloneItem = menu.add(new MenuItem("Clone"));
543
+                
544
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
544
545
 		cloneItem.addActionListener(this);
545
-        if (Globals.ADVANCED)
546
+        //if (Globals.ADVANCED)
546
547
         {
547
548
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
548
549
 		cloneSupportItem.addActionListener(this);
549
550
         }
551
+                oe.jTree.popup.addSeparator();
550
552
 		menu.add("-");
551
-		cutItem = menu.add(new MenuItem("Cut"));
553
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
552
554
 		cutItem.addActionListener(this);
553
-		copyItem = menu.add(new MenuItem("Copy"));
555
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
554
556
 		copyItem.addActionListener(this);
555
557
 		pasteItem = menu.add(new MenuItem("Paste"));
556
558
 		pasteItem.addActionListener(this);
557
559
                 
558
-		menu.add("-");
559
-		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"));
560
563
 		pasteIntoItem.addActionListener(this);
561
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
564
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
562
565
 		pasteLinkItem.addActionListener(this);
563
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
566
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
564
567
 		pasteCloneItem.addActionListener(this);
565
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
568
+// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
566
569
 //		pasteExpandItem.addActionListener(this);
567
-		menu.add("-");
568
-		deleteItem = menu.add(new MenuItem("Delete"));
570
+		//menu.add("-");
571
+                oe.jTree.popup.addSeparator();
572
+                
573
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
569
574
 		deleteItem.addActionListener(this);
570
575
                 
571
576
         if (Globals.ADVANCED)
..
..
@@ -716,7 +721,7 @@
716
721
 		hideItem = menu.add(new MenuItem("Hidden Group"));
717
722
 		hideItem.addActionListener(this);
718
723
         }
719
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
724
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
720
725
 		ungroupItem.addActionListener(this);
721
726
                 
722
727
 //		menu.add("-");
..
..
@@ -935,9 +940,9 @@
935
940
         
936
941
     public void ResourceCallBack(String[] path)
937
942
     {
938
-//        for (int i = 0; i < path.length; i++)
939
-//            System.out.print(path[i] + "/");
940
-//        System.out.println();
943
+        for (int i = 0; i < path.length; i++)
944
+            System.out.print(path[i] + "/");
945
+        System.out.println();
941
946
         
942
947
         if (//rowcount == 0 ||
943
948
                 path.length == 1)
..
..
@@ -2680,27 +2685,35 @@
2680
2685
 		} else
2681
2686
 		if (source == loopItem || source == loopButton)
2682
2687
 		{
2688
+                    if (!group.selection.isEmpty())
2689
+                    {
2683
2690
                         Composite csg = new GroupLeaf();
2684
2691
                         csg.count = 5;
2685
-			group(csg);
2686
2692
                         Composite child = new cGroup("Branch");
2687
2693
                         csg.addChild(child);
2688
2694
                         child.addChild(csg);
2695
+			group(csg);
2696
+                    }
2689
2697
 		} else
2690
2698
 		if (source == doubleItem)
2691
2699
 		{
2700
+                    if (!group.selection.isEmpty())
2701
+                    {
2692
2702
                         Composite csg = new GroupLeaf("Fork");
2693
2703
                         csg.count = 5;
2694
-			group(csg);
2695
2704
                         Composite child = new cGroup("Branch A");
2696
2705
                         csg.addChild(child);
2697
2706
                         child.addChild(csg);
2698
2707
                         child = new cGroup("Branch B");
2699
2708
                         csg.addChild(child);
2700
2709
                         child.addChild(csg);
2710
+			group(csg);
2711
+                    }
2701
2712
 		} else
2702
2713
 		if (source == tripleItem)
2703
2714
 		{
2715
+                    if (!group.selection.isEmpty())
2716
+                    {
2704
2717
                         Composite csg = new GroupLeaf("Trident");
2705
2718
                         csg.count = 4;
2706
2719
 			group(csg);
..
..
@@ -2713,6 +2726,7 @@
2713
2726
                         child = new cGroup();
2714
2727
                         csg.addChild(child);
2715
2728
                         child.addChild(csg);
2729
+                    }
2716
2730
 		} else
2717
2731
 		if (source == computeAOItem)
2718
2732
 		{
..
..
@@ -3348,22 +3362,34 @@
3348
3362
 		} else
3349
3363
 		if (source == ungroupItem || source == ungroupButton)
3350
3364
 		{
3351
-                    boolean hasRoot = false;
3365
+                    boolean canUngroup = true;
3352
3366
                     
3353
3367
                     for (int i=0; i<group.selection.size(); i++)
3354
3368
                     {
3355
-                        if (group.selection.get(i) == group)
3369
+                        Object3D selectedItem = group.selection.get(i);
3370
+                        
3371
+                        if (selectedItem.Size() == 0)
3356
3372
                         {
3357
-                            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;
3358
3382
                             break;
3359
3383
                         }
3360
3384
                     }
3361
3385
 
3362
-                    if (!hasRoot)
3386
+                    if (canUngroup)
3363
3387
                     {
3364
3388
                         for (int i=0; i<group.selection.size(); i++)
3365
3389
                         {
3366
-                            Ungroup(group.selection.get(i));
3390
+                            Object3D selectedItem = group.selection.get(i);
3391
+                            
3392
+                            Ungroup(selectedItem);
3367
3393
                         }
3368
3394
 
3369
3395
                         ClearSelection(false);
..
..
@@ -6233,11 +6259,11 @@
6233
6259
 	private MenuItem lookAtItem;
6234
6260
 	private MenuItem lookFromItem;
6235
6261
 	private MenuItem switchViewItem;
6236
-	private MenuItem cutItem;
6262
+	private JMenuItem cutItem;
6237
6263
 	private MenuItem undoItem;
6238
6264
 	private MenuItem redoItem;
6239
6265
 	private JMenuItem duplicateItem;
6240
-	private MenuItem cloneItem;
6266
+	private JMenuItem cloneItem;
6241
6267
 	private MenuItem cloneSupportItem;
6242
6268
 	private MenuItem overwriteGeoItem;
6243
6269
 	private MenuItem overwriteMatItem;
..
..
@@ -6258,13 +6284,13 @@
6258
6284
 	private MenuItem cloneGeometriesItem;
6259
6285
 	private MenuItem shareGeometriesItem;
6260
6286
 	private MenuItem mergeGeometriesItem;
6261
-	private MenuItem copyItem;
6287
+	private JMenuItem copyItem;
6262
6288
 	private MenuItem pasteItem;
6263
-	private MenuItem pasteIntoItem;
6264
-	private MenuItem pasteLinkItem;
6265
-	private MenuItem pasteCloneItem;
6266
-	private MenuItem pasteExpandItem;
6267
-	private MenuItem deleteItem;
6289
+	private JMenuItem pasteIntoItem;
6290
+	private JMenuItem pasteLinkItem;
6291
+	private JMenuItem pasteCloneItem;
6292
+	private JMenuItem pasteExpandItem;
6293
+	private JMenuItem deleteItem;
6268
6294
 	private MenuItem clearAllItem;
6269
6295
 	private MenuItem genUVItem;
6270
6296
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6332,7 +6358,7 @@
6332
6358
 	private MenuItem switchTransfoItem;
6333
6359
 	private MenuItem morphItem;
6334
6360
 	private MenuItem linkerItem;
6335
-	private MenuItem ungroupItem;
6361
+	private JMenuItem ungroupItem;
6336
6362
 	private MenuItem editItem;
6337
6363
 	private MenuItem openWindowItem;
6338
6364
 	private MenuItem editLeafItem;
 cTree.java
..
..
@@ -20,7 +20,8 @@
20
20
         {
21
21
             public void mousePressed(MouseEvent e)
22
22
             {
23
-                if (e.isPopupTrigger())
23
+                //if (e.isPopupTrigger()) // Works only on mouse released on Windows.
24
+                if ((e.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
24
25
                 {
25
26
                     int row = getClosestRowForLocation(e.getX(), e.getY());
26
27
                     if (!isRowSelected(row))