~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)
..	..	@@ -406,12 +415,14 @@
406	415	this.copy = this.group = group;
407	416	//selectees = this.group.selectees;
408	417
	418	+ assert(false);
	419	+
409	420	if (copy.versionlist == null)
410	421	{
411	422	copy.versionlist = new Object3D[100];
412	423	copy.versionindex = -1;
413	424
414		- Save(true);
	425	+ //Save(true);
415	426	}
416	427
417	428	if(ui)
..	..	@@ -440,7 +451,7 @@
440	451	copy.versionlist = new Object3D[100];
441	452	copy.versionindex = -1;
442	453
443		- Save(true);
	454	+ //Save(true);
444	455	}
445	456	}
446	457
..	..	@@ -531,33 +542,35 @@
531	542	// menu.add("-");
532	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
533	544	duplicateItem.addActionListener(this);
534		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
535	547	cloneItem.addActionListener(this);
536		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
537	549	{
538	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
539	551	cloneSupportItem.addActionListener(this);
540	552	}
	553	+ oe.jTree.popup.addSeparator();
541	554	menu.add("-");
542		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
543	556	cutItem.addActionListener(this);
544		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
545	558	copyItem.addActionListener(this);
546	559	pasteItem = menu.add(new MenuItem("Paste"));
547	560	pasteItem.addActionListener(this);
548	561
549		- menu.add("-");
550		- 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"));
551	565	pasteIntoItem.addActionListener(this);
552		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
553	567	pasteLinkItem.addActionListener(this);
554		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
555	569	pasteCloneItem.addActionListener(this);
556		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
557	571	// pasteExpandItem.addActionListener(this);
558		- menu.add("-");
559		- deleteItem = menu.add(new MenuItem("Delete"));
560		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
561	574
562	575	if (Globals.ADVANCED)
563	576	{
..	..	@@ -692,9 +705,8 @@
692	705	setMasterItem.addActionListener(this);
693	706	}
694	707
695		- oe.menuBar.add(menu = new Menu("Group"));
696		-// grabItem = menu.add(new MenuItem("Grab"));
697		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
698	710	backItem = menu.add(new MenuItem("Back"));
699	711	backItem.addActionListener(this);
700	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -702,13 +714,21 @@
702	714	// compositeItem = menu.add(new MenuItem("Composite"));
703	715	// compositeItem.addActionListener(this);
704	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
705	720	if (Globals.ADVANCED)
706	721	{
707	722	hideItem = menu.add(new MenuItem("Hidden Group"));
708	723	hideItem.addActionListener(this);
709	724	}
710		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
712	732
713	733	// menu.add("-");
714	734	//
..	..	@@ -914,7 +934,7 @@
914	934
915	935	JTabbedPane resourcecontainer;
916	936	cGridBag currenttab;
917		- boolean added; // patch for jar
	937	+ //boolean added; // patch for jar
918	938
919	939	int tabcount = 0;
920	940	int colcount = 0;
..	..	@@ -931,12 +951,14 @@
931	951	// System.out.println();
932	952
933	953	if (//rowcount == 0 \|\|
934		- path.length == 1)
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
935	955	{
936	956	currenttab = new cGridBag();
937		- added = false;
938	957	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939	958	currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
940	962	rowcount = 1;
941	963	colcount = 0;
942	964	texturecount = 0;
..	..	@@ -944,12 +966,11 @@
944	966
945	967	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
946	968	{
947		- if (!added)
	969	+ //if (!added)
948	970	{
949		- added = true;
950		- resourcecontainer.add(currenttab);
	971	+ //added = true;
951	972	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
952		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
953	974	}
954	975
955	976	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -1017,9 +1038,9 @@
1017	1038	oe.radioPanel.add(dummyButton);
1018	1039	oe.buttonGroup.add(dummyButton);
1019	1040	*/
1020		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
1021	1042
1022		- copyOptionsPanel.preferredHeight = 2;
	1043	+ versionManagerPanel.preferredHeight = 4;
1023	1044
1024	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1025	1046
..	..	@@ -1034,8 +1055,8 @@
1034	1055	// maxButton.addActionListener(this);
1035	1056	}
1036	1057
1037		-// cButton gcButton;
1038		-//
	1058	+ cButton gcButton;
	1059	+
1039	1060	// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040	1061	// gcButton.setToolTipText("Garbage collect");
1041	1062	// gcButton.addActionListener(new ActionListener()
..	..	@@ -1050,7 +1071,7 @@
1050	1071	collapseButton.setToolTipText("Collapse toolbar");
1051	1072	collapseButton.addActionListener(this);
1052	1073
1053		- oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054	1075	maximize3DButton.setToolTipText("Maximize 3D view");
1055	1076	maximize3DButton.addActionListener(this);
1056	1077
..	..	@@ -1085,15 +1106,16 @@
1085	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
1086	1107	restoreCameraButton.addActionListener(this);
1087	1108
1088		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1089	1110	saveVersionButton.setToolTipText("Duplicate current version");
1090	1111	saveVersionButton.addActionListener(this);
1091	1112
1092		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093	1114	deleteVersionButton.setToolTipText("Delete current version");
1094	1115	deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
1095	1117
1096		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1097	1119	previousVersionButton.setToolTipText("Previous version");
1098	1120	previousVersionButton.addActionListener(this);
1099	1121	previousVersionButton.setEnabled(false);
..	..	@@ -1102,16 +1124,16 @@
1102	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103	1125	restoreButton.setToolTipText("Undo (restore current version)");
1104	1126	restoreButton.addActionListener(this);
1105		- //restoreButton.setEnabled(false);
	1127	+ restoreButton.setEnabled(false);
1106	1128
1107	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108	1130	replaceButton.setToolTipText("Save (replace current version)");
1109	1131	replaceButton.addActionListener(this);
1110		- //replaceButton.setEnabled(false);
	1132	+ replaceButton.setEnabled(false);
1111	1133
1112		- copyOptionsPanel.add(updown);
	1134	+ versionManagerPanel.add(updown);
1113	1135
1114		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115	1137	nextVersionButton.setToolTipText("Next version");
1116	1138	nextVersionButton.addActionListener(this);
1117	1139	nextVersionButton.setEnabled(false);
..	..	@@ -1172,6 +1194,10 @@
1172	1194	boxButton.setToolTipText("Create box");
1173	1195	boxButton.addActionListener(this);
1174	1196
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
1175	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176	1202	sphereButton.setToolTipText("Create sphere");
1177	1203	sphereButton.addActionListener(this);
..	..	@@ -1183,10 +1209,6 @@
1183	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184	1210	torusButton.setToolTipText("Create torus");
1185	1211	torusButton.addActionListener(this);
1186		-
1187		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1188		- superButton.setToolTipText("Create superellipsoid");
1189		- superButton.addActionListener(this);
1190	1212
1191	1213	if (Globals.ADVANCED)
1192	1214	{
..	..	@@ -1236,6 +1258,8 @@
1236	1258	cGridBag textures = new cGridBag();
1237	1259
1238	1260	CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1239	1263
1240	1264	oe.toolboxPanel.add(textures);
1241	1265
..	..	@@ -1287,6 +1311,8 @@
1287	1311
1288	1312	cGridBag jSPPanel = new cGridBag();
1289	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
1290	1316	JScrollPane jSP;
1291	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1292	1318	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1295,11 +1321,11 @@
1295	1321	oe.treePanel.add(jSPPanel);
1296	1322	oe.treePanel.Return();
1297	1323
1298		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
1299	1325	oe.treePanel.Return();
1300		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1301		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1302		- sliderPane.preferredHeight = 1;
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
1303	1329
1304	1330	// mainPanel.setDividerLocation(0.1); //1.0);
1305	1331	mainPanel.setResizeWeight(0.4);
..	..	@@ -1459,11 +1485,11 @@
1459	1485	{
1460	1486	assert(obj instanceof Composite);
1461	1487
1462		- if (obj.versionlist == null)
1463		- {
1464		- obj.versionlist = new Object3D[100];
1465		- obj.versionindex = -1;
1466		- }
	1488	+// if (obj.versionlist == null)
	1489	+// {
	1490	+// obj.versionlist = new Object3D[100];
	1491	+// obj.versionindex = -1;
	1492	+// }
1467	1493
1468	1494	cRadio radioButton = new cRadio(obj.name);
1469	1495
..	..	@@ -1489,6 +1515,7 @@
1489	1515
1490	1516	oe.SetupViews();
1491	1517
	1518	+ if (Globals.DEBUG)
1492	1519	System.out.println("SetupViews");
1493	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1494	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -2150,7 +2177,11 @@
2150	2177	shadow.material = new cMaterial(obj.material);
2151	2178	shadow.material.diffuse = 0.0001f;
2152	2179	shadow.material.specular = 0.0001f;
2153		- //shadow.projectedVertices[1].x = 300;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
2154	2185
2155	2186	makeSomething(shadow);
2156	2187	}
..	..	@@ -2671,27 +2702,35 @@
2671	2702	} else
2672	2703	if (source == loopItem \|\| source == loopButton)
2673	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2674	2707	Composite csg = new GroupLeaf();
2675	2708	csg.count = 5;
2676		- group(csg);
2677	2709	Composite child = new cGroup("Branch");
2678	2710	csg.addChild(child);
2679	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
2680	2714	} else
2681	2715	if (source == doubleItem)
2682	2716	{
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
2683	2719	Composite csg = new GroupLeaf("Fork");
2684	2720	csg.count = 5;
2685		- group(csg);
2686	2721	Composite child = new cGroup("Branch A");
2687	2722	csg.addChild(child);
2688	2723	child.addChild(csg);
2689	2724	child = new cGroup("Branch B");
2690	2725	csg.addChild(child);
2691	2726	child.addChild(csg);
	2727	+ group(csg);
	2728	+ }
2692	2729	} else
2693	2730	if (source == tripleItem)
2694	2731	{
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
2695	2734	Composite csg = new GroupLeaf("Trident");
2696	2735	csg.count = 4;
2697	2736	group(csg);
..	..	@@ -2704,6 +2743,7 @@
2704	2743	child = new cGroup();
2705	2744	csg.addChild(child);
2706	2745	child.addChild(csg);
	2746	+ }
2707	2747	} else
2708	2748	if (source == computeAOItem)
2709	2749	{
..	..	@@ -3339,22 +3379,34 @@
3339	3379	} else
3340	3380	if (source == ungroupItem \|\| source == ungroupButton)
3341	3381	{
3342		- boolean hasRoot = false;
	3382	+ boolean canUngroup = true;
3343	3383
3344	3384	for (int i=0; i<group.selection.size(); i++)
3345	3385	{
3346		- if (group.selection.get(i) == group)
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
3347	3389	{
3348		- hasRoot = true;
	3390	+ // Cannot ungroup leaves
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+
	3395	+ if (selectedItem == group)
	3396	+ {
	3397	+ // Cannot ungroup root
	3398	+ canUngroup = false;
3349	3399	break;
3350	3400	}
3351	3401	}
3352	3402
3353		- if (!hasRoot)
	3403	+ if (canUngroup)
3354	3404	{
3355	3405	for (int i=0; i<group.selection.size(); i++)
3356	3406	{
3357		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
3358	3410	}
3359	3411
3360	3412	ClearSelection(false);
..	..	@@ -3918,6 +3970,8 @@
3918	3970	if (source == closeButton)
3919	3971	{
3920	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3921	3975	cRadio ab;
3922	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3923	3977	{
..	..	@@ -4016,6 +4070,8 @@
4016	4070	} else
4017	4071	if(source instanceof cRadio)
4018	4072	{
	4073	+ Replace();
	4074	+
4019	4075	group.parent = keepparent;
4020	4076	group.attributes = 0;
4021	4077	//group.editWindow = null;
..	..	@@ -4067,7 +4123,28 @@
4067	4123	*/
4068	4124	radio.layout.doClick();
4069	4125
4070		- SetUndoStates();
	4126	+ assert(copy instanceof Composite);
	4127	+
	4128	+ if (copy.versionlist == null)
	4129	+ {
	4130	+ copy.versionindex = -1;
	4131	+
	4132	+ // Cannot work with loops
	4133	+ // To fix this issue, we first mark all nodes above the root,
	4134	+ // and check if any of these nodes are reachable below the root.
	4135	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4136	+
	4137	+ if (!copy.HasTags())
	4138	+ {
	4139	+ copy.versionlist = new Object3D[100];
	4140	+
	4141	+ Save(true);
	4142	+ }
	4143	+
	4144	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4145	+ }
	4146	+
	4147	+ SetVersionStates();
4071	4148
4072	4149	ClearUnpinned();
4073	4150
..	..	@@ -4212,7 +4289,7 @@
4212	4289	TouchTransform(obj);
4213	4290	continue;
4214	4291	}
4215		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
4216	4293	{
4217	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4218	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -4220,10 +4297,6 @@
4220	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4221	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4222	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4223		- }
4224		- if ((mask&4) != 0) // Rotation
4225		- {
4226		- // ?
4227	4300	}
4228	4301	if ((mask&1) != 0) // Translation
4229	4302	{
..	..	@@ -5306,9 +5379,11 @@
5306	5379
5307	5380	boolean allComposites = true;
5308	5381
	5382	+ if (group.selection != null)
5309	5383	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310	5384	{
5311		- if (!(e.nextElement() instanceof Composite))
	5385	+ Object next = e.nextElement();
	5386	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
5312	5387	{
5313	5388	allComposites = false;
5314	5389	break;
..	..	@@ -5320,6 +5395,7 @@
5320	5395
5321	5396	void refreshContents(boolean cp)
5322	5397	{
	5398	+ if (false)
5323	5399	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5324	5400	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5325	5401	{
..	..	@@ -6213,11 +6289,11 @@
6213	6289	private MenuItem lookAtItem;
6214	6290	private MenuItem lookFromItem;
6215	6291	private MenuItem switchViewItem;
6216		- private MenuItem cutItem;
	6292	+ private JMenuItem cutItem;
6217	6293	private MenuItem undoItem;
6218	6294	private MenuItem redoItem;
6219	6295	private JMenuItem duplicateItem;
6220		- private MenuItem cloneItem;
	6296	+ private JMenuItem cloneItem;
6221	6297	private MenuItem cloneSupportItem;
6222	6298	private MenuItem overwriteGeoItem;
6223	6299	private MenuItem overwriteMatItem;
..	..	@@ -6238,13 +6314,13 @@
6238	6314	private MenuItem cloneGeometriesItem;
6239	6315	private MenuItem shareGeometriesItem;
6240	6316	private MenuItem mergeGeometriesItem;
6241		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
6242	6318	private MenuItem pasteItem;
6243		- private MenuItem pasteIntoItem;
6244		- private MenuItem pasteLinkItem;
6245		- private MenuItem pasteCloneItem;
6246		- private MenuItem pasteExpandItem;
6247		- private MenuItem deleteItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
6248	6324	private MenuItem clearAllItem;
6249	6325	private MenuItem genUVItem;
6250	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -6299,7 +6375,7 @@
6299	6375	private MenuItem transformGeometryItem;
6300	6376	private MenuItem transformChildrenItem;
6301	6377	private MenuItem hideItem;
6302		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
6303	6379	private MenuItem backItem;
6304	6380	private MenuItem frontItem;
6305	6381	private MenuItem cameraItem;
..	..	@@ -6312,7 +6388,7 @@
6312	6388	private MenuItem switchTransfoItem;
6313	6389	private MenuItem morphItem;
6314	6390	private MenuItem linkerItem;
6315		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
6316	6392	private MenuItem editItem;
6317	6393	private MenuItem openWindowItem;
6318	6394	private MenuItem editLeafItem;