~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -30,7 +31,7 @@
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31	32	row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
34	35	skyboxButton.addActionListener(new ActionListener()
35	36	{
36	37	@Override
..	..	@@ -41,6 +42,22 @@
41	42	});
42	43	}
43	44
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
44	61	public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45	62	{
46	63	cGridBag tab0 = new cGridBag().setVertical(true);
..	..	@@ -56,11 +73,11 @@
56	73	cGridBag row5 = new cGridBag();
57	74	cGridBag row6 = new cGridBag();
58	75
59		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
60	77	//AddSkyboxButton("default", "cornell", row0);
61	78	AddSkyboxButton("penguins", "dust", row0);
62	79	AddSkyboxButton("penguins", "tropic", row0);
63		- AddSkyboxButton("default", "skycube", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
64	81
65	82	AddSkyboxButton("default", "uffizi", row1);
66	83	AddSkyboxButton("bridge", "Bridge", row1);
..	..	@@ -90,7 +107,7 @@
90	107	AddSkyboxButton("park", "Skansen3", row6);
91	108	AddSkyboxButton("park", "Skansen4", row6);
92	109	AddSkyboxButton("park", "Skansen5", row6);
93		- AddSkyboxButton("park", "Stairs", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94	111
95	112	tab0.add(row0);
96	113	tab0.add(row1);
..	..	@@ -144,21 +161,18 @@
144	161
145	162	AddSkyboxButton("mountain", "Maskonaive2", row4);
146	163	AddSkyboxButton("mountain", "Maskonaive3", row4);
147		- AddSkyboxButton("mountain", "Ryfjallet", row4);
148	164	AddSkyboxButton("mountain", "Teide", row4);
149	165	AddSkyboxButton("park", "Tantolunden4", row4);
150	166
151		- AddSkyboxButton("penguins", "wrath", row5);
152		- AddSkyboxButton("penguins", "yonder", row5);
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
153	169	AddSkyboxButton("rocky", "Langholmen", row5);
154	170	AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155		- AddSkyboxButton("rocky", "Tantolunden6", row5);
156	171
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
157	173	AddSkyboxButton("default", "CloudyHills", row6);
158	174	AddSkyboxButton("daz", "Autumn", row6);
159		- AddSkyboxButton("daz", "Greenlands", row6);
160	175	AddSkyboxButton("daz", "MountainTrail", row6);
161		- AddSkyboxButton("daz", "Oasis", row6);
162	176	/*
163	177	Autumn
164	178	Greenlands
..	..	@@ -210,8 +224,8 @@
210	224	AddSkyboxButton("penguins", "sleepyhollow", row1);
211	225
212	226	AddSkyboxButton("penguins", "kenon_star", row2);
213		- AddSkyboxButton("indoors", "DallasW", row2);
214		- AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
215	229	AddSkyboxButton("indoors", "Vasa", row2);
216	230
217	231	AddSkyboxButton("winter", "Backyard", row3);
..	..	@@ -232,7 +246,7 @@
232	246	AddSkyboxButton("daz", "TheRock", row6);
233	247	AddSkyboxButton("daz", "TopOfTheWorld", row6);
234	248	AddSkyboxButton("daz", "Winter", row6);
235		- AddSkyboxButton("penguins", "desertdawn", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
236	250
237	251	tab0.add(row0);
238	252	tab0.add(row1);
..	..	@@ -248,15 +262,122 @@
248	262	//tab0.add(new cGridBag());
249	263	}
250	264	}
251		-
252		- public void ChangeSkybox(String name)
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
253	267	{
254		- //cameraView.envyoff = false;
255		- group.skyboxname = name;
256		- group.skyboxext = "jpg";
257		- cameraView.repaint();
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	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	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
258	358	}
259	359
	360	+ public void ChangeTexture(String texture)
	361	+ {
	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();
	379	+ }
	380	+
260	381	//ObjEditor objEditor;
261	382	public void closeUI2()
262	383	{
..	..	@@ -294,10 +415,12 @@
294	415	this.copy = this.group = group;
295	416	//selectees = this.group.selectees;
296	417
297		- if (copy.versions == null)
	418	+ if (copy.versionlist == null)
298	419	{
299		- copy.versions = new byte[100][];
	420	+ copy.versionlist = new Object3D[100];
300	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
301	424	}
302	425
303	426	if(ui)
..	..	@@ -321,9 +444,9 @@
321	444
322	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323	446
324		- if (copy.versions == null)
	447	+ if (copy.versionlist == null)
325	448	{
326		- copy.versions = new byte[100][];
	449	+ copy.versionlist = new Object3D[100];
327	450	copy.versionindex = -1;
328	451
329	452	Save(true);
..	..	@@ -417,32 +540,37 @@
417	540	// menu.add("-");
418	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
419	542	duplicateItem.addActionListener(this);
420		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
421	545	cloneItem.addActionListener(this);
422		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
423	547	{
424	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
425	549	cloneSupportItem.addActionListener(this);
426	550	}
	551	+ oe.jTree.popup.addSeparator();
427	552	menu.add("-");
428		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
429	554	cutItem.addActionListener(this);
430		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
431	556	copyItem.addActionListener(this);
432	557	pasteItem = menu.add(new MenuItem("Paste"));
433	558	pasteItem.addActionListener(this);
434	559
435		- menu.add("-");
436		- 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"));
437	563	pasteIntoItem.addActionListener(this);
438		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
439	565	pasteLinkItem.addActionListener(this);
440		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
441	567	pasteCloneItem.addActionListener(this);
442		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
443	569	// pasteExpandItem.addActionListener(this);
444		- menu.add("-");
445		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
446	574	deleteItem.addActionListener(this);
447	575
448	576	if (Globals.ADVANCED)
..	..	@@ -529,11 +657,9 @@
529	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
530	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
531	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
532		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
533	660	oe.cameraMenu.add("-");
534	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
535	662	openWindowItem.addActionListener(this);
536		- editLeafItem.addActionListener(this);
537	663	lookAtItem.addActionListener(this);
538	664	//lookFromItem.addActinoListener(this);
539	665	//switchViewItem.addActionListener(this);
..	..	@@ -595,7 +721,7 @@
595	721	hideItem = menu.add(new MenuItem("Hidden Group"));
596	722	hideItem.addActionListener(this);
597	723	}
598		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
599	725	ungroupItem.addActionListener(this);
600	726
601	727	// menu.add("-");
..	..	@@ -781,6 +907,9 @@
781	907	shareGeometriesItem.addActionListener(this);
782	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
783	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
784	913	if (Globals.ADVANCED)
785	914	{
786	915	// Pretty much the same as duplicate and clone.
..	..	@@ -797,6 +926,74 @@
797	926	buildToolsMenu(menu);
798	927	}
799	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ //boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	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"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
800	997
801	998	void SetupUI2(ObjEditor oe)
802	999	{
..	..	@@ -815,11 +1012,6 @@
815	1012	//new Exception().printStackTrace();
816	1013
817	1014	oe.radioPanel = new JPanel(new GridBagLayout());
818		- oe.aConstraints.weightx = 1;
819		- oe.aConstraints.weighty = 0;
820		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- oe.aConstraints.gridwidth = 100;
822		- oe.aConstraints.gridheight = 1;
823	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
824	1016
825	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -852,10 +1044,49 @@
852	1044
853	1045	if (Globals.ADVANCED)
854	1046	{
855		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
856		- maxButton.setToolTipText("Maximize window");
857		- 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);
858	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	+ //
859	1090
860	1091	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
861	1092	fullButton.setToolTipText("Full-screen window");
..	..	@@ -869,41 +1100,45 @@
869	1100	restoreCameraButton.setToolTipText("Restore viewpoint");
870	1101	restoreCameraButton.addActionListener(this);
871	1102
872		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873		- saveButton.setToolTipText("New version");
874		- saveButton.addActionListener(this);
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
875	1106
876		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
877		- undoButton.setToolTipText("Previous version");
878		- undoButton.addActionListener(this);
879		- undoButton.setEnabled(false);
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
880	1115
881	1116	cGridBag updown = new cGridBag().setVertical(true);
882	1117	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883		- restoreButton.setToolTipText("Restore current");
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
884	1119	restoreButton.addActionListener(this);
885		- restoreButton.setEnabled(false);
	1120	+ //restoreButton.setEnabled(false);
886	1121
887	1122	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888		- replaceButton.setToolTipText("Replace current");
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
889	1124	replaceButton.addActionListener(this);
890		- replaceButton.setEnabled(false);
	1125	+ //replaceButton.setEnabled(false);
891	1126
892	1127	copyOptionsPanel.add(updown);
893	1128
894		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
895		- redoButton.setToolTipText("Next version");
896		- redoButton.addActionListener(this);
897		- redoButton.setEnabled(false);
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ oneStepButton.setToolTipText("Animate one step forward");
	1136	+ oneStepButton.addActionListener(this);
898	1137
899	1138	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
900	1139	liveCB.setToolTipText("Enable animation");
901	1140	liveCB.addItemListener(this);
902	1141
903		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
904		- oneStepButton.setToolTipText("Animate one step forward");
905		- oneStepButton.addActionListener(this);
906		-
907	1142	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
908	1143	fastCB.setToolTipText("Fast mode");
909	1144	fastCB.addItemListener(this);
..	..	@@ -930,21 +1165,6 @@
930	1165
931	1166	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
932	1167
933		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
934		- twoButton.setToolTipText("Show 3D view only");
935		- twoButton.addActionListener(this);
936		- this.fullscreenLayout = twoButton;
937		-
938		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939		- threeButton.setToolTipText("Show controls and 3D view");
940		- threeButton.addActionListener(this);
941		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- sixButton.setToolTipText("Show 3D view and controls");
943		- sixButton.addActionListener(this);
944		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945		-// sevenButton.setToolTipText("3-column layout");
946		-// sevenButton.addActionListener(this);
947		- //
948	1168
949	1169	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950	1170	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -960,7 +1180,7 @@
960	1180
961	1181	// INSERT
962	1182	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
963		- gridButton.setToolTipText("Create grid");
	1183	+ gridButton.setToolTipText("Create ground");
964	1184	gridButton.addActionListener(this);
965	1185
966	1186	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1028,18 +1248,15 @@
1028	1248
1029	1249	oe.toolboxPanel.add(row2);
1030	1250
1031		- // ENVYMAPS
1032		- cGridBag skyboxpane = new cGridBag();
1033		- skyboxpane.preferredHeight = 100;
	1251	+ cGridBag textures = new cGridBag();
1034	1252
1035		- oe.toolboxPanel.add(skyboxpane);
	1253	+ CreateTexturePanel(textures);
1036	1254
1037		- JTabbedPane skyboxpanel = new JTabbedPane();
1038		- skyboxpane.add(skyboxpanel);
	1255	+ oe.toolboxPanel.add(textures);
1039	1256
1040		- AddSkyboxTab0(skyboxpanel);
1041		- AddSkyboxTab1(skyboxpanel);
1042		- AddSkyboxTab2(skyboxpanel);
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
1043	1260
1044	1261	// EDIT panel
1045	1262	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1047,20 +1264,20 @@
1047	1264	editButton.addActionListener(this);
1048	1265
1049	1266	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050		- uneditButton.setToolTipText("Remove selection controls");
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1051	1268	uneditButton.addActionListener(this);
1052	1269
1053	1270	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1054		- allParamsButton.setToolTipText("Show all controle");
	1271	+ allParamsButton.setToolTipText("Show all controls");
1055	1272	allParamsButton.addActionListener(this);
1056	1273
1057		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
1059	1276	clearPanelButton.addActionListener(this);
1060	1277
1061		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1062		- unselectButton.setToolTipText("Unselect");
1063		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
1064	1281
1065	1282	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1066	1283	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1120,7 +1337,7 @@
1120	1337	dgr.addDragGestureListener(this);
1121	1338	}catch(Exception e) {}
1122	1339	*/
1123		- radio.layout = sixButton; // sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
1124	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1125	1342	}
1126	1343
..	..	@@ -1171,9 +1388,12 @@
1171	1388	smoothCB.setToolTipText("Snapping delay");
1172	1389	smoothCB.addItemListener(this);
1173	1390
1174		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175		- slowCB.setToolTipText("Smooth interpolation");
1176		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
1177	1397
1178	1398	// constraints.gridy += 1;
1179	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1252,6 +1472,14 @@
1252	1472
1253	1473	void EditObject(Object3D obj)
1254	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	+
1255	1483	cRadio radioButton = new cRadio(obj.name);
1256	1484
1257	1485	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1262,7 +1490,7 @@
1262	1490	}
1263	1491
1264	1492	radioButton.SetObject(obj);
1265		- radioButton.layout = sixButton; // sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
1266	1494	radioButton.SetCamera(cameraView.renderCamera, false);
1267	1495	radioButton.addActionListener(this);
1268	1496	radioPanel.add(radioButton);
..	..	@@ -1287,6 +1515,8 @@
1287	1515	cCheckBox localCB;
1288	1516	cCheckBox crowdCB;
1289	1517	cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
1290	1520	cToggleButton fastCB;
1291	1521	cCheckBox slowCB;
1292	1522	cCheckBox boxCB;
..	..	@@ -1357,6 +1587,12 @@
1357	1587	{
1358	1588	cameraView.ToggleInertia();
1359	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
1360	1596	}
1361	1597	else if(e.getSource() == localCB)
1362	1598	{
..	..	@@ -1634,7 +1870,12 @@
1634	1870	TreePath path;
1635	1871
1636	1872	public TransferableTreePath(TreePath tp) {
1637		- 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);
1638	1879	}
1639	1880
1640	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2445,27 +2686,35 @@
2445	2686	} else
2446	2687	if (source == loopItem \|\| source == loopButton)
2447	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
2448	2691	Composite csg = new GroupLeaf();
2449	2692	csg.count = 5;
2450		- group(csg);
2451	2693	Composite child = new cGroup("Branch");
2452	2694	csg.addChild(child);
2453	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
2454	2698	} else
2455	2699	if (source == doubleItem)
2456	2700	{
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
2457	2703	Composite csg = new GroupLeaf("Fork");
2458	2704	csg.count = 5;
2459		- group(csg);
2460	2705	Composite child = new cGroup("Branch A");
2461	2706	csg.addChild(child);
2462	2707	child.addChild(csg);
2463	2708	child = new cGroup("Branch B");
2464	2709	csg.addChild(child);
2465	2710	child.addChild(csg);
	2711	+ group(csg);
	2712	+ }
2466	2713	} else
2467	2714	if (source == tripleItem)
2468	2715	{
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
2469	2718	Composite csg = new GroupLeaf("Trident");
2470	2719	csg.count = 4;
2471	2720	group(csg);
..	..	@@ -2478,6 +2727,7 @@
2478	2727	child = new cGroup();
2479	2728	csg.addChild(child);
2480	2729	child.addChild(csg);
	2730	+ }
2481	2731	} else
2482	2732	if (source == computeAOItem)
2483	2733	{
..	..	@@ -2497,7 +2747,7 @@
2497	2747	if (source == invariantsItem)
2498	2748	{
2499	2749	System.out.println("Invariants:");
2500		- Grafreed.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
2501	2751	} else
2502	2752	if (source == memoryItem)
2503	2753	{
..	..	@@ -2528,33 +2778,52 @@
2528	2778	{
2529	2779	ToggleFullScreen();
2530	2780	} else
2531		- if (source == undoButton)
	2781	+ if (source == collapseButton)
	2782	+ {
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
	2785	+ } else
	2786	+ if (source == maximize3DButton)
	2787	+ {
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
	2792	+ } else
	2793	+ if (source == previousVersionButton)
2532	2794	{
2533	2795	// Go to previous version
2534	2796	//if (!Undo())
2535	2797	//java.awt.Toolkit.getDefaultToolkit().beep();
2536		- Undo();
	2798	+ PreviousVersion();
2537	2799	} else
2538	2800	if (source == restoreButton)
2539	2801	{
2540	2802	// Restore current version
2541	2803	Restore();
	2804	+ //restoreButton.setEnabled(false);
2542	2805	} else
2543	2806	if (source == replaceButton)
2544	2807	{
2545	2808	// Overwrite current version
2546	2809	Replace();
	2810	+ //replaceButton.setEnabled(false);
2547	2811	} else
2548		- if (source == redoButton)
	2812	+ if (source == nextVersionButton)
2549	2813	{
2550	2814	// Go to next version
2551		- Redo();
	2815	+ NextVersion();
2552	2816	} else
2553		- if (source == saveButton)
	2817	+ if (source == saveVersionButton)
2554	2818	{
2555	2819	// Save a new version
2556	2820	if (!Save(true))
2557	2821	java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
2558	2827	} else
2559	2828	if (source == oneStepButton)
2560	2829	{
..	..	@@ -2609,11 +2878,11 @@
2609	2878	} else
2610	2879	if (source == undoItem)
2611	2880	{
2612		- Undo();
	2881	+ PreviousVersion();
2613	2882	} else
2614	2883	if (source == redoItem)
2615	2884	{
2616		- Redo();
	2885	+ NextVersion();
2617	2886	} else
2618	2887	if (source == duplicateItem)
2619	2888	{
..	..	@@ -3094,22 +3363,34 @@
3094	3363	} else
3095	3364	if (source == ungroupItem \|\| source == ungroupButton)
3096	3365	{
3097		- boolean hasRoot = false;
	3366	+ boolean canUngroup = true;
3098	3367
3099	3368	for (int i=0; i<group.selection.size(); i++)
3100	3369	{
3101		- if (group.selection.get(i) == group)
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
3102	3373	{
3103		- hasRoot = true;
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
3104	3383	break;
3105	3384	}
3106	3385	}
3107	3386
3108		- if (!hasRoot)
	3387	+ if (canUngroup)
3109	3388	{
3110	3389	for (int i=0; i<group.selection.size(); i++)
3111	3390	{
3112		- Ungroup(group.selection.get(i));
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
3113	3394	}
3114	3395
3115	3396	ClearSelection(false);
..	..	@@ -3472,38 +3753,7 @@
3472	3753	if (CameraPane.FULLSCREEN)
3473	3754	fullscreenLayout = radio.layout;
3474	3755
3475		- // bug
3476		- //gridPanel.setDividerLocation(1.0);
3477		- //bigPanel.setDividerLocation(0.0);
3478		-// bigThree.remove(scenePanel);
3479		-// bigThree.remove(centralPanel);
3480		-// bigThree.remove(XYZPanel);
3481		-// aWindowConstraints.gridx = 0;
3482		-// aWindowConstraints.gridy = 0;
3483		-// aWindowConstraints.gridwidth = 1;
3484		-// // aConstraints.gridheight = 3;
3485		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3486		-// aWindowConstraints.weightx = 0;
3487		-// aWindowConstraints.weighty = 1;
3488		-// //bigThree.add(jtp, aWindowConstraints);
3489		-// aWindowConstraints.weightx = 1;
3490		-// aWindowConstraints.gridwidth = 3;
3491		-// // aConstraints.gridheight = 3;
3492		-// aWindowConstraints.gridx = 1;
3493		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3494		-// bigThree.add(centralPanel, aWindowConstraints);
3495		-// aWindowConstraints.weightx = 0;
3496		-// aWindowConstraints.gridx = 4;
3497		-// aWindowConstraints.gridwidth = 1;
3498		-// // aConstraints.gridheight = 3;
3499		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3500		-// //bigThree.add(XYZPanel, aWindowConstraints);
3501		-// scenePanel.setVisible(false);
3502		-// centralPanel.setVisible(true);
3503		-// XYZPanel.setVisible(false);
3504		- bigThree.ClearUI();
3505		- bigThree.add(centralPanel);
3506		- bigThree.FlushUI();
	3756	+ Show3DView();
3507	3757
3508	3758	cameraView.requestFocusInWindow();
3509	3759
..	..	@@ -3689,6 +3939,7 @@
3689	3939	} else
3690	3940	if (source == rootButton)
3691	3941	{
	3942	+ Replace();
3692	3943	Object3D obj;
3693	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3694	3945	{
..	..	@@ -3746,10 +3997,10 @@
3746	3997	{
3747	3998	Object3D child = (Object3D)e.nextElement();
3748	3999	if(child.editWindow != null)
3749		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	4000	child.pinned = false;
3751	4001	child.CloseUI();
3752	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3753	4004
3754	4005	//child.editWindow = null; // ???????????
3755	4006	}
..	..	@@ -3768,6 +4019,7 @@
3768	4019	obj.CloseUI();
3769	4020	}
3770	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
3771	4023	refreshContents(true);
3772	4024	} else
3773	4025	if (source == allParamsButton)
..	..	@@ -3824,8 +4076,6 @@
3824	4076
3825	4077	copy = group;
3826	4078
3827		- SetUndoStates();
3828		-
3829	4079	//Globals.theRenderer.object = group;
3830	4080	if(!useclient)
3831	4081	{
..	..	@@ -3853,7 +4103,20 @@
3853	4103	*/
3854	4104	radio.layout.doClick();
3855	4105
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
3856	4118	ClearUnpinned();
	4119	+
3857	4120	//Grafreed.Assert(group != null);
3858	4121	//Grafreed.Assert(group.selection != null);
3859	4122	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3870,11 +4133,13 @@
3870	4133	} else if (event.getSource() == editCameraItem)
3871	4134	{
3872	4135	cameraView.ProtectCamera();
	4136	+ cameraView.requestFocusInWindow();
3873	4137	cameraView.repaint();
3874	4138	return;
3875	4139	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3876	4140	{
3877	4141	cameraView.RevertCamera();
	4142	+ cameraView.requestFocusInWindow();
3878	4143	cameraView.repaint();
3879	4144	return;
3880	4145	// } else if (event.getSource() == textureButton)
..	..	@@ -5007,9 +5272,7 @@
5007	5272
5008	5273	freezemodel = false;
5009	5274	}
5010		-
5011		- boolean flashIt = true;
5012		-
	5275	+
5013	5276	public void valueChanged(TreeSelectionEvent e)
5014	5277	//public boolean handleEvent(Event event)
5015	5278	{
..	..	@@ -5082,13 +5345,29 @@
5082	5345	{
5083	5346	editButton.setEnabled(enabled);
5084	5347	uneditButton.setEnabled(enabled);
5085		- unselectButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
5086	5349	flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
5087	5366	}
5088	5367
5089	5368	void refreshContents(boolean cp)
5090	5369	{
5091		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5092	5371	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5093	5372	{
5094	5373	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5098,7 +5377,7 @@
5098	5377	Object3D child = (Object3D) group.selection.get(i);
5099	5378
5100	5379	objEditor.AddInfo(child, this, true);
5101		- System.err.println("info : " + child.GetPath());
	5380	+// System.err.println("info : " + child.GetPath());
5102	5381	}
5103	5382
5104	5383	objEditor.SetText(); // jan 2014
..	..	@@ -5924,7 +6203,6 @@
5924	6203
5925	6204	cButton restoreCameraButton;
5926	6205
5927		- cButton saveButton;
5928	6206	cButton oneStepButton;
5929	6207
5930	6208	cButton groupButton;
..	..	@@ -5982,11 +6260,11 @@
5982	6260	private MenuItem lookAtItem;
5983	6261	private MenuItem lookFromItem;
5984	6262	private MenuItem switchViewItem;
5985		- private MenuItem cutItem;
	6263	+ private JMenuItem cutItem;
5986	6264	private MenuItem undoItem;
5987	6265	private MenuItem redoItem;
5988	6266	private JMenuItem duplicateItem;
5989		- private MenuItem cloneItem;
	6267	+ private JMenuItem cloneItem;
5990	6268	private MenuItem cloneSupportItem;
5991	6269	private MenuItem overwriteGeoItem;
5992	6270	private MenuItem overwriteMatItem;
..	..	@@ -6007,13 +6285,13 @@
6007	6285	private MenuItem cloneGeometriesItem;
6008	6286	private MenuItem shareGeometriesItem;
6009	6287	private MenuItem mergeGeometriesItem;
6010		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
6011	6289	private MenuItem pasteItem;
6012		- private MenuItem pasteIntoItem;
6013		- private MenuItem pasteLinkItem;
6014		- private MenuItem pasteCloneItem;
6015		- private MenuItem pasteExpandItem;
6016		- private MenuItem deleteItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
6017	6295	private MenuItem clearAllItem;
6018	6296	private MenuItem genUVItem;
6019	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -6081,7 +6359,7 @@
6081	6359	private MenuItem switchTransfoItem;
6082	6360	private MenuItem morphItem;
6083	6361	private MenuItem linkerItem;
6084		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
6085	6363	private MenuItem editItem;
6086	6364	private MenuItem openWindowItem;
6087	6365	private MenuItem editLeafItem;