~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	{
..	..	@@ -220,7 +600,7 @@
220	600	// toggleSwitchItem.addItemListener(this);
221	601	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	602
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	604	toggleHandleItem.addItemListener(this);
225	605	toggleHandleItem.setState(CameraPane.HANDLES);
226	606
..	..	@@ -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	//
..	..	@@ -380,13 +765,14 @@
380	765	shadowYItem.addActionListener(this);
381	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
383	771	if (Globals.ADVANCED)
384	772	{
385	773	menu.add("-");
386	774	linkerItem = menu.add(new MenuItem("Linker"));
387	775	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	776	templateItem = menu.add(new MenuItem("Template"));
391	777	templateItem.addActionListener(this);
392	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +801,7 @@
415	801	genNormalsMESHItem.addActionListener(this);
416	802	if (Globals.ADVANCED)
417	803	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	805	genNormalsMINEItem.addActionListener(this);
420	806	}
421	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -449,6 +835,8 @@
449	835	}
450	836
451	837	oe.menuBar.add(menu = new Menu("Attributes"));
	838	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	839	+ clearVersionsItem.addActionListener(this);
452	840	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
453	841	clearMaterialsItem.addActionListener(this);
454	842	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -471,9 +859,9 @@
471	859	hideleavesItem.addActionListener(this);
472	860	showleavesItem = menu.add(new MenuItem("Show Leaves"));
473	861	showleavesItem.addActionListener(this);
474		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	862	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
475	863	markleavesItem.addActionListener(this);
476		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	864	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
477	865	unmarkleavesItem.addActionListener(this);
478	866	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
479	867	rewindleavesItem.addActionListener(this);
..	..	@@ -508,10 +896,15 @@
508	896	attachBumpItem.addActionListener(this);
509	897	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	898	pigmentBumpItem.addActionListener(this);
	899	+ //embedTexturesItem
511	900	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	901	detachPigmentItem.addActionListener(this);
513	902	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	903	detachBumpItem.addActionListener(this);
	904	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	905	+ embedTexturesItem.addActionListener(this);
	906	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	907	+ deEmbedTexturesItem.addActionListener(this);
515	908	menu.add("-");
516	909	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	910	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +915,9 @@
522	915	shareGeometriesItem.addActionListener(this);
523	916	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	917	mergeGeometriesItem.addActionListener(this);
	918	+ menu.add("-");
	919	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	920	+ editLeafItem.addActionListener(this);
525	921	if (Globals.ADVANCED)
526	922	{
527	923	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +934,80 @@
538	934	buildToolsMenu(menu);
539	935	}
540	936
	937	+ JTabbedPane resourcecontainer;
	938	+ cGridBag currenttab;
	939	+ //boolean added; // patch for jar
	940	+
	941	+ int totalcount = 0;
	942	+
	943	+ int tabcount = 0;
	944	+ int colcount = 0;
	945	+ int rowcount = 0;
	946	+ int texturecount = 0;
	947	+
	948	+ int columns = 5;
	949	+ int rows = 7;
	950	+
	951	+ public void ResourceCallBack(String[] path)
	952	+ {
	953	+// for (int i = 0; i < path.length; i++)
	954	+// System.out.print(path[i] + "/");
	955	+// System.out.println();
	956	+
	957	+ if (//rowcount == 0 \|\|
	958	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	959	+ {
	960	+ currenttab = new cGridBag();
	961	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	962	+ currenttab.setName(tabname);
	963	+ //added = false;
	964	+ resourcecontainer.add(currenttab);
	965	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	966	+ rowcount = 1;
	967	+ colcount = 0;
	968	+ texturecount = 0;
	969	+ }
	970	+
	971	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	972	+ {
	973	+ //if (!added)
	974	+ {
	975	+ //added = true;
	976	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	977	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	978	+ }
	979	+
	980	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	981	+ totalcount++;
	982	+
	983	+ if (++colcount >= columns)
	984	+ {
	985	+ colcount = 0;
	986	+ currenttab.Return();
	987	+
	988	+ if (rowcount++ >= rows)
	989	+ {
	990	+ rowcount = 0;
	991	+ }
	992	+ }
	993	+ }
	994	+ else
	995	+ {
	996	+// if (!path[path.length-1].equals("icons"))
	997	+// resourcecontainer.Return();
	998	+ }
	999	+ }
	1000	+
	1001	+ void CreateTexturePanel(cGridBag container)
	1002	+ {
	1003	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1004	+ container.add(resourcecontainer);
	1005	+
	1006	+ Grafreed.ParseResources("textures", this);
	1007	+
	1008	+ // 935. System.out.println("Total = " + totalcount);
	1009	+ }
	1010	+
541	1011	void SetupUI2(ObjEditor oe)
542	1012	{
543	1013	// June 2019
..	..	@@ -555,11 +1025,6 @@
555	1025	//new Exception().printStackTrace();
556	1026
557	1027	oe.radioPanel = new JPanel(new GridBagLayout());
558		- oe.aConstraints.weightx = 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
561		- oe.aConstraints.gridwidth = 100;
562		- oe.aConstraints.gridheight = 1;
563	1028	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1029
565	1030	oe.buttonGroup = new ButtonGroup();
..	..	@@ -580,9 +1045,9 @@
580	1045	oe.radioPanel.add(dummyButton);
581	1046	oe.buttonGroup.add(dummyButton);
582	1047	*/
583		- cGridBag copyOptionsPanel = new cGridBag();
	1048	+ cGridBag versionManagerPanel = new cGridBag();
584	1049
585		- copyOptionsPanel.preferredHeight = 2;
	1050	+ versionManagerPanel.preferredHeight = 4;
586	1051
587	1052	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	1053
..	..	@@ -590,50 +1055,110 @@
590	1055	//minButton.setToolTipText("Minimize window");
591	1056	//minButton.addActionListener(this);
592	1057
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1058	+ if (Globals.ADVANCED)
	1059	+ {
	1060	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// maxButton.setToolTipText("Maximize window");
	1062	+// maxButton.addActionListener(this);
	1063	+ }
596	1064
597		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ cButton gcButton;
	1066	+
	1067	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// gcButton.setToolTipText("Garbage collect");
	1069	+// gcButton.addActionListener(new ActionListener()
	1070	+// {
	1071	+// public void actionPerformed(ActionEvent e)
	1072	+// {
	1073	+// System.gc();
	1074	+// }
	1075	+// });
	1076	+
	1077	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ collapseButton.setToolTipText("Collapse toolbar");
	1079	+ collapseButton.addActionListener(this);
	1080	+
	1081	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1083	+ maximize3DButton.addActionListener(this);
	1084	+
	1085	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ twoButton.setToolTipText("Show 3D view only");
	1087	+ twoButton.addActionListener(this);
	1088	+ this.fullscreenLayout = twoButton;
	1089	+
	1090	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ threeButton.setToolTipText("Show controls and 3D view");
	1092	+ threeButton.addActionListener(this);
	1093	+ if (Globals.ADVANCED)
	1094	+ {
	1095	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ sixButton.setToolTipText("Show 3D view and controls");
	1097	+ sixButton.addActionListener(this);
	1098	+ }
	1099	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+// sevenButton.setToolTipText("3-column layout");
	1101	+// sevenButton.addActionListener(this);
	1102	+ //
	1103	+
	1104	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
598	1105	fullButton.setToolTipText("Full-screen window");
599	1106	fullButton.addActionListener(this);
600	1107
601		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ screenfitButton.setToolTipText("Screen fit");
	1110	+ screenfitButton.addActionListener(this);
	1111	+
	1112	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
602	1113	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1114	restoreCameraButton.addActionListener(this);
604	1115
605		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
607		- undoButton.addActionListener(this);
608		- undoButton.setEnabled(false);
	1116	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ saveVersionButton.setToolTipText("Duplicate current version");
	1118	+ saveVersionButton.addActionListener(this);
	1119	+
	1120	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ deleteVersionButton.setToolTipText("Delete current version");
	1122	+ deleteVersionButton.addActionListener(this);
	1123	+ deleteVersionButton.setEnabled(false);
	1124	+
	1125	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ previousVersionButton.setToolTipText("Previous version");
	1127	+ previousVersionButton.addActionListener(this);
	1128	+ previousVersionButton.setEnabled(false);
609	1129
610		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
612		- redoButton.addActionListener(this);
613		- redoButton.setEnabled(false);
	1130	+ cGridBag updown = new cGridBag().setVertical(true);
	1131	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ restoreButton.setToolTipText("Undo (restore current version)");
	1133	+ restoreButton.addActionListener(this);
	1134	+ restoreButton.setEnabled(false);
614	1135
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
	1136	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ replaceButton.setToolTipText("Save (replace current version)");
	1138	+ replaceButton.addActionListener(this);
	1139	+ replaceButton.setEnabled(false);
618	1140
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620		- liveCB.setToolTipText("Enable animation");
621		- liveCB.addItemListener(this);
622		-
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ versionManagerPanel.add(updown);
	1142	+
	1143	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ nextVersionButton.setToolTipText("Next version");
	1145	+ nextVersionButton.addActionListener(this);
	1146	+ nextVersionButton.setEnabled(false);
	1147	+
	1148	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
624	1149	oneStepButton.setToolTipText("Animate one step forward");
625	1150	oneStepButton.addActionListener(this);
626	1151
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1152	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1153	+ liveCB.setToolTipText("Enable animation");
	1154	+ liveCB.addItemListener(this);
	1155	+
	1156	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	1157	fastCB.setToolTipText("Fast mode");
629	1158	fastCB.addItemListener(this);
630	1159
631	1160	//oe.toolboxPanel.Return();
632	1161
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1162	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1163	// trackCB.setToolTipText("Enable tracking");
639	1164	// trackCB.addItemListener(this);
..	..	@@ -643,142 +1168,137 @@
643	1168
644	1169	if (Globals.ADVANCED)
645	1170	{
646		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
647	1172	snapobjectButton.addActionListener(this);
648	1173	snapobjectButton.setToolTipText("Snap Object");
	1174	+
	1175	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ fourButton.addActionListener(this);
	1177	+ fourButton.setToolTipText("Show control panel only");
649	1178	}
650	1179
651	1180	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1181
653		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- twoButton.setToolTipText("Show center view only");
655		- twoButton.addActionListener(this);
656		- this.fullscreenLayout = twoButton;
657		-
658		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659		- fourButton.addActionListener(this);
660		- fourButton.setToolTipText("Show left panel only");
661		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- sixButton.setToolTipText("2-column layout left");
663		- sixButton.addActionListener(this);
664		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- threeButton.setToolTipText("2-column layout right");
666		- threeButton.addActionListener(this);
667		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- sevenButton.setToolTipText("3-column layout");
669		- sevenButton.addActionListener(this);
670		- //
671	1182
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	1183	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ rootButton.setToolTipText("Open selection in new tab");
674	1185	rootButton.addActionListener(this);
675	1186
676		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
677	1188	closeButton.setToolTipText("Close tab");
678	1189	closeButton.addActionListener(this);
679	1190	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1191	//clearButton.addActionListener(this);
681	1192
	1193	+ cGridBag row1 = new cGridBag();
	1194	+
682	1195	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1196	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ gridButton.setToolTipText("Create ground");
685	1198	gridButton.addActionListener(this);
686	1199
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1200	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
688	1201	boxButton.setToolTipText("Create box");
689	1202	boxButton.addActionListener(this);
690	1203
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692		- sphereButton.setToolTipText("Create sphere");
693		- sphereButton.addActionListener(this);
694		-
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- coneButton.setToolTipText("Create cone");
697		- coneButton.addActionListener(this);
698		-
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- torusButton.setToolTipText("Create torus");
701		- torusButton.addActionListener(this);
702		-
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
704	1205	superButton.setToolTipText("Create superellipsoid");
705	1206	superButton.addActionListener(this);
706	1207
	1208	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ sphereButton.setToolTipText("Create sphere");
	1210	+ sphereButton.addActionListener(this);
	1211	+
	1212	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ coneButton.setToolTipText("Create cone");
	1214	+ coneButton.addActionListener(this);
	1215	+
	1216	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1217	+ torusButton.setToolTipText("Create torus");
	1218	+ torusButton.addActionListener(this);
	1219	+
707	1220	if (Globals.ADVANCED)
708	1221	{
709		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
710	1223	kleinButton.setToolTipText("Create Klein bottle");
711	1224	kleinButton.addActionListener(this);
712	1225	}
713	1226
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
715	1228	particlesButton.setToolTipText("Create particle system");
716	1229	particlesButton.addActionListener(this);
717	1230
718		- oe.toolboxPanel.Return();
	1231	+ oe.toolboxPanel.add(row1);
719	1232
720		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ cGridBag row2 = new cGridBag();
	1234	+
	1235	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
721	1236	groupButton.setToolTipText("Create group");
722	1237	groupButton.addActionListener(this);
723	1238
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1239	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
725	1240	compositeButton.setToolTipText("Create composite");
726	1241	compositeButton.addActionListener(this);
727	1242
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1243	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ switchButton.setToolTipText("Create item switcher");
730	1245	switchButton.addActionListener(this);
731	1246
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1248	loopButton.setToolTipText("Create loop");
734	1249	loopButton.addActionListener(this);
735	1250
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
737	1252	textureButton.setToolTipText("Create texture");
738	1253	textureButton.addActionListener(this);
739	1254
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
741	1256	overlayButton.setToolTipText("Create overlay");
742	1257	overlayButton.addActionListener(this);
743	1258
744		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
745	1260	lightButton.setToolTipText("Create light");
746	1261	lightButton.addActionListener(this);
747	1262
748		- for (int i=6; --i>=0;)
749		- {
750		- oe.toolboxPanel.Return();
751		- oe.toolboxPanel.add(new cGridBag());
752		- oe.toolboxPanel.add(new cGridBag());
753		- oe.toolboxPanel.add(new cGridBag());
754		- oe.toolboxPanel.add(new cGridBag());
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- }
	1263	+ oe.toolboxPanel.add(row2);
	1264	+
	1265	+ cGridBag textures = new cGridBag();
	1266	+
	1267	+ CreateTexturePanel(textures);
	1268	+
	1269	+ int tabCount = resourcecontainer.getTabCount();
	1270	+
	1271	+ if (tabCount > 0)
	1272	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1273	+
	1274	+ oe.toolboxPanel.add(textures);
	1275	+
	1276	+ textures.preferredHeight = 100;
	1277	+
	1278	+ CreateSkyboxPanel(oe.skyboxPanel);
759	1279
760	1280	// EDIT panel
761		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1281	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
762	1282	editButton.setToolTipText("Pin selection controls");
763	1283	editButton.addActionListener(this);
764	1284
765		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Remove selection controls");
	1285	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1287	uneditButton.addActionListener(this);
768	1288
769	1289	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Show all controle");
	1290	+ allParamsButton.setToolTipText("Show all controls");
771	1291	allParamsButton.addActionListener(this);
772	1292
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1293	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1294	+ clearPanelButton.setToolTipText("Clear all controls");
775	1295	clearPanelButton.addActionListener(this);
776	1296
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1297	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1298	+ //unselectButton.setToolTipText("Unselect");
	1299	+ //unselectButton.addActionListener(this);
780	1300
781		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
782	1302	flashSelectionButton.setToolTipText("Highlight selection");
783	1303	flashSelectionButton.addActionListener(this);
784	1304
..	..	@@ -801,6 +1321,8 @@
801	1321
802	1322	cGridBag jSPPanel = new cGridBag();
803	1323
	1324	+ jSPPanel.preferredHeight = 20;
	1325	+
804	1326	JScrollPane jSP;
805	1327	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
806	1328	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -809,11 +1331,14 @@
809	1331	oe.treePanel.add(jSPPanel);
810	1332	oe.treePanel.Return();
811	1333
812		- oe.treePanel.add(copyOptionsPanel);
	1334	+ oe.treePanel.add(versionManagerPanel);
813	1335	oe.treePanel.Return();
	1336	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1337	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1338	+ versionSliderPane.preferredHeight = 3;
814	1339
815		-// mainPanel.setDividerLocation(0.5); //1.0);
816		-// mainPanel.setResizeWeight(0.5);
	1340	+// mainPanel.setDividerLocation(0.1); //1.0);
	1341	+ mainPanel.setResizeWeight(0.4);
817	1342
818	1343	//jList.addListSelectionListener(this);
819	1344	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -821,7 +1346,7 @@
821	1346	//jTree.setEditable(true);
822	1347	oe.jTree.setDragEnabled(true);
823	1348	//jTree.setPreferredSize(new Dimension(10,10));
824		- jSP.setPreferredSize(new Dimension(100,200));
	1349	+ //jSP.setPreferredSize(new Dimension(100,200));
825	1350
826	1351	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
827	1352
..	..	@@ -833,7 +1358,7 @@
833	1358	dgr.addDragGestureListener(this);
834	1359	}catch(Exception e) {}
835	1360	*/
836		- radio.layout = sevenButton;
	1361	+ radio.layout = threeButton; // sixButton;
837	1362	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838	1363	}
839	1364
..	..	@@ -863,9 +1388,13 @@
863	1388
864	1389	if (true) // Globals.ADVANCED)
865	1390	{
866		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867		- supportCB.setToolTipText("Enable rigging");
868		- supportCB.addItemListener(this);
	1391	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1392	+// supportCB.setToolTipText("Enable rigging");
	1393	+// supportCB.addItemListener(this);
	1394	+
	1395	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1396	+ freezeCB.setToolTipText("Fast moving camera");
	1397	+ freezeCB.addItemListener(this);
869	1398
870	1399	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871	1400	// localCB.addItemListener(this);
..	..	@@ -880,9 +1409,12 @@
880	1409	smoothCB.setToolTipText("Snapping delay");
881	1410	smoothCB.addItemListener(this);
882	1411
883		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
884		- slowCB.setToolTipText("Smooth interpolation");
885		- slowCB.addItemListener(this);
	1412	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1413	+// slowCB.setToolTipText("Smooth interpolation");
	1414	+// slowCB.addItemListener(this);
	1415	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1416	+ minshaderCB.setToolTipText("Minimal fast shader");
	1417	+ minshaderCB.addItemListener(this);
886	1418
887	1419	// constraints.gridy += 1;
888	1420	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -929,12 +1461,12 @@
929	1461	toggleTextureCB.addItemListener(this);
930	1462
931	1463	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932		- toggleSwitchCB.setToolTipText("Use switch");
	1464	+ toggleSwitchCB.setToolTipText("Choose a single item");
933	1465	toggleSwitchCB.addItemListener(this);
934	1466
935		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
936		- autosaveCB.setToolTipText("On structure change");
937		- autosaveCB.addItemListener(this);
	1467	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1468	+ autokeepCB.setToolTipText("On structure change");
	1469	+ autokeepCB.addItemListener(this);
938	1470
939	1471	panel.Return();
940	1472	if (Globals.ADVANCED)
..	..	@@ -961,9 +1493,17 @@
961	1493
962	1494	void EditObject(Object3D obj)
963	1495	{
	1496	+ assert(obj instanceof Composite);
	1497	+
	1498	+// if (obj.versionlist == null)
	1499	+// {
	1500	+// obj.versionlist = new Object3D[100];
	1501	+// obj.versionindex = -1;
	1502	+// }
	1503	+
964	1504	cRadio radioButton = new cRadio(obj.name);
965	1505
966		- // Patch to avoid bug with transparency.
	1506	+ // June 2019. Patch to avoid bug with transparency.
967	1507	radioButton.hadMaterial = obj.material != null;
968	1508	if (!radioButton.hadMaterial)
969	1509	{
..	..	@@ -971,7 +1511,7 @@
971	1511	}
972	1512
973	1513	radioButton.SetObject(obj);
974		- radioButton.layout = sevenButton;
	1514	+ radioButton.layout = threeButton; // sixButton;
975	1515	radioButton.SetCamera(cameraView.renderCamera, false);
976	1516	radioButton.addActionListener(this);
977	1517	radioPanel.add(radioButton);
..	..	@@ -985,6 +1525,7 @@
985	1525
986	1526	oe.SetupViews();
987	1527
	1528	+ if (Globals.DEBUG)
988	1529	System.out.println("SetupViews");
989	1530	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
990	1531	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -996,10 +1537,13 @@
996	1537	cCheckBox localCB;
997	1538	cCheckBox crowdCB;
998	1539	cCheckBox smoothCB;
	1540	+ cCheckBox minshaderCB;
	1541	+
999	1542	cToggleButton fastCB;
1000	1543	cCheckBox slowCB;
1001	1544	cCheckBox boxCB;
1002	1545	cCheckBox zoomBoxCB;
	1546	+ cCheckBox freezeCB;
1003	1547	//cToggleButton trackCB;
1004	1548	cCheckBox trackCB;
1005	1549	cCheckBox smoothfocusCB;
..	..	@@ -1010,7 +1554,7 @@
1010	1554
1011	1555	cCheckBox oeilCB;
1012	1556	cCheckBox shadowCB;
1013		- cCheckBox autosaveCB;
	1557	+ cCheckBox autokeepCB;
1014	1558	cCheckBox lookAtCB;
1015	1559
1016	1560	// static int COLOR = 1;
..	..	@@ -1066,6 +1610,12 @@
1066	1610	cameraView.ToggleInertia();
1067	1611	cameraView.repaint();
1068	1612	}
	1613	+ else if(e.getSource() == minshaderCB)
	1614	+ {
	1615	+ Globals.MINSHADER ^= true;
	1616	+ cameraView.programInitialized = false;
	1617	+ cameraView.repaint();
	1618	+ }
1069	1619	else if(e.getSource() == localCB)
1070	1620	{
1071	1621	cameraView.ToggleLocal();
..	..	@@ -1118,9 +1668,13 @@
1118	1668	{
1119	1669	Globals.COMPUTESHADOWWHENLIVE ^= true;
1120	1670	}
1121		- else if(e.getSource() == autosaveCB)
	1671	+ else if(e.getSource() == freezeCB)
1122	1672	{
1123		- Globals.SAVEONMAKE ^= true;
	1673	+ Globals.FREEZEONMOVE ^= true;
	1674	+ }
	1675	+ else if(e.getSource() == autokeepCB)
	1676	+ {
	1677	+ Globals.REPLACEONMAKE ^= true;
1124	1678	}
1125	1679	else if(e.getSource() == lookAtCB)
1126	1680	{
..	..	@@ -1202,8 +1756,6 @@
1202	1756	}
1203	1757	}
1204	1758
1205		- String string = (String) object;
1206		-
1207	1759	System.out.println("Transfer = " + object + "; drop : " + target);
1208	1760	// if( object instanceof java.io.File[])
1209	1761	// {
..	..	@@ -1211,6 +1763,8 @@
1211	1763	// objEditor.DropFile((java.io.File[]) object, true);
1212	1764	// return;
1213	1765	// }
	1766	+
	1767	+ String string = object.toString();
1214	1768
1215	1769	// File path for Mac and Windows
1216	1770	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1338,7 +1892,12 @@
1338	1892	TreePath path;
1339	1893
1340	1894	public TransferableTreePath(TreePath tp) {
1341		- path = tp;
	1895	+ Object[] objs = new Object[tp.getPathCount()];
	1896	+ for (int i=0; i<objs.length; i++)
	1897	+ {
	1898	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1899	+ }
	1900	+ path = new TreePath(objs);
1342	1901	}
1343	1902
1344	1903	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1460,6 +2019,9 @@
1460	2019	animationItem.addItemListener(this);
1461	2020	animationItem.setState(Globals.ANIMATION);
1462	2021
	2022	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2023	+ archiveItem.addActionListener(this);
	2024	+
1463	2025	menu.add("-");
1464	2026	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1465	2027	parseverticesItem.addActionListener(this);
..	..	@@ -1472,6 +2034,8 @@
1472	2034	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1473	2035	reduce34MorphItem.addActionListener(this);
1474	2036	menu.add("-");
	2037	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2038	+ memoryItem.addActionListener(this);
1475	2039	menu.add(computeAOItem = new MenuItem("Compute AO"));
1476	2040	computeAOItem.addActionListener(this);
1477	2041
..	..	@@ -1480,8 +2044,6 @@
1480	2044	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1481	2045	mirrorItem.addActionListener(this);
1482	2046	menu.add("-");
1483		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1484		- memoryItem.addActionListener(this);
1485	2047	menu.add(analyzeItem = new MenuItem("Analyze"));
1486	2048	analyzeItem.addActionListener(this);
1487	2049	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1567,24 +2129,24 @@
1567	2129	switch(axis)
1568	2130	{
1569	2131	case 0 :
1570		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1571		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1572		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1573		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2132	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2133	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2134	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2135	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1574	2136	norm = cVector.X;
1575	2137	break;
1576	2138	case 1 :
1577		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1578		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1579		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1580		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2140	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2141	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2142	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1581	2143	norm = cVector.Y;
1582	2144	break;
1583	2145	case 2 :
1584		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1585		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1586		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1587		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2148	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2149	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1588	2150	norm = cVector.Z;
1589	2151	break;
1590	2152	}
..	..	@@ -1625,7 +2187,11 @@
1625	2187	shadow.material = new cMaterial(obj.material);
1626	2188	shadow.material.diffuse = 0.0001f;
1627	2189	shadow.material.specular = 0.0001f;
1628		- //shadow.projectedVertices[1].x = 300;
	2190	+ shadow.material.opacity = 0.75f;
	2191	+
	2192	+ AllocProjectedVertices(shadow);
	2193	+
	2194	+ shadow.projectedVertices[1].x = 300;
1629	2195
1630	2196	makeSomething(shadow);
1631	2197	}
..	..	@@ -1642,6 +2208,16 @@
1642	2208	listUI.remove(i);
1643	2209	}
1644	2210	}
	2211	+ }
	2212	+
	2213	+ private void EditElement(Object3D elem, boolean newWindow)
	2214	+ {
	2215	+ // if (!(elem instanceof Composite))
	2216	+ // newWindow = false;
	2217	+ listUI.add(elem);
	2218	+ elem.openEditWindow(this, newWindow); //, false);
	2219	+ System.out.println("edit : " + elem);
	2220	+ elem.editWindow.refreshContents(true); // ? new
1645	2221	}
1646	2222
1647	2223	/**
..	..	@@ -2071,6 +2647,23 @@
2071	2647	{
2072	2648	makeSomething(new Light());
2073	2649	} else
	2650	+// if (source == skybox1Button \|\|
	2651	+// source == skybox2Button \|\|
	2652	+// source == skybox3Button \|\|
	2653	+// source == skybox4Button \|\|
	2654	+// source == skybox5Button \|\|
	2655	+// source == skybox6Button \|\|
	2656	+// source == skybox7Button \|\|
	2657	+// source == skybox11Button \|\|
	2658	+// source == skybox12Button \|\|
	2659	+// source == skybox13Button \|\|
	2660	+// source == skybox14Button \|\|
	2661	+// source == skybox15Button \|\|
	2662	+// source == skybox16Button \|\|
	2663	+// source == skybox17Button)
	2664	+// {
	2665	+// ChangeSkybox(source);
	2666	+// } else
2074	2667	if (source == csgItem)
2075	2668	{
2076	2669	group(new CSG());
..	..	@@ -2119,28 +2712,36 @@
2119	2712	} else
2120	2713	if (source == loopItem \|\| source == loopButton)
2121	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2122	2717	Composite csg = new GroupLeaf();
2123	2718	csg.count = 5;
2124		- group(csg);
2125		- Composite child = new cGroup();
	2719	+ Composite child = new cGroup("Branch");
2126	2720	csg.addChild(child);
2127	2721	child.addChild(csg);
	2722	+ group(csg);
	2723	+ }
2128	2724	} else
2129	2725	if (source == doubleItem)
2130	2726	{
2131		- Composite csg = new GroupLeaf();
	2727	+ if (!group.selection.isEmpty())
	2728	+ {
	2729	+ Composite csg = new GroupLeaf("Fork");
2132	2730	csg.count = 5;
	2731	+ Composite child = new cGroup("Branch A");
	2732	+ csg.addChild(child);
	2733	+ child.addChild(csg);
	2734	+ child = new cGroup("Branch B");
	2735	+ csg.addChild(child);
	2736	+ child.addChild(csg);
2133	2737	group(csg);
2134		- Composite child = new cGroup();
2135		- csg.addChild(child);
2136		- child.addChild(csg);
2137		- child = new cGroup();
2138		- csg.addChild(child);
2139		- child.addChild(csg);
	2738	+ }
2140	2739	} else
2141	2740	if (source == tripleItem)
2142	2741	{
2143		- Composite csg = new GroupLeaf();
	2742	+ if (!group.selection.isEmpty())
	2743	+ {
	2744	+ Composite csg = new GroupLeaf("Trident");
2144	2745	csg.count = 4;
2145	2746	group(csg);
2146	2747	Composite child = new cGroup();
..	..	@@ -2152,11 +2753,12 @@
2152	2753	child = new cGroup();
2153	2754	csg.addChild(child);
2154	2755	child.addChild(csg);
	2756	+ }
2155	2757	} else
2156	2758	if (source == computeAOItem)
2157	2759	{
2158	2760	Globals.drawMode = CameraPane.OCCLUSION;
2159		- Globals.theRenderer.repaint();
	2761	+ cameraView.repaint();
2160	2762	} else
2161	2763	if (source == recompileItem)
2162	2764	{
..	..	@@ -2171,7 +2773,7 @@
2171	2773	if (source == invariantsItem)
2172	2774	{
2173	2775	System.out.println("Invariants:");
2174		- Grafreed.grafreeD.universe.invariants();
	2776	+ Grafreed.grafreed.universe.invariants();
2175	2777	} else
2176	2778	if (source == memoryItem)
2177	2779	{
..	..	@@ -2202,17 +2804,52 @@
2202	2804	{
2203	2805	ToggleFullScreen();
2204	2806	} else
2205		- if (source == undoButton)
	2807	+ if (source == collapseButton)
2206	2808	{
2207		- Undo();
	2809	+ this.expandedLayout = radio.layout;
	2810	+ CollapseToolbar();
2208	2811	} else
2209		- if (source == redoButton)
	2812	+ if (source == maximize3DButton)
2210	2813	{
2211		- Redo();
	2814	+ this.expandedLayout = radio.layout;
	2815	+ radio.layout = twoButton;
	2816	+ Show3DView();
	2817	+ CollapseToolbar();
2212	2818	} else
2213		- if (source == saveButton)
	2819	+ if (source == previousVersionButton)
2214	2820	{
2215		- Save();
	2821	+ // Go to previous version
	2822	+ //if (!Undo())
	2823	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2824	+ PreviousVersion();
	2825	+ } else
	2826	+ if (source == restoreButton)
	2827	+ {
	2828	+ // Restore current version
	2829	+ Restore();
	2830	+ //restoreButton.setEnabled(false);
	2831	+ } else
	2832	+ if (source == replaceButton)
	2833	+ {
	2834	+ // Overwrite current version
	2835	+ Replace();
	2836	+ //replaceButton.setEnabled(false);
	2837	+ } else
	2838	+ if (source == nextVersionButton)
	2839	+ {
	2840	+ // Go to next version
	2841	+ NextVersion();
	2842	+ } else
	2843	+ if (source == saveVersionButton)
	2844	+ {
	2845	+ // Save a new version
	2846	+ if (!Save(true))
	2847	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2848	+ } else
	2849	+ if (source == deleteVersionButton)
	2850	+ {
	2851	+ // Delete a new version
	2852	+ DeleteVersion();
2216	2853	} else
2217	2854	if (source == oneStepButton)
2218	2855	{
..	..	@@ -2221,17 +2858,14 @@
2221	2858	} else
2222	2859	if (source == screenfitButton)
2223	2860	{
2224		- //Reload(lastConverter, lastFilename, true);
2225	2861	ScreenFit();
2226	2862	} else
2227	2863	if (source == screenfitpointButton)
2228	2864	{
2229		- //Reload(lastConverter, lastFilename, true);
2230	2865	ScreenFitPoint();
2231	2866	} else
2232	2867	if (source == snapobjectButton)
2233	2868	{
2234		- //Reload(lastConverter, lastFilename, true);
2235	2869	SnapObject();
2236	2870	} else
2237	2871	// if (event.getSource() == recompileButton)
..	..	@@ -2270,11 +2904,11 @@
2270	2904	} else
2271	2905	if (source == undoItem)
2272	2906	{
2273		- Undo();
	2907	+ PreviousVersion();
2274	2908	} else
2275	2909	if (source == redoItem)
2276	2910	{
2277		- Redo();
	2911	+ NextVersion();
2278	2912	} else
2279	2913	if (source == duplicateItem)
2280	2914	{
..	..	@@ -2595,7 +3229,7 @@
2595	3229	{
2596	3230	StepAll();
2597	3231	} else
2598		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3232	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2599	3233	{
2600	3234	//int indices[] = jList.getSelectedIndices();
2601	3235	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2755,15 +3389,40 @@
2755	3389	} else
2756	3390	if (source == ungroupItem \|\| source == ungroupButton)
2757	3391	{
2758		- //ungroup();
	3392	+ boolean canUngroup = true;
	3393	+
2759	3394	for (int i=0; i<group.selection.size(); i++)
2760	3395	{
2761		- Ungroup(group.selection.get(i));
	3396	+ Object3D selectedItem = group.selection.get(i);
	3397	+
	3398	+ if (selectedItem.Size() == 0)
	3399	+ {
	3400	+ // Cannot ungroup leaves
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
	3404	+
	3405	+ if (selectedItem == group)
	3406	+ {
	3407	+ // Cannot ungroup root
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
2762	3411	}
2763	3412
2764		- ClearSelection(false);
2765		-
2766		- refreshContents();
	3413	+ if (canUngroup)
	3414	+ {
	3415	+ for (int i=0; i<group.selection.size(); i++)
	3416	+ {
	3417	+ Object3D selectedItem = group.selection.get(i);
	3418	+
	3419	+ Ungroup(selectedItem);
	3420	+ }
	3421	+
	3422	+ ClearSelection(false);
	3423	+
	3424	+ refreshContents();
	3425	+ }
2767	3426	} else
2768	3427	if (source == genUVItem)
2769	3428	{
..	..	@@ -2808,6 +3467,10 @@
2808	3467	if (source == clearMaterialsItem)
2809	3468	{
2810	3469	ClearMaterials();
	3470	+ } else
	3471	+ if (source == clearVersionsItem)
	3472	+ {
	3473	+ ClearVersions();
2811	3474	} else
2812	3475	if (source == liveleavesItem)
2813	3476	{
..	..	@@ -3064,7 +3727,7 @@
3064	3727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3065	3728	{
3066	3729	obj = (Object3D)e.nextElement();
3067		- obj.SetBumpTexture(null);
	3730	+ obj.ResetBumpTexture();
3068	3731	}
3069	3732
3070	3733	refreshContents();
..	..	@@ -3078,6 +3741,31 @@
3078	3741	obj.SetBumpTexture(obj.GetPigmentTexture());
3079	3742	}
3080	3743
	3744	+ refreshContents();
	3745	+ } else
	3746	+ if (source == embedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(true);
	3753	+ }
	3754	+
	3755	+ refreshContents();
	3756	+ } else
	3757	+ if (source == deEmbedTexturesItem)
	3758	+ {
	3759	+ Object3D obj;
	3760	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3761	+ {
	3762	+ obj = (Object3D)e.nextElement();
	3763	+ obj.EmbedTextures(false);
	3764	+ }
	3765	+
	3766	+ CameraPane.texturepigment.clear();
	3767	+ CameraPane.texturebump.clear();
	3768	+
3081	3769	refreshContents();
3082	3770	} else
3083	3771	if (source == flashSelectionButton)
..	..	@@ -3095,38 +3783,7 @@
3095	3783	if (CameraPane.FULLSCREEN)
3096	3784	fullscreenLayout = radio.layout;
3097	3785
3098		- // bug
3099		- //gridPanel.setDividerLocation(1.0);
3100		- //bigPanel.setDividerLocation(0.0);
3101		-// bigThree.remove(scenePanel);
3102		-// bigThree.remove(centralPanel);
3103		-// bigThree.remove(XYZPanel);
3104		-// aWindowConstraints.gridx = 0;
3105		-// aWindowConstraints.gridy = 0;
3106		-// aWindowConstraints.gridwidth = 1;
3107		-// // aConstraints.gridheight = 3;
3108		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3109		-// aWindowConstraints.weightx = 0;
3110		-// aWindowConstraints.weighty = 1;
3111		-// //bigThree.add(jtp, aWindowConstraints);
3112		-// aWindowConstraints.weightx = 1;
3113		-// aWindowConstraints.gridwidth = 3;
3114		-// // aConstraints.gridheight = 3;
3115		-// aWindowConstraints.gridx = 1;
3116		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3117		-// bigThree.add(centralPanel, aWindowConstraints);
3118		-// aWindowConstraints.weightx = 0;
3119		-// aWindowConstraints.gridx = 4;
3120		-// aWindowConstraints.gridwidth = 1;
3121		-// // aConstraints.gridheight = 3;
3122		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3123		-// //bigThree.add(XYZPanel, aWindowConstraints);
3124		-// scenePanel.setVisible(false);
3125		-// centralPanel.setVisible(true);
3126		-// XYZPanel.setVisible(false);
3127		- bigThree.ClearUI();
3128		- bigThree.add(centralPanel);
3129		- bigThree.FlushUI();
	3786	+ Show3DView();
3130	3787
3131	3788	cameraView.requestFocusInWindow();
3132	3789
..	..	@@ -3181,8 +3838,8 @@
3181	3838	// centralPanel.setVisible(true);
3182	3839	// XYZPanel.setVisible(true);
3183	3840	bigThree.ClearUI();
	3841	+ bigThree.add(scenePanel);
3184	3842	bigThree.add(centralPanel);
3185		- bigThree.add(XYZPanel);
3186	3843	bigThree.FlushUI();
3187	3844
3188	3845	cameraView.requestFocusInWindow();
..	..	@@ -3262,8 +3919,8 @@
3262	3919	// centralPanel.setVisible(true);
3263	3920	// XYZPanel.setVisible(false);
3264	3921	bigThree.ClearUI();
3265		- bigThree.add(scenePanel);
3266	3922	bigThree.add(centralPanel);
	3923	+ bigThree.add(scenePanel);
3267	3924	bigThree.FlushUI();
3268	3925
3269	3926	cameraView.requestFocusInWindow();
..	..	@@ -3312,6 +3969,7 @@
3312	3969	} else
3313	3970	if (source == rootButton)
3314	3971	{
	3972	+ Replace();
3315	3973	Object3D obj;
3316	3974	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3317	3975	{
..	..	@@ -3326,6 +3984,8 @@
3326	3984	if (source == closeButton)
3327	3985	{
3328	3986	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3987	+ Replace();
	3988	+
3329	3989	cRadio ab;
3330	3990	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3331	3991	{
..	..	@@ -3369,10 +4029,10 @@
3369	4029	{
3370	4030	Object3D child = (Object3D)e.nextElement();
3371	4031	if(child.editWindow != null)
3372		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3373	4032	child.pinned = false;
3374	4033	child.CloseUI();
3375	4034	listUI.remove(child);
	4035	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3376	4036
3377	4037	//child.editWindow = null; // ???????????
3378	4038	}
..	..	@@ -3391,6 +4051,7 @@
3391	4051	obj.CloseUI();
3392	4052	}
3393	4053	listUI.clear();
	4054	+ SetPinStates(group.selection.size() > 0);
3394	4055	refreshContents(true);
3395	4056	} else
3396	4057	if (source == allParamsButton)
..	..	@@ -3423,6 +4084,8 @@
3423	4084	} else
3424	4085	if(source instanceof cRadio)
3425	4086	{
	4087	+ Replace();
	4088	+
3426	4089	group.parent = keepparent;
3427	4090	group.attributes = 0;
3428	4091	//group.editWindow = null;
..	..	@@ -3446,6 +4109,7 @@
3446	4109	}
3447	4110
3448	4111	copy = group;
	4112	+
3449	4113	//Globals.theRenderer.object = group;
3450	4114	if(!useclient)
3451	4115	{
..	..	@@ -3473,9 +4137,37 @@
3473	4137	*/
3474	4138	radio.layout.doClick();
3475	4139
	4140	+ assert(copy instanceof Composite);
	4141	+
	4142	+ if (copy.versionlist == null)
	4143	+ {
	4144	+ copy.versionindex = -1;
	4145	+
	4146	+ // Cannot work with loops
	4147	+ // To fix this issue, we first mark all nodes above the root,
	4148	+ // and check if any of these nodes are reachable below the root.
	4149	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4150	+
	4151	+ if (copy.versionlist == null && !copy.HasTags())
	4152	+ {
	4153	+ copy.versionlist = new Object3D[100];
	4154	+
	4155	+ //Save(true);
	4156	+ }
	4157	+ else
	4158	+ copy.versionindex = -2;
	4159	+
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4161	+ }
	4162	+
	4163	+ SetVersionStates();
	4164	+
3476	4165	ClearUnpinned();
3477		- SetPinStates(group.selection.size() > 0);
3478		- if (group.selection.size() == 1)
	4166	+
	4167	+ //Grafreed.Assert(group != null);
	4168	+ //Grafreed.Assert(group.selection != null);
	4169	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4170	+ if (group.selection == null \|\| group.selection.size() == 1)
3479	4171	EditSelection(false);
3480	4172	keepparent = group.parent;
3481	4173	// PARENT = NULL or not???
..	..	@@ -3488,11 +4180,13 @@
3488	4180	} else if (event.getSource() == editCameraItem)
3489	4181	{
3490	4182	cameraView.ProtectCamera();
	4183	+ cameraView.requestFocusInWindow();
3491	4184	cameraView.repaint();
3492	4185	return;
3493	4186	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3494	4187	{
3495	4188	cameraView.RevertCamera();
	4189	+ cameraView.requestFocusInWindow();
3496	4190	cameraView.repaint();
3497	4191	return;
3498	4192	// } else if (event.getSource() == textureButton)
..	..	@@ -3611,7 +4305,7 @@
3611	4305	TouchTransform(obj);
3612	4306	continue;
3613	4307	}
3614		- if ((mask&2) != 0) // Scale
	4308	+ if ((mask&2) != 0) // Scale/rotation
3615	4309	{
3616	4310	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3617	4311	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3619,10 +4313,6 @@
3619	4313	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3620	4314	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3621	4315	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3622		- }
3623		- if ((mask&4) != 0) // Rotation
3624		- {
3625		- // ?
3626	4316	}
3627	4317	if ((mask&1) != 0) // Translation
3628	4318	{
..	..	@@ -4069,7 +4759,7 @@
4069	4759
4070	4760	try
4071	4761	{
4072		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4762	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4073	4763	}
4074	4764	catch (Exception e)
4075	4765	{
..	..	@@ -4431,6 +5121,12 @@
4431	5121	refreshContents();
4432	5122	}
4433	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4434	5130	void FlipV(boolean flip)
4435	5131	{
4436	5132	group.selection.FlipV(flip);
..	..	@@ -4546,6 +5242,12 @@
4546	5242
4547	5243	void EditSelection(boolean newWindow)
4548	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4549	5251	// aConstraints.gridy = 0;
4550	5252	for (int i=0; i<group.selection.size(); i++)
4551	5253	{
..	..	@@ -4556,12 +5258,7 @@
4556	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4557	5259	if(elem != group \|\| !newWindow)
4558	5260	{
4559		- // if (!(elem instanceof Composite))
4560		- // newWindow = false;
4561		- listUI.add(elem);
4562		- elem.openEditWindow(this, newWindow); //, false);
4563		- System.out.println("edit : " + elem);
4564		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4565	5262	}
4566	5263	}
4567	5264	}
..	..	@@ -4624,9 +5321,7 @@
4624	5321
4625	5322	freezemodel = false;
4626	5323	}
4627		-
4628		- boolean flashIt = true;
4629		-
	5324	+
4630	5325	public void valueChanged(TreeSelectionEvent e)
4631	5326	//public boolean handleEvent(Event event)
4632	5327	{
..	..	@@ -4699,14 +5394,32 @@
4699	5394	{
4700	5395	editButton.setEnabled(enabled);
4701	5396	uneditButton.setEnabled(enabled);
4702		- unselectButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
4703	5398	flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(allComposites);
4704	5416	}
4705	5417
4706	5418	void refreshContents(boolean cp)
4707	5419	{
4708		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4709		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5420	+ if (Globals.ADVANCED)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4710	5423	{
4711	5424	objEditor.ClearInfo(); // .GetMaterial());
4712	5425
..	..	@@ -4715,7 +5428,7 @@
4715	5428	Object3D child = (Object3D) group.selection.get(i);
4716	5429
4717	5430	objEditor.AddInfo(child, this, true);
4718		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
4719	5432	}
4720	5433
4721	5434	objEditor.SetText(); // jan 2014
..	..	@@ -4805,8 +5518,8 @@
4805	5518
4806	5519	if (cut)
4807	5520	{
4808		- if (Globals.SAVEONMAKE)
4809		- Save();
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4810	5523	//int indices[] = jList.getSelectedIndices();
4811	5524	//for (int i = indices.length - 1; i >= 0; i--)
4812	5525	//jList.remove(indices[i]);
..	..	@@ -4909,6 +5622,10 @@
4909	5622
4910	5623	void paste(boolean expand)
4911	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4912	5629	// if (GrafreeD.clipboard == null)
4913	5630	// return;
4914	5631	boolean first = true;
..	..	@@ -4968,6 +5685,7 @@
4968	5685	Grafreed.clipboard.get(0).parent = keepparent;
4969	5686	}
4970	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4971	5689	ResetModel();
4972	5690	refreshContents();
4973	5691	}
..	..	@@ -5103,6 +5821,10 @@
5103	5821
5104	5822	void group(Object3D csg, boolean grab)
5105	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
5106	5828	if (//false) // why??
5107	5829	!group.selection.isEmpty())
5108	5830	{
..	..	@@ -5216,10 +5938,15 @@
5216	5938	//node.add(csg);
5217	5939	//makeSomething(node);
5218	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
5219	5942	}
5220	5943
5221	5944	void Ungroup(Object3D g)
5222	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
5223	5950	if (g instanceof HiddenObject)
5224	5951	{
5225	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -5236,6 +5963,7 @@
5236	5963	objEditor.makeSomething(g.get(i), false);
5237	5964	}
5238	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
5239	5967	}
5240	5968
5241	5969	void ungroup()
..	..	@@ -5526,10 +6254,6 @@
5526	6254
5527	6255	cButton restoreCameraButton;
5528	6256
5529		- cButton minButton;
5530		- cButton maxButton;
5531		- cButton fullButton;
5532		- cButton saveButton;
5533	6257	cButton oneStepButton;
5534	6258
5535	6259	cButton groupButton;
..	..	@@ -5538,6 +6262,22 @@
5538	6262	cButton switchButton;
5539	6263	cButton loopButton;
5540	6264	cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
5541	6281
5542	6282	cButton gridButton;
5543	6283	cButton boxButton;
..	..	@@ -5571,11 +6311,11 @@
5571	6311	private MenuItem lookAtItem;
5572	6312	private MenuItem lookFromItem;
5573	6313	private MenuItem switchViewItem;
5574		- private MenuItem cutItem;
	6314	+ private JMenuItem cutItem;
5575	6315	private MenuItem undoItem;
5576	6316	private MenuItem redoItem;
5577	6317	private JMenuItem duplicateItem;
5578		- private MenuItem cloneItem;
	6318	+ private JMenuItem cloneItem;
5579	6319	private MenuItem cloneSupportItem;
5580	6320	private MenuItem overwriteGeoItem;
5581	6321	private MenuItem overwriteMatItem;
..	..	@@ -5596,13 +6336,13 @@
5596	6336	private MenuItem cloneGeometriesItem;
5597	6337	private MenuItem shareGeometriesItem;
5598	6338	private MenuItem mergeGeometriesItem;
5599		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5600	6340	private MenuItem pasteItem;
5601		- private MenuItem pasteIntoItem;
5602		- private MenuItem pasteLinkItem;
5603		- private MenuItem pasteCloneItem;
5604		- private MenuItem pasteExpandItem;
5605		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5606	6346	private MenuItem clearAllItem;
5607	6347	private MenuItem genUVItem;
5608	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5628,6 +6368,7 @@
5628	6368	private MenuItem clipMeshItem;
5629	6369	private MenuItem smoothMeshItem;
5630	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5631	6372
5632	6373	private MenuItem liveleavesItem;
5633	6374	private MenuItem unliveleavesItem;
..	..	@@ -5657,7 +6398,7 @@
5657	6398	private MenuItem transformGeometryItem;
5658	6399	private MenuItem transformChildrenItem;
5659	6400	private MenuItem hideItem;
5660		- private MenuItem grabItem;
	6401	+ private JMenuItem grabItem;
5661	6402	private MenuItem backItem;
5662	6403	private MenuItem frontItem;
5663	6404	private MenuItem cameraItem;
..	..	@@ -5670,7 +6411,7 @@
5670	6411	private MenuItem switchTransfoItem;
5671	6412	private MenuItem morphItem;
5672	6413	private MenuItem linkerItem;
5673		- private MenuItem ungroupItem;
	6414	+ private JMenuItem ungroupItem;
5674	6415	private MenuItem editItem;
5675	6416	private MenuItem openWindowItem;
5676	6417	private MenuItem editLeafItem;
..	..	@@ -5686,6 +6427,8 @@
5686	6427	private MenuItem attachBumpItem;
5687	6428	private MenuItem detachBumpItem;
5688	6429	private MenuItem pigmentBumpItem;
	6430	+ private MenuItem embedTexturesItem;
	6431	+ private MenuItem deEmbedTexturesItem;
5689	6432
5690	6433	private MenuItem particleItem;
5691	6434	private MenuItem ragdollItem;