blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009 
 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 //                
....@@ -1032,9 +1038,9 @@
10321038         oe.radioPanel.add(dummyButton);
10331039         oe.buttonGroup.add(dummyButton);
10341040          */
1035
-                cGridBag copyOptionsPanel = new cGridBag();
1041
+                cGridBag versionManagerPanel = new cGridBag();
10361042                                         
1037
-                copyOptionsPanel.preferredHeight = 2;
1043
+                versionManagerPanel.preferredHeight = 4;
10381044                 
10391045                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
10401046                 
....@@ -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/square.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
10691075                 maximize3DButton.setToolTipText("Maximize 3D view");
10701076 		maximize3DButton.addActionListener(this);
10711077                 
....@@ -1100,15 +1106,16 @@
11001106                 restoreCameraButton.setToolTipText("Restore viewpoint");
11011107 		restoreCameraButton.addActionListener(this);
11021108                 
1103
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1109
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11041110                 saveVersionButton.setToolTipText("Duplicate current version");
11051111 		saveVersionButton.addActionListener(this);
11061112                                                 
1107
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+		versionManagerPanel.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                                                 
1111
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11121119                 previousVersionButton.setToolTipText("Previous version");
11131120 		previousVersionButton.addActionListener(this);
11141121                 previousVersionButton.setEnabled(false);
....@@ -1117,16 +1124,16 @@
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                 
1127
-                copyOptionsPanel.add(updown);
1134
+                versionManagerPanel.add(updown);
11281135                 
1129
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11301137                 nextVersionButton.setToolTipText("Next version");
11311138 		nextVersionButton.addActionListener(this);
11321139                 nextVersionButton.setEnabled(false);
....@@ -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                 {
....@@ -1251,6 +1258,8 @@
12511258                 cGridBag textures = new cGridBag();
12521259                 
12531260                 CreateTexturePanel(textures);
1261
+                
1262
+                resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
12541263                 
12551264                 oe.toolboxPanel.add(textures);
12561265                 
....@@ -1302,6 +1311,8 @@
13021311                 
13031312                 cGridBag jSPPanel = new cGridBag();
13041313 
1314
+            jSPPanel.preferredHeight = 20;
1315
+            
13051316                 JScrollPane jSP;
13061317 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
13071318 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1310,11 +1321,11 @@
13101321                 oe.treePanel.add(jSPPanel);
13111322                 oe.treePanel.Return();
13121323 
1313
-                oe.treePanel.add(copyOptionsPanel);
1324
+                oe.treePanel.add(versionManagerPanel);
13141325                 oe.treePanel.Return();
1315
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1316
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1317
-            sliderPane.preferredHeight = 1;
1326
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1327
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1328
+            versionSliderPane.preferredHeight = 3;
13181329                 
13191330 //        mainPanel.setDividerLocation(0.1); //1.0);
13201331         mainPanel.setResizeWeight(0.4);
....@@ -1504,6 +1515,7 @@
15041515                     
15051516             oe.SetupViews();
15061517             
1518
+        if (Globals.DEBUG)
15071519 		System.out.println("SetupViews");
15081520             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
15091521                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -2165,7 +2177,11 @@
21652177             shadow.material = new cMaterial(obj.material);
21662178             shadow.material.diffuse = 0.0001f;
21672179             shadow.material.specular = 0.0001f;
2168
-            //shadow.projectedVertices[1].x = 300;
2180
+            shadow.material.opacity = 0.75f;
2181
+            
2182
+            AllocProjectedVertices(shadow);
2183
+        
2184
+            shadow.projectedVertices[1].x = 300;
21692185             
21702186             makeSomething(shadow);
21712187         }
....@@ -3954,6 +3970,8 @@
39543970 		if (source == closeButton)
39553971 		{
39563972 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3973
+                    Replace();
3974
+                    
39573975                     cRadio ab;
39583976                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
39593977                     {
....@@ -4052,6 +4070,8 @@
40524070 		} else
40534071                 if(source instanceof cRadio)
40544072 		{
4073
+                    Replace();
4074
+                    
40554075                     group.parent = keepparent;
40564076                         group.attributes = 0;
40574077                     //group.editWindow = null;
....@@ -4107,10 +4127,21 @@
41074127                     
41084128         if (copy.versionlist == null)
41094129         {
4110
-            copy.versionlist = new Object3D[100];
41114130             copy.versionindex = -1;
41124131             
4113
-            Save(true);
4132
+            // Cannot work with loops
4133
+            // To fix this issue, we first mark all nodes above the root,
4134
+            // and check if any of these nodes are reachable below the root.
4135
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4136
+            
4137
+            if (!copy.HasTags())
4138
+            {
4139
+                copy.versionlist = new Object3D[100];
4140
+                
4141
+                Save(true);
4142
+            }
4143
+            
4144
+            Grafreed.grafreed.universe.TagObjects(copy, false);
41144145         }
41154146         
41164147                     SetVersionStates();
....@@ -4258,7 +4289,7 @@
42584289                         TouchTransform(obj);
42594290                         continue;
42604291                     }
4261
-                    if ((mask&2) != 0) // Scale
4292
+                    if ((mask&2) != 0) // Scale/rotation
42624293                     {
42634294                         obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
42644295                         obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -4266,10 +4297,6 @@
42664297                         obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
42674298                         obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
42684299                         obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4269
-                    }
4270
-                    if ((mask&4) != 0) // Rotation
4271
-                    {
4272
-                        // ?
42734300                     }
42744301                     if ((mask&1) != 0) // Translation
42754302                     {
....@@ -5355,7 +5382,8 @@
53555382             if (group.selection != null)
53565383             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
53575384             {
5358
-                    if (!(e.nextElement() instanceof Composite))
5385
+                    Object next = e.nextElement();
5386
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
53595387                     {
53605388                         allComposites = false;
53615389                         break;
....@@ -5367,6 +5395,7 @@
53675395 
53685396         void refreshContents(boolean cp)
53695397         {
5398
+            if (false)
53705399             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
53715400             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
53725401             {
....@@ -6346,7 +6375,7 @@
63466375 	private MenuItem transformGeometryItem;
63476376 	private MenuItem transformChildrenItem;
63486377 	private MenuItem hideItem;
6349
-	private MenuItem grabItem;
6378
+	private JMenuItem grabItem;
63506379 	private MenuItem backItem;
63516380 	private MenuItem frontItem;
63526381 	private MenuItem cameraItem;