blame | history | patch | commit | commitdiff
Normand Briere
2019-06-24 47cd0f0a3870d843cb758535316060d30f15c811 
 GroupEditor.java
....@@ -150,6 +150,8 @@
150150     
151151 	void SetupMenu2(GroupEditor oe)
152152 	{
153
+                oe.jTree = new cTree();
154
+
153155 		Menu menu;
154156 		oe.menuBar.add(menu = new Menu("Edit"));
155157 		//editItem = menu.add(new MenuItem("Edit"));
....@@ -160,7 +162,7 @@
160162 //		redoItem = menu.add(new MenuItem("Redo"));
161163 //		redoItem.addActionListener(this);
162164 //		menu.add("-");
163
-		duplicateItem = menu.add(new MenuItem("Duplicate"));
165
+		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164166 		duplicateItem.addActionListener(this);
165167 		cloneItem = menu.add(new MenuItem("Clone"));
166168 		cloneItem.addActionListener(this);
....@@ -176,7 +178,6 @@
176178 		copyItem.addActionListener(this);
177179 		pasteItem = menu.add(new MenuItem("Paste"));
178180 		pasteItem.addActionListener(this);
179
-		menu.add("-");
180181                 
181182 		menu.add("-");
182183 		pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -335,13 +336,21 @@
335336 		frontItem.addActionListener(this);
336337 		compositeItem = menu.add(new MenuItem("Composite"));
337338 		compositeItem.addActionListener(this);
339
+                
340
+        if (Globals.ADVANCED)
341
+        {
338342 		hideItem = menu.add(new MenuItem("Hidden Group"));
339343 		hideItem.addActionListener(this);
344
+        }
340345 		ungroupItem = menu.add(new MenuItem("Ungroup"));
341346 		ungroupItem.addActionListener(this);
347
+                
342348 		menu.add("-");
349
+                
343350 		randomItem = menu.add(new MenuItem("Switch node"));
344351 		randomItem.addActionListener(this);
352
+        if (Globals.ADVANCED)
353
+        {
345354 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346355 		switchGeoItem.addActionListener(this);
347356 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -349,8 +358,6 @@
349358 		morphItem = menu.add(new MenuItem("Morph Group"));
350359 		morphItem.addActionListener(this);
351360                 
352
-        if (Globals.ADVANCED)
353
-        {
354361 		menu.add("-");
355362 		physicsItem = menu.add(new MenuItem("Physics"));
356363 		physicsItem.addActionListener(this);
....@@ -369,11 +376,11 @@
369376 		billboardItem.addActionListener(this);
370377 		csgItem = menu.add(new MenuItem("CSG"));
371378 		csgItem.addActionListener(this);
372
-                shadowXItem = menu.add(new MenuItem("Shadow X"));
379
+                shadowXItem = menu.add(new MenuItem("Shadow Red"));
373380 		shadowXItem.addActionListener(this);
374
-                shadowYItem = menu.add(new MenuItem("Shadow Y"));
381
+                shadowYItem = menu.add(new MenuItem("Shadow Green"));
375382 		shadowYItem.addActionListener(this);
376
-                shadowZItem = menu.add(new MenuItem("Shadow Z"));
383
+                shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377384 		shadowZItem.addActionListener(this);
378385         if (Globals.ADVANCED)
379386         {
....@@ -581,43 +588,45 @@
581588                 //minButton.setToolTipText("Minimize window");
582589 		//minButton.addActionListener(this);
583590                 
584
-		oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591
+		oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585592                 maxButton.setToolTipText("Maximize window");
586593 		maxButton.addActionListener(this);
587594                 
588
-		oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
595
+		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589596                 fullButton.setToolTipText("Full-screen window");
590597 		fullButton.addActionListener(this);
591598                 
592
-		oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599
+		oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593600                 undoButton.setToolTipText("Undo changes");
594601 		undoButton.addActionListener(this);
595602                 
596
-		oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603
+		oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597604                 redoButton.setToolTipText("Redo changes");
598605 		redoButton.addActionListener(this);
599606                 
600
-		oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601608                 saveButton.setToolTipText("Save changes");
602609 		saveButton.addActionListener(this);
603610                 
604
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
611
+                oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
605612                 liveCB.setToolTipText("Enable animation");
606613                                 liveCB.addItemListener(this);
607614 
608
-		oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615
+		oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609616                 oneStepButton.setToolTipText("Animate one step forward");
610617 		oneStepButton.addActionListener(this);
611618                 
612
-                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
619
+                oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613620                 fastCB.setToolTipText("Fast mode");
614621                                 fastCB.addItemListener(this);
615622                                 
616
-                oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
623
+                oe.toolboxPanel.Return();
624
+                
625
+                oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
617626                 trackCB.setToolTipText("Enable tracking");
618627                                 trackCB.addItemListener(this);
619628 
620
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629
+		oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621630                 screenfitButton.setToolTipText("Screen fit");
622631 		screenfitButton.addActionListener(this);
623632 
....@@ -631,65 +640,112 @@
631640                         snapobjectButton.setToolTipText("Snap Object");
632641                 }
633642 
634
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635
-                flashSelectionButton.setToolTipText("Show selection");
643
+		oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644
+                flashSelectionButton.setToolTipText("Highlight selection");
636645 		flashSelectionButton.addActionListener(this);
637646                 
638
-		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
647
+		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639648                 
640
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641650                 twoButton.setToolTipText("Show center view only");
642651 		twoButton.addActionListener(this);
643
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652
+                this.fullscreenLayout = twoButton;
653
+                
654
+		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644655 		fourButton.addActionListener(this);
645656                 fourButton.setToolTipText("Show left panel only");
646
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657
+		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647658                 sixButton.setToolTipText("2-column layout left");
648659 		sixButton.addActionListener(this);
649
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
660
+		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650661                 threeButton.setToolTipText("2-column layout right");
651662 		threeButton.addActionListener(this);
652
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663
+		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653664                 sevenButton.setToolTipText("3-column layout");
654665 		sevenButton.addActionListener(this);
655666                 //
656667 
657
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668
+		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658669                 rootButton.setToolTipText("Edit selection in new tab");
659670 		rootButton.addActionListener(this);
660671 
661
-                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
672
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662673                 closeButton.setToolTipText("Close tab");
663674 		closeButton.addActionListener(this);
664675 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665676 		//clearButton.addActionListener(this);
666
-                        
667
-                cGridBag commandsPanel = new cGridBag();
677
+
678
+                // INSERT
679
+                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680
+                gridButton.setToolTipText("Create grid");
681
+                                gridButton.addActionListener(this);
682
+
683
+                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684
+                boxButton.setToolTipText("Create box");
685
+                                boxButton.addActionListener(this);
686
+
687
+                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688
+                sphereButton.setToolTipText("Create sphere");
689
+                                sphereButton.addActionListener(this);
690
+
691
+                oe.toolboxPanel.Return();
668692                 
669
-		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
+                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694
+                coneButton.setToolTipText("Create cone");
695
+                                coneButton.addActionListener(this);
696
+
697
+                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698
+                torusButton.setToolTipText("Create torus");
699
+                                torusButton.addActionListener(this);
700
+
701
+                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702
+                superButton.setToolTipText("Create superellipsoid");
703
+                                superButton.addActionListener(this);
704
+
705
+                if (Globals.ADVANCED)
706
+                {
707
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
+                    kleinButton.setToolTipText("Create Klein bottle");
709
+                                    kleinButton.addActionListener(this);
710
+                }
711
+                
712
+                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713
+                particlesButton.setToolTipText("Create particle system");
714
+                               particlesButton.addActionListener(this);
715
+
716
+                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717
+                overlayButton.setToolTipText("Create overlay");
718
+                               overlayButton.addActionListener(this);
719
+
720
+                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721
+                lightButton.setToolTipText("Create light");
722
+                               lightButton.addActionListener(this);
723
+
724
+                // EDIT panel
725
+		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670726                 editButton.setToolTipText("Edit selection");
671727 		editButton.addActionListener(this);
672728 
673
-		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729
+		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674730                 uneditButton.setToolTipText("Unedit selection");
675731 		uneditButton.addActionListener(this);
676732 
677
-		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
733
+		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678734                 allParamsButton.setToolTipText("Edit all params");
679735 		allParamsButton.addActionListener(this);
680736 
681
-		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737
+		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682738                 clearPanelButton.setToolTipText("Clear edit panel");
683739 		clearPanelButton.addActionListener(this);
684740 
685
-		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741
+		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686742                 unselectButton.setToolTipText("Unselect");
687743 		unselectButton.addActionListener(this);
688744 
689
-                commandsPanel.preferredHeight = 1;
745
+                editCommandsPanel.preferredHeight = 1;
690746                 
691
-                oe.treePanel.add(commandsPanel);
692
-                oe.treePanel.Return();
747
+//                oe.treePanel.add(commandsPanel);
748
+//                oe.treePanel.Return();
693749                 
694750 //		oe.aConstraints.gridx += 1;
695751 //		oe.aConstraints.weighty = 0;
....@@ -706,7 +762,7 @@
706762 
707763                 JScrollPane jSP;
708764 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709
-		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
765
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710766                 ResetModel();
711767                 
712768                 oe.treePanel.add(jSPPanel);
....@@ -811,11 +867,23 @@
811867 //                debugCB.addItemListener(this);
812868 
813869                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870
+                oeilCB.setToolTipText("Move camera when tracking target");
814871                                 oeilCB.addItemListener(this);
815872 
873
+                panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874
+                shadowCB.setToolTipText("Compute shadows when live");
875
+                                shadowCB.addItemListener(this);
876
+
877
+                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878
+                autosaveCB.setToolTipText("Auto-save on structure change");
879
+                                autosaveCB.addItemListener(this);
880
+
881
+            if (Globals.ADVANCED)
882
+            {
816883                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817884                 lookAtCB.setToolTipText("Look-at target");
818885                                 lookAtCB.addItemListener(this);
886
+            }
819887                 
820888         }
821889                                 
....@@ -830,6 +898,14 @@
830898         void EditObject(Object3D obj)
831899         {
832900             cRadio radioButton = new cRadio(obj.name);
901
+            
902
+            // Patch to avoid bug with transparency.
903
+            radioButton.hadMaterial = obj.material != null;
904
+            if (!radioButton.hadMaterial)
905
+            {
906
+                obj.material = new cMaterial();
907
+            }
908
+            
833909             radioButton.SetObject(obj);
834910             radioButton.layout = sevenButton;
835911             radioButton.SetCamera(cameraView.renderCamera, false);
....@@ -851,23 +927,26 @@
851927             /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
852928         }
853929 
854
-        JCheckBox liveCB;
855
-        JCheckBox supportCB;
856
-        JCheckBox localCB;
857
-        JCheckBox crowdCB;
858
-        JCheckBox smoothCB;
859
-        JCheckBox fastCB;
860
-        JCheckBox slowCB;
861
-        JCheckBox boxCB;
862
-        JCheckBox zoomBoxCB;
863
-        JCheckBox trackCB;
864
-        JCheckBox smoothfocusCB;
930
+        cToggleButton liveCB;
931
+        cCheckBox supportCB;
932
+        cCheckBox localCB;
933
+        cCheckBox crowdCB;
934
+        cCheckBox smoothCB;
935
+        cToggleButton fastCB;
936
+        cCheckBox slowCB;
937
+        cCheckBox boxCB;
938
+        cCheckBox zoomBoxCB;
939
+        cToggleButton trackCB;
940
+        cCheckBox smoothfocusCB;
865941 //        JCheckBox speakerMocapCB;
866
-        JCheckBox speakerCameraCB;
867
-        JCheckBox speakerFocusCB;
868
-        JCheckBox debugCB;
869
-        JCheckBox oeilCB;
870
-        JCheckBox lookAtCB;
942
+        cCheckBox speakerCameraCB;
943
+        cCheckBox speakerFocusCB;
944
+        cCheckBox debugCB;
945
+        
946
+        cCheckBox oeilCB;
947
+        cCheckBox shadowCB;
948
+        cCheckBox autosaveCB;
949
+        cCheckBox lookAtCB;
871950         
872951 //        static int COLOR = 1;
873952 //        static int MATERIAL = 2;
....@@ -875,9 +954,9 @@
875954         
876955         int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
877956         
878
-        JCheckBox colorCB;
879
-        JCheckBox materialCB;
880
-        JCheckBox textureCB;
957
+        cCheckBox colorCB;
958
+        cCheckBox materialCB;
959
+        cCheckBox textureCB;
881960         
882961         public void itemStateChanged(ItemEvent e)
883962         {
....@@ -970,6 +1049,14 @@
9701049             {
9711050                 cameraView.ToggleOeil();
9721051             }
1052
+            else if(e.getSource() == shadowCB)
1053
+            {
1054
+                Globals.COMPUTESHADOWWHENLIVE ^= true;
1055
+            }
1056
+            else if(e.getSource() == autosaveCB)
1057
+            {
1058
+                Globals.SAVEONMAKE ^= true;
1059
+            }
9731060             else if(e.getSource() == lookAtCB)
9741061             {
9751062                 cameraView.ToggleLookAt();
....@@ -986,7 +1073,8 @@
9861073 		
9871074                 /**/
9881075 		//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989
-		TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1076
+		//TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1077
+		TreePath path = objEditor.jTree.getSelectionPath();
9901078 		if ((path == null) || (path.getPathCount() <= 1)) {
9911079 		  // We can't move the root node or an empty selection
9921080 		  return;
....@@ -1110,16 +1198,16 @@
11101198                 return;
11111199             }
11121200 
1113
-            if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1114
-            {
1201
+// june 2019            if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202
+//            {
11151203                 loadClipboard(true);
11161204                 objEditor.jTree.setSelectionPath(destinationPath);
11171205                 pasteInto(false, false);
1118
-            } else {
1119
-                loadClipboard(false);
1120
-                objEditor.jTree.setSelectionPath(destinationPath);
1121
-                pasteInto(false, false); // true); // ???
1122
-            }
1206
+//            } else {
1207
+//                loadClipboard(false);
1208
+//                objEditor.jTree.setSelectionPath(destinationPath);
1209
+//                pasteInto(false, false); // true); // ???
1210
+//            }
11231211 	}
11241212 	public void	dropActionChanged(DropTargetDragEvent dtde) 
11251213 	// Called if the user has modified the current drop gesture
....@@ -1454,6 +1542,7 @@
14541542             shadow.material = new cMaterial(obj.material);
14551543             shadow.material.diffuse = 0.0001f;
14561544             shadow.material.specular = 0.0001f;
1545
+            //shadow.projectedVertices[1].x = 300;
14571546             
14581547             makeSomething(shadow);
14591548         }
....@@ -1710,11 +1799,11 @@
17101799 			objEditor.cameraView.renderCamera.setAim(v2, v1);
17111800 			objEditor.cameraView.repaint();
17121801 		} else
1713
-		if (source == rectoidItem)
1802
+		if (source == rectoidItem || source == boxButton)
17141803 		{
17151804 			makeSomething(new Box());
17161805 		} else
1717
-		if (source == particleItem)
1806
+		if (source == particleItem || source == particlesButton)
17181807 		{
17191808         ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
17201809         ParticleController particleController = new ParticleController(particleGeom);
....@@ -1793,27 +1882,27 @@
17931882                     
17941883                     makeSomething(obj);
17951884 		} else
1796
-		if (source == gridItem)
1885
+		if (source == gridItem || source == gridButton)
17971886 		{
17981887 			makeSomething(new Grid());
17991888 		} else
1800
-		if (source == ellipsoidItem)
1889
+		if (source == ellipsoidItem || source == sphereButton)
18011890 		{
18021891 			makeSomething(new Sphere());
18031892 		} else
1804
-		if (source == coneItem)
1893
+		if (source == coneItem || source == coneButton)
18051894 		{
18061895 			makeSomething(new Cone());
18071896 		} else
1808
-		if (source == torusItem)
1897
+		if (source == torusItem || source == torusButton)
18091898 		{
18101899 			makeSomething(new Torus());
18111900 		} else
1812
-		if (source == superItem)
1901
+		if (source == superItem || source == superButton)
18131902 		{
18141903 			makeSomething(new Superellipsoid());
18151904 		} else
1816
-		if (source == kleinItem)
1905
+		if (source == kleinItem || source == kleinButton)
18171906 		{
18181907 			makeSomething(new Klein());
18191908 		} else
....@@ -1833,7 +1922,7 @@
18331922 		{
18341923 			makeSomething(new BezierSurface());
18351924 		} else
1836
-		if (source == overlayItem)
1925
+		if (source == overlayItem || source == overlayButton)
18371926 		{
18381927                     /*
18391928 			Object3D obj = new BezierSurface(5,8);
....@@ -1881,7 +1970,7 @@
18811970                         s.setup();
18821971 			makeSomething(s);
18831972 		} else
1884
-		if (source == lightItem)
1973
+		if (source == lightItem || source == lightButton)
18851974 		{
18861975 			makeSomething(new Light());
18871976 		} else
....@@ -2567,7 +2656,7 @@
25672656 		{
25682657 			CastShadow(2);
25692658 		} else
2570
-		if (source == ungroupItem)
2659
+		if (source == ungroupItem || source == ungroupButton)
25712660 		{
25722661 			//ungroup();
25732662                     for (int i=0; i<group.selection.size(); i++)
....@@ -2905,6 +2994,10 @@
29052994 		if (source == twoButton)
29062995 		{
29072996                     radio.layout = twoButton;
2997
+                    
2998
+                    if (CameraPane.FULLSCREEN)
2999
+                        fullscreenLayout = radio.layout;
3000
+                    
29083001                     // bug
29093002                     //gridPanel.setDividerLocation(1.0);
29103003                     //bigPanel.setDividerLocation(0.0);
....@@ -2960,6 +3053,9 @@
29603053 		{
29613054                     radio.layout = threeButton;
29623055                     
3056
+                    if (CameraPane.FULLSCREEN)
3057
+                        fullscreenLayout = radio.layout;
3058
+                    
29633059 //                    bigThree.remove(scenePanel);
29643060 //                    bigThree.remove(centralPanel);
29653061 //                    bigThree.remove(XYZPanel);
....@@ -2998,6 +3094,9 @@
29983094 		{
29993095                     radio.layout = fourButton;
30003096                     
3097
+                    if (CameraPane.FULLSCREEN)
3098
+                        fullscreenLayout = radio.layout;
3099
+                    
30013100 //                    bigThree.remove(scenePanel);
30023101 //                    bigThree.remove(centralPanel);
30033102 //                    bigThree.remove(XYZPanel);
....@@ -3034,6 +3133,9 @@
30343133 		if (source == sixButton)
30353134 		{
30363135                     radio.layout = sixButton;
3136
+                    
3137
+                    if (CameraPane.FULLSCREEN)
3138
+                        fullscreenLayout = radio.layout;
30373139                     
30383140 //                    bigThree.remove(scenePanel);
30393141 //                    bigThree.remove(centralPanel);
....@@ -3072,6 +3174,9 @@
30723174 		if (source == sevenButton)
30733175 		{
30743176                     radio.layout = sevenButton;
3177
+                    
3178
+                    if (CameraPane.FULLSCREEN)
3179
+                        fullscreenLayout = radio.layout;
30753180                     
30763181 //                    bigThree.remove(scenePanel);
30773182 //                    bigThree.remove(centralPanel);
....@@ -3128,12 +3233,19 @@
31283233                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
31293234                     {
31303235                             ab = (cRadio)e.nextElement();
3131
-                            if(ab.getModel().isSelected() && ab.GetObject() != client)
3236
+                            if (ab.getModel().isSelected() && ab.GetObject() != client)
31323237                             {
3238
+                                // Patch to avoid bug with transparency.
3239
+                                if (!ab.hadMaterial)
3240
+                                {
3241
+                                    ab.object.material = null;
3242
+                                }
3243
+                                
31333244                                 buttonGroup.remove(ab);
31343245                                 radioPanel.remove(ab);
31353246                                 
3136
-                                ab.GetObject().editWindow = null;
3247
+                                //ab.GetObject().editWindow = null;
3248
+                                ab.GetObject().manipWindow = null;
31373249                             //    ab.GetObject().objectUI = null; // ?????????
31383250                                 
31393251                                 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
....@@ -3247,6 +3359,7 @@
32473359                     
32483360 // fix "+" issue
32493361                     //group.editWindow = this;
3362
+                    group.manipWindow = this;
32503363                     
32513364                     /*
32523365                     currentLayout = radio.layout;
....@@ -4332,7 +4445,7 @@
43324445 		{
43334446                     //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
43344447                     //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335
-                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4448
+                    //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
43364449                     
43374450 			Object3D elem = (Object3D)group.selection.elementAt(i);
43384451                         if(elem != group || !newWindow)
....@@ -4569,6 +4682,7 @@
45694682                 
45704683 		if (cut)
45714684 		{
4685
+        if (Globals.SAVEONMAKE)
45724686                     Save();
45734687 			//int indices[] = jList.getSelectedIndices();
45744688 			//for (int i = indices.length - 1; i >= 0; i--)
....@@ -5295,6 +5409,21 @@
52955409 	cButton saveButton;
52965410 	cButton oneStepButton;
52975411         
5412
+        cButton groupButton;
5413
+        cButton ungroupButton;
5414
+        cButton compositeButton;
5415
+        
5416
+        cButton gridButton;
5417
+        cButton boxButton;
5418
+        cButton sphereButton;
5419
+        cButton coneButton;
5420
+        cButton torusButton;
5421
+        cButton superButton;
5422
+        cButton kleinButton;
5423
+        cButton particlesButton;
5424
+        cButton overlayButton;
5425
+        cButton lightButton;
5426
+        
52985427 	cButton screenfitButton;
52995428 	cButton screenfitpointButton;
53005429 	cButton snapobjectButton;
....@@ -5319,7 +5448,7 @@
53195448 	private MenuItem cutItem;
53205449 	private MenuItem undoItem;
53215450 	private MenuItem redoItem;
5322
-	private MenuItem duplicateItem;
5451
+	private JMenuItem duplicateItem;
53235452 	private MenuItem cloneItem;
53245453 	private MenuItem cloneSupportItem;
53255454 	private MenuItem overwriteGeoItem;