blame | history | patch | commit | commitdiff
Normand Briere
2019-07-14 bc829f47837b5a001f911542140b0b8e63c2bb0c 
 GroupEditor.java
....@@ -84,6 +84,10 @@
8484 
8585     void CloneSelection(boolean supports)
8686     {
87
+        if (Globals.SAVEONMAKE)
88
+            Save();
89
+        boolean keep = Globals.SAVEONMAKE;
90
+        Globals.SAVEONMAKE = false;
8791         //   Object3D keep = GrafreeD.clipboard;
8892            //Object3D obj;
8993            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,6 +98,7 @@
9498                
9599                makeSomething(clone, i==group.selection.size()-1);
96100            }
101
+        Globals.SAVEONMAKE = keep;
97102     }
98103 
99104     void CloneClipboard(boolean supports)
....@@ -220,7 +225,7 @@
220225 //        toggleSwitchItem.addItemListener(this);
221226 //        toggleSwitchItem.setState(CameraPane.SWITCH);
222227         
223
-        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
228
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224229         toggleHandleItem.addItemListener(this);
225230         toggleHandleItem.setState(CameraPane.HANDLES);
226231         
....@@ -380,13 +385,14 @@
380385 		shadowYItem.addActionListener(this);
381386                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382387 		shadowZItem.addActionListener(this);
388
+		attributeItem = menu.add(new MenuItem("Attribute"));
389
+		attributeItem.addActionListener(this);
390
+                
383391         if (Globals.ADVANCED)
384392         {
385393 		menu.add("-");
386394 		linkerItem = menu.add(new MenuItem("Linker"));
387395 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390396 		templateItem = menu.add(new MenuItem("Template"));
391397 		templateItem.addActionListener(this);
392398 		pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -582,7 +588,7 @@
582588          */
583589                 cGridBag copyOptionsPanel = new cGridBag();
584590                                         
585
-                copyOptionsPanel.preferredHeight = 2;
591
+                copyOptionsPanel.preferredHeight = 1;
586592                 
587593                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588594                 
....@@ -590,14 +596,21 @@
590596                 //minButton.setToolTipText("Minimize window");
591597 		//minButton.addActionListener(this);
592598                 
593
-		oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
-                maxButton.setToolTipText("Maximize window");
595
-		maxButton.addActionListener(this);
599
+                if (Globals.ADVANCED)
600
+                {
601
+                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602
+                    maxButton.setToolTipText("Maximize window");
603
+                    maxButton.addActionListener(this);
604
+                }
596605                 
597606 		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598607                 fullButton.setToolTipText("Full-screen window");
599608 		fullButton.addActionListener(this);
600609                 
610
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611
+                screenfitButton.setToolTipText("Screen fit");
612
+		screenfitButton.addActionListener(this);
613
+
601614 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602615                 restoreCameraButton.setToolTipText("Restore viewpoint");
603616 		restoreCameraButton.addActionListener(this);
....@@ -630,10 +643,6 @@
630643                                 
631644                 //oe.toolboxPanel.Return();
632645                 
633
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
-                screenfitButton.setToolTipText("Screen fit");
635
-		screenfitButton.addActionListener(this);
636
-
637646 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638647 //                trackCB.setToolTipText("Enable tracking");
639648 //                                trackCB.addItemListener(this);
....@@ -726,7 +735,7 @@
726735                                compositeButton.addActionListener(this);
727736 
728737                 oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729
-                switchButton.setToolTipText("Create switch");
738
+                switchButton.setToolTipText("Create item switcher");
730739                                switchButton.addActionListener(this);
731740 
732741                 oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -758,16 +767,16 @@
758767                 }
759768                 
760769                 // EDIT panel
761
-		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762
-                editButton.setToolTipText("Edit selection");
770
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
771
+                editButton.setToolTipText("Pin selection controls");
763772 		editButton.addActionListener(this);
764773 
765
-		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766
-                uneditButton.setToolTipText("Unedit selection");
774
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775
+                uneditButton.setToolTipText("Remove selection controls");
767776 		uneditButton.addActionListener(this);
768777 
769778 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770
-                allParamsButton.setToolTipText("Edit all params");
779
+                allParamsButton.setToolTipText("Show all controle");
771780 		allParamsButton.addActionListener(this);
772781 
773782 		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -784,6 +793,7 @@
784793                 
785794                 editCommandsPanel.preferredHeight = 1;
786795                 
796
+                SetPinStates(false);
787797 //                oe.treePanel.add(commandsPanel);
788798 //                oe.treePanel.Return();
789799                 
....@@ -857,14 +867,18 @@
857867                                 boxCB.addItemListener(this);
858868                                 
859869                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
870
+                zoomBoxCB.setToolTipText("Display only for wheel");
861871                                 zoomBoxCB.addItemListener(this);
862872 
863873         if (true) // Globals.ADVANCED)
864874         {
865
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866
-                supportCB.setToolTipText("Enable rigging");
867
-                                supportCB.addItemListener(this);
875
+//                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
876
+//                supportCB.setToolTipText("Enable rigging");
877
+//                                supportCB.addItemListener(this);
878
+
879
+                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
880
+                freezeCB.setToolTipText("Fast moving camera");
881
+                                freezeCB.addItemListener(this);
868882 
869883         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870884         //                        localCB.addItemListener(this);
....@@ -919,7 +933,7 @@
919933                                 oeilCB.addItemListener(this);
920934 
921935                 panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922
-                shadowCB.setToolTipText("Compute shadows when live");
936
+                shadowCB.setToolTipText("When live compute shadows");
923937                                 shadowCB.addItemListener(this);
924938 
925939                 panel.Return();
....@@ -928,11 +942,11 @@
928942                                 toggleTextureCB.addItemListener(this);
929943                                 
930944                 panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931
-                toggleSwitchCB.setToolTipText("Use switch");
945
+                toggleSwitchCB.setToolTipText("Choose a single item");
932946                                 toggleSwitchCB.addItemListener(this);
933947                                 
934948                 panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935
-                autosaveCB.setToolTipText("Auto-save on structure change");
949
+                autosaveCB.setToolTipText("On structure change");
936950                                 autosaveCB.addItemListener(this);
937951 
938952                 panel.Return();
....@@ -962,7 +976,7 @@
962976         {
963977             cRadio radioButton = new cRadio(obj.name);
964978             
965
-            // Patch to avoid bug with transparency.
979
+            // June 2019. Patch to avoid bug with transparency.
966980             radioButton.hadMaterial = obj.material != null;
967981             if (!radioButton.hadMaterial)
968982             {
....@@ -999,6 +1013,7 @@
9991013         cCheckBox slowCB;
10001014         cCheckBox boxCB;
10011015         cCheckBox zoomBoxCB;
1016
+        cCheckBox freezeCB;
10021017         //cToggleButton trackCB;
10031018         cCheckBox trackCB;
10041019         cCheckBox smoothfocusCB;
....@@ -1117,6 +1132,10 @@
11171132             {
11181133                 Globals.COMPUTESHADOWWHENLIVE ^= true;
11191134             }
1135
+            else if(e.getSource() == freezeCB)
1136
+            {
1137
+                Globals.FREEZEONMOVE ^= true;
1138
+            }
11201139             else if(e.getSource() == autosaveCB)
11211140             {
11221141                 Globals.SAVEONMAKE ^= true;
....@@ -1201,8 +1220,6 @@
12011220                         }
12021221                     }
12031222                     
1204
-                    String string = (String) object;
1205
-                    
12061223                     System.out.println("Transfer = " + object + "; drop : " + target);
12071224 //                    if( object instanceof java.io.File[])
12081225 //                    {
....@@ -1210,6 +1227,8 @@
12101227 //                        objEditor.DropFile((java.io.File[]) object, true);
12111228 //                        return;
12121229 //                    }
1230
+                    
1231
+                    String string = object.toString();
12131232                     
12141233                     // File path for Mac and Windows
12151234                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1459,6 +1478,9 @@
14591478 		animationItem.addItemListener(this);
14601479                 animationItem.setState(Globals.ANIMATION);
14611480                 
1481
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1482
+		archiveItem.addActionListener(this);
1483
+                
14621484 		menu.add("-");
14631485 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
14641486 		parseverticesItem.addActionListener(this);
....@@ -1471,6 +1493,8 @@
14711493 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
14721494 		reduce34MorphItem.addActionListener(this);
14731495 		menu.add("-");
1496
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1497
+		memoryItem.addActionListener(this);
14741498 		menu.add(computeAOItem = new MenuItem("Compute AO"));
14751499 		computeAOItem.addActionListener(this);
14761500                 
....@@ -1479,8 +1503,6 @@
14791503 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
14801504 		mirrorItem.addActionListener(this);
14811505 		menu.add("-");
1482
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1483
-		memoryItem.addActionListener(this);
14841506 		menu.add(analyzeItem = new MenuItem("Analyze"));
14851507 		analyzeItem.addActionListener(this);
14861508 		menu.add(dumpItem = new MenuItem("Print"));
....@@ -1628,6 +1650,20 @@
16281650             
16291651             makeSomething(shadow);
16301652         }
1653
+
1654
+    private void ClearUnpinned()
1655
+    {
1656
+        //for (Object3D obj : listUI)
1657
+        for (int i=listUI.size(); --i>=0;)
1658
+        {
1659
+            Object3D obj = listUI.elementAt(i);
1660
+            if (!obj.pinned)
1661
+            {
1662
+                obj.CloseUI();
1663
+                listUI.remove(i);
1664
+            }
1665
+        }
1666
+    }
16311667         
16321668     /**
16331669      * applyExample
....@@ -2107,25 +2143,25 @@
21072143                         Composite csg = new GroupLeaf();
21082144                         csg.count = 5;
21092145 			group(csg);
2110
-                        Composite child = new cGroup();
2146
+                        Composite child = new cGroup("Branch");
21112147                         csg.addChild(child);
21122148                         child.addChild(csg);
21132149 		} else
21142150 		if (source == doubleItem)
21152151 		{
2116
-                        Composite csg = new GroupLeaf();
2152
+                        Composite csg = new GroupLeaf("Fork");
21172153                         csg.count = 5;
21182154 			group(csg);
2119
-                        Composite child = new cGroup();
2155
+                        Composite child = new cGroup("Branch A");
21202156                         csg.addChild(child);
21212157                         child.addChild(csg);
2122
-                        child = new cGroup();
2158
+                        child = new cGroup("Branch B");
21232159                         csg.addChild(child);
21242160                         child.addChild(csg);
21252161 		} else
21262162 		if (source == tripleItem)
21272163 		{
2128
-                        Composite csg = new GroupLeaf();
2164
+                        Composite csg = new GroupLeaf("Trident");
21292165                         csg.count = 4;
21302166 			group(csg);
21312167                         Composite child = new cGroup();
....@@ -2189,7 +2225,8 @@
21892225 		} else
21902226 		if (source == undoButton)
21912227 		{
2192
-			Undo();
2228
+			if (!Undo())
2229
+                            java.awt.Toolkit.getDefaultToolkit().beep();
21932230 		} else
21942231 		if (source == redoButton)
21952232 		{
....@@ -2197,7 +2234,8 @@
21972234 		} else
21982235 		if (source == saveButton)
21992236 		{
2200
-			Save();
2237
+			if (!Save(true))
2238
+                            java.awt.Toolkit.getDefaultToolkit().beep();
22012239 		} else
22022240 		if (source == oneStepButton)
22032241 		{
....@@ -2206,17 +2244,14 @@
22062244 		} else
22072245 		if (source == screenfitButton)
22082246 		{
2209
-			//Reload(lastConverter, lastFilename, true);
22102247                     ScreenFit();
22112248 		} else
22122249 		if (source == screenfitpointButton)
22132250 		{
2214
-			//Reload(lastConverter, lastFilename, true);
22152251                     ScreenFitPoint();
22162252 		} else
22172253 		if (source == snapobjectButton)
22182254 		{
2219
-			//Reload(lastConverter, lastFilename, true);
22202255                     SnapObject();
22212256 		} else
22222257 //		if (event.getSource() == recompileButton)
....@@ -2740,15 +2775,28 @@
27402775 		} else
27412776 		if (source == ungroupItem || source == ungroupButton)
27422777 		{
2743
-			//ungroup();
2778
+                    boolean hasRoot = false;
2779
+                    
27442780                     for (int i=0; i<group.selection.size(); i++)
27452781                     {
2746
-                        Ungroup(group.selection.get(i));
2782
+                        if (group.selection.get(i) == group)
2783
+                        {
2784
+                            hasRoot = true;
2785
+                            break;
2786
+                        }
27472787                     }
27482788 
2749
-                    ClearSelection(false);
2750
-                    
2751
-                    refreshContents();
2789
+                    if (!hasRoot)
2790
+                    {
2791
+                        for (int i=0; i<group.selection.size(); i++)
2792
+                        {
2793
+                            Ungroup(group.selection.get(i));
2794
+                        }
2795
+
2796
+                        ClearSelection(false);
2797
+
2798
+                        refreshContents();
2799
+                    }
27522800 		} else
27532801 		if (source == genUVItem)
27542802                 {
....@@ -3372,7 +3420,7 @@
33723420                     //copy.ClearUI();
33733421                     for (Object3D obj : listUI)
33743422                     {
3375
-                        obj.pinned = true;
3423
+                        obj.pinned = false;
33763424                         obj.CloseUI();
33773425                     }
33783426                     listUI.clear();
....@@ -3457,6 +3505,11 @@
34573505                         currentLayout = sevenButton;
34583506                      */
34593507                     radio.layout.doClick();
3508
+                    
3509
+                    ClearUnpinned();
3510
+                    SetPinStates(group.selection.size() > 0);
3511
+                    if (group.selection.size() == 1)
3512
+                        EditSelection(false);
34603513                     keepparent = group.parent;
34613514                     // PARENT = NULL or not???
34623515                     //group.parent = null; // ROOT
....@@ -4616,17 +4669,7 @@
46164669 		//new Exception().printStackTrace();
46174670 
46184671 		freezemodel = true;
4619
-		
4620
-                //for (Object3D obj : listUI)
4621
-                for (int i=listUI.size(); --i>=0;)
4622
-                {
4623
-                    Object3D obj = listUI.elementAt(i);
4624
-                    if (!obj.pinned)
4625
-                    {
4626
-                        obj.CloseUI();
4627
-                        listUI.remove(i);
4628
-                    }
4629
-                }
4672
+        ClearUnpinned();
46304673                     
46314674 		/**/
46324675 		//switch (event.id)
....@@ -4689,12 +4732,14 @@
46894732         {
46904733             editButton.setEnabled(enabled);
46914734             uneditButton.setEnabled(enabled);
4735
+            unselectButton.setEnabled(enabled);
4736
+            flashSelectionButton.setEnabled(enabled);
46924737         }
46934738 
46944739         void refreshContents(boolean cp)
46954740         {
46964741             if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4742
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
46984743             {
46994744                 objEditor.ClearInfo(); // .GetMaterial());
47004745 
....@@ -4793,8 +4838,8 @@
47934838                 
47944839 		if (cut)
47954840 		{
4796
-        if (Globals.SAVEONMAKE)
4797
-                    Save();
4841
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
4842
+//                    Save();
47984843 			//int indices[] = jList.getSelectedIndices();
47994844 			//for (int i = indices.length - 1; i >= 0; i--)
48004845 			//jList.remove(indices[i]);
....@@ -4897,6 +4942,10 @@
48974942 	
48984943 	void paste(boolean expand)
48994944 	{
4945
+        if (Globals.SAVEONMAKE)
4946
+            Save();
4947
+        boolean keep = Globals.SAVEONMAKE;
4948
+        Globals.SAVEONMAKE = false;
49004949 	//	if (GrafreeD.clipboard == null)
49014950 	//		return;
49024951 		boolean first = true;
....@@ -4956,6 +5005,7 @@
49565005                         Grafreed.clipboard.get(0).parent = keepparent;
49575006 		}
49585007 		
5008
+        Globals.SAVEONMAKE = keep;
49595009 		ResetModel();
49605010 		refreshContents();
49615011 	}
....@@ -5091,6 +5141,10 @@
50915141         
50925142 	void group(Object3D csg, boolean grab)
50935143 	{
5144
+        if (Globals.SAVEONMAKE)
5145
+            Save();
5146
+        boolean keep = Globals.SAVEONMAKE;
5147
+        Globals.SAVEONMAKE = false;
50945148 		if (//false) // why??
50955149                     !group.selection.isEmpty())
50965150                 {
....@@ -5204,10 +5258,15 @@
52045258                 //node.add(csg);
52055259 		//makeSomething(node);
52065260 		makeSomething(csg);
5261
+        Globals.SAVEONMAKE = keep;
52075262 	}
52085263 	
52095264         void Ungroup(Object3D g)
52105265         {
5266
+        if (Globals.SAVEONMAKE)
5267
+            Save();
5268
+        boolean keep = Globals.SAVEONMAKE;
5269
+        Globals.SAVEONMAKE = false;
52115270             if (g instanceof HiddenObject)
52125271             {
52135272                 HiddenObject h = (HiddenObject) g;
....@@ -5224,6 +5283,7 @@
52245283                     objEditor.makeSomething(g.get(i), false);
52255284                 }
52265285             }
5286
+        Globals.SAVEONMAKE = keep;
52275287         }
52285288         
52295289 	void ungroup()
....@@ -5514,9 +5574,6 @@
55145574 	
55155575 	cButton restoreCameraButton;
55165576         
5517
-	cButton minButton;
5518
-	cButton maxButton;
5519
-	cButton fullButton;
55205577 	cButton saveButton;
55215578 	cButton oneStepButton;
55225579