~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
..	..	@@ -42,12 +42,12 @@
42	42	});
43	43	}
44	44
45		- public void AddTextureButton(String f, final String t, cGridBag row)
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46	46	{
47	47	cButton textureButton;
48		- final String path = "textures/" + f + "/"; // + t;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49	49	row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50		- textureButton.setToolTipText(f + "s");
	50	+ textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
53	53	@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)
..	..	@@ -350,7 +359,23 @@
350	359
351	360	public void ChangeTexture(String texture)
352	361	{
353		- cameraView.repaint();
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	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();
354	379	}
355	380
356	381	//ObjEditor objEditor;
..	..	@@ -394,6 +419,8 @@
394	419	{
395	420	copy.versionlist = new Object3D[100];
396	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
397	424	}
398	425
399	426	if(ui)
..	..	@@ -513,32 +540,37 @@
513	540	// menu.add("-");
514	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
515	542	duplicateItem.addActionListener(this);
516		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
517	545	cloneItem.addActionListener(this);
518		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
519	547	{
520	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
521	549	cloneSupportItem.addActionListener(this);
522	550	}
	551	+ oe.jTree.popup.addSeparator();
523	552	menu.add("-");
524		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
525	554	cutItem.addActionListener(this);
526		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
527	556	copyItem.addActionListener(this);
528	557	pasteItem = menu.add(new MenuItem("Paste"));
529	558	pasteItem.addActionListener(this);
530	559
531		- menu.add("-");
532		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
533	563	pasteIntoItem.addActionListener(this);
534		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
535	565	pasteLinkItem.addActionListener(this);
536		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
537	567	pasteCloneItem.addActionListener(this);
538		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
539	569	// pasteExpandItem.addActionListener(this);
540		- menu.add("-");
541		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
542	574	deleteItem.addActionListener(this);
543	575
544	576	if (Globals.ADVANCED)
..	..	@@ -625,11 +657,9 @@
625	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
626	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
627	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
628		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
629	660	oe.cameraMenu.add("-");
630	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
631	662	openWindowItem.addActionListener(this);
632		- editLeafItem.addActionListener(this);
633	663	lookAtItem.addActionListener(this);
634	664	//lookFromItem.addActinoListener(this);
635	665	//switchViewItem.addActionListener(this);
..	..	@@ -691,7 +721,7 @@
691	721	hideItem = menu.add(new MenuItem("Hidden Group"));
692	722	hideItem.addActionListener(this);
693	723	}
694		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
695	725	ungroupItem.addActionListener(this);
696	726
697	727	// menu.add("-");
..	..	@@ -877,6 +907,9 @@
877	907	shareGeometriesItem.addActionListener(this);
878	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
879	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
880	913	if (Globals.ADVANCED)
881	914	{
882	915	// Pretty much the same as duplicate and clone.
..	..	@@ -895,40 +928,47 @@
895	928
896	929	JTabbedPane resourcecontainer;
897	930	cGridBag currenttab;
898		- boolean added; // patch for jar
	931	+ //boolean added; // patch for jar
899	932
900	933	int tabcount = 0;
901	934	int colcount = 0;
902	935	int rowcount = 0;
	936	+ int texturecount = 0;
903	937
904	938	int columns = 5;
905	939	int rows = 7;
906	940
907	941	public void ResourceCallBack(String[] path)
908	942	{
909		- for (int i = 0; i < path.length; i++)
910		- System.out.print(path[i] + "/");
911		- System.out.println();
912		- if (rowcount == 0)
	943	+// for (int i = 0; i < path.length; i++)
	944	+// System.out.print(path[i] + "/");
	945	+// System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
913	949	{
914	950	currenttab = new cGridBag();
915		- added = false;
916		- String tabname = String.valueOf((char)('A'+tabcount));
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
917	952	currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
918	956	rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
919	959	}
920	960
921		- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
922	962	{
923		- if (!added)
	963	+ //if (!added)
924	964	{
925		- added = true;
926		- resourcecontainer.add(currenttab);
927		- String tabname = String.valueOf((char)('A'+tabcount));
928		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
929	968	}
930	969
931		- AddTextureButton(path[0], path[1], currenttab);
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
932	972	if (++colcount >= columns)
933	973	{
934	974	colcount = 0;
..	..	@@ -949,7 +989,7 @@
949	989
950	990	void CreateTexturePanel(cGridBag container)
951	991	{
952		- resourcecontainer = new JTabbedPane();
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
953	993	container.add(resourcecontainer);
954	994
955	995	Grafreed.ParseResources("textures", this);
..	..	@@ -972,11 +1012,6 @@
972	1012	//new Exception().printStackTrace();
973	1013
974	1014	oe.radioPanel = new JPanel(new GridBagLayout());
975		- oe.aConstraints.weightx = 1;
976		- oe.aConstraints.weighty = 0;
977		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
978		- oe.aConstraints.gridwidth = 100;
979		- oe.aConstraints.gridheight = 1;
980	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
981	1016
982	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1009,10 +1044,49 @@
1009	1044
1010	1045	if (Globals.ADVANCED)
1011	1046	{
1012		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013		- maxButton.setToolTipText("Maximize window");
1014		- maxButton.addActionListener(this);
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
1015	1050	}
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
1016	1090
1017	1091	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018	1092	fullButton.setToolTipText("Full-screen window");
..	..	@@ -1057,14 +1131,14 @@
1057	1131	nextVersionButton.addActionListener(this);
1058	1132	nextVersionButton.setEnabled(false);
1059	1133
1060		- oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1061		- liveCB.setToolTipText("Enable animation");
1062		- liveCB.addItemListener(this);
1063		-
1064	1134	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065	1135	oneStepButton.setToolTipText("Animate one step forward");
1066	1136	oneStepButton.addActionListener(this);
1067	1137
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
	1140	+ liveCB.addItemListener(this);
	1141	+
1068	1142	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1069	1143	fastCB.setToolTipText("Fast mode");
1070	1144	fastCB.addItemListener(this);
..	..	@@ -1091,21 +1165,6 @@
1091	1165
1092	1166	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1093	1167
1094		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095		- twoButton.setToolTipText("Show 3D view only");
1096		- twoButton.addActionListener(this);
1097		- this.fullscreenLayout = twoButton;
1098		-
1099		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100		- threeButton.setToolTipText("Show controls and 3D view");
1101		- threeButton.addActionListener(this);
1102		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103		- sixButton.setToolTipText("Show 3D view and controls");
1104		- sixButton.addActionListener(this);
1105		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106		-// sevenButton.setToolTipText("3-column layout");
1107		-// sevenButton.addActionListener(this);
1108		- //
1109	1168
1110	1169	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1111	1170	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1121,12 +1180,16 @@
1121	1180
1122	1181	// INSERT
1123	1182	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124		- gridButton.setToolTipText("Create grid");
	1183	+ gridButton.setToolTipText("Create ground");
1125	1184	gridButton.addActionListener(this);
1126	1185
1127	1186	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1128	1187	boxButton.setToolTipText("Create box");
1129	1188	boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
1130	1193
1131	1194	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1132	1195	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1139,10 +1202,6 @@
1139	1202	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140	1203	torusButton.setToolTipText("Create torus");
1141	1204	torusButton.addActionListener(this);
1142		-
1143		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144		- superButton.setToolTipText("Create superellipsoid");
1145		- superButton.addActionListener(this);
1146	1205
1147	1206	if (Globals.ADVANCED)
1148	1207	{
..	..	@@ -1413,6 +1472,14 @@
1413	1472
1414	1473	void EditObject(Object3D obj)
1415	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
1416	1483	cRadio radioButton = new cRadio(obj.name);
1417	1484
1418	1485	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1803,7 +1870,12 @@
1803	1870	TreePath path;
1804	1871
1805	1872	public TransferableTreePath(TreePath tp) {
1806		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1807	1879	}
1808	1880
1809	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2093,7 +2165,11 @@
2093	2165	shadow.material = new cMaterial(obj.material);
2094	2166	shadow.material.diffuse = 0.0001f;
2095	2167	shadow.material.specular = 0.0001f;
2096		- //shadow.projectedVertices[1].x = 300;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
2097	2173
2098	2174	makeSomething(shadow);
2099	2175	}
..	..	@@ -2614,27 +2690,35 @@
2614	2690	} else
2615	2691	if (source == loopItem \|\| source == loopButton)
2616	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
2617	2695	Composite csg = new GroupLeaf();
2618	2696	csg.count = 5;
2619		- group(csg);
2620	2697	Composite child = new cGroup("Branch");
2621	2698	csg.addChild(child);
2622	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
2623	2702	} else
2624	2703	if (source == doubleItem)
2625	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2626	2707	Composite csg = new GroupLeaf("Fork");
2627	2708	csg.count = 5;
2628		- group(csg);
2629	2709	Composite child = new cGroup("Branch A");
2630	2710	csg.addChild(child);
2631	2711	child.addChild(csg);
2632	2712	child = new cGroup("Branch B");
2633	2713	csg.addChild(child);
2634	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2635	2717	} else
2636	2718	if (source == tripleItem)
2637	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2638	2722	Composite csg = new GroupLeaf("Trident");
2639	2723	csg.count = 4;
2640	2724	group(csg);
..	..	@@ -2647,6 +2731,7 @@
2647	2731	child = new cGroup();
2648	2732	csg.addChild(child);
2649	2733	child.addChild(csg);
	2734	+ }
2650	2735	} else
2651	2736	if (source == computeAOItem)
2652	2737	{
..	..	@@ -2696,6 +2781,18 @@
2696	2781	if (source == fullButton)
2697	2782	{
2698	2783	ToggleFullScreen();
	2784	+ } else
	2785	+ if (source == collapseButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ CollapseToolbar();
	2789	+ } else
	2790	+ if (source == maximize3DButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ radio.layout = twoButton;
	2794	+ Show3DView();
	2795	+ CollapseToolbar();
2699	2796	} else
2700	2797	if (source == previousVersionButton)
2701	2798	{
..	..	@@ -3270,22 +3367,34 @@
3270	3367	} else
3271	3368	if (source == ungroupItem \|\| source == ungroupButton)
3272	3369	{
3273		- boolean hasRoot = false;
	3370	+ boolean canUngroup = true;
3274	3371
3275	3372	for (int i=0; i<group.selection.size(); i++)
3276	3373	{
3277		- if (group.selection.get(i) == group)
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
3278	3377	{
3279		- hasRoot = true;
	3378	+ // Cannot ungroup leaves
	3379	+ canUngroup = false;
	3380	+ break;
	3381	+ }
	3382	+
	3383	+ if (selectedItem == group)
	3384	+ {
	3385	+ // Cannot ungroup root
	3386	+ canUngroup = false;
3280	3387	break;
3281	3388	}
3282	3389	}
3283	3390
3284		- if (!hasRoot)
	3391	+ if (canUngroup)
3285	3392	{
3286	3393	for (int i=0; i<group.selection.size(); i++)
3287	3394	{
3288		- Ungroup(group.selection.get(i));
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
3289	3398	}
3290	3399
3291	3400	ClearSelection(false);
..	..	@@ -3648,38 +3757,7 @@
3648	3757	if (CameraPane.FULLSCREEN)
3649	3758	fullscreenLayout = radio.layout;
3650	3759
3651		- // bug
3652		- //gridPanel.setDividerLocation(1.0);
3653		- //bigPanel.setDividerLocation(0.0);
3654		-// bigThree.remove(scenePanel);
3655		-// bigThree.remove(centralPanel);
3656		-// bigThree.remove(XYZPanel);
3657		-// aWindowConstraints.gridx = 0;
3658		-// aWindowConstraints.gridy = 0;
3659		-// aWindowConstraints.gridwidth = 1;
3660		-// // aConstraints.gridheight = 3;
3661		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3662		-// aWindowConstraints.weightx = 0;
3663		-// aWindowConstraints.weighty = 1;
3664		-// //bigThree.add(jtp, aWindowConstraints);
3665		-// aWindowConstraints.weightx = 1;
3666		-// aWindowConstraints.gridwidth = 3;
3667		-// // aConstraints.gridheight = 3;
3668		-// aWindowConstraints.gridx = 1;
3669		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3670		-// bigThree.add(centralPanel, aWindowConstraints);
3671		-// aWindowConstraints.weightx = 0;
3672		-// aWindowConstraints.gridx = 4;
3673		-// aWindowConstraints.gridwidth = 1;
3674		-// // aConstraints.gridheight = 3;
3675		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3676		-// //bigThree.add(XYZPanel, aWindowConstraints);
3677		-// scenePanel.setVisible(false);
3678		-// centralPanel.setVisible(true);
3679		-// XYZPanel.setVisible(false);
3680		- bigThree.ClearUI();
3681		- bigThree.add(centralPanel);
3682		- bigThree.FlushUI();
	3760	+ Show3DView();
3683	3761
3684	3762	cameraView.requestFocusInWindow();
3685	3763
..	..	@@ -3865,6 +3943,7 @@
3865	3943	} else
3866	3944	if (source == rootButton)
3867	3945	{
	3946	+ Replace();
3868	3947	Object3D obj;
3869	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3870	3949	{
..	..	@@ -4001,8 +4080,6 @@
4001	4080
4002	4081	copy = group;
4003	4082
4004		- SetUndoStates();
4005		-
4006	4083	//Globals.theRenderer.object = group;
4007	4084	if(!useclient)
4008	4085	{
..	..	@@ -4030,6 +4107,18 @@
4030	4107	*/
4031	4108	radio.layout.doClick();
4032	4109
	4110	+ assert(copy instanceof Composite);
	4111	+
	4112	+ if (copy.versionlist == null)
	4113	+ {
	4114	+ copy.versionlist = new Object3D[100];
	4115	+ copy.versionindex = -1;
	4116	+
	4117	+ Save(true);
	4118	+ }
	4119	+
	4120	+ SetVersionStates();
	4121	+
4033	4122	ClearUnpinned();
4034	4123
4035	4124	//Grafreed.Assert(group != null);
..	..	@@ -5264,6 +5353,20 @@
5264	5353	flashSelectionButton.setEnabled(enabled);
5265	5354
5266	5355	clearPanelButton.setEnabled(!listUI.isEmpty());
	5356	+
	5357	+ boolean allComposites = true;
	5358	+
	5359	+ if (group.selection != null)
	5360	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5361	+ {
	5362	+ if (!(e.nextElement() instanceof Composite))
	5363	+ {
	5364	+ allComposites = false;
	5365	+ break;
	5366	+ }
	5367	+ }
	5368	+
	5369	+ rootButton.setEnabled(allComposites);
5267	5370	}
5268	5371
5269	5372	void refreshContents(boolean cp)
..	..	@@ -5278,7 +5381,7 @@
5278	5381	Object3D child = (Object3D) group.selection.get(i);
5279	5382
5280	5383	objEditor.AddInfo(child, this, true);
5281		- System.err.println("info : " + child.GetPath());
	5384	+// System.err.println("info : " + child.GetPath());
5282	5385	}
5283	5386
5284	5387	objEditor.SetText(); // jan 2014
..	..	@@ -6161,11 +6264,11 @@
6161	6264	private MenuItem lookAtItem;
6162	6265	private MenuItem lookFromItem;
6163	6266	private MenuItem switchViewItem;
6164		- private MenuItem cutItem;
	6267	+ private JMenuItem cutItem;
6165	6268	private MenuItem undoItem;
6166	6269	private MenuItem redoItem;
6167	6270	private JMenuItem duplicateItem;
6168		- private MenuItem cloneItem;
	6271	+ private JMenuItem cloneItem;
6169	6272	private MenuItem cloneSupportItem;
6170	6273	private MenuItem overwriteGeoItem;
6171	6274	private MenuItem overwriteMatItem;
..	..	@@ -6186,13 +6289,13 @@
6186	6289	private MenuItem cloneGeometriesItem;
6187	6290	private MenuItem shareGeometriesItem;
6188	6291	private MenuItem mergeGeometriesItem;
6189		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
6190	6293	private MenuItem pasteItem;
6191		- private MenuItem pasteIntoItem;
6192		- private MenuItem pasteLinkItem;
6193		- private MenuItem pasteCloneItem;
6194		- private MenuItem pasteExpandItem;
6195		- private MenuItem deleteItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
6196	6299	private MenuItem clearAllItem;
6197	6300	private MenuItem genUVItem;
6198	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -6260,7 +6363,7 @@
6260	6363	private MenuItem switchTransfoItem;
6261	6364	private MenuItem morphItem;
6262	6365	private MenuItem linkerItem;
6263		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
6264	6367	private MenuItem editItem;
6265	6368	private MenuItem openWindowItem;
6266	6369	private MenuItem editLeafItem;