~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,7 +31,7 @@
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32	32	row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35	35	skyboxButton.addActionListener(new ActionListener()
36	36	{
37	37	@Override
..	..	@@ -73,7 +73,7 @@
73	73	cGridBag row5 = new cGridBag();
74	74	cGridBag row6 = new cGridBag();
75	75
76		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
77	77	//AddSkyboxButton("default", "cornell", row0);
78	78	AddSkyboxButton("penguins", "dust", row0);
79	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -330,10 +330,19 @@
330	330
331	331	public void ChangeSkybox(String skybox)
332	332	{
333		- //cameraView.envyoff = false;
334		- group.skyboxname = skybox;
335		- group.skyboxext = "jpg";
336		- cameraView.repaint();
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
337	346	}
338	347
339	348	public void CreateSkyboxPanel(cGridBag skyboxPanel)
..	..	@@ -357,6 +366,16 @@
357	366	}
358	367
359	368	refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
360	379	}
361	380
362	381	//ObjEditor objEditor;
..	..	@@ -396,10 +415,14 @@
396	415	this.copy = this.group = group;
397	416	//selectees = this.group.selectees;
398	417
	418	+ assert(false);
	419	+
399	420	if (copy.versionlist == null)
400	421	{
401	422	copy.versionlist = new Object3D[100];
402	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
403	426	}
404	427
405	428	if(ui)
..	..	@@ -428,7 +451,7 @@
428	451	copy.versionlist = new Object3D[100];
429	452	copy.versionindex = -1;
430	453
431		- Save(true);
	454	+ //Save(true);
432	455	}
433	456	}
434	457
..	..	@@ -519,33 +542,35 @@
519	542	// menu.add("-");
520	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
521	544	duplicateItem.addActionListener(this);
522		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
523	547	cloneItem.addActionListener(this);
524		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
525	549	{
526	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
527	551	cloneSupportItem.addActionListener(this);
528	552	}
	553	+ oe.jTree.popup.addSeparator();
529	554	menu.add("-");
530		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
531	556	cutItem.addActionListener(this);
532		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
533	558	copyItem.addActionListener(this);
534	559	pasteItem = menu.add(new MenuItem("Paste"));
535	560	pasteItem.addActionListener(this);
536	561
537		- menu.add("-");
538		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
539	565	pasteIntoItem.addActionListener(this);
540		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
541	567	pasteLinkItem.addActionListener(this);
542		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
543	569	pasteCloneItem.addActionListener(this);
544		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
545	571	// pasteExpandItem.addActionListener(this);
546		- menu.add("-");
547		- deleteItem = menu.add(new MenuItem("Delete"));
548		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
549	574
550	575	if (Globals.ADVANCED)
551	576	{
..	..	@@ -631,11 +656,9 @@
631	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
632	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
633	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
634		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
635	659	oe.cameraMenu.add("-");
636	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
637	661	openWindowItem.addActionListener(this);
638		- editLeafItem.addActionListener(this);
639	662	lookAtItem.addActionListener(this);
640	663	//lookFromItem.addActinoListener(this);
641	664	//switchViewItem.addActionListener(this);
..	..	@@ -682,9 +705,8 @@
682	705	setMasterItem.addActionListener(this);
683	706	}
684	707
685		- oe.menuBar.add(menu = new Menu("Group"));
686		-// grabItem = menu.add(new MenuItem("Grab"));
687		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
688	710	backItem = menu.add(new MenuItem("Back"));
689	711	backItem.addActionListener(this);
690	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -692,13 +714,21 @@
692	714	// compositeItem = menu.add(new MenuItem("Composite"));
693	715	// compositeItem.addActionListener(this);
694	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
695	720	if (Globals.ADVANCED)
696	721	{
697	722	hideItem = menu.add(new MenuItem("Hidden Group"));
698	723	hideItem.addActionListener(this);
699	724	}
700		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
701	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
702	732
703	733	// menu.add("-");
704	734	//
..	..	@@ -883,6 +913,9 @@
883	913	shareGeometriesItem.addActionListener(this);
884	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
885	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
886	919	if (Globals.ADVANCED)
887	920	{
888	921	// Pretty much the same as duplicate and clone.
..	..	@@ -901,7 +934,7 @@
901	934
902	935	JTabbedPane resourcecontainer;
903	936	cGridBag currenttab;
904		- boolean added; // patch for jar
	937	+ //boolean added; // patch for jar
905	938
906	939	int tabcount = 0;
907	940	int colcount = 0;
..	..	@@ -918,12 +951,14 @@
918	951	// System.out.println();
919	952
920	953	if (//rowcount == 0 \|\|
921		- path.length == 1)
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
922	955	{
923	956	currenttab = new cGridBag();
924		- added = false;
925	957	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
926	958	currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
927	962	rowcount = 1;
928	963	colcount = 0;
929	964	texturecount = 0;
..	..	@@ -931,12 +966,11 @@
931	966
932	967	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
933	968	{
934		- if (!added)
	969	+ //if (!added)
935	970	{
936		- added = true;
937		- resourcecontainer.add(currenttab);
	971	+ //added = true;
938	972	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
940	974	}
941	975
942	976	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -984,11 +1018,6 @@
984	1018	//new Exception().printStackTrace();
985	1019
986	1020	oe.radioPanel = new JPanel(new GridBagLayout());
987		- oe.aConstraints.weightx = 1;
988		- oe.aConstraints.weighty = 0;
989		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
990		- oe.aConstraints.gridwidth = 100;
991		- oe.aConstraints.gridheight = 1;
992	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
993	1022
994	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1021,10 +1050,49 @@
1021	1050
1022	1051	if (Globals.ADVANCED)
1023	1052	{
1024		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- maxButton.setToolTipText("Maximize window");
1026		- maxButton.addActionListener(this);
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
1027	1056	}
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
1028	1096
1029	1097	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030	1098	fullButton.setToolTipText("Full-screen window");
..	..	@@ -1045,6 +1113,7 @@
1045	1113	copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1046	1114	deleteVersionButton.setToolTipText("Delete current version");
1047	1115	deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
1048	1117
1049	1118	copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050	1119	previousVersionButton.setToolTipText("Previous version");
..	..	@@ -1055,12 +1124,12 @@
1055	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1056	1125	restoreButton.setToolTipText("Undo (restore current version)");
1057	1126	restoreButton.addActionListener(this);
1058		- //restoreButton.setEnabled(false);
	1127	+ restoreButton.setEnabled(false);
1059	1128
1060	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061	1130	replaceButton.setToolTipText("Save (replace current version)");
1062	1131	replaceButton.addActionListener(this);
1063		- //replaceButton.setEnabled(false);
	1132	+ replaceButton.setEnabled(false);
1064	1133
1065	1134	copyOptionsPanel.add(updown);
1066	1135
..	..	@@ -1069,14 +1138,14 @@
1069	1138	nextVersionButton.addActionListener(this);
1070	1139	nextVersionButton.setEnabled(false);
1071	1140
1072		- oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1073		- liveCB.setToolTipText("Enable animation");
1074		- liveCB.addItemListener(this);
1075		-
1076	1141	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077	1142	oneStepButton.setToolTipText("Animate one step forward");
1078	1143	oneStepButton.addActionListener(this);
1079	1144
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
1080	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1081	1150	fastCB.setToolTipText("Fast mode");
1082	1151	fastCB.addItemListener(this);
..	..	@@ -1103,21 +1172,6 @@
1103	1172
1104	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1105	1174
1106		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1107		- twoButton.setToolTipText("Show 3D view only");
1108		- twoButton.addActionListener(this);
1109		- this.fullscreenLayout = twoButton;
1110		-
1111		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112		- threeButton.setToolTipText("Show controls and 3D view");
1113		- threeButton.addActionListener(this);
1114		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115		- sixButton.setToolTipText("Show 3D view and controls");
1116		- sixButton.addActionListener(this);
1117		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118		-// sevenButton.setToolTipText("3-column layout");
1119		-// sevenButton.addActionListener(this);
1120		- //
1121	1175
1122	1176	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123	1177	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1133,12 +1187,16 @@
1133	1187
1134	1188	// INSERT
1135	1189	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136		- gridButton.setToolTipText("Create grid");
	1190	+ gridButton.setToolTipText("Create ground");
1137	1191	gridButton.addActionListener(this);
1138	1192
1139	1193	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140	1194	boxButton.setToolTipText("Create box");
1141	1195	boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
1142	1200
1143	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144	1202	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1151,10 +1209,6 @@
1151	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152	1210	torusButton.setToolTipText("Create torus");
1153	1211	torusButton.addActionListener(this);
1154		-
1155		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1156		- superButton.setToolTipText("Create superellipsoid");
1157		- superButton.addActionListener(this);
1158	1212
1159	1213	if (Globals.ADVANCED)
1160	1214	{
..	..	@@ -1204,6 +1258,8 @@
1204	1258	cGridBag textures = new cGridBag();
1205	1259
1206	1260	CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1207	1263
1208	1264	oe.toolboxPanel.add(textures);
1209	1265
..	..	@@ -1425,6 +1481,14 @@
1425	1481
1426	1482	void EditObject(Object3D obj)
1427	1483	{
	1484	+ assert(obj instanceof Composite);
	1485	+
	1486	+// if (obj.versionlist == null)
	1487	+// {
	1488	+// obj.versionlist = new Object3D[100];
	1489	+// obj.versionindex = -1;
	1490	+// }
	1491	+
1428	1492	cRadio radioButton = new cRadio(obj.name);
1429	1493
1430	1494	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1449,6 +1513,7 @@
1449	1513
1450	1514	oe.SetupViews();
1451	1515
	1516	+ if (Globals.DEBUG)
1452	1517	System.out.println("SetupViews");
1453	1518	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1454	1519	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1815,7 +1880,12 @@
1815	1880	TreePath path;
1816	1881
1817	1882	public TransferableTreePath(TreePath tp) {
1818		- path = tp;
	1883	+ Object[] objs = new Object[tp.getPathCount()];
	1884	+ for (int i=0; i<objs.length; i++)
	1885	+ {
	1886	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1887	+ }
	1888	+ path = new TreePath(objs);
1819	1889	}
1820	1890
1821	1891	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2105,7 +2175,11 @@
2105	2175	shadow.material = new cMaterial(obj.material);
2106	2176	shadow.material.diffuse = 0.0001f;
2107	2177	shadow.material.specular = 0.0001f;
2108		- //shadow.projectedVertices[1].x = 300;
	2178	+ shadow.material.opacity = 0.75f;
	2179	+
	2180	+ AllocProjectedVertices(shadow);
	2181	+
	2182	+ shadow.projectedVertices[1].x = 300;
2109	2183
2110	2184	makeSomething(shadow);
2111	2185	}
..	..	@@ -2626,27 +2700,35 @@
2626	2700	} else
2627	2701	if (source == loopItem \|\| source == loopButton)
2628	2702	{
	2703	+ if (!group.selection.isEmpty())
	2704	+ {
2629	2705	Composite csg = new GroupLeaf();
2630	2706	csg.count = 5;
2631		- group(csg);
2632	2707	Composite child = new cGroup("Branch");
2633	2708	csg.addChild(child);
2634	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
2635	2712	} else
2636	2713	if (source == doubleItem)
2637	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2638	2717	Composite csg = new GroupLeaf("Fork");
2639	2718	csg.count = 5;
2640		- group(csg);
2641	2719	Composite child = new cGroup("Branch A");
2642	2720	csg.addChild(child);
2643	2721	child.addChild(csg);
2644	2722	child = new cGroup("Branch B");
2645	2723	csg.addChild(child);
2646	2724	child.addChild(csg);
	2725	+ group(csg);
	2726	+ }
2647	2727	} else
2648	2728	if (source == tripleItem)
2649	2729	{
	2730	+ if (!group.selection.isEmpty())
	2731	+ {
2650	2732	Composite csg = new GroupLeaf("Trident");
2651	2733	csg.count = 4;
2652	2734	group(csg);
..	..	@@ -2659,6 +2741,7 @@
2659	2741	child = new cGroup();
2660	2742	csg.addChild(child);
2661	2743	child.addChild(csg);
	2744	+ }
2662	2745	} else
2663	2746	if (source == computeAOItem)
2664	2747	{
..	..	@@ -2708,6 +2791,18 @@
2708	2791	if (source == fullButton)
2709	2792	{
2710	2793	ToggleFullScreen();
	2794	+ } else
	2795	+ if (source == collapseButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ CollapseToolbar();
	2799	+ } else
	2800	+ if (source == maximize3DButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ radio.layout = twoButton;
	2804	+ Show3DView();
	2805	+ CollapseToolbar();
2711	2806	} else
2712	2807	if (source == previousVersionButton)
2713	2808	{
..	..	@@ -3282,22 +3377,34 @@
3282	3377	} else
3283	3378	if (source == ungroupItem \|\| source == ungroupButton)
3284	3379	{
3285		- boolean hasRoot = false;
	3380	+ boolean canUngroup = true;
3286	3381
3287	3382	for (int i=0; i<group.selection.size(); i++)
3288	3383	{
3289		- if (group.selection.get(i) == group)
	3384	+ Object3D selectedItem = group.selection.get(i);
	3385	+
	3386	+ if (selectedItem.Size() == 0)
3290	3387	{
3291		- hasRoot = true;
	3388	+ // Cannot ungroup leaves
	3389	+ canUngroup = false;
	3390	+ break;
	3391	+ }
	3392	+
	3393	+ if (selectedItem == group)
	3394	+ {
	3395	+ // Cannot ungroup root
	3396	+ canUngroup = false;
3292	3397	break;
3293	3398	}
3294	3399	}
3295	3400
3296		- if (!hasRoot)
	3401	+ if (canUngroup)
3297	3402	{
3298	3403	for (int i=0; i<group.selection.size(); i++)
3299	3404	{
3300		- Ungroup(group.selection.get(i));
	3405	+ Object3D selectedItem = group.selection.get(i);
	3406	+
	3407	+ Ungroup(selectedItem);
3301	3408	}
3302	3409
3303	3410	ClearSelection(false);
..	..	@@ -3660,38 +3767,7 @@
3660	3767	if (CameraPane.FULLSCREEN)
3661	3768	fullscreenLayout = radio.layout;
3662	3769
3663		- // bug
3664		- //gridPanel.setDividerLocation(1.0);
3665		- //bigPanel.setDividerLocation(0.0);
3666		-// bigThree.remove(scenePanel);
3667		-// bigThree.remove(centralPanel);
3668		-// bigThree.remove(XYZPanel);
3669		-// aWindowConstraints.gridx = 0;
3670		-// aWindowConstraints.gridy = 0;
3671		-// aWindowConstraints.gridwidth = 1;
3672		-// // aConstraints.gridheight = 3;
3673		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3674		-// aWindowConstraints.weightx = 0;
3675		-// aWindowConstraints.weighty = 1;
3676		-// //bigThree.add(jtp, aWindowConstraints);
3677		-// aWindowConstraints.weightx = 1;
3678		-// aWindowConstraints.gridwidth = 3;
3679		-// // aConstraints.gridheight = 3;
3680		-// aWindowConstraints.gridx = 1;
3681		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3682		-// bigThree.add(centralPanel, aWindowConstraints);
3683		-// aWindowConstraints.weightx = 0;
3684		-// aWindowConstraints.gridx = 4;
3685		-// aWindowConstraints.gridwidth = 1;
3686		-// // aConstraints.gridheight = 3;
3687		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3688		-// //bigThree.add(XYZPanel, aWindowConstraints);
3689		-// scenePanel.setVisible(false);
3690		-// centralPanel.setVisible(true);
3691		-// XYZPanel.setVisible(false);
3692		- bigThree.ClearUI();
3693		- bigThree.add(centralPanel);
3694		- bigThree.FlushUI();
	3770	+ Show3DView();
3695	3771
3696	3772	cameraView.requestFocusInWindow();
3697	3773
..	..	@@ -3877,6 +3953,7 @@
3877	3953	} else
3878	3954	if (source == rootButton)
3879	3955	{
	3956	+ Replace();
3880	3957	Object3D obj;
3881	3958	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3882	3959	{
..	..	@@ -4013,8 +4090,6 @@
4013	4090
4014	4091	copy = group;
4015	4092
4016		- SetUndoStates();
4017		-
4018	4093	//Globals.theRenderer.object = group;
4019	4094	if(!useclient)
4020	4095	{
..	..	@@ -4042,6 +4117,21 @@
4042	4117	*/
4043	4118	radio.layout.doClick();
4044	4119
	4120	+ assert(copy instanceof Composite);
	4121	+
	4122	+ if (copy.versionlist == null)
	4123	+ {
	4124	+ copy.versionlist = new Object3D[100];
	4125	+ copy.versionindex = -1;
	4126	+
	4127	+ // Cannot work with loops
	4128	+ // To fix this issue, first mark all nodes above the root,
	4129	+ // and check if any of these nodes are reachable below the root.
	4130	+ //Save(true);
	4131	+ }
	4132	+
	4133	+ SetVersionStates();
	4134	+
4045	4135	ClearUnpinned();
4046	4136
4047	4137	//Grafreed.Assert(group != null);
..	..	@@ -5276,6 +5366,21 @@
5276	5366	flashSelectionButton.setEnabled(enabled);
5277	5367
5278	5368	clearPanelButton.setEnabled(!listUI.isEmpty());
	5369	+
	5370	+ boolean allComposites = true;
	5371	+
	5372	+ if (group.selection != null)
	5373	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5374	+ {
	5375	+ Object next = e.nextElement();
	5376	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5377	+ {
	5378	+ allComposites = false;
	5379	+ break;
	5380	+ }
	5381	+ }
	5382	+
	5383	+ rootButton.setEnabled(allComposites);
5279	5384	}
5280	5385
5281	5386	void refreshContents(boolean cp)
..	..	@@ -5290,7 +5395,7 @@
5290	5395	Object3D child = (Object3D) group.selection.get(i);
5291	5396
5292	5397	objEditor.AddInfo(child, this, true);
5293		- System.err.println("info : " + child.GetPath());
	5398	+// System.err.println("info : " + child.GetPath());
5294	5399	}
5295	5400
5296	5401	objEditor.SetText(); // jan 2014
..	..	@@ -6173,11 +6278,11 @@
6173	6278	private MenuItem lookAtItem;
6174	6279	private MenuItem lookFromItem;
6175	6280	private MenuItem switchViewItem;
6176		- private MenuItem cutItem;
	6281	+ private JMenuItem cutItem;
6177	6282	private MenuItem undoItem;
6178	6283	private MenuItem redoItem;
6179	6284	private JMenuItem duplicateItem;
6180		- private MenuItem cloneItem;
	6285	+ private JMenuItem cloneItem;
6181	6286	private MenuItem cloneSupportItem;
6182	6287	private MenuItem overwriteGeoItem;
6183	6288	private MenuItem overwriteMatItem;
..	..	@@ -6198,13 +6303,13 @@
6198	6303	private MenuItem cloneGeometriesItem;
6199	6304	private MenuItem shareGeometriesItem;
6200	6305	private MenuItem mergeGeometriesItem;
6201		- private MenuItem copyItem;
	6306	+ private JMenuItem copyItem;
6202	6307	private MenuItem pasteItem;
6203		- private MenuItem pasteIntoItem;
6204		- private MenuItem pasteLinkItem;
6205		- private MenuItem pasteCloneItem;
6206		- private MenuItem pasteExpandItem;
6207		- private MenuItem deleteItem;
	6308	+ private JMenuItem pasteIntoItem;
	6309	+ private JMenuItem pasteLinkItem;
	6310	+ private JMenuItem pasteCloneItem;
	6311	+ private JMenuItem pasteExpandItem;
	6312	+ private JMenuItem deleteItem;
6208	6313	private MenuItem clearAllItem;
6209	6314	private MenuItem genUVItem;
6210	6315	private MenuItem genNormalsMESHItem;
..	..	@@ -6259,7 +6364,7 @@
6259	6364	private MenuItem transformGeometryItem;
6260	6365	private MenuItem transformChildrenItem;
6261	6366	private MenuItem hideItem;
6262		- private MenuItem grabItem;
	6367	+ private JMenuItem grabItem;
6263	6368	private MenuItem backItem;
6264	6369	private MenuItem frontItem;
6265	6370	private MenuItem cameraItem;
..	..	@@ -6272,7 +6377,7 @@
6272	6377	private MenuItem switchTransfoItem;
6273	6378	private MenuItem morphItem;
6274	6379	private MenuItem linkerItem;
6275		- private MenuItem ungroupItem;
	6380	+ private JMenuItem ungroupItem;
6276	6381	private MenuItem editItem;
6277	6382	private MenuItem openWindowItem;
6278	6383	private MenuItem editLeafItem;