~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,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	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, !Globals.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	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	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(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	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	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -80,10 +445,22 @@
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +471,7 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
..	..	@@ -164,33 +542,35 @@
164	542	// menu.add("-");
165	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
166	544	duplicateItem.addActionListener(this);
167		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
168	547	cloneItem.addActionListener(this);
169		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
170	549	{
171	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
172	551	cloneSupportItem.addActionListener(this);
173	552	}
	553	+ oe.jTree.popup.addSeparator();
174	554	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	556	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	558	copyItem.addActionListener(this);
179	559	pasteItem = menu.add(new MenuItem("Paste"));
180	560	pasteItem.addActionListener(this);
181	561
182		- menu.add("-");
183		- 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"));
184	565	pasteIntoItem.addActionListener(this);
185		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
186	567	pasteLinkItem.addActionListener(this);
187		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
188	569	pasteCloneItem.addActionListener(this);
189		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
190	571	// pasteExpandItem.addActionListener(this);
191		- menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
194	574
195	575	if (Globals.ADVANCED)
196	576	{
..	..	@@ -276,11 +656,9 @@
276	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	659	oe.cameraMenu.add("-");
281	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	661	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	662	lookAtItem.addActionListener(this);
285	663	//lookFromItem.addActinoListener(this);
286	664	//switchViewItem.addActionListener(this);
..	..	@@ -327,9 +705,8 @@
327	705	setMasterItem.addActionListener(this);
328	706	}
329	707
330		- oe.menuBar.add(menu = new Menu("Group"));
331		-// grabItem = menu.add(new MenuItem("Grab"));
332		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
333	710	backItem = menu.add(new MenuItem("Back"));
334	711	backItem.addActionListener(this);
335	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -337,13 +714,21 @@
337	714	// compositeItem = menu.add(new MenuItem("Composite"));
338	715	// compositeItem.addActionListener(this);
339	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
340	720	if (Globals.ADVANCED)
341	721	{
342	722	hideItem = menu.add(new MenuItem("Hidden Group"));
343	723	hideItem.addActionListener(this);
344	724	}
345		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
347	732
348	733	// menu.add("-");
349	734	//
..	..	@@ -383,22 +768,29 @@
383	768
384	769	if (Globals.ADVANCED)
385	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
386	773	menu.add("-");
387	774	linkerItem = menu.add(new MenuItem("Linker"));
388	775	linkerItem.addActionListener(this);
389		- attributeItem = menu.add(new MenuItem("Attribute"));
390		- attributeItem.addActionListener(this);
391	776	templateItem = menu.add(new MenuItem("Template"));
392	777	templateItem.addActionListener(this);
393	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
394	779	pointflowItem.addActionListener(this);
395	780	}
396	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
397	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
398	790	resetTransformItem.addActionListener(this);
399	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
400	792	resetCentroidItem.addActionListener(this);
401		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
402	794	resetCentroidXZItem.addActionListener(this);
403	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
404	796	transformGeometryItem.addActionListener(this);
..	..	@@ -416,7 +808,7 @@
416	808	genNormalsMESHItem.addActionListener(this);
417	809	if (Globals.ADVANCED)
418	810	{
419		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
420	812	genNormalsMINEItem.addActionListener(this);
421	813	}
422	814	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -450,6 +842,8 @@
450	842	}
451	843
452	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
453	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
454	848	clearMaterialsItem.addActionListener(this);
455	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -472,9 +866,9 @@
472	866	hideleavesItem.addActionListener(this);
473	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
474	868	showleavesItem.addActionListener(this);
475		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
476	870	markleavesItem.addActionListener(this);
477		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
478	872	unmarkleavesItem.addActionListener(this);
479	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
480	874	rewindleavesItem.addActionListener(this);
..	..	@@ -509,10 +903,15 @@
509	903	attachBumpItem.addActionListener(this);
510	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
511	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
512	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
513	908	detachPigmentItem.addActionListener(this);
514	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
515	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
516	915	menu.add("-");
517	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
518	917	sortbysizeItem.addActionListener(this);
..	..	@@ -523,6 +922,9 @@
523	922	shareGeometriesItem.addActionListener(this);
524	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
525	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
526	928	if (Globals.ADVANCED)
527	929	{
528	930	// Pretty much the same as duplicate and clone.
..	..	@@ -539,6 +941,80 @@
539	941	buildToolsMenu(menu);
540	942	}
541	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
	1017	+
542	1018	void SetupUI2(ObjEditor oe)
543	1019	{
544	1020	// June 2019
..	..	@@ -556,11 +1032,6 @@
556	1032	//new Exception().printStackTrace();
557	1033
558	1034	oe.radioPanel = new JPanel(new GridBagLayout());
559		- oe.aConstraints.weightx = 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
562		- oe.aConstraints.gridwidth = 100;
563		- oe.aConstraints.gridheight = 1;
564	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
565	1036
566	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -581,9 +1052,9 @@
581	1052	oe.radioPanel.add(dummyButton);
582	1053	oe.buttonGroup.add(dummyButton);
583	1054	*/
584		- cGridBag copyOptionsPanel = new cGridBag();
	1055	+ cGridBag versionManagerPanel = new cGridBag();
585	1056
586		- copyOptionsPanel.preferredHeight = 1;
	1057	+ versionManagerPanel.preferredHeight = 4;
587	1058
588	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
589	1060
..	..	@@ -593,46 +1064,103 @@
593	1064
594	1065	if (Globals.ADVANCED)
595	1066	{
596		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- maxButton.setToolTipText("Maximize window");
598		- maxButton.addActionListener(this);
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
599	1070	}
600	1071
601		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
602	1112	fullButton.setToolTipText("Full-screen window");
603	1113	fullButton.addActionListener(this);
604	1114
605		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
606	1116	screenfitButton.setToolTipText("Screen fit");
607	1117	screenfitButton.addActionListener(this);
608	1118
609		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
610	1120	restoreCameraButton.setToolTipText("Restore viewpoint");
611	1121	restoreCameraButton.addActionListener(this);
612	1122
613		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- undoButton.setToolTipText("Undo changes");
615		- undoButton.addActionListener(this);
616		- undoButton.setEnabled(false);
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
	1126	+
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
617	1136
618		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- redoButton.setToolTipText("Redo changes");
620		- redoButton.addActionListener(this);
621		- redoButton.setEnabled(false);
	1137	+ cGridBag updown = new cGridBag().setVertical(true);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
	1140	+ restoreButton.addActionListener(this);
	1141	+ restoreButton.setEnabled(false);
622	1142
623		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- saveButton.setToolTipText("Save changes");
625		- saveButton.addActionListener(this);
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
	1145	+ replaceButton.addActionListener(this);
	1146	+ replaceButton.setEnabled(false);
626	1147
627		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
628		- liveCB.setToolTipText("Enable animation");
629		- liveCB.addItemListener(this);
630		-
631		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1148	+ versionManagerPanel.add(updown);
	1149	+
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
632	1156	oneStepButton.setToolTipText("Animate one step forward");
633	1157	oneStepButton.addActionListener(this);
634	1158
635		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1159	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1160	+ liveCB.setToolTipText("Enable animation");
	1161	+ liveCB.addItemListener(this);
	1162	+
	1163	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
636	1164	fastCB.setToolTipText("Fast mode");
637	1165	fastCB.addItemListener(this);
638	1166
..	..	@@ -647,142 +1175,137 @@
647	1175
648	1176	if (Globals.ADVANCED)
649	1177	{
650		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
651	1179	snapobjectButton.addActionListener(this);
652	1180	snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ fourButton.addActionListener(this);
	1184	+ fourButton.setToolTipText("Show control panel only");
653	1185	}
654	1186
655	1187	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
656	1188
657		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- twoButton.setToolTipText("Show center view only");
659		- twoButton.addActionListener(this);
660		- this.fullscreenLayout = twoButton;
661		-
662		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- fourButton.addActionListener(this);
664		- fourButton.setToolTipText("Show left panel only");
665		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sixButton.setToolTipText("2-column layout left");
667		- sixButton.addActionListener(this);
668		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- threeButton.setToolTipText("2-column layout right");
670		- threeButton.addActionListener(this);
671		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
672		- sevenButton.setToolTipText("3-column layout");
673		- sevenButton.addActionListener(this);
674		- //
675	1189
676		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- rootButton.setToolTipText("Edit selection in new tab");
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
678	1192	rootButton.addActionListener(this);
679	1193
680		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
681	1195	closeButton.setToolTipText("Close tab");
682	1196	closeButton.addActionListener(this);
683	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
684	1198	//clearButton.addActionListener(this);
685	1199
	1200	+ cGridBag row1 = new cGridBag();
	1201	+
686	1202	// INSERT
687		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688		- gridButton.setToolTipText("Create grid");
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
689	1205	gridButton.addActionListener(this);
690	1206
691		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
692	1208	boxButton.setToolTipText("Create box");
693	1209	boxButton.addActionListener(this);
694	1210
695		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- sphereButton.setToolTipText("Create sphere");
697		- sphereButton.addActionListener(this);
698		-
699		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- coneButton.setToolTipText("Create cone");
701		- coneButton.addActionListener(this);
702		-
703		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704		- torusButton.setToolTipText("Create torus");
705		- torusButton.addActionListener(this);
706		-
707		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
708	1212	superButton.setToolTipText("Create superellipsoid");
709	1213	superButton.addActionListener(this);
710	1214
711		- if (Globals.ADVANCED)
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
712	1228	{
713		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
714	1230	kleinButton.setToolTipText("Create Klein bottle");
715	1231	kleinButton.addActionListener(this);
716	1232	}
717	1233
718		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
719	1235	particlesButton.setToolTipText("Create particle system");
720	1236	particlesButton.addActionListener(this);
721	1237
722		- oe.toolboxPanel.Return();
	1238	+ oe.toolboxPanel.add(row1);
723	1239
724		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
725	1243	groupButton.setToolTipText("Create group");
726	1244	groupButton.addActionListener(this);
727	1245
728		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
729	1247	compositeButton.setToolTipText("Create composite");
730	1248	compositeButton.addActionListener(this);
731	1249
732		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1251	switchButton.setToolTipText("Create item switcher");
734	1252	switchButton.addActionListener(this);
735	1253
736		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
737	1255	loopButton.setToolTipText("Create loop");
738	1256	loopButton.addActionListener(this);
739	1257
740		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
741	1259	textureButton.setToolTipText("Create texture");
742	1260	textureButton.addActionListener(this);
743	1261
744		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
745	1263	overlayButton.setToolTipText("Create overlay");
746	1264	overlayButton.addActionListener(this);
747	1265
748		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
749	1267	lightButton.setToolTipText("Create light");
750	1268	lightButton.addActionListener(this);
751	1269
752		- for (int i=6; --i>=0;)
753		- {
754		- oe.toolboxPanel.Return();
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- oe.toolboxPanel.add(new cGridBag());
759		- oe.toolboxPanel.add(new cGridBag());
760		- oe.toolboxPanel.add(new cGridBag());
761		- oe.toolboxPanel.add(new cGridBag());
762		- }
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
763	1286
764	1287	// EDIT panel
765		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
766	1289	editButton.setToolTipText("Pin selection controls");
767	1290	editButton.addActionListener(this);
768	1291
769		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
770		- uneditButton.setToolTipText("Remove selection controls");
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
771	1294	uneditButton.addActionListener(this);
772	1295
773	1296	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
774		- allParamsButton.setToolTipText("Show all controle");
	1297	+ allParamsButton.setToolTipText("Show all controls");
775	1298	allParamsButton.addActionListener(this);
776	1299
777		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- clearPanelButton.setToolTipText("Clear edit panel");
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
779	1302	clearPanelButton.addActionListener(this);
780	1303
781		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782		- unselectButton.setToolTipText("Unselect");
783		- unselectButton.addActionListener(this);
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
784	1307
785		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
786	1309	flashSelectionButton.setToolTipText("Highlight selection");
787	1310	flashSelectionButton.addActionListener(this);
788	1311
..	..	@@ -805,6 +1328,8 @@
805	1328
806	1329	cGridBag jSPPanel = new cGridBag();
807	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
808	1333	JScrollPane jSP;
809	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
810	1335	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -813,11 +1338,14 @@
813	1338	oe.treePanel.add(jSPPanel);
814	1339	oe.treePanel.Return();
815	1340
816		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
817	1342	oe.treePanel.Return();
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
818	1346
819		-// mainPanel.setDividerLocation(0.5); //1.0);
820		-// mainPanel.setResizeWeight(0.5);
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
821	1349
822	1350	//jList.addListSelectionListener(this);
823	1351	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -825,7 +1353,7 @@
825	1353	//jTree.setEditable(true);
826	1354	oe.jTree.setDragEnabled(true);
827	1355	//jTree.setPreferredSize(new Dimension(10,10));
828		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
829	1357
830	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
831	1359
..	..	@@ -837,7 +1365,7 @@
837	1365	dgr.addDragGestureListener(this);
838	1366	}catch(Exception e) {}
839	1367	*/
840		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
841	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
842	1370	}
843	1371
..	..	@@ -888,9 +1416,12 @@
888	1416	smoothCB.setToolTipText("Snapping delay");
889	1417	smoothCB.addItemListener(this);
890	1418
891		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
892		- slowCB.setToolTipText("Smooth interpolation");
893		- slowCB.addItemListener(this);
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
894	1425
895	1426	// constraints.gridy += 1;
896	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -940,9 +1471,9 @@
940	1471	toggleSwitchCB.setToolTipText("Choose a single item");
941	1472	toggleSwitchCB.addItemListener(this);
942	1473
943		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
944		- autosaveCB.setToolTipText("On structure change");
945		- autosaveCB.addItemListener(this);
	1474	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1475	+ autokeepCB.setToolTipText("On structure change");
	1476	+ autokeepCB.addItemListener(this);
946	1477
947	1478	panel.Return();
948	1479	if (Globals.ADVANCED)
..	..	@@ -969,9 +1500,17 @@
969	1500
970	1501	void EditObject(Object3D obj)
971	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
972	1511	cRadio radioButton = new cRadio(obj.name);
973	1512
974		- // Patch to avoid bug with transparency.
	1513	+ // June 2019. Patch to avoid bug with transparency.
975	1514	radioButton.hadMaterial = obj.material != null;
976	1515	if (!radioButton.hadMaterial)
977	1516	{
..	..	@@ -979,7 +1518,7 @@
979	1518	}
980	1519
981	1520	radioButton.SetObject(obj);
982		- radioButton.layout = sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
983	1522	radioButton.SetCamera(cameraView.renderCamera, false);
984	1523	radioButton.addActionListener(this);
985	1524	radioPanel.add(radioButton);
..	..	@@ -993,6 +1532,7 @@
993	1532
994	1533	oe.SetupViews();
995	1534
	1535	+ if (Globals.DEBUG)
996	1536	System.out.println("SetupViews");
997	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
998	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1004,6 +1544,8 @@
1004	1544	cCheckBox localCB;
1005	1545	cCheckBox crowdCB;
1006	1546	cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
1007	1549	cToggleButton fastCB;
1008	1550	cCheckBox slowCB;
1009	1551	cCheckBox boxCB;
..	..	@@ -1019,7 +1561,7 @@
1019	1561
1020	1562	cCheckBox oeilCB;
1021	1563	cCheckBox shadowCB;
1022		- cCheckBox autosaveCB;
	1564	+ cCheckBox autokeepCB;
1023	1565	cCheckBox lookAtCB;
1024	1566
1025	1567	// static int COLOR = 1;
..	..	@@ -1074,6 +1616,12 @@
1074	1616	{
1075	1617	cameraView.ToggleInertia();
1076	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
1077	1625	}
1078	1626	else if(e.getSource() == localCB)
1079	1627	{
..	..	@@ -1131,9 +1679,9 @@
1131	1679	{
1132	1680	Globals.FREEZEONMOVE ^= true;
1133	1681	}
1134		- else if(e.getSource() == autosaveCB)
	1682	+ else if(e.getSource() == autokeepCB)
1135	1683	{
1136		- Globals.SAVEONMAKE ^= true;
	1684	+ Globals.REPLACEONMAKE ^= true;
1137	1685	}
1138	1686	else if(e.getSource() == lookAtCB)
1139	1687	{
..	..	@@ -1223,7 +1771,7 @@
1223	1771	// return;
1224	1772	// }
1225	1773
1226		- String string = (String) object;
	1774	+ String string = object.toString();
1227	1775
1228	1776	// File path for Mac and Windows
1229	1777	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1351,7 +1899,12 @@
1351	1899	TreePath path;
1352	1900
1353	1901	public TransferableTreePath(TreePath tp) {
1354		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1355	1908	}
1356	1909
1357	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1488,6 +2041,8 @@
1488	2041	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1489	2042	reduce34MorphItem.addActionListener(this);
1490	2043	menu.add("-");
	2044	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2045	+ memoryItem.addActionListener(this);
1491	2046	menu.add(computeAOItem = new MenuItem("Compute AO"));
1492	2047	computeAOItem.addActionListener(this);
1493	2048
..	..	@@ -1496,8 +2051,6 @@
1496	2051	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1497	2052	mirrorItem.addActionListener(this);
1498	2053	menu.add("-");
1499		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1500		- memoryItem.addActionListener(this);
1501	2054	menu.add(analyzeItem = new MenuItem("Analyze"));
1502	2055	analyzeItem.addActionListener(this);
1503	2056	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1583,24 +2136,24 @@
1583	2136	switch(axis)
1584	2137	{
1585	2138	case 0 :
1586		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1587		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1588		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1589		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1590	2143	norm = cVector.X;
1591	2144	break;
1592	2145	case 1 :
1593		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1594		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1595		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1596		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1597	2150	norm = cVector.Y;
1598	2151	break;
1599	2152	case 2 :
1600		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1601		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1602		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1603		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1604	2157	norm = cVector.Z;
1605	2158	break;
1606	2159	}
..	..	@@ -1641,7 +2194,11 @@
1641	2194	shadow.material = new cMaterial(obj.material);
1642	2195	shadow.material.diffuse = 0.0001f;
1643	2196	shadow.material.specular = 0.0001f;
1644		- //shadow.projectedVertices[1].x = 300;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1645	2202
1646	2203	makeSomething(shadow);
1647	2204	}
..	..	@@ -1658,6 +2215,16 @@
1658	2215	listUI.remove(i);
1659	2216	}
1660	2217	}
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
1661	2228	}
1662	2229
1663	2230	/**
..	..	@@ -2087,6 +2654,23 @@
2087	2654	{
2088	2655	makeSomething(new Light());
2089	2656	} else
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
2090	2674	if (source == csgItem)
2091	2675	{
2092	2676	group(new CSG());
..	..	@@ -2135,27 +2719,35 @@
2135	2719	} else
2136	2720	if (source == loopItem \|\| source == loopButton)
2137	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
2138	2724	Composite csg = new GroupLeaf();
2139	2725	csg.count = 5;
2140		- group(csg);
2141	2726	Composite child = new cGroup("Branch");
2142	2727	csg.addChild(child);
2143	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
2144	2731	} else
2145	2732	if (source == doubleItem)
2146	2733	{
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
2147	2736	Composite csg = new GroupLeaf("Fork");
2148	2737	csg.count = 5;
2149		- group(csg);
2150	2738	Composite child = new cGroup("Branch A");
2151	2739	csg.addChild(child);
2152	2740	child.addChild(csg);
2153	2741	child = new cGroup("Branch B");
2154	2742	csg.addChild(child);
2155	2743	child.addChild(csg);
	2744	+ group(csg);
	2745	+ }
2156	2746	} else
2157	2747	if (source == tripleItem)
2158	2748	{
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
2159	2751	Composite csg = new GroupLeaf("Trident");
2160	2752	csg.count = 4;
2161	2753	group(csg);
..	..	@@ -2168,11 +2760,12 @@
2168	2760	child = new cGroup();
2169	2761	csg.addChild(child);
2170	2762	child.addChild(csg);
	2763	+ }
2171	2764	} else
2172	2765	if (source == computeAOItem)
2173	2766	{
2174	2767	Globals.drawMode = CameraPane.OCCLUSION;
2175		- Globals.theRenderer.repaint();
	2768	+ cameraView.repaint();
2176	2769	} else
2177	2770	if (source == recompileItem)
2178	2771	{
..	..	@@ -2187,7 +2780,7 @@
2187	2780	if (source == invariantsItem)
2188	2781	{
2189	2782	System.out.println("Invariants:");
2190		- Grafreed.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
2191	2784	} else
2192	2785	if (source == memoryItem)
2193	2786	{
..	..	@@ -2218,19 +2811,52 @@
2218	2811	{
2219	2812	ToggleFullScreen();
2220	2813	} else
2221		- if (source == undoButton)
	2814	+ if (source == collapseButton)
2222	2815	{
2223		- if (!Undo())
2224		- java.awt.Toolkit.getDefaultToolkit().beep();
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
2225	2818	} else
2226		- if (source == redoButton)
	2819	+ if (source == maximize3DButton)
2227	2820	{
2228		- Redo();
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
2229	2825	} else
2230		- if (source == saveButton)
	2826	+ if (source == previousVersionButton)
2231	2827	{
	2828	+ // Go to previous version
	2829	+ //if (!Undo())
	2830	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ PreviousVersion();
	2832	+ } else
	2833	+ if (source == restoreButton)
	2834	+ {
	2835	+ // Restore current version
	2836	+ Restore();
	2837	+ //restoreButton.setEnabled(false);
	2838	+ } else
	2839	+ if (source == replaceButton)
	2840	+ {
	2841	+ // Overwrite current version
	2842	+ Replace();
	2843	+ //replaceButton.setEnabled(false);
	2844	+ } else
	2845	+ if (source == nextVersionButton)
	2846	+ {
	2847	+ // Go to next version
	2848	+ NextVersion();
	2849	+ } else
	2850	+ if (source == saveVersionButton)
	2851	+ {
	2852	+ // Save a new version
2232	2853	if (!Save(true))
2233	2854	java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
2234	2860	} else
2235	2861	if (source == oneStepButton)
2236	2862	{
..	..	@@ -2285,11 +2911,11 @@
2285	2911	} else
2286	2912	if (source == undoItem)
2287	2913	{
2288		- Undo();
	2914	+ PreviousVersion();
2289	2915	} else
2290	2916	if (source == redoItem)
2291	2917	{
2292		- Redo();
	2918	+ NextVersion();
2293	2919	} else
2294	2920	if (source == duplicateItem)
2295	2921	{
..	..	@@ -2610,7 +3236,7 @@
2610	3236	{
2611	3237	StepAll();
2612	3238	} else
2613		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2614	3240	{
2615	3241	//int indices[] = jList.getSelectedIndices();
2616	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2770,22 +3396,34 @@
2770	3396	} else
2771	3397	if (source == ungroupItem \|\| source == ungroupButton)
2772	3398	{
2773		- boolean hasRoot = false;
	3399	+ boolean canUngroup = true;
2774	3400
2775	3401	for (int i=0; i<group.selection.size(); i++)
2776	3402	{
2777		- if (group.selection.get(i) == group)
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
2778	3406	{
2779		- hasRoot = true;
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
2780	3416	break;
2781	3417	}
2782	3418	}
2783	3419
2784		- if (!hasRoot)
	3420	+ if (canUngroup)
2785	3421	{
2786	3422	for (int i=0; i<group.selection.size(); i++)
2787	3423	{
2788		- Ungroup(group.selection.get(i));
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
2789	3427	}
2790	3428
2791	3429	ClearSelection(false);
..	..	@@ -2836,6 +3474,10 @@
2836	3474	if (source == clearMaterialsItem)
2837	3475	{
2838	3476	ClearMaterials();
	3477	+ } else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
2839	3481	} else
2840	3482	if (source == liveleavesItem)
2841	3483	{
..	..	@@ -2977,6 +3619,18 @@
2977	3619	{
2978	3620	TransformChildren();
2979	3621	} else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
	3633	+ } else
2980	3634	if (source == resetTransformItem)
2981	3635	{
2982	3636	ResetTransform();
..	..	@@ -3092,7 +3746,7 @@
3092	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093	3747	{
3094	3748	obj = (Object3D)e.nextElement();
3095		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
3096	3750	}
3097	3751
3098	3752	refreshContents();
..	..	@@ -3106,6 +3760,31 @@
3106	3760	obj.SetBumpTexture(obj.GetPigmentTexture());
3107	3761	}
3108	3762
	3763	+ refreshContents();
	3764	+ } else
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
3109	3788	refreshContents();
3110	3789	} else
3111	3790	if (source == flashSelectionButton)
..	..	@@ -3123,38 +3802,7 @@
3123	3802	if (CameraPane.FULLSCREEN)
3124	3803	fullscreenLayout = radio.layout;
3125	3804
3126		- // bug
3127		- //gridPanel.setDividerLocation(1.0);
3128		- //bigPanel.setDividerLocation(0.0);
3129		-// bigThree.remove(scenePanel);
3130		-// bigThree.remove(centralPanel);
3131		-// bigThree.remove(XYZPanel);
3132		-// aWindowConstraints.gridx = 0;
3133		-// aWindowConstraints.gridy = 0;
3134		-// aWindowConstraints.gridwidth = 1;
3135		-// // aConstraints.gridheight = 3;
3136		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3137		-// aWindowConstraints.weightx = 0;
3138		-// aWindowConstraints.weighty = 1;
3139		-// //bigThree.add(jtp, aWindowConstraints);
3140		-// aWindowConstraints.weightx = 1;
3141		-// aWindowConstraints.gridwidth = 3;
3142		-// // aConstraints.gridheight = 3;
3143		-// aWindowConstraints.gridx = 1;
3144		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3145		-// bigThree.add(centralPanel, aWindowConstraints);
3146		-// aWindowConstraints.weightx = 0;
3147		-// aWindowConstraints.gridx = 4;
3148		-// aWindowConstraints.gridwidth = 1;
3149		-// // aConstraints.gridheight = 3;
3150		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3151		-// //bigThree.add(XYZPanel, aWindowConstraints);
3152		-// scenePanel.setVisible(false);
3153		-// centralPanel.setVisible(true);
3154		-// XYZPanel.setVisible(false);
3155		- bigThree.ClearUI();
3156		- bigThree.add(centralPanel);
3157		- bigThree.FlushUI();
	3805	+ Show3DView();
3158	3806
3159	3807	cameraView.requestFocusInWindow();
3160	3808
..	..	@@ -3209,8 +3857,8 @@
3209	3857	// centralPanel.setVisible(true);
3210	3858	// XYZPanel.setVisible(true);
3211	3859	bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
3212	3861	bigThree.add(centralPanel);
3213		- bigThree.add(XYZPanel);
3214	3862	bigThree.FlushUI();
3215	3863
3216	3864	cameraView.requestFocusInWindow();
..	..	@@ -3290,8 +3938,8 @@
3290	3938	// centralPanel.setVisible(true);
3291	3939	// XYZPanel.setVisible(false);
3292	3940	bigThree.ClearUI();
3293		- bigThree.add(scenePanel);
3294	3941	bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
3295	3943	bigThree.FlushUI();
3296	3944
3297	3945	cameraView.requestFocusInWindow();
..	..	@@ -3340,6 +3988,7 @@
3340	3988	} else
3341	3989	if (source == rootButton)
3342	3990	{
	3991	+ Replace();
3343	3992	Object3D obj;
3344	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3345	3994	{
..	..	@@ -3354,6 +4003,9 @@
3354	4003	if (source == closeButton)
3355	4004	{
3356	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3357	4009	cRadio ab;
3358	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3359	4011	{
..	..	@@ -3397,10 +4049,10 @@
3397	4049	{
3398	4050	Object3D child = (Object3D)e.nextElement();
3399	4051	if(child.editWindow != null)
3400		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	4052	child.pinned = false;
3402	4053	child.CloseUI();
3403	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3404	4056
3405	4057	//child.editWindow = null; // ???????????
3406	4058	}
..	..	@@ -3419,6 +4071,7 @@
3419	4071	obj.CloseUI();
3420	4072	}
3421	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
3422	4075	refreshContents(true);
3423	4076	} else
3424	4077	if (source == allParamsButton)
..	..	@@ -3451,6 +4104,9 @@
3451	4104	} else
3452	4105	if(source instanceof cRadio)
3453	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3454	4110	group.parent = keepparent;
3455	4111	group.attributes = 0;
3456	4112	//group.editWindow = null;
..	..	@@ -3474,6 +4130,7 @@
3474	4130	}
3475	4131
3476	4132	copy = group;
	4133	+
3477	4134	//Globals.theRenderer.object = group;
3478	4135	if(!useclient)
3479	4136	{
..	..	@@ -3501,9 +4158,37 @@
3501	4158	*/
3502	4159	radio.layout.doClick();
3503	4160
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
3504	4186	ClearUnpinned();
3505		- SetPinStates(group.selection.size() > 0);
3506		- if (group.selection.size() == 1)
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
3507	4192	EditSelection(false);
3508	4193	keepparent = group.parent;
3509	4194	// PARENT = NULL or not???
..	..	@@ -3516,11 +4201,13 @@
3516	4201	} else if (event.getSource() == editCameraItem)
3517	4202	{
3518	4203	cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
3519	4205	cameraView.repaint();
3520	4206	return;
3521	4207	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3522	4208	{
3523	4209	cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
3524	4211	cameraView.repaint();
3525	4212	return;
3526	4213	// } else if (event.getSource() == textureButton)
..	..	@@ -3609,6 +4296,18 @@
3609	4296	refreshContents();
3610	4297	}
3611	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
3612	4311	void ResetTransform()
3613	4312	{
3614	4313	ResetTransform(-1);
..	..	@@ -3624,42 +4323,8 @@
3624	4323	if (obj.toParent == null)
3625	4324	continue;
3626	4325
3627		- if (mask == -1)
3628		- {
3629		- if (obj instanceof Camera) // jan 2014
3630		- {
3631		- LA.matIdentity(obj.toParent);
3632		- LA.matIdentity(obj.fromParent);
3633		- }
3634		- else
3635		- {
3636		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3637		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3638		- }
3639		- TouchTransform(obj);
3640		- continue;
3641		- }
3642		- if ((mask&2) != 0) // Scale
3643		- {
3644		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3645		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3646		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3647		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3648		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3649		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3650		- }
3651		- if ((mask&4) != 0) // Rotation
3652		- {
3653		- // ?
3654		- }
3655		- if ((mask&1) != 0) // Translation
3656		- {
3657		- if (obj.toParent != null)
3658		- {
3659		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3660		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3661		- }
3662		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3663	4328	if (obj.parent == null)
3664	4329	{
3665	4330	System.out.println("NULL PARENT!");
..	..	@@ -4097,7 +4762,7 @@
4097	4762
4098	4763	try
4099	4764	{
4100		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101	4766	}
4102	4767	catch (Exception e)
4103	4768	{
..	..	@@ -4167,6 +4832,12 @@
4167	4832	for (int i=0; i<group.selection.size(); i++)
4168	4833	{
4169	4834	Object3D obj = group.selection.get(i);
	4835	+
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
4170	4841
4171	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4172	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4459,6 +5130,12 @@
4459	5130	refreshContents();
4460	5131	}
4461	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
4462	5139	void FlipV(boolean flip)
4463	5140	{
4464	5141	group.selection.FlipV(flip);
..	..	@@ -4574,6 +5251,12 @@
4574	5251
4575	5252	void EditSelection(boolean newWindow)
4576	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
4577	5260	// aConstraints.gridy = 0;
4578	5261	for (int i=0; i<group.selection.size(); i++)
4579	5262	{
..	..	@@ -4584,12 +5267,7 @@
4584	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
4585	5268	if(elem != group \|\| !newWindow)
4586	5269	{
4587		- // if (!(elem instanceof Composite))
4588		- // newWindow = false;
4589		- listUI.add(elem);
4590		- elem.openEditWindow(this, newWindow); //, false);
4591		- System.out.println("edit : " + elem);
4592		- elem.editWindow.refreshContents(true); // ? new
	5270	+ EditElement(elem, newWindow); // ? new
4593	5271	}
4594	5272	}
4595	5273	}
..	..	@@ -4652,9 +5330,7 @@
4652	5330
4653	5331	freezemodel = false;
4654	5332	}
4655		-
4656		- boolean flashIt = true;
4657		-
	5333	+
4658	5334	public void valueChanged(TreeSelectionEvent e)
4659	5335	//public boolean handleEvent(Event event)
4660	5336	{
..	..	@@ -4727,13 +5403,31 @@
4727	5403	{
4728	5404	editButton.setEnabled(enabled);
4729	5405	uneditButton.setEnabled(enabled);
4730		- unselectButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
4731	5407	flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
4732	5425	}
4733	5426
4734	5427	void refreshContents(boolean cp)
4735	5428	{
4736		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4737	5431	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738	5432	{
4739	5433	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4743,7 +5437,7 @@
4743	5437	Object3D child = (Object3D) group.selection.get(i);
4744	5438
4745	5439	objEditor.AddInfo(child, this, true);
4746		- System.err.println("info : " + child.GetPath());
	5440	+// System.err.println("info : " + child.GetPath());
4747	5441	}
4748	5442
4749	5443	objEditor.SetText(); // jan 2014
..	..	@@ -4833,8 +5527,8 @@
4833	5527
4834	5528	if (cut)
4835	5529	{
4836		- if (Globals.SAVEONMAKE)
4837		- Save();
	5530	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5531	+// Save();
4838	5532	//int indices[] = jList.getSelectedIndices();
4839	5533	//for (int i = indices.length - 1; i >= 0; i--)
4840	5534	//jList.remove(indices[i]);
..	..	@@ -4937,6 +5631,10 @@
4937	5631
4938	5632	void paste(boolean expand)
4939	5633	{
	5634	+ if (Globals.REPLACEONMAKE)
	5635	+ Save();
	5636	+ boolean keep = Globals.REPLACEONMAKE;
	5637	+ Globals.REPLACEONMAKE = false;
4940	5638	// if (GrafreeD.clipboard == null)
4941	5639	// return;
4942	5640	boolean first = true;
..	..	@@ -4996,6 +5694,7 @@
4996	5694	Grafreed.clipboard.get(0).parent = keepparent;
4997	5695	}
4998	5696
	5697	+ Globals.REPLACEONMAKE = keep;
4999	5698	ResetModel();
5000	5699	refreshContents();
5001	5700	}
..	..	@@ -5131,6 +5830,10 @@
5131	5830
5132	5831	void group(Object3D csg, boolean grab)
5133	5832	{
	5833	+ if (Globals.REPLACEONMAKE)
	5834	+ Save();
	5835	+ boolean keep = Globals.REPLACEONMAKE;
	5836	+ Globals.REPLACEONMAKE = false;
5134	5837	if (//false) // why??
5135	5838	!group.selection.isEmpty())
5136	5839	{
..	..	@@ -5244,10 +5947,15 @@
5244	5947	//node.add(csg);
5245	5948	//makeSomething(node);
5246	5949	makeSomething(csg);
	5950	+ Globals.REPLACEONMAKE = keep;
5247	5951	}
5248	5952
5249	5953	void Ungroup(Object3D g)
5250	5954	{
	5955	+ if (Globals.REPLACEONMAKE)
	5956	+ Save();
	5957	+ boolean keep = Globals.REPLACEONMAKE;
	5958	+ Globals.REPLACEONMAKE = false;
5251	5959	if (g instanceof HiddenObject)
5252	5960	{
5253	5961	HiddenObject h = (HiddenObject) g;
..	..	@@ -5264,6 +5972,7 @@
5264	5972	objEditor.makeSomething(g.get(i), false);
5265	5973	}
5266	5974	}
	5975	+ Globals.REPLACEONMAKE = keep;
5267	5976	}
5268	5977
5269	5978	void ungroup()
..	..	@@ -5554,7 +6263,6 @@
5554	6263
5555	6264	cButton restoreCameraButton;
5556	6265
5557		- cButton saveButton;
5558	6266	cButton oneStepButton;
5559	6267
5560	6268	cButton groupButton;
..	..	@@ -5563,6 +6271,22 @@
5563	6271	cButton switchButton;
5564	6272	cButton loopButton;
5565	6273	cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
5566	6290
5567	6291	cButton gridButton;
5568	6292	cButton boxButton;
..	..	@@ -5596,11 +6320,11 @@
5596	6320	private MenuItem lookAtItem;
5597	6321	private MenuItem lookFromItem;
5598	6322	private MenuItem switchViewItem;
5599		- private MenuItem cutItem;
	6323	+ private JMenuItem cutItem;
5600	6324	private MenuItem undoItem;
5601	6325	private MenuItem redoItem;
5602	6326	private JMenuItem duplicateItem;
5603		- private MenuItem cloneItem;
	6327	+ private JMenuItem cloneItem;
5604	6328	private MenuItem cloneSupportItem;
5605	6329	private MenuItem overwriteGeoItem;
5606	6330	private MenuItem overwriteMatItem;
..	..	@@ -5621,13 +6345,13 @@
5621	6345	private MenuItem cloneGeometriesItem;
5622	6346	private MenuItem shareGeometriesItem;
5623	6347	private MenuItem mergeGeometriesItem;
5624		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
5625	6349	private MenuItem pasteItem;
5626		- private MenuItem pasteIntoItem;
5627		- private MenuItem pasteLinkItem;
5628		- private MenuItem pasteCloneItem;
5629		- private MenuItem pasteExpandItem;
5630		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
5631	6355	private MenuItem clearAllItem;
5632	6356	private MenuItem genUVItem;
5633	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -5653,6 +6377,7 @@
5653	6377	private MenuItem clipMeshItem;
5654	6378	private MenuItem smoothMeshItem;
5655	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
5656	6381
5657	6382	private MenuItem liveleavesItem;
5658	6383	private MenuItem unliveleavesItem;
..	..	@@ -5676,13 +6401,16 @@
5676	6401	private MenuItem maxTexturesItem;
5677	6402	private MenuItem panoTexturesItem;
5678	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5679	6407	private MenuItem resetCentroidItem;
5680	6408	private MenuItem resetCentroidXZItem;
5681	6409	private MenuItem resetTransformItem;
5682	6410	private MenuItem transformGeometryItem;
5683	6411	private MenuItem transformChildrenItem;
5684	6412	private MenuItem hideItem;
5685		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5686	6414	private MenuItem backItem;
5687	6415	private MenuItem frontItem;
5688	6416	private MenuItem cameraItem;
..	..	@@ -5695,7 +6423,7 @@
5695	6423	private MenuItem switchTransfoItem;
5696	6424	private MenuItem morphItem;
5697	6425	private MenuItem linkerItem;
5698		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5699	6427	private MenuItem editItem;
5700	6428	private MenuItem openWindowItem;
5701	6429	private MenuItem editLeafItem;
..	..	@@ -5711,6 +6439,8 @@
5711	6439	private MenuItem attachBumpItem;
5712	6440	private MenuItem detachBumpItem;
5713	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
5714	6444
5715	6445	private MenuItem particleItem;
5716	6446	private MenuItem ragdollItem;