blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 
 GroupEditor.java
....@@ -415,12 +415,14 @@
415415 		this.copy = this.group = group;
416416 		//selectees = this.group.selectees;
417417 		
418
+                assert(false);
419
+                
418420         if (copy.versionlist == null)
419421         {
420422             copy.versionlist = new Object3D[100];
421423             copy.versionindex = -1;
422424             
423
-            Save(true);
425
+            //Save(true);
424426         }
425427         
426428 		if(ui)
....@@ -449,7 +451,7 @@
449451             copy.versionlist = new Object3D[100];
450452             copy.versionindex = -1;
451453             
452
-            Save(true);
454
+            //Save(true);
453455         }
454456 	}
455457 
....@@ -569,9 +571,6 @@
569571 //		pasteExpandItem.addActionListener(this);
570572 		//menu.add("-");
571573                 oe.jTree.popup.addSeparator();
572
-                
573
-		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
574
-		deleteItem.addActionListener(this);
575574                 
576575         if (Globals.ADVANCED)
577576         {
....@@ -706,15 +705,17 @@
706705 		setMasterItem.addActionListener(this);
707706         }
708707                 
709
-		oe.menuBar.add(menu = new Menu("Group"));
710
-//		grabItem = menu.add(new MenuItem("Grab"));
711
-//		grabItem.addActionListener(this);
708
+		oe.menuBar.add(menu = new Menu("Order"));
709
+                
712710 		backItem = menu.add(new MenuItem("Back"));
713711 		backItem.addActionListener(this);
714712 		frontItem = menu.add(new MenuItem("Front"));
715713 		frontItem.addActionListener(this);
716714 //		compositeItem = menu.add(new MenuItem("Composite"));
717715 //		compositeItem.addActionListener(this);
716
+                
717
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+		grabItem.addActionListener(this);
718719                 
719720         if (Globals.ADVANCED)
720721         {
....@@ -723,6 +724,11 @@
723724         }
724725 		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
725726 		ungroupItem.addActionListener(this);
727
+                
728
+                oe.jTree.popup.addSeparator();
729
+                
730
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+		deleteItem.addActionListener(this);
726732                 
727733 //		menu.add("-");
728734 //                
....@@ -1065,7 +1071,7 @@
10651071                 collapseButton.setToolTipText("Collapse toolbar");
10661072 		collapseButton.addActionListener(this);
10671073                 
1068
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1074
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
10691075                 maximize3DButton.setToolTipText("Maximize 3D view");
10701076 		maximize3DButton.addActionListener(this);
10711077                 
....@@ -1107,6 +1113,7 @@
11071113 		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11081114                 deleteVersionButton.setToolTipText("Delete current version");
11091115 		deleteVersionButton.addActionListener(this);
1116
+                deleteVersionButton.setEnabled(false);
11101117                                                 
11111118 		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11121119                 previousVersionButton.setToolTipText("Previous version");
....@@ -1117,12 +1124,12 @@
11171124 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11181125                 restoreButton.setToolTipText("Undo (restore current version)");
11191126 		restoreButton.addActionListener(this);
1120
-                //restoreButton.setEnabled(false);
1127
+                restoreButton.setEnabled(false);
11211128                 
11221129 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11231130                 replaceButton.setToolTipText("Save (replace current version)");
11241131 		replaceButton.addActionListener(this);
1125
-                //replaceButton.setEnabled(false);
1132
+                replaceButton.setEnabled(false);
11261133                 
11271134                 copyOptionsPanel.add(updown);
11281135                 
....@@ -1187,6 +1194,10 @@
11871194                 boxButton.setToolTipText("Create box");
11881195                                 boxButton.addActionListener(this);
11891196 
1197
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+                superButton.setToolTipText("Create superellipsoid");
1199
+                                superButton.addActionListener(this);
1200
+
11901201                 row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11911202                 sphereButton.setToolTipText("Create sphere");
11921203                                 sphereButton.addActionListener(this);
....@@ -1198,10 +1209,6 @@
11981209                 row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11991210                 torusButton.setToolTipText("Create torus");
12001211                                 torusButton.addActionListener(this);
1201
-
1202
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1203
-                superButton.setToolTipText("Create superellipsoid");
1204
-                                superButton.addActionListener(this);
12051212 
12061213                 if (Globals.ADVANCED)
12071214                 {
....@@ -1504,6 +1511,7 @@
15041511                     
15051512             oe.SetupViews();
15061513             
1514
+        if (Globals.DEBUG)
15071515 		System.out.println("SetupViews");
15081516             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
15091517                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -2165,7 +2173,11 @@
21652173             shadow.material = new cMaterial(obj.material);
21662174             shadow.material.diffuse = 0.0001f;
21672175             shadow.material.specular = 0.0001f;
2168
-            //shadow.projectedVertices[1].x = 300;
2176
+            shadow.material.opacity = 0.75f;
2177
+            
2178
+            AllocProjectedVertices(shadow);
2179
+        
2180
+            shadow.projectedVertices[1].x = 300;
21692181             
21702182             makeSomething(shadow);
21712183         }
....@@ -4110,7 +4122,10 @@
41104122             copy.versionlist = new Object3D[100];
41114123             copy.versionindex = -1;
41124124             
4113
-            Save(true);
4125
+            // Cannot work with loops
4126
+            // To fix this issue, first mark all nodes above the root,
4127
+            // and check if any of these nodes are reachable below the root.
4128
+            //Save(true);
41144129         }
41154130         
41164131                     SetVersionStates();
....@@ -5355,7 +5370,8 @@
53555370             if (group.selection != null)
53565371             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
53575372             {
5358
-                    if (!(e.nextElement() instanceof Composite))
5373
+                    Object next = e.nextElement();
5374
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
53595375                     {
53605376                         allComposites = false;
53615377                         break;
....@@ -6346,7 +6362,7 @@
63466362 	private MenuItem transformGeometryItem;
63476363 	private MenuItem transformChildrenItem;
63486364 	private MenuItem hideItem;
6349
-	private MenuItem grabItem;
6365
+	private JMenuItem grabItem;
63506366 	private MenuItem backItem;
63516367 	private MenuItem frontItem;
63526368 	private MenuItem cameraItem;