blame | history | patch | commit | commitdiff
Normand Briere
2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253 
 GroupEditor.java
....@@ -154,11 +154,12 @@
154154 		oe.menuBar.add(menu = new Menu("Edit"));
155155 		//editItem = menu.add(new MenuItem("Edit"));
156156 		//editItem.addActionListener(this);
157
-		undoItem = menu.add(new MenuItem("Undo"));
158
-		undoItem.addActionListener(this);
159
-		redoItem = menu.add(new MenuItem("Redo"));
160
-		redoItem.addActionListener(this);
161
-		menu.add("-");
157
+                
158
+//		undoItem = menu.add(new MenuItem("Undo"));
159
+//		undoItem.addActionListener(this);
160
+//		redoItem = menu.add(new MenuItem("Redo"));
161
+//		redoItem.addActionListener(this);
162
+//		menu.add("-");
162163 		duplicateItem = menu.add(new MenuItem("Duplicate"));
163164 		duplicateItem.addActionListener(this);
164165 		cloneItem = menu.add(new MenuItem("Clone"));
....@@ -175,7 +176,6 @@
175176 		copyItem.addActionListener(this);
176177 		pasteItem = menu.add(new MenuItem("Paste"));
177178 		pasteItem.addActionListener(this);
178
-		menu.add("-");
179179                 
180180 		menu.add("-");
181181 		pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -202,7 +202,7 @@
202202         //zBufferItem.addActionListener(this);
203203         //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204204         //normalLensItem.addActionListener(this);
205
-        cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
205
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206206         revertCameraItem.addActionListener(this);
207207         
208208         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
....@@ -245,7 +245,7 @@
245245 
246246                 cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247247                 toggleDebugItem.addItemListener(this);
248
-                toggleDebugItem.setState(CameraPane.DEBUG);
248
+                toggleDebugItem.setState(Globals.DEBUG);
249249 
250250                 cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251251                 toggleFrustumItem.addItemListener(this);
....@@ -266,7 +266,7 @@
266266 //		animationItem.addItemListener(this);
267267 //                    animationItem.setState(CameraPane.ANIMATION);
268268         cameraMenu.add("-");
269
-        cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
269
+        cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270270         editCameraItem.addActionListener(this);
271271         
272272         if (Globals.ADVANCED)
....@@ -368,11 +368,11 @@
368368 		billboardItem.addActionListener(this);
369369 		csgItem = menu.add(new MenuItem("CSG"));
370370 		csgItem.addActionListener(this);
371
-                shadowXItem = menu.add(new MenuItem("Shadow X"));
371
+                shadowXItem = menu.add(new MenuItem("Shadow Red"));
372372 		shadowXItem.addActionListener(this);
373
-                shadowYItem = menu.add(new MenuItem("Shadow Y"));
373
+                shadowYItem = menu.add(new MenuItem("Shadow Green"));
374374 		shadowYItem.addActionListener(this);
375
-                shadowZItem = menu.add(new MenuItem("Shadow Z"));
375
+                shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376376 		shadowZItem.addActionListener(this);
377377         if (Globals.ADVANCED)
378378         {
....@@ -469,6 +469,14 @@
469469 		markleavesItem.addActionListener(this);
470470 		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471471 		unmarkleavesItem.addActionListener(this);
472
+		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473
+		rewindleavesItem.addActionListener(this);
474
+		unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
475
+		unrewindleavesItem.addActionListener(this);
476
+		randomleavesItem = menu.add(new MenuItem("Random Leaves"));
477
+		randomleavesItem.addActionListener(this);
478
+		unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
479
+		unrandomleavesItem.addActionListener(this);
472480 		menu.add("-");
473481 		flipVItem = menu.add(new MenuItem("Flip V"));
474482 		flipVItem.addActionListener(this);
....@@ -526,6 +534,18 @@
526534 	
527535 	void SetupUI2(ObjEditor oe)
528536 	{
537
+            // June 2019
538
+            if (oe == null)
539
+            {
540
+                //super.SetupUI2(this);
541
+                //return;
542
+            }
543
+            
544
+            if (copy != group)
545
+            {
546
+                //super.SetupUI2(this);
547
+            }
548
+            
529549             //new Exception().printStackTrace();
530550                 
531551         oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -556,11 +576,35 @@
556576          */
557577                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558578                 
579
+		//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580
+                //minButton.setToolTipText("Minimize window");
581
+		//minButton.addActionListener(this);
582
+                
583
+		oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584
+                maxButton.setToolTipText("Maximize window");
585
+		maxButton.addActionListener(this);
586
+                
587
+		oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588
+                fullButton.setToolTipText("Full-screen window");
589
+		fullButton.addActionListener(this);
590
+                
591
+		oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592
+                undoButton.setToolTipText("Undo changes");
593
+		undoButton.addActionListener(this);
594
+                
595
+		oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
+                redoButton.setToolTipText("Redo changes");
597
+		redoButton.addActionListener(this);
598
+                
599
+		oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
+                saveButton.setToolTipText("Save changes");
601
+		saveButton.addActionListener(this);
602
+                
559603                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
560604                 liveCB.setToolTipText("Enable animation");
561605                                 liveCB.addItemListener(this);
562606 
563
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564608                 oneStepButton.setToolTipText("Animate one step forward");
565609 		oneStepButton.addActionListener(this);
566610                 
....@@ -568,7 +612,7 @@
568612                 fastCB.setToolTipText("Fast mode");
569613                                 fastCB.addItemListener(this);
570614                                 
571
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
615
+                oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
572616                 trackCB.setToolTipText("Enable tracking");
573617                                 trackCB.addItemListener(this);
574618 
....@@ -592,19 +636,19 @@
592636                 
593637 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594638                 
595
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596640                 twoButton.setToolTipText("Show center view only");
597641 		twoButton.addActionListener(this);
598
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
+		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599643 		fourButton.addActionListener(this);
600644                 fourButton.setToolTipText("Show left panel only");
601
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645
+		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602646                 sixButton.setToolTipText("2-column layout left");
603647 		sixButton.addActionListener(this);
604
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
648
+		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605649                 threeButton.setToolTipText("2-column layout right");
606650 		threeButton.addActionListener(this);
607
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651
+		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608652                 sevenButton.setToolTipText("3-column layout");
609653 		sevenButton.addActionListener(this);
610654                 //
....@@ -619,32 +663,30 @@
619663 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620664 		//clearButton.addActionListener(this);
621665                         
622
-                cGridBag commandsPanel = new cGridBag();
623
-                
624
-		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666
+		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625667                 editButton.setToolTipText("Edit selection");
626668 		editButton.addActionListener(this);
627669 
628
-		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629671                 uneditButton.setToolTipText("Unedit selection");
630672 		uneditButton.addActionListener(this);
631673 
632
-		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
674
+		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633675                 allParamsButton.setToolTipText("Edit all params");
634676 		allParamsButton.addActionListener(this);
635677 
636
-		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
678
+		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637679                 clearPanelButton.setToolTipText("Clear edit panel");
638680 		clearPanelButton.addActionListener(this);
639681 
640
-		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
+		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641683                 unselectButton.setToolTipText("Unselect");
642684 		unselectButton.addActionListener(this);
643685 
644
-                commandsPanel.preferredHeight = 1;
686
+                editCommandsPanel.preferredHeight = 1;
645687                 
646
-                oe.treePanel.add(commandsPanel);
647
-                oe.treePanel.Return();
688
+//                oe.treePanel.add(commandsPanel);
689
+//                oe.treePanel.Return();
648690                 
649691 //		oe.aConstraints.gridx += 1;
650692 //		oe.aConstraints.weighty = 0;
....@@ -766,11 +808,19 @@
766808 //                debugCB.addItemListener(this);
767809 
768810                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811
+                oeilCB.setToolTipText("Move camera when tracking target");
769812                                 oeilCB.addItemListener(this);
770813 
814
+                panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815
+                shadowCB.setToolTipText("Compute shadows when live");
816
+                                shadowCB.addItemListener(this);
817
+
818
+            if (Globals.ADVANCED)
819
+            {
771820                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772821                 lookAtCB.setToolTipText("Look-at target");
773822                                 lookAtCB.addItemListener(this);
823
+            }
774824                 
775825         }
776826                                 
....@@ -785,6 +835,14 @@
785835         void EditObject(Object3D obj)
786836         {
787837             cRadio radioButton = new cRadio(obj.name);
838
+            
839
+            // Patch to avoid bug with transparency.
840
+            radioButton.hadMaterial = obj.material != null;
841
+            if (!radioButton.hadMaterial)
842
+            {
843
+                obj.material = new cMaterial();
844
+            }
845
+            
788846             radioButton.SetObject(obj);
789847             radioButton.layout = sevenButton;
790848             radioButton.SetCamera(cameraView.renderCamera, false);
....@@ -796,6 +854,8 @@
796854         
797855         void SetupViews(ObjEditor oe)
798856         {
857
+                    theFrame = this;
858
+                    
799859             oe.SetupViews();
800860             
801861 		System.out.println("SetupViews");
....@@ -819,7 +879,9 @@
819879         JCheckBox speakerCameraCB;
820880         JCheckBox speakerFocusCB;
821881         JCheckBox debugCB;
882
+        
822883         JCheckBox oeilCB;
884
+        JCheckBox shadowCB;
823885         JCheckBox lookAtCB;
824886         
825887 //        static int COLOR = 1;
....@@ -858,6 +920,7 @@
858920             } else if(e.getSource() == liveCB)
859921             {
860922                 cameraView.ToggleLive();
923
+                refreshContents(false);
861924             }
862925             else if(e.getSource() == supportCB)
863926             {
....@@ -921,6 +984,10 @@
921984             else if(e.getSource() == oeilCB)
922985             {
923986                 cameraView.ToggleOeil();
987
+            }
988
+            else if(e.getSource() == shadowCB)
989
+            {
990
+                Globals.COMPUTESHADOWWHENLIVE ^= true;
924991             }
925992             else if(e.getSource() == lookAtCB)
926993             {
....@@ -1265,7 +1332,7 @@
12651332 		memoryItem.addActionListener(this);
12661333 		menu.add(analyzeItem = new MenuItem("Analyze"));
12671334 		analyzeItem.addActionListener(this);
1268
-		menu.add(dumpItem = new MenuItem("Dump"));
1335
+		menu.add(dumpItem = new MenuItem("Print"));
12691336 		dumpItem.addActionListener(this);
12701337 //		menu.add(pathItem = new MenuItem("From-to path"));
12711338 //		pathItem.addActionListener(this);
....@@ -1406,6 +1473,7 @@
14061473             shadow.material = new cMaterial(obj.material);
14071474             shadow.material.diffuse = 0.0001f;
14081475             shadow.material.specular = 0.0001f;
1476
+            //shadow.projectedVertices[1].x = 300;
14091477             
14101478             makeSomething(shadow);
14111479         }
....@@ -1955,6 +2023,30 @@
19552023 		if (source == dumpItem)
19562024 		{
19572025                     DumpObject();
2026
+		} else
2027
+		if (source == minButton)
2028
+		{
2029
+			Minimize();
2030
+		} else
2031
+		if (source == maxButton)
2032
+		{
2033
+			Maximize();
2034
+		} else
2035
+		if (source == fullButton)
2036
+		{
2037
+			ToggleFullScreen();
2038
+		} else
2039
+		if (source == undoButton)
2040
+		{
2041
+			Undo();
2042
+		} else
2043
+		if (source == redoButton)
2044
+		{
2045
+			Redo();
2046
+		} else
2047
+		if (source == saveButton)
2048
+		{
2049
+			Save();
19582050 		} else
19592051 		if (source == oneStepButton)
19602052 		{
....@@ -2517,7 +2609,7 @@
25172609 		} else
25182610 		if (source == genNormalsMESHItem)
25192611                 {
2520
-			GenNormals(true); // TODO
2612
+			GenNormalsMESH();
25212613 		} else
25222614 		if (source == genNormalsORGANItem)
25232615                 {
....@@ -2582,6 +2674,22 @@
25822674 		if (source == unmarkleavesItem)
25832675                 {
25842676 			MarkLeaves(false);
2677
+		} else
2678
+		if (source == rewindleavesItem)
2679
+                {
2680
+			RewindLeaves(true);
2681
+		} else
2682
+		if (source == unrewindleavesItem)
2683
+                {
2684
+			RewindLeaves(false);
2685
+		} else
2686
+		if (source == randomleavesItem)
2687
+                {
2688
+			RandomLeaves(true);
2689
+		} else
2690
+		if (source == unrandomleavesItem)
2691
+                {
2692
+			RandomLeaves(false);
25852693 		} else
25862694 		if (source == flipVItem)
25872695                 {
....@@ -2849,6 +2957,24 @@
28492957                     bigThree.ClearUI();
28502958                     bigThree.add(centralPanel);
28512959                     bigThree.FlushUI();
2960
+                    
2961
+                    cameraView.requestFocusInWindow();
2962
+                    
2963
+//                    refreshContents(true);
2964
+//                    
2965
+//                    try
2966
+//                    {
2967
+//                        java.awt.Robot bot = new java.awt.Robot();
2968
+//                        int mask = InputEvent.BUTTON1_MASK;
2969
+//                        bot.mouseMove(100, 100);           
2970
+//                        bot.mousePress(mask);     
2971
+//                        bot.mouseRelease(mask);                    
2972
+//                    }
2973
+//                    catch (Exception e)
2974
+//                    {
2975
+//                        
2976
+//                    }
2977
+                    
28522978                 } else
28532979 		if (source == threeButton)
28542980 		{
....@@ -2885,6 +3011,8 @@
28853011                     bigThree.add(centralPanel);
28863012                     bigThree.add(XYZPanel);
28873013                     bigThree.FlushUI();
3014
+                    
3015
+                    cameraView.requestFocusInWindow();
28883016                 } else
28893017 		if (source == fourButton)
28903018 		{
....@@ -2920,6 +3048,8 @@
29203048                     bigThree.ClearUI();
29213049                     bigThree.add(scenePanel);
29223050                     bigThree.FlushUI();
3051
+                    
3052
+                    cameraView.requestFocusInWindow();
29233053                 } else
29243054 		if (source == sixButton)
29253055 		{
....@@ -2956,6 +3086,8 @@
29563086                     bigThree.add(scenePanel);
29573087                     bigThree.add(centralPanel);
29583088                     bigThree.FlushUI();
3089
+                    
3090
+                    cameraView.requestFocusInWindow();
29593091                 } else
29603092 		if (source == sevenButton)
29613093 		{
....@@ -2993,6 +3125,8 @@
29933125                     bigThree.add(centralPanel);
29943126                     bigThree.add(XYZPanel);
29953127                     bigThree.FlushUI();
3128
+                    
3129
+                    cameraView.requestFocusInWindow();
29963130                 } else
29973131 		if (source == rootButton)
29983132 		{
....@@ -3004,6 +3138,7 @@
30043138                                 EditObject(obj);
30053139                     }
30063140 
3141
+                    cameraView.requestFocusInWindow();
30073142                     refreshContents(true);
30083143 		} else
30093144 		if (source == closeButton)
....@@ -3013,8 +3148,14 @@
30133148                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
30143149                     {
30153150                             ab = (cRadio)e.nextElement();
3016
-                            if(ab.getModel().isSelected() && ab.GetObject() != client)
3151
+                            if (ab.getModel().isSelected() && ab.GetObject() != client)
30173152                             {
3153
+                                // Patch to avoid bug with transparency.
3154
+                                if (!ab.hadMaterial)
3155
+                                {
3156
+                                    ab.object.material = null;
3157
+                                }
3158
+                                
30183159                                 buttonGroup.remove(ab);
30193160                                 radioPanel.remove(ab);
30203161                                 
....@@ -3025,6 +3166,8 @@
30253166                                 break;
30263167                             }
30273168                     }
3169
+                    
3170
+                    cameraView.requestFocusInWindow();
30283171                     refreshContents(true);
30293172 		} else
30303173 		if (source == editItem || source == editButton)
....@@ -3128,7 +3271,8 @@
31283271                         sideView.object = group;
31293272                     }
31303273                     
3131
-// fix "+" issue                    group.editWindow = this;
3274
+// fix "+" issue
3275
+                    //group.editWindow = this;
31323276                     
31333277                     /*
31343278                     currentLayout = radio.layout;
....@@ -3141,6 +3285,8 @@
31413285                     //group.parent = null; // ROOT
31423286                     //group.attributes = -1;
31433287                     ResetModel();
3288
+                    
3289
+                    cameraView.requestFocusInWindow();
31443290                     refreshContents(true);
31453291                 } else if (event.getSource() == editCameraItem)
31463292                 {
....@@ -3164,7 +3310,6 @@
31643310 	}
31653311         
31663312         boolean useclient = false;
3167
-        cRadio radio;
31683313         
31693314         void ToggleRoot()
31703315         {
....@@ -3403,7 +3548,8 @@
34033548                     
34043549                     int size = obj.MemorySize();
34053550                     
3406
-                    System.err.println((size/1024) + " KB is the size of " + obj);
3551
+                    //System.err.println((size/1024) + " KB is the size of " + obj);
3552
+                    System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
34073553                 }
34083554             }
34093555             catch (Exception e)
....@@ -3484,6 +3630,13 @@
34843630 	void GenNormals(boolean crease)
34853631 	{
34863632 		group.GenNormalsS(crease);
3633
+		
3634
+		refreshContents();
3635
+	}
3636
+	
3637
+	void GenNormalsMESH()
3638
+	{
3639
+		group.GenNormalsMeshS();
34873640 		
34883641 		refreshContents();
34893642 	}
....@@ -4111,6 +4264,18 @@
41114264 		refreshContents();
41124265 	}
41134266 	
4267
+	void RewindLeaves(boolean hide)
4268
+	{
4269
+		group.selection.RewindLeaves(hide);
4270
+		refreshContents();
4271
+	}
4272
+	
4273
+	void RandomLeaves(boolean hide)
4274
+	{
4275
+		group.selection.RandomLeaves(hide);
4276
+		refreshContents();
4277
+	}
4278
+	
41144279 	void SetTexRes(int tr)
41154280 	{
41164281 		group.selection.SetTexRes(tr);
....@@ -4286,7 +4451,6 @@
42864451 			//case 702: // Event.LIST_DESELECT
42874452 			group.deselectAll();
42884453 			TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289
-			objEditor.ClearInfo(); // .GetMaterial());
42904454 			if (tps != null)
42914455 			{
42924456 				for (int i=0; i < tps.length; i++)
....@@ -4295,10 +4459,8 @@
42954459 					
42964460 					//if (child.parent != null)
42974461 						//child.parent.addSelectee(child);
4462
+                    objEditor.SetMaterial(child);
42984463 					group.addSelectee(child);
4299
-					objEditor.SetMaterial(child); // .GetMaterial());
4300
-					objEditor.AddInfo(child, this, true); // .GetMaterial());
4301
-            System.err.println("info : " + child.GetPath());
43024464 				}
43034465 			}
43044466 //			else
....@@ -4308,8 +4470,6 @@
43084470 //            System.err.println("info : " + group.GetPath());
43094471 //                        }
43104472 			
4311
-                        objEditor.SetText(); // jan 2014
4312
-                        
43134473 			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
43144474 				CameraPane.flash = true;
43154475                         
....@@ -4333,6 +4493,26 @@
43334493 		
43344494 		freezemodel = false;
43354495 	}
4496
+        
4497
+        void refreshContents(boolean cp)
4498
+        {
4499
+            if (!Globals.MOUSEDRAGGED)
4500
+            {
4501
+                objEditor.ClearInfo(); // .GetMaterial());
4502
+
4503
+                for (int i=0; i < group.selection.Size(); i++)
4504
+                {
4505
+                    Object3D child = (Object3D) group.selection.get(i);
4506
+
4507
+                    objEditor.AddInfo(child, this, true);
4508
+    System.err.println("info : " + child.GetPath());
4509
+                }
4510
+
4511
+                objEditor.SetText(); // jan 2014
4512
+            }
4513
+                        
4514
+            super.refreshContents(cp);
4515
+        }
43364516 	
43374517 	void linkSomething(Object3D thing)
43384518 	{
....@@ -4404,6 +4584,7 @@
44044584 	{
44054585 		if (group.selection.isEmpty())
44064586 			return;
4587
+                
44074588 		Grafreed.clipboardIsTempGroup = false;
44084589 		Composite tGroup = null;
44094590 		if (group.selection.size() > 0) // 1)
....@@ -4414,6 +4595,7 @@
44144595                 
44154596 		if (cut)
44164597 		{
4598
+                    Save();
44174599 			//int indices[] = jList.getSelectedIndices();
44184600 			//for (int i = indices.length - 1; i >= 0; i--)
44194601 			//jList.remove(indices[i]);
....@@ -4503,8 +4685,10 @@
45034685 			}
45044686 			
45054687 		}
4688
+                
45064689 		if (Grafreed.clipboardIsTempGroup)
45074690 			Grafreed.clipboard = tGroup;
4691
+                
45084692 		if (cut)
45094693                 {
45104694                     ResetModel();
....@@ -5129,6 +5313,12 @@
51295313 	cButton clearpanelButton;
51305314 	cButton unselectButton;
51315315 	
5316
+	cButton minButton;
5317
+	cButton maxButton;
5318
+	cButton fullButton;
5319
+	cButton undoButton;
5320
+	cButton redoButton;
5321
+	cButton saveButton;
51325322 	cButton oneStepButton;
51335323         
51345324 	cButton screenfitButton;
....@@ -5141,14 +5331,6 @@
51415331 	cButton closeButton;
51425332 
51435333 	cButton setsupportButton;
5144
-        
5145
-	cButton twoButton;
5146
-	cButton sixButton;
5147
-	cButton threeButton;
5148
-	cButton sevenButton;
5149
-	cButton fourButton; // full panel
5150
-	cButton oneButton; // full XYZ
5151
-        //cButton currentLayout;
51525334         
51535335 	//
51545336         //Composite
....@@ -5226,6 +5408,10 @@
52265408 	private MenuItem showleavesItem;
52275409 	private MenuItem markleavesItem;
52285410 	private MenuItem unmarkleavesItem;
5411
+	private MenuItem rewindleavesItem;
5412
+	private MenuItem unrewindleavesItem;
5413
+	private MenuItem randomleavesItem;
5414
+	private MenuItem unrandomleavesItem;
52295415         
52305416 	private MenuItem flipVItem;
52315417 	private MenuItem unflipVItem;