blame | history | patch | commit | commitdiff
Normand Briere
2019-06-29 a69bb4474a3264a9a7a7f8b8d8154ea771f167c8 
 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                 
....@@ -726,7 +726,7 @@
726726                                compositeButton.addActionListener(this);
727727 
728728                 oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729
-                switchButton.setToolTipText("Create switch");
729
+                switchButton.setToolTipText("Create item switcher");
730730                                switchButton.addActionListener(this);
731731 
732732                 oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -863,9 +863,13 @@
863863 
864864         if (true) // Globals.ADVANCED)
865865         {
866
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867
-                supportCB.setToolTipText("Enable rigging");
868
-                                supportCB.addItemListener(this);
866
+//                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867
+//                supportCB.setToolTipText("Enable rigging");
868
+//                                supportCB.addItemListener(this);
869
+
870
+                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
871
+                freezeCB.setToolTipText("Fast moving camera");
872
+                                freezeCB.addItemListener(this);
869873 
870874         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871875         //                        localCB.addItemListener(this);
....@@ -929,7 +933,7 @@
929933                                 toggleTextureCB.addItemListener(this);
930934                                 
931935                 panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932
-                toggleSwitchCB.setToolTipText("Use switch");
936
+                toggleSwitchCB.setToolTipText("Choose a single item");
933937                                 toggleSwitchCB.addItemListener(this);
934938                                 
935939                 panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
....@@ -1000,6 +1004,7 @@
10001004         cCheckBox slowCB;
10011005         cCheckBox boxCB;
10021006         cCheckBox zoomBoxCB;
1007
+        cCheckBox freezeCB;
10031008         //cToggleButton trackCB;
10041009         cCheckBox trackCB;
10051010         cCheckBox smoothfocusCB;
....@@ -1117,6 +1122,10 @@
11171122             else if(e.getSource() == shadowCB)
11181123             {
11191124                 Globals.COMPUTESHADOWWHENLIVE ^= true;
1125
+            }
1126
+            else if(e.getSource() == freezeCB)
1127
+            {
1128
+                Globals.FREEZEONMOVE ^= true;
11201129             }
11211130             else if(e.getSource() == autosaveCB)
11221131             {
....@@ -2122,25 +2131,25 @@
21222131                         Composite csg = new GroupLeaf();
21232132                         csg.count = 5;
21242133 			group(csg);
2125
-                        Composite child = new cGroup();
2134
+                        Composite child = new cGroup("Branch");
21262135                         csg.addChild(child);
21272136                         child.addChild(csg);
21282137 		} else
21292138 		if (source == doubleItem)
21302139 		{
2131
-                        Composite csg = new GroupLeaf();
2140
+                        Composite csg = new GroupLeaf("Fork");
21322141                         csg.count = 5;
21332142 			group(csg);
2134
-                        Composite child = new cGroup();
2143
+                        Composite child = new cGroup("Branch A");
21352144                         csg.addChild(child);
21362145                         child.addChild(csg);
2137
-                        child = new cGroup();
2146
+                        child = new cGroup("Branch B");
21382147                         csg.addChild(child);
21392148                         child.addChild(csg);
21402149 		} else
21412150 		if (source == tripleItem)
21422151 		{
2143
-                        Composite csg = new GroupLeaf();
2152
+                        Composite csg = new GroupLeaf("Trident");
21442153                         csg.count = 4;
21452154 			group(csg);
21462155                         Composite child = new cGroup();
....@@ -2755,15 +2764,28 @@
27552764 		} else
27562765 		if (source == ungroupItem || source == ungroupButton)
27572766 		{
2758
-			//ungroup();
2767
+                    boolean hasRoot = false;
2768
+                    
27592769                     for (int i=0; i<group.selection.size(); i++)
27602770                     {
2761
-                        Ungroup(group.selection.get(i));
2771
+                        if (group.selection.get(i) == group)
2772
+                        {
2773
+                            hasRoot = true;
2774
+                            break;
2775
+                        }
27622776                     }
27632777 
2764
-                    ClearSelection(false);
2765
-                    
2766
-                    refreshContents();
2778
+                    if (!hasRoot)
2779
+                    {
2780
+                        for (int i=0; i<group.selection.size(); i++)
2781
+                        {
2782
+                            Ungroup(group.selection.get(i));
2783
+                        }
2784
+
2785
+                        ClearSelection(false);
2786
+
2787
+                        refreshContents();
2788
+                    }
27672789 		} else
27682790 		if (source == genUVItem)
27692791                 {
....@@ -5526,9 +5548,6 @@
55265548 	
55275549 	cButton restoreCameraButton;
55285550         
5529
-	cButton minButton;
5530
-	cButton maxButton;
5531
-	cButton fullButton;
55325551 	cButton saveButton;
55335552 	cButton oneStepButton;
55345553