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");
....@@ -605,10 +608,12 @@
605608 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606609                 undoButton.setToolTipText("Undo changes");
607610 		undoButton.addActionListener(this);
611
+                undoButton.setEnabled(false);
608612                 
609613 		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
610614                 redoButton.setToolTipText("Redo changes");
611615 		redoButton.addActionListener(this);
616
+                redoButton.setEnabled(false);
612617                 
613618 		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614619                 saveButton.setToolTipText("Save changes");
....@@ -724,7 +729,7 @@
724729                                compositeButton.addActionListener(this);
725730 
726731                 oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727
-                switchButton.setToolTipText("Create switch");
732
+                switchButton.setToolTipText("Create item switcher");
728733                                switchButton.addActionListener(this);
729734 
730735                 oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -743,17 +748,29 @@
743748                 lightButton.setToolTipText("Create light");
744749                                lightButton.addActionListener(this);
745750 
751
+                for (int i=6; --i>=0;)
752
+                {
753
+                oe.toolboxPanel.Return();
754
+                oe.toolboxPanel.add(new cGridBag());
755
+                oe.toolboxPanel.add(new cGridBag());
756
+                oe.toolboxPanel.add(new cGridBag());
757
+                oe.toolboxPanel.add(new cGridBag());
758
+                oe.toolboxPanel.add(new cGridBag());
759
+                oe.toolboxPanel.add(new cGridBag());
760
+                oe.toolboxPanel.add(new cGridBag());
761
+                }
762
+                
746763                 // EDIT panel
747
-		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748
-                editButton.setToolTipText("Edit selection");
764
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
765
+                editButton.setToolTipText("Pin selection controls");
749766 		editButton.addActionListener(this);
750767 
751
-		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752
-                uneditButton.setToolTipText("Unedit selection");
768
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769
+                uneditButton.setToolTipText("Remove selection controls");
753770 		uneditButton.addActionListener(this);
754771 
755772 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
756
-                allParamsButton.setToolTipText("Edit all params");
773
+                allParamsButton.setToolTipText("Show all controle");
757774 		allParamsButton.addActionListener(this);
758775 
759776 		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -770,6 +787,7 @@
770787                 
771788                 editCommandsPanel.preferredHeight = 1;
772789                 
790
+                SetPinStates(false);
773791 //                oe.treePanel.add(commandsPanel);
774792 //                oe.treePanel.Return();
775793                 
....@@ -843,14 +861,18 @@
843861                                 boxCB.addItemListener(this);
844862                                 
845863                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
846
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
864
+                zoomBoxCB.setToolTipText("Display only for wheel");
847865                                 zoomBoxCB.addItemListener(this);
848866 
849867         if (true) // Globals.ADVANCED)
850868         {
851
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
852
-                supportCB.setToolTipText("Enable rigging");
853
-                                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);
854876 
855877         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
856878         //                        localCB.addItemListener(this);
....@@ -905,7 +927,7 @@
905927                                 oeilCB.addItemListener(this);
906928 
907929                 panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
908
-                shadowCB.setToolTipText("Compute shadows when live");
930
+                shadowCB.setToolTipText("When live compute shadows");
909931                                 shadowCB.addItemListener(this);
910932 
911933                 panel.Return();
....@@ -914,11 +936,11 @@
914936                                 toggleTextureCB.addItemListener(this);
915937                                 
916938                 panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917
-                toggleSwitchCB.setToolTipText("Use switch");
939
+                toggleSwitchCB.setToolTipText("Choose a single item");
918940                                 toggleSwitchCB.addItemListener(this);
919941                                 
920942                 panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
921
-                autosaveCB.setToolTipText("Auto-save on structure change");
943
+                autosaveCB.setToolTipText("On structure change");
922944                                 autosaveCB.addItemListener(this);
923945 
924946                 panel.Return();
....@@ -985,6 +1007,7 @@
9851007         cCheckBox slowCB;
9861008         cCheckBox boxCB;
9871009         cCheckBox zoomBoxCB;
1010
+        cCheckBox freezeCB;
9881011         //cToggleButton trackCB;
9891012         cCheckBox trackCB;
9901013         cCheckBox smoothfocusCB;
....@@ -1102,6 +1125,10 @@
11021125             else if(e.getSource() == shadowCB)
11031126             {
11041127                 Globals.COMPUTESHADOWWHENLIVE ^= true;
1128
+            }
1129
+            else if(e.getSource() == freezeCB)
1130
+            {
1131
+                Globals.FREEZEONMOVE ^= true;
11051132             }
11061133             else if(e.getSource() == autosaveCB)
11071134             {
....@@ -1445,6 +1472,9 @@
14451472 		animationItem.addItemListener(this);
14461473                 animationItem.setState(Globals.ANIMATION);
14471474                 
1475
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1476
+		archiveItem.addActionListener(this);
1477
+                
14481478 		menu.add("-");
14491479 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
14501480 		parseverticesItem.addActionListener(this);
....@@ -1614,6 +1644,20 @@
16141644             
16151645             makeSomething(shadow);
16161646         }
1647
+
1648
+    private void ClearUnpinned()
1649
+    {
1650
+        //for (Object3D obj : listUI)
1651
+        for (int i=listUI.size(); --i>=0;)
1652
+        {
1653
+            Object3D obj = listUI.elementAt(i);
1654
+            if (!obj.pinned)
1655
+            {
1656
+                obj.CloseUI();
1657
+                listUI.remove(i);
1658
+            }
1659
+        }
1660
+    }
16171661         
16181662     /**
16191663      * applyExample
....@@ -2093,25 +2137,25 @@
20932137                         Composite csg = new GroupLeaf();
20942138                         csg.count = 5;
20952139 			group(csg);
2096
-                        Composite child = new cGroup();
2140
+                        Composite child = new cGroup("Branch");
20972141                         csg.addChild(child);
20982142                         child.addChild(csg);
20992143 		} else
21002144 		if (source == doubleItem)
21012145 		{
2102
-                        Composite csg = new GroupLeaf();
2146
+                        Composite csg = new GroupLeaf("Fork");
21032147                         csg.count = 5;
21042148 			group(csg);
2105
-                        Composite child = new cGroup();
2149
+                        Composite child = new cGroup("Branch A");
21062150                         csg.addChild(child);
21072151                         child.addChild(csg);
2108
-                        child = new cGroup();
2152
+                        child = new cGroup("Branch B");
21092153                         csg.addChild(child);
21102154                         child.addChild(csg);
21112155 		} else
21122156 		if (source == tripleItem)
21132157 		{
2114
-                        Composite csg = new GroupLeaf();
2158
+                        Composite csg = new GroupLeaf("Trident");
21152159                         csg.count = 4;
21162160 			group(csg);
21172161                         Composite child = new cGroup();
....@@ -2726,15 +2770,28 @@
27262770 		} else
27272771 		if (source == ungroupItem || source == ungroupButton)
27282772 		{
2729
-			//ungroup();
2773
+                    boolean hasRoot = false;
2774
+                    
27302775                     for (int i=0; i<group.selection.size(); i++)
27312776                     {
2732
-                        Ungroup(group.selection.get(i));
2777
+                        if (group.selection.get(i) == group)
2778
+                        {
2779
+                            hasRoot = true;
2780
+                            break;
2781
+                        }
27332782                     }
27342783 
2735
-                    ClearSelection(false);
2736
-                    
2737
-                    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
+                    }
27382795 		} else
27392796 		if (source == genUVItem)
27402797                 {
....@@ -3326,6 +3383,12 @@
33263383 		} else
33273384 		if (source == editItem || source == editButton)
33283385 		{
3386
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3387
+			{
3388
+				Object3D child = (Object3D)e.nextElement();
3389
+                                child.pinned = true;
3390
+                        }
3391
+                        
33293392 			EditSelection(false);
33303393 		} else
33313394 		if (source == uneditButton)
....@@ -3335,6 +3398,7 @@
33353398 				Object3D child = (Object3D)e.nextElement();
33363399                                 if(child.editWindow != null)
33373400                                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401
+                                child.pinned = false;
33383402 				child.CloseUI();
33393403                                 listUI.remove(child);
33403404                                 
....@@ -3351,6 +3415,7 @@
33513415                     //copy.ClearUI();
33523416                     for (Object3D obj : listUI)
33533417                     {
3418
+                        obj.pinned = false;
33543419                         obj.CloseUI();
33553420                     }
33563421                     listUI.clear();
....@@ -3360,7 +3425,7 @@
33603425 		{
33613426                     assert(copy == group);
33623427                     
3363
-                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3428
+                    //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
33643429                     
33653430                     for (Object3D obj : listUI)
33663431                     {
....@@ -3435,6 +3500,11 @@
34353500                         currentLayout = sevenButton;
34363501                      */
34373502                     radio.layout.doClick();
3503
+                    
3504
+                    ClearUnpinned();
3505
+                    SetPinStates(group.selection.size() > 0);
3506
+                    if (group.selection.size() == 1)
3507
+                        EditSelection(false);
34383508                     keepparent = group.parent;
34393509                     // PARENT = NULL or not???
34403510                     //group.parent = null; // ROOT
....@@ -4502,10 +4572,6 @@
45024572 //		}
45034573 //	}
45044574 	
4505
-        static boolean allparams = true;
4506
-        
4507
-        static Vector<Object3D> listUI = new Vector<Object3D>();
4508
-        
45094575 	void EditSelection(boolean newWindow)
45104576 	{
45114577         //    aConstraints.gridy = 0;
....@@ -4598,7 +4664,8 @@
45984664 		//new Exception().printStackTrace();
45994665 
46004666 		freezemodel = true;
4601
-		
4667
+        ClearUnpinned();
4668
+                    
46024669 		/**/
46034670 		//switch (event.id)
46044671 		{
....@@ -4631,7 +4698,7 @@
46314698 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
46324699                             // a camera
46334700                         {
4634
-                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4701
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
46354702                             {
46364703                                 CameraPane.camerachangeframe = 0; // don't refuse it
46374704                                 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
....@@ -4640,6 +4707,13 @@
46404707                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
46414708                         }
46424709                             
4710
+                        if (tps != null && tps.length == 1)
4711
+                        {
4712
+                            EditSelection(false);
4713
+                        }
4714
+                        
4715
+                        SetPinStates(tps != null && tps.length > 0);
4716
+                        
46434717 			refreshContents();
46444718 			//return true;
46454719 		}
....@@ -4649,10 +4723,18 @@
46494723 		freezemodel = false;
46504724 	}
46514725         
4726
+        void SetPinStates(boolean enabled)
4727
+        {
4728
+            editButton.setEnabled(enabled);
4729
+            uneditButton.setEnabled(enabled);
4730
+            unselectButton.setEnabled(enabled);
4731
+            flashSelectionButton.setEnabled(enabled);
4732
+        }
4733
+
46524734         void refreshContents(boolean cp)
46534735         {
46544736             if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4737
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
46564738             {
46574739                 objEditor.ClearInfo(); // .GetMaterial());
46584740 
....@@ -5472,11 +5554,6 @@
54725554 	
54735555 	cButton restoreCameraButton;
54745556         
5475
-	cButton minButton;
5476
-	cButton maxButton;
5477
-	cButton fullButton;
5478
-	cButton undoButton;
5479
-	cButton redoButton;
54805557 	cButton saveButton;
54815558 	cButton oneStepButton;
54825559