blame | history | patch | commit | commitdiff
Normand Briere
2019-07-01 6600d22461ccc1cb602f238a9ffa83cf07dd830e 
 GroupEditor.java
....@@ -220,7 +220,7 @@
220220 //        toggleSwitchItem.addItemListener(this);
221221 //        toggleSwitchItem.setState(CameraPane.SWITCH);
222222         
223
-        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224224         toggleHandleItem.addItemListener(this);
225225         toggleHandleItem.setState(CameraPane.HANDLES);
226226         
....@@ -582,7 +582,7 @@
582582          */
583583                 cGridBag copyOptionsPanel = new cGridBag();
584584                                         
585
-                copyOptionsPanel.preferredHeight = 2;
585
+                copyOptionsPanel.preferredHeight = 1;
586586                 
587587                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588588                 
....@@ -590,9 +590,12 @@
590590                 //minButton.setToolTipText("Minimize window");
591591 		//minButton.addActionListener(this);
592592                 
593
-		oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
-                maxButton.setToolTipText("Maximize window");
595
-		maxButton.addActionListener(this);
593
+                if (Globals.ADVANCED)
594
+                {
595
+                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
+                    maxButton.setToolTipText("Maximize window");
597
+                    maxButton.addActionListener(this);
598
+                }
596599                 
597600 		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598601                 fullButton.setToolTipText("Full-screen window");
....@@ -726,7 +729,7 @@
726729                                compositeButton.addActionListener(this);
727730 
728731                 oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729
-                switchButton.setToolTipText("Create switch");
732
+                switchButton.setToolTipText("Create item switcher");
730733                                switchButton.addActionListener(this);
731734 
732735                 oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -863,9 +866,13 @@
863866 
864867         if (true) // Globals.ADVANCED)
865868         {
866
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867
-                supportCB.setToolTipText("Enable rigging");
868
-                                supportCB.addItemListener(this);
869
+//                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
870
+//                supportCB.setToolTipText("Enable rigging");
871
+//                                supportCB.addItemListener(this);
872
+
873
+                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
874
+                freezeCB.setToolTipText("Fast moving camera");
875
+                                freezeCB.addItemListener(this);
869876 
870877         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871878         //                        localCB.addItemListener(this);
....@@ -929,7 +936,7 @@
929936                                 toggleTextureCB.addItemListener(this);
930937                                 
931938                 panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932
-                toggleSwitchCB.setToolTipText("Use switch");
939
+                toggleSwitchCB.setToolTipText("Choose a single item");
933940                                 toggleSwitchCB.addItemListener(this);
934941                                 
935942                 panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
....@@ -1000,6 +1007,7 @@
10001007         cCheckBox slowCB;
10011008         cCheckBox boxCB;
10021009         cCheckBox zoomBoxCB;
1010
+        cCheckBox freezeCB;
10031011         //cToggleButton trackCB;
10041012         cCheckBox trackCB;
10051013         cCheckBox smoothfocusCB;
....@@ -1117,6 +1125,10 @@
11171125             else if(e.getSource() == shadowCB)
11181126             {
11191127                 Globals.COMPUTESHADOWWHENLIVE ^= true;
1128
+            }
1129
+            else if(e.getSource() == freezeCB)
1130
+            {
1131
+                Globals.FREEZEONMOVE ^= true;
11201132             }
11211133             else if(e.getSource() == autosaveCB)
11221134             {
....@@ -1459,6 +1471,9 @@
14591471 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
14601472 		animationItem.addItemListener(this);
14611473                 animationItem.setState(Globals.ANIMATION);
1474
+                
1475
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1476
+		archiveItem.addActionListener(this);
14621477                 
14631478 		menu.add("-");
14641479 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
....@@ -2122,25 +2137,25 @@
21222137                         Composite csg = new GroupLeaf();
21232138                         csg.count = 5;
21242139 			group(csg);
2125
-                        Composite child = new cGroup();
2140
+                        Composite child = new cGroup("Branch");
21262141                         csg.addChild(child);
21272142                         child.addChild(csg);
21282143 		} else
21292144 		if (source == doubleItem)
21302145 		{
2131
-                        Composite csg = new GroupLeaf();
2146
+                        Composite csg = new GroupLeaf("Fork");
21322147                         csg.count = 5;
21332148 			group(csg);
2134
-                        Composite child = new cGroup();
2149
+                        Composite child = new cGroup("Branch A");
21352150                         csg.addChild(child);
21362151                         child.addChild(csg);
2137
-                        child = new cGroup();
2152
+                        child = new cGroup("Branch B");
21382153                         csg.addChild(child);
21392154                         child.addChild(csg);
21402155 		} else
21412156 		if (source == tripleItem)
21422157 		{
2143
-                        Composite csg = new GroupLeaf();
2158
+                        Composite csg = new GroupLeaf("Trident");
21442159                         csg.count = 4;
21452160 			group(csg);
21462161                         Composite child = new cGroup();
....@@ -2755,15 +2770,28 @@
27552770 		} else
27562771 		if (source == ungroupItem || source == ungroupButton)
27572772 		{
2758
-			//ungroup();
2773
+                    boolean hasRoot = false;
2774
+                    
27592775                     for (int i=0; i<group.selection.size(); i++)
27602776                     {
2761
-                        Ungroup(group.selection.get(i));
2777
+                        if (group.selection.get(i) == group)
2778
+                        {
2779
+                            hasRoot = true;
2780
+                            break;
2781
+                        }
27622782                     }
27632783 
2764
-                    ClearSelection(false);
2765
-                    
2766
-                    refreshContents();
2784
+                    if (!hasRoot)
2785
+                    {
2786
+                        for (int i=0; i<group.selection.size(); i++)
2787
+                        {
2788
+                            Ungroup(group.selection.get(i));
2789
+                        }
2790
+
2791
+                        ClearSelection(false);
2792
+
2793
+                        refreshContents();
2794
+                    }
27672795 		} else
27682796 		if (source == genUVItem)
27692797                 {
....@@ -4706,7 +4734,7 @@
47064734         void refreshContents(boolean cp)
47074735         {
47084736             if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4709
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4737
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
47104738             {
47114739                 objEditor.ClearInfo(); // .GetMaterial());
47124740 
....@@ -5526,9 +5554,6 @@
55265554 	
55275555 	cButton restoreCameraButton;
55285556         
5529
-	cButton minButton;
5530
-	cButton maxButton;
5531
-	cButton fullButton;
55325557 	cButton saveButton;
55335558 	cButton oneStepButton;
55345559