~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,351 @@
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", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(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, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	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", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,6 +406,14 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+
	414	+ Save(true);
	415	+ }
	416	+
63	417	if(ui)
64	418	SetupUI(objEditor);
65	419	}
..	..	@@ -80,10 +434,22 @@
80	434	SetupViews(objEditor);
81	435
82	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
83	445	}
84	446
85	447	void CloneSelection(boolean supports)
86	448	{
	449	+ if (Globals.REPLACEONMAKE)
	450	+ Save();
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
87	453	// Object3D keep = GrafreeD.clipboard;
88	454	//Object3D obj;
89	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +460,7 @@
94	460
95	461	makeSomething(clone, i==group.selection.size()-1);
96	462	}
	463	+ Globals.REPLACEONMAKE = keep;
97	464	}
98	465
99	466	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +517,8 @@
150	517
151	518	void SetupMenu2(GroupEditor oe)
152	519	{
	520	+ oe.jTree = new cTree();
	521	+
153	522	Menu menu;
154	523	oe.menuBar.add(menu = new Menu("Edit"));
155	524	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +529,7 @@
160	529	// redoItem = menu.add(new MenuItem("Redo"));
161	530	// redoItem.addActionListener(this);
162	531	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	532	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	533	duplicateItem.addActionListener(this);
165	534	cloneItem = menu.add(new MenuItem("Clone"));
166	535	cloneItem.addActionListener(this);
..	..	@@ -176,7 +545,6 @@
176	545	copyItem.addActionListener(this);
177	546	pasteItem = menu.add(new MenuItem("Paste"));
178	547	pasteItem.addActionListener(this);
179		- menu.add("-");
180	548
181	549	menu.add("-");
182	550	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +556,8 @@
188	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	557	// pasteExpandItem.addActionListener(this);
190	558	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
193	561
194	562	if (Globals.ADVANCED)
195	563	{
..	..	@@ -203,23 +571,23 @@
203	571	//zBufferItem.addActionListener(this);
204	572	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	573	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	574	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	575	+ restoreCameraItem.addActionListener(this);
208	576
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	577	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	578	+// toggleFullScreenItem.addItemListener(this);
	579	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	580	+// cameraMenu.add("-");
	581	+//
	582	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	583	+// toggleTextureItem.addItemListener(this);
	584	+// toggleTextureItem.setState(CameraPane.textureon);
	585	+//
	586	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	587	+// toggleSwitchItem.addItemListener(this);
	588	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	589
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	590	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	591	toggleHandleItem.addItemListener(this);
224	592	toggleHandleItem.setState(CameraPane.HANDLES);
225	593
..	..	@@ -246,7 +614,7 @@
246	614
247	615	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	616	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	617	+ toggleDebugItem.setState(Globals.DEBUG);
250	618
251	619	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	620	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,15 +642,13 @@
274	642	{
275	643	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	644	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	645	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	646	oe.cameraMenu.add("-");
280	647	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	648	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	649	lookAtItem.addActionListener(this);
284	650	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	651	+ //switchViewItem.addActionListener(this);
286	652	}
287	653
288	654	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +693,29 @@
327	693	}
328	694
329	695	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
332	698	backItem = menu.add(new MenuItem("Back"));
333	699	backItem.addActionListener(this);
334	700	frontItem = menu.add(new MenuItem("Front"));
335	701	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
338	707	hideItem = menu.add(new MenuItem("Hidden Group"));
339	708	hideItem.addActionListener(this);
	709	+ }
340	710	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	711	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
345	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	720	switchGeoItem.addActionListener(this);
347	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +723,6 @@
349	723	morphItem = menu.add(new MenuItem("Morph Group"));
350	724	morphItem.addActionListener(this);
351	725
352		- if (Globals.ADVANCED)
353		- {
354	726	menu.add("-");
355	727	physicsItem = menu.add(new MenuItem("Physics"));
356	728	physicsItem.addActionListener(this);
..	..	@@ -358,30 +730,29 @@
358	730	frameselectorItem.addActionListener(this);
359	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	732	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	733	}
364	734
365	735	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
368	738	billboardItem = menu.add(new MenuItem("Billboard"));
369	739	billboardItem.addActionListener(this);
370	740	csgItem = menu.add(new MenuItem("CSG"));
371	741	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	743	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	745	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
378	751	if (Globals.ADVANCED)
379	752	{
380	753	menu.add("-");
381	754	linkerItem = menu.add(new MenuItem("Linker"));
382	755	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	756	templateItem = menu.add(new MenuItem("Template"));
386	757	templateItem.addActionListener(this);
387	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +781,7 @@
410	781	genNormalsMESHItem.addActionListener(this);
411	782	if (Globals.ADVANCED)
412	783	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	785	genNormalsMINEItem.addActionListener(this);
415	786	}
416	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -470,6 +841,14 @@
470	841	markleavesItem.addActionListener(this);
471	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
473	852	menu.add("-");
474	853	flipVItem = menu.add(new MenuItem("Flip V"));
475	854	flipVItem.addActionListener(this);
..	..	@@ -495,10 +874,15 @@
495	874	attachBumpItem.addActionListener(this);
496	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
498	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	879	detachPigmentItem.addActionListener(this);
500	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
502	886	menu.add("-");
503	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	888	sortbysizeItem.addActionListener(this);
..	..	@@ -509,6 +893,9 @@
509	893	shareGeometriesItem.addActionListener(this);
510	894	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
511	895	mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
512	899	if (Globals.ADVANCED)
513	900	{
514	901	// Pretty much the same as duplicate and clone.
..	..	@@ -525,16 +912,91 @@
525	912	buildToolsMenu(menu);
526	913	}
527	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
528	983	void SetupUI2(ObjEditor oe)
529	984	{
	985	+ // June 2019
	986	+ if (oe == null)
	987	+ {
	988	+ //super.SetupUI2(this);
	989	+ //return;
	990	+ }
	991	+
	992	+ if (copy != group)
	993	+ {
	994	+ //super.SetupUI2(this);
	995	+ }
	996	+
530	997	//new Exception().printStackTrace();
531	998
532	999	oe.radioPanel = new JPanel(new GridBagLayout());
533		- oe.aConstraints.weightx = 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
536		- oe.aConstraints.gridwidth = 100;
537		- oe.aConstraints.gridheight = 1;
538	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
539	1001
540	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -555,39 +1017,122 @@
555	1017	oe.radioPanel.add(dummyButton);
556	1018	oe.buttonGroup.add(dummyButton);
557	1019	*/
	1020	+ cGridBag copyOptionsPanel = new cGridBag();
	1021	+
	1022	+ copyOptionsPanel.preferredHeight = 2;
	1023	+
558	1024	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	1025
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	1026	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1027	+ //minButton.setToolTipText("Minimize window");
	1028	+ //minButton.addActionListener(this);
563	1029
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	1030	+ if (Globals.ADVANCED)
	1031	+ {
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
	1035	+ }
567	1036
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
570		- saveButton.addActionListener(this);
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
571	1048
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
573		- liveCB.setToolTipText("Enable animation");
574		- liveCB.addItemListener(this);
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
	1075	+
	1076	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ fullButton.setToolTipText("Full-screen window");
	1078	+ fullButton.addActionListener(this);
	1079	+
	1080	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ screenfitButton.setToolTipText("Screen fit");
	1082	+ screenfitButton.addActionListener(this);
575	1083
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1086	+ restoreCameraButton.addActionListener(this);
	1087	+
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
	1100	+
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
	1106	+
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
	1111	+
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	1120	oneStepButton.setToolTipText("Animate one step forward");
578	1121	oneStepButton.addActionListener(this);
579	1122
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
	1125	+ liveCB.addItemListener(this);
	1126	+
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	1128	fastCB.setToolTipText("Fast mode");
582	1129	fastCB.addItemListener(this);
583	1130
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	1131	+ //oe.toolboxPanel.Return();
	1132	+
	1133	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1134	+// trackCB.setToolTipText("Enable tracking");
	1135	+// trackCB.addItemListener(this);
591	1136
592	1137	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	1138	// screenfitpointButton.addActionListener(this);
..	..	@@ -597,67 +1142,137 @@
597	1142	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1143	snapobjectButton.addActionListener(this);
599	1144	snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ fourButton.addActionListener(this);
	1148	+ fourButton.setToolTipText("Show control panel only");
600	1149	}
601	1150
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	1151	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	1152
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- twoButton.setToolTipText("Show center view only");
610		- twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612		- fourButton.addActionListener(this);
613		- fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
616		- sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
619		- threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
623		- //
624	1153
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
627	1156	rootButton.addActionListener(this);
628	1157
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1159	closeButton.setToolTipText("Close tab");
631	1160	closeButton.addActionListener(this);
632	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	1162	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	1163	+
	1164	+ cGridBag row1 = new cGridBag();
636	1165
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	1166	+ // INSERT
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
	1169	+ gridButton.addActionListener(this);
	1170	+
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ boxButton.setToolTipText("Create box");
	1173	+ boxButton.addActionListener(this);
	1174	+
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ sphereButton.setToolTipText("Create sphere");
	1177	+ sphereButton.addActionListener(this);
	1178	+
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ coneButton.setToolTipText("Create cone");
	1181	+ coneButton.addActionListener(this);
	1182	+
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ torusButton.setToolTipText("Create torus");
	1185	+ torusButton.addActionListener(this);
	1186	+
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ superButton.setToolTipText("Create superellipsoid");
	1189	+ superButton.addActionListener(this);
	1190	+
	1191	+ if (Globals.ADVANCED)
	1192	+ {
	1193	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ kleinButton.setToolTipText("Create Klein bottle");
	1195	+ kleinButton.addActionListener(this);
	1196	+ }
	1197	+
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ particlesButton.setToolTipText("Create particle system");
	1200	+ particlesButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row1);
	1203	+
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ groupButton.setToolTipText("Create group");
	1208	+ groupButton.addActionListener(this);
	1209	+
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ compositeButton.setToolTipText("Create composite");
	1212	+ compositeButton.addActionListener(this);
	1213	+
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ switchButton.setToolTipText("Create item switcher");
	1216	+ switchButton.addActionListener(this);
	1217	+
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ loopButton.setToolTipText("Create loop");
	1220	+ loopButton.addActionListener(this);
	1221	+
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ textureButton.setToolTipText("Create texture");
	1224	+ textureButton.addActionListener(this);
	1225	+
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ overlayButton.setToolTipText("Create overlay");
	1228	+ overlayButton.addActionListener(this);
	1229	+
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ lightButton.setToolTipText("Create light");
	1232	+ lightButton.addActionListener(this);
	1233	+
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
	1245	+
	1246	+ // EDIT panel
	1247	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ editButton.setToolTipText("Pin selection controls");
639	1249	editButton.addActionListener(this);
640	1250
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1251	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
643	1253	uneditButton.addActionListener(this);
644	1254
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1255	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1256	+ allParamsButton.setToolTipText("Show all controls");
647	1257	allParamsButton.addActionListener(this);
648	1258
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
651	1261	clearPanelButton.addActionListener(this);
652	1262
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- unselectButton.setToolTipText("Unselect");
655		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
656	1266
657		- commandsPanel.preferredHeight = 1;
	1267	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1268	+ flashSelectionButton.setToolTipText("Highlight selection");
	1269	+ flashSelectionButton.addActionListener(this);
658	1270
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1271	+ editCommandsPanel.preferredHeight = 1;
	1272	+
	1273	+ SetPinStates(false);
	1274	+// oe.treePanel.add(commandsPanel);
	1275	+// oe.treePanel.Return();
661	1276
662	1277	// oe.aConstraints.gridx += 1;
663	1278	// oe.aConstraints.weighty = 0;
..	..	@@ -674,32 +1289,20 @@
674	1289
675	1290	JScrollPane jSP;
676	1291	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1292	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1293	ResetModel();
679	1294
680	1295	oe.treePanel.add(jSPPanel);
681	1296	oe.treePanel.Return();
682	1297
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	1298	oe.treePanel.add(copyOptionsPanel);
699	1299	oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
700	1303
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
703	1306
704	1307	//jList.addListSelectionListener(this);
705	1308	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1310,7 @@
707	1310	//jTree.setEditable(true);
708	1311	oe.jTree.setDragEnabled(true);
709	1312	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1314
712	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1316
..	..	@@ -719,29 +1322,49 @@
719	1322	dgr.addDragGestureListener(this);
720	1323	}catch(Exception e) {}
721	1324	*/
722		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
723	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1327	}
725	1328
726	1329	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1330	{
	1331	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1332	+ colorCB.setToolTipText("Copy color when dropped");
	1333	+ colorCB.addItemListener(this);
	1334	+
	1335	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1336	+ materialCB.setToolTipText("Copy material when dropped");
	1337	+ materialCB.addItemListener(this);
	1338	+
	1339	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1340	+ textureCB.setToolTipText("Copy texture when dropped");
	1341	+ textureCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
728	1345	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1346	boxCB.setToolTipText("Display bounding boxes");
730	1347	boxCB.addItemListener(this);
731	1348
732	1349	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1350	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1351	zoomBoxCB.addItemListener(this);
735	1352
736	1353	if (true) // Globals.ADVANCED)
737	1354	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1355	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1356	+// supportCB.setToolTipText("Enable rigging");
	1357	+// supportCB.addItemListener(this);
	1358	+
	1359	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1360	+ freezeCB.setToolTipText("Fast moving camera");
	1361	+ freezeCB.addItemListener(this);
741	1362
742	1363	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1364	// localCB.addItemListener(this);
744	1365
	1366	+ panel.Return();
	1367	+
745	1368	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1369	crowdCB.setToolTipText("Used for crowds");
747	1370	crowdCB.addItemListener(this);
..	..	@@ -750,14 +1373,19 @@
750	1373	smoothCB.setToolTipText("Snapping delay");
751	1374	smoothCB.addItemListener(this);
752	1375
753		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754		- slowCB.setToolTipText("Smooth interpolation");
755		- slowCB.addItemListener(this);
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
756	1382
757	1383	// constraints.gridy += 1;
758	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1385	// speakerMocapCB.addItemListener(this);
760	1386
	1387	+ panel.Return();
	1388	+
761	1389	if (false)
762	1390	{
763	1391	// handled in scripts
..	..	@@ -772,34 +1400,82 @@
772	1400	//constraints.gridy += 1;
773	1401	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	1402	smoothfocusCB.addItemListener(this);
	1403	+ panel.Return();
775	1404	}
776	1405
777	1406	//constraints.gridx += 1;
778	1407	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1408	// debugCB.addItemListener(this);
780	1409
	1410	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1411	+ trackCB.setToolTipText("Enable tracking target");
	1412	+ trackCB.addItemListener(this);
	1413	+
781	1414	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1415	+ oeilCB.setToolTipText("Move camera when tracking");
782	1416	oeilCB.addItemListener(this);
783	1417
	1418	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1419	+ shadowCB.setToolTipText("When live compute shadows");
	1420	+ shadowCB.addItemListener(this);
	1421	+
	1422	+ panel.Return();
	1423	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1424	+ toggleTextureCB.setToolTipText("Load textures");
	1425	+ toggleTextureCB.addItemListener(this);
	1426	+
	1427	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1428	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1429	+ toggleSwitchCB.addItemListener(this);
	1430	+
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
	1434	+
	1435	+ panel.Return();
	1436	+ if (Globals.ADVANCED)
	1437	+ {
784	1438	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1439	lookAtCB.setToolTipText("Look-at target");
786	1440	lookAtCB.addItemListener(this);
	1441	+ }
787	1442
788	1443	}
789	1444
790	1445	cGridBag fill = new cGridBag();
791		-
792	1446	fill.preferredHeight = 200;
	1447	+ cGridBag fill2 = new cGridBag();
	1448	+ fill2.preferredHeight = 200;
	1449	+ cGridBag fill3 = new cGridBag();
	1450	+ fill3.preferredHeight = 200;
793	1451
794	1452	panel.add(fill);
	1453	+ panel.add(fill2);
	1454	+ panel.add(fill3);
795	1455
796	1456	}
797	1457
798	1458	void EditObject(Object3D obj)
799	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
800	1468	cRadio radioButton = new cRadio(obj.name);
	1469	+
	1470	+ // June 2019. Patch to avoid bug with transparency.
	1471	+ radioButton.hadMaterial = obj.material != null;
	1472	+ if (!radioButton.hadMaterial)
	1473	+ {
	1474	+ obj.material = new cMaterial();
	1475	+ }
	1476	+
801	1477	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
803	1479	radioButton.SetCamera(cameraView.renderCamera, false);
804	1480	radioButton.addActionListener(this);
805	1481	radioPanel.add(radioButton);
..	..	@@ -809,6 +1485,8 @@
809	1485
810	1486	void SetupViews(ObjEditor oe)
811	1487	{
	1488	+ theFrame = this;
	1489	+
812	1490	oe.SetupViews();
813	1491
814	1492	System.out.println("SetupViews");
..	..	@@ -817,23 +1495,30 @@
817	1495	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1496	}
819	1497
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1498	+ cToggleButton liveCB;
	1499	+ cCheckBox supportCB;
	1500	+ cCheckBox localCB;
	1501	+ cCheckBox crowdCB;
	1502	+ cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
	1505	+ cToggleButton fastCB;
	1506	+ cCheckBox slowCB;
	1507	+ cCheckBox boxCB;
	1508	+ cCheckBox zoomBoxCB;
	1509	+ cCheckBox freezeCB;
	1510	+ //cToggleButton trackCB;
	1511	+ cCheckBox trackCB;
	1512	+ cCheckBox smoothfocusCB;
831	1513	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1514	+ cCheckBox speakerCameraCB;
	1515	+ cCheckBox speakerFocusCB;
	1516	+ cCheckBox debugCB;
	1517	+
	1518	+ cCheckBox oeilCB;
	1519	+ cCheckBox shadowCB;
	1520	+ cCheckBox autokeepCB;
	1521	+ cCheckBox lookAtCB;
837	1522
838	1523	// static int COLOR = 1;
839	1524	// static int MATERIAL = 2;
..	..	@@ -841,9 +1526,9 @@
841	1526
842	1527	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1528
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1529	+ cCheckBox colorCB;
	1530	+ cCheckBox materialCB;
	1531	+ cCheckBox textureCB;
847	1532
848	1533	public void itemStateChanged(ItemEvent e)
849	1534	{
..	..	@@ -871,6 +1556,7 @@
871	1556	} else if(e.getSource() == liveCB)
872	1557	{
873	1558	cameraView.ToggleLive();
	1559	+ refreshContents(false);
874	1560	}
875	1561	else if(e.getSource() == supportCB)
876	1562	{
..	..	@@ -886,6 +1572,12 @@
886	1572	{
887	1573	cameraView.ToggleInertia();
888	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
889	1581	}
890	1582	else if(e.getSource() == localCB)
891	1583	{
..	..	@@ -935,6 +1627,18 @@
935	1627	{
936	1628	cameraView.ToggleOeil();
937	1629	}
	1630	+ else if(e.getSource() == shadowCB)
	1631	+ {
	1632	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1633	+ }
	1634	+ else if(e.getSource() == freezeCB)
	1635	+ {
	1636	+ Globals.FREEZEONMOVE ^= true;
	1637	+ }
	1638	+ else if(e.getSource() == autokeepCB)
	1639	+ {
	1640	+ Globals.REPLACEONMAKE ^= true;
	1641	+ }
938	1642	else if(e.getSource() == lookAtCB)
939	1643	{
940	1644	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1655,8 @@
951	1655
952	1656	/**/
953	1657	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1658	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1659	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1660	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1661	// We can't move the root node or an empty selection
957	1662	return;
..	..	@@ -1014,8 +1719,6 @@
1014	1719	}
1015	1720	}
1016	1721
1017		- String string = (String) object;
1018		-
1019	1722	System.out.println("Transfer = " + object + "; drop : " + target);
1020	1723	// if( object instanceof java.io.File[])
1021	1724	// {
..	..	@@ -1023,6 +1726,8 @@
1023	1726	// objEditor.DropFile((java.io.File[]) object, true);
1024	1727	// return;
1025	1728	// }
	1729	+
	1730	+ String string = object.toString();
1026	1731
1027	1732	// File path for Mac and Windows
1028	1733	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1068,23 +1773,33 @@
1068	1773
1069	1774	assert target == objEditor.jTree;
1070	1775	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1776	+ Object3D destinationLeaf;
1071	1777	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1778	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1779	} catch (Exception e) {
1074	1780	System.out.println("destinationPath : " + destinationPath);
1075	1781	return;
1076	1782	}
1077	1783
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1784	+ for (int i=group.selection.size(); --i>=0;)
1079	1785	{
	1786	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1787	+
	1788	+ // Cannot move into itself
	1789	+ if (child == destinationLeaf)
	1790	+ return;
	1791	+ }
	1792	+
	1793	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1794	+// {
1080	1795	loadClipboard(true);
1081	1796	objEditor.jTree.setSelectionPath(destinationPath);
1082	1797	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1798	+// } else {
	1799	+// loadClipboard(false);
	1800	+// objEditor.jTree.setSelectionPath(destinationPath);
	1801	+// pasteInto(false, false); // true); // ???
	1802	+// }
1088	1803	}
1089	1804	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1805	// Called if the user has modified the current drop gesture
..	..	@@ -1140,7 +1855,12 @@
1140	1855	TreePath path;
1141	1856
1142	1857	public TransferableTreePath(TreePath tp) {
1143		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
1144	1864	}
1145	1865
1146	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1189,22 +1909,30 @@
1189	1909	{
1190	1910	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1911	//heightFieldItem.addActionListener(this);
1192		- gridItem = menu.add(new MenuItem("Grid"));
1193		- gridItem.addActionListener(this);
1194		- rectoidItem = menu.add(new MenuItem("Box"));
1195		- rectoidItem.addActionListener(this);
1196		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197		- ellipsoidItem.addActionListener(this);
1198		- coneItem = menu.add(new MenuItem("Cone"));
1199		- coneItem.addActionListener(this);
1200		- torusItem = menu.add(new MenuItem("Torus"));
1201		- torusItem.addActionListener(this);
1202		- superItem = menu.add(new MenuItem("Superellipsoid"));
1203		- superItem.addActionListener(this);
	1912	+// gridItem = menu.add(new MenuItem("Grid"));
	1913	+// gridItem.addActionListener(this);
	1914	+// rectoidItem = menu.add(new MenuItem("Box"));
	1915	+// rectoidItem.addActionListener(this);
	1916	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1917	+// ellipsoidItem.addActionListener(this);
	1918	+// coneItem = menu.add(new MenuItem("Cone"));
	1919	+// coneItem.addActionListener(this);
	1920	+// torusItem = menu.add(new MenuItem("Torus"));
	1921	+// torusItem.addActionListener(this);
	1922	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1923	+// superItem.addActionListener(this);
	1924	+
	1925	+ cameraItem = menu.add(new MenuItem("Camera"));
	1926	+ cameraItem.addActionListener(this);
	1927	+
	1928	+ if (!Globals.ADVANCED)
	1929	+ {
1204	1930	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1931	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1932	+ }
	1933	+
	1934	+// particleItem = menu.add(new MenuItem("Particle system"));
	1935	+// particleItem.addActionListener(this);
1208	1936	if (Globals.ADVANCED)
1209	1937	{
1210	1938	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1958,15 @@
1230	1958	}
1231	1959	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1960	bezierItem.addActionListener(this);
1233		- overlayItem = menu.add(new MenuItem("Overlay"));
1234		- overlayItem.addActionListener(this);
1235		- lightItem = menu.add(new MenuItem("Light"));
1236		- lightItem.addActionListener(this);
	1961	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1962	+// overlayItem.addActionListener(this);
	1963	+// lightItem = menu.add(new MenuItem("Light"));
	1964	+// lightItem.addActionListener(this);
1237	1965	menu.add("-");
1238	1966	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	1967	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	1968	+// loopItem = menu.add(new MenuItem("Loop"));
	1969	+// loopItem.addActionListener(this);
1242	1970	doubleItem = menu.add(new MenuItem("Fork"));
1243	1971	doubleItem.addActionListener(this);
1244	1972	if (Globals.ADVANCED)
..	..	@@ -1254,6 +1982,9 @@
1254	1982	animationItem.addItemListener(this);
1255	1983	animationItem.setState(Globals.ANIMATION);
1256	1984
	1985	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1986	+ archiveItem.addActionListener(this);
	1987	+
1257	1988	menu.add("-");
1258	1989	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1259	1990	parseverticesItem.addActionListener(this);
..	..	@@ -1266,6 +1997,8 @@
1266	1997	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1267	1998	reduce34MorphItem.addActionListener(this);
1268	1999	menu.add("-");
	2000	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2001	+ memoryItem.addActionListener(this);
1269	2002	menu.add(computeAOItem = new MenuItem("Compute AO"));
1270	2003	computeAOItem.addActionListener(this);
1271	2004
..	..	@@ -1274,11 +2007,9 @@
1274	2007	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1275	2008	mirrorItem.addActionListener(this);
1276	2009	menu.add("-");
1277		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1278		- memoryItem.addActionListener(this);
1279	2010	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	2011	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	2012	+ menu.add(dumpItem = new MenuItem("Print"));
1282	2013	dumpItem.addActionListener(this);
1283	2014	// menu.add(pathItem = new MenuItem("From-to path"));
1284	2015	// pathItem.addActionListener(this);
..	..	@@ -1419,9 +2150,34 @@
1419	2150	shadow.material = new cMaterial(obj.material);
1420	2151	shadow.material.diffuse = 0.0001f;
1421	2152	shadow.material.specular = 0.0001f;
	2153	+ //shadow.projectedVertices[1].x = 300;
1422	2154
1423	2155	makeSomething(shadow);
1424	2156	}
	2157	+
	2158	+ private void ClearUnpinned()
	2159	+ {
	2160	+ //for (Object3D obj : listUI)
	2161	+ for (int i=listUI.size(); --i>=0;)
	2162	+ {
	2163	+ Object3D obj = listUI.elementAt(i);
	2164	+ if (!obj.pinned)
	2165	+ {
	2166	+ obj.CloseUI();
	2167	+ listUI.remove(i);
	2168	+ }
	2169	+ }
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
	2180	+ }
1425	2181
1426	2182	/**
1427	2183	* applyExample
..	..	@@ -1666,7 +2422,7 @@
1666	2422	{
1667	2423	ScreenFit();
1668	2424	} else
1669		- if (source == switchItem)
	2425	+ if (source == switchViewItem)
1670	2426	{
1671	2427	cVector v1 = new cVector();
1672	2428	cVector v2 = new cVector();
..	..	@@ -1675,11 +2431,11 @@
1675	2431	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	2432	objEditor.cameraView.repaint();
1677	2433	} else
1678		- if (source == rectoidItem)
	2434	+ if (source == rectoidItem \|\| source == boxButton)
1679	2435	{
1680	2436	makeSomething(new Box());
1681	2437	} else
1682		- if (source == particleItem)
	2438	+ if (source == particleItem \|\| source == particlesButton)
1683	2439	{
1684	2440	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	2441	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +2514,27 @@
1758	2514
1759	2515	makeSomething(obj);
1760	2516	} else
1761		- if (source == gridItem)
	2517	+ if (source == gridItem \|\| source == gridButton)
1762	2518	{
1763	2519	makeSomething(new Grid());
1764	2520	} else
1765		- if (source == ellipsoidItem)
	2521	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	2522	{
1767	2523	makeSomething(new Sphere());
1768	2524	} else
1769		- if (source == coneItem)
	2525	+ if (source == coneItem \|\| source == coneButton)
1770	2526	{
1771	2527	makeSomething(new Cone());
1772	2528	} else
1773		- if (source == torusItem)
	2529	+ if (source == torusItem \|\| source == torusButton)
1774	2530	{
1775	2531	makeSomething(new Torus());
1776	2532	} else
1777		- if (source == superItem)
	2533	+ if (source == superItem \|\| source == superButton)
1778	2534	{
1779	2535	makeSomething(new Superellipsoid());
1780	2536	} else
1781		- if (source == kleinItem)
	2537	+ if (source == kleinItem \|\| source == kleinButton)
1782	2538	{
1783	2539	makeSomething(new Klein());
1784	2540	} else
..	..	@@ -1798,7 +2554,7 @@
1798	2554	{
1799	2555	makeSomething(new BezierSurface());
1800	2556	} else
1801		- if (source == overlayItem)
	2557	+ if (source == overlayItem \|\| source == overlayButton)
1802	2558	{
1803	2559	/*
1804	2560	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,10 +2602,27 @@
1846	2602	s.setup();
1847	2603	makeSomething(s);
1848	2604	} else
1849		- if (source == lightItem)
	2605	+ if (source == lightItem \|\| source == lightButton)
1850	2606	{
1851	2607	makeSomething(new Light());
1852	2608	} else
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
1853	2626	if (source == csgItem)
1854	2627	{
1855	2628	group(new CSG());
..	..	@@ -1896,30 +2669,30 @@
1896	2669
1897	2670	group(g);
1898	2671	} else
1899		- if (source == loopItem)
	2672	+ if (source == loopItem \|\| source == loopButton)
1900	2673	{
1901	2674	Composite csg = new GroupLeaf();
1902	2675	csg.count = 5;
1903	2676	group(csg);
1904		- Composite child = new cGroup();
	2677	+ Composite child = new cGroup("Branch");
1905	2678	csg.addChild(child);
1906	2679	child.addChild(csg);
1907	2680	} else
1908	2681	if (source == doubleItem)
1909	2682	{
1910		- Composite csg = new GroupLeaf();
	2683	+ Composite csg = new GroupLeaf("Fork");
1911	2684	csg.count = 5;
1912	2685	group(csg);
1913		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch A");
1914	2687	csg.addChild(child);
1915	2688	child.addChild(csg);
1916		- child = new cGroup();
	2689	+ child = new cGroup("Branch B");
1917	2690	csg.addChild(child);
1918	2691	child.addChild(csg);
1919	2692	} else
1920	2693	if (source == tripleItem)
1921	2694	{
1922		- Composite csg = new GroupLeaf();
	2695	+ Composite csg = new GroupLeaf("Trident");
1923	2696	csg.count = 4;
1924	2697	group(csg);
1925	2698	Composite child = new cGroup();
..	..	@@ -1935,7 +2708,7 @@
1935	2708	if (source == computeAOItem)
1936	2709	{
1937	2710	Globals.drawMode = CameraPane.OCCLUSION;
1938		- Globals.theRenderer.repaint();
	2711	+ cameraView.repaint();
1939	2712	} else
1940	2713	if (source == recompileItem)
1941	2714	{
..	..	@@ -1950,7 +2723,7 @@
1950	2723	if (source == invariantsItem)
1951	2724	{
1952	2725	System.out.println("Invariants:");
1953		- Grafreed.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
1954	2727	} else
1955	2728	if (source == memoryItem)
1956	2729	{
..	..	@@ -1969,17 +2742,64 @@
1969	2742	{
1970	2743	DumpObject();
1971	2744	} else
1972		- if (source == undoButton)
	2745	+ if (source == minButton)
1973	2746	{
1974		- Undo();
	2747	+ Minimize();
1975	2748	} else
1976		- if (source == redoButton)
	2749	+ if (source == maxButton)
1977	2750	{
1978		- Redo();
	2751	+ Maximize();
1979	2752	} else
1980		- if (source == saveButton)
	2753	+ if (source == fullButton)
1981	2754	{
1982		- Save();
	2755	+ ToggleFullScreen();
	2756	+ } else
	2757	+ if (source == collapseButton)
	2758	+ {
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
	2761	+ } else
	2762	+ if (source == maximize3DButton)
	2763	+ {
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
	2768	+ } else
	2769	+ if (source == previousVersionButton)
	2770	+ {
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
	2796	+ if (!Save(true))
	2797	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
1983	2803	} else
1984	2804	if (source == oneStepButton)
1985	2805	{
..	..	@@ -1988,17 +2808,14 @@
1988	2808	} else
1989	2809	if (source == screenfitButton)
1990	2810	{
1991		- //Reload(lastConverter, lastFilename, true);
1992	2811	ScreenFit();
1993	2812	} else
1994	2813	if (source == screenfitpointButton)
1995	2814	{
1996		- //Reload(lastConverter, lastFilename, true);
1997	2815	ScreenFitPoint();
1998	2816	} else
1999	2817	if (source == snapobjectButton)
2000	2818	{
2001		- //Reload(lastConverter, lastFilename, true);
2002	2819	SnapObject();
2003	2820	} else
2004	2821	// if (event.getSource() == recompileButton)
..	..	@@ -2037,11 +2854,11 @@
2037	2854	} else
2038	2855	if (source == undoItem)
2039	2856	{
2040		- Undo();
	2857	+ PreviousVersion();
2041	2858	} else
2042	2859	if (source == redoItem)
2043	2860	{
2044		- Redo();
	2861	+ NextVersion();
2045	2862	} else
2046	2863	if (source == duplicateItem)
2047	2864	{
..	..	@@ -2362,7 +3179,7 @@
2362	3179	{
2363	3180	StepAll();
2364	3181	} else
2365		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2366	3183	{
2367	3184	//int indices[] = jList.getSelectedIndices();
2368	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2374,9 +3191,9 @@
2374	3191	{
2375	3192	ClearSelection(true);
2376	3193	} else
2377		- if (source == grabItem)
	3194	+ if (source == grabItem \|\| source == groupButton)
2378	3195	{
2379		- group(new cGroup(), true);
	3196	+ group(new cGroup(), false); // true);
2380	3197	} else
2381	3198	if (source == hideItem)
2382	3199	{
..	..	@@ -2394,11 +3211,11 @@
2394	3211	{
2395	3212	makeSomething(new Camera());
2396	3213	} else
2397		- if (source == compositeItem)
	3214	+ if (source == compositeItem \|\| source == compositeButton)
2398	3215	{
2399	3216	group(new Composite());
2400	3217	} else
2401		- if (source == randomItem)
	3218	+ if (source == switchItem \|\| source == switchButton)
2402	3219	{
2403	3220	RandomNode random = new RandomNode();
2404	3221	group(random);
..	..	@@ -2500,7 +3317,7 @@
2500	3317	{
2501	3318	group(new cLinker());
2502	3319	} else
2503		- if (source == textureItem)
	3320	+ if (source == textureItem \|\| source == textureButton)
2504	3321	{
2505	3322	group(new TextureNode());
2506	3323	} else
..	..	@@ -2520,17 +3337,30 @@
2520	3337	{
2521	3338	CastShadow(2);
2522	3339	} else
2523		- if (source == ungroupItem)
	3340	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	3341	{
2525		- //ungroup();
	3342	+ boolean hasRoot = false;
	3343	+
2526	3344	for (int i=0; i<group.selection.size(); i++)
2527	3345	{
2528		- Ungroup(group.selection.get(i));
	3346	+ if (group.selection.get(i) == group)
	3347	+ {
	3348	+ hasRoot = true;
	3349	+ break;
	3350	+ }
2529	3351	}
2530	3352
2531		- ClearSelection(false);
2532		-
2533		- refreshContents();
	3353	+ if (!hasRoot)
	3354	+ {
	3355	+ for (int i=0; i<group.selection.size(); i++)
	3356	+ {
	3357	+ Ungroup(group.selection.get(i));
	3358	+ }
	3359	+
	3360	+ ClearSelection(false);
	3361	+
	3362	+ refreshContents();
	3363	+ }
2534	3364	} else
2535	3365	if (source == genUVItem)
2536	3366	{
..	..	@@ -2542,7 +3372,7 @@
2542	3372	} else
2543	3373	if (source == genNormalsMESHItem)
2544	3374	{
2545		- GenNormals(true); // TODO
	3375	+ GenNormalsMESH();
2546	3376	} else
2547	3377	if (source == genNormalsORGANItem)
2548	3378	{
..	..	@@ -2607,6 +3437,22 @@
2607	3437	if (source == unmarkleavesItem)
2608	3438	{
2609	3439	MarkLeaves(false);
	3440	+ } else
	3441	+ if (source == rewindleavesItem)
	3442	+ {
	3443	+ RewindLeaves(true);
	3444	+ } else
	3445	+ if (source == unrewindleavesItem)
	3446	+ {
	3447	+ RewindLeaves(false);
	3448	+ } else
	3449	+ if (source == randomleavesItem)
	3450	+ {
	3451	+ RandomLeaves(true);
	3452	+ } else
	3453	+ if (source == unrandomleavesItem)
	3454	+ {
	3455	+ RandomLeaves(false);
2610	3456	} else
2611	3457	if (source == flipVItem)
2612	3458	{
..	..	@@ -2815,7 +3661,7 @@
2815	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2816	3662	{
2817	3663	obj = (Object3D)e.nextElement();
2818		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
2819	3665	}
2820	3666
2821	3667	refreshContents();
..	..	@@ -2831,6 +3677,31 @@
2831	3677
2832	3678	refreshContents();
2833	3679	} else
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
	3703	+ refreshContents();
	3704	+ } else
2834	3705	if (source == flashSelectionButton)
2835	3706	{
2836	3707	CameraPane.flash = true;
..	..	@@ -2842,42 +3713,36 @@
2842	3713	if (source == twoButton)
2843	3714	{
2844	3715	radio.layout = twoButton;
2845		- // bug
2846		- //gridPanel.setDividerLocation(1.0);
2847		- //bigPanel.setDividerLocation(0.0);
2848		-// bigThree.remove(scenePanel);
2849		-// bigThree.remove(centralPanel);
2850		-// bigThree.remove(XYZPanel);
2851		-// aWindowConstraints.gridx = 0;
2852		-// aWindowConstraints.gridy = 0;
2853		-// aWindowConstraints.gridwidth = 1;
2854		-// // aConstraints.gridheight = 3;
2855		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2856		-// aWindowConstraints.weightx = 0;
2857		-// aWindowConstraints.weighty = 1;
2858		-// //bigThree.add(jtp, aWindowConstraints);
2859		-// aWindowConstraints.weightx = 1;
2860		-// aWindowConstraints.gridwidth = 3;
2861		-// // aConstraints.gridheight = 3;
2862		-// aWindowConstraints.gridx = 1;
2863		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2864		-// bigThree.add(centralPanel, aWindowConstraints);
2865		-// aWindowConstraints.weightx = 0;
2866		-// aWindowConstraints.gridx = 4;
2867		-// aWindowConstraints.gridwidth = 1;
2868		-// // aConstraints.gridheight = 3;
2869		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2870		-// //bigThree.add(XYZPanel, aWindowConstraints);
2871		-// scenePanel.setVisible(false);
2872		-// centralPanel.setVisible(true);
2873		-// XYZPanel.setVisible(false);
2874		- bigThree.ClearUI();
2875		- bigThree.add(centralPanel);
2876		- bigThree.FlushUI();
	3716	+
	3717	+ if (CameraPane.FULLSCREEN)
	3718	+ fullscreenLayout = radio.layout;
	3719	+
	3720	+ Show3DView();
	3721	+
	3722	+ cameraView.requestFocusInWindow();
	3723	+
	3724	+// refreshContents(true);
	3725	+//
	3726	+// try
	3727	+// {
	3728	+// java.awt.Robot bot = new java.awt.Robot();
	3729	+// int mask = InputEvent.BUTTON1_MASK;
	3730	+// bot.mouseMove(100, 100);
	3731	+// bot.mousePress(mask);
	3732	+// bot.mouseRelease(mask);
	3733	+// }
	3734	+// catch (Exception e)
	3735	+// {
	3736	+//
	3737	+// }
	3738	+
2877	3739	} else
2878	3740	if (source == threeButton)
2879	3741	{
2880	3742	radio.layout = threeButton;
	3743	+
	3744	+ if (CameraPane.FULLSCREEN)
	3745	+ fullscreenLayout = radio.layout;
2881	3746
2882	3747	// bigThree.remove(scenePanel);
2883	3748	// bigThree.remove(centralPanel);
..	..	@@ -2907,13 +3772,18 @@
2907	3772	// centralPanel.setVisible(true);
2908	3773	// XYZPanel.setVisible(true);
2909	3774	bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
2910	3776	bigThree.add(centralPanel);
2911		- bigThree.add(XYZPanel);
2912	3777	bigThree.FlushUI();
	3778	+
	3779	+ cameraView.requestFocusInWindow();
2913	3780	} else
2914	3781	if (source == fourButton)
2915	3782	{
2916	3783	radio.layout = fourButton;
	3784	+
	3785	+ if (CameraPane.FULLSCREEN)
	3786	+ fullscreenLayout = radio.layout;
2917	3787
2918	3788	// bigThree.remove(scenePanel);
2919	3789	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3815,15 @@
2945	3815	bigThree.ClearUI();
2946	3816	bigThree.add(scenePanel);
2947	3817	bigThree.FlushUI();
	3818	+
	3819	+ cameraView.requestFocusInWindow();
2948	3820	} else
2949	3821	if (source == sixButton)
2950	3822	{
2951	3823	radio.layout = sixButton;
	3824	+
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
2952	3827
2953	3828	// bigThree.remove(scenePanel);
2954	3829	// bigThree.remove(centralPanel);
..	..	@@ -2978,13 +3853,18 @@
2978	3853	// centralPanel.setVisible(true);
2979	3854	// XYZPanel.setVisible(false);
2980	3855	bigThree.ClearUI();
2981		- bigThree.add(scenePanel);
2982	3856	bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
2983	3858	bigThree.FlushUI();
	3859	+
	3860	+ cameraView.requestFocusInWindow();
2984	3861	} else
2985	3862	if (source == sevenButton)
2986	3863	{
2987	3864	radio.layout = sevenButton;
	3865	+
	3866	+ if (CameraPane.FULLSCREEN)
	3867	+ fullscreenLayout = radio.layout;
2988	3868
2989	3869	// bigThree.remove(scenePanel);
2990	3870	// bigThree.remove(centralPanel);
..	..	@@ -3018,9 +3898,12 @@
3018	3898	bigThree.add(centralPanel);
3019	3899	bigThree.add(XYZPanel);
3020	3900	bigThree.FlushUI();
	3901	+
	3902	+ cameraView.requestFocusInWindow();
3021	3903	} else
3022	3904	if (source == rootButton)
3023	3905	{
	3906	+ Replace();
3024	3907	Object3D obj;
3025	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3026	3909	{
..	..	@@ -3029,6 +3912,7 @@
3029	3912	EditObject(obj);
3030	3913	}
3031	3914
	3915	+ cameraView.requestFocusInWindow();
3032	3916	refreshContents(true);
3033	3917	} else
3034	3918	if (source == closeButton)
..	..	@@ -3038,22 +3922,37 @@
3038	3922	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	3923	{
3040	3924	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3925	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	3926	{
	3927	+ // Patch to avoid bug with transparency.
	3928	+ if (!ab.hadMaterial)
	3929	+ {
	3930	+ ab.object.material = null;
	3931	+ }
	3932	+
3043	3933	buttonGroup.remove(ab);
3044	3934	radioPanel.remove(ab);
3045	3935
3046		- ab.GetObject().editWindow = null;
	3936	+ //ab.GetObject().editWindow = null;
	3937	+ ab.GetObject().manipWindow = null;
3047	3938	// ab.GetObject().objectUI = null; // ?????????
3048	3939
3049	3940	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	3941	break;
3051	3942	}
3052	3943	}
	3944	+
	3945	+ cameraView.requestFocusInWindow();
3053	3946	refreshContents(true);
3054	3947	} else
3055	3948	if (source == editItem \|\| source == editButton)
3056	3949	{
	3950	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3951	+ {
	3952	+ Object3D child = (Object3D)e.nextElement();
	3953	+ child.pinned = true;
	3954	+ }
	3955	+
3057	3956	EditSelection(false);
3058	3957	} else
3059	3958	if (source == uneditButton)
..	..	@@ -3062,9 +3961,10 @@
3062	3961	{
3063	3962	Object3D child = (Object3D)e.nextElement();
3064	3963	if(child.editWindow != null)
3065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3964	+ child.pinned = false;
3066	3965	child.CloseUI();
3067	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3068	3968
3069	3969	//child.editWindow = null; // ???????????
3070	3970	}
..	..	@@ -3079,16 +3979,18 @@
3079	3979	//copy.ClearUI();
3080	3980	for (Object3D obj : listUI)
3081	3981	{
	3982	+ obj.pinned = false;
3082	3983	obj.CloseUI();
3083	3984	}
3084	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
3085	3987	refreshContents(true);
3086	3988	} else
3087	3989	if (source == allParamsButton)
3088	3990	{
3089	3991	assert(copy == group);
3090	3992
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3993	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	3994
3093	3995	for (Object3D obj : listUI)
3094	3996	{
..	..	@@ -3137,6 +4039,7 @@
3137	4039	}
3138	4040
3139	4041	copy = group;
	4042	+
3140	4043	//Globals.theRenderer.object = group;
3141	4044	if(!useclient)
3142	4045	{
..	..	@@ -3154,7 +4057,8 @@
3154	4057	}
3155	4058
3156	4059	// fix "+" issue
3157		- group.editWindow = this;
	4060	+ //group.editWindow = this;
	4061	+ group.manipWindow = this;
3158	4062
3159	4063	/*
3160	4064	currentLayout = radio.layout;
..	..	@@ -3162,20 +4066,34 @@
3162	4066	currentLayout = sevenButton;
3163	4067	*/
3164	4068	radio.layout.doClick();
	4069	+
	4070	+ SetUndoStates();
	4071	+
	4072	+ ClearUnpinned();
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
	4078	+ EditSelection(false);
3165	4079	keepparent = group.parent;
3166	4080	// PARENT = NULL or not???
3167	4081	//group.parent = null; // ROOT
3168	4082	//group.attributes = -1;
3169	4083	ResetModel();
	4084	+
	4085	+ cameraView.requestFocusInWindow();
3170	4086	refreshContents(true);
3171	4087	} else if (event.getSource() == editCameraItem)
3172	4088	{
3173	4089	cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
3174	4091	cameraView.repaint();
3175	4092	return;
3176		- } else if (event.getSource() == revertCameraItem)
	4093	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	4094	{
3178	4095	cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
3179	4097	cameraView.repaint();
3180	4098	return;
3181	4099	// } else if (event.getSource() == textureButton)
..	..	@@ -3190,7 +4108,6 @@
3190	4108	}
3191	4109
3192	4110	boolean useclient = false;
3193		- cRadio radio;
3194	4111
3195	4112	void ToggleRoot()
3196	4113	{
..	..	@@ -3429,7 +4346,8 @@
3429	4346
3430	4347	int size = obj.MemorySize();
3431	4348
3432		- System.err.println((size/1024) + " KB is the size of " + obj);
	4349	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4350	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3433	4351	}
3434	4352	}
3435	4353	catch (Exception e)
..	..	@@ -3510,6 +4428,13 @@
3510	4428	void GenNormals(boolean crease)
3511	4429	{
3512	4430	group.GenNormalsS(crease);
	4431	+
	4432	+ refreshContents();
	4433	+ }
	4434	+
	4435	+ void GenNormalsMESH()
	4436	+ {
	4437	+ group.GenNormalsMeshS();
3513	4438
3514	4439	refreshContents();
3515	4440	}
..	..	@@ -3745,7 +4670,7 @@
3745	4670
3746	4671	try
3747	4672	{
3748		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3749	4674	}
3750	4675	catch (Exception e)
3751	4676	{
..	..	@@ -4137,6 +5062,18 @@
4137	5062	refreshContents();
4138	5063	}
4139	5064
	5065	+ void RewindLeaves(boolean hide)
	5066	+ {
	5067	+ group.selection.RewindLeaves(hide);
	5068	+ refreshContents();
	5069	+ }
	5070	+
	5071	+ void RandomLeaves(boolean hide)
	5072	+ {
	5073	+ group.selection.RandomLeaves(hide);
	5074	+ refreshContents();
	5075	+ }
	5076	+
4140	5077	void SetTexRes(int tr)
4141	5078	{
4142	5079	group.selection.SetTexRes(tr);
..	..	@@ -4208,28 +5145,25 @@
4208	5145	// }
4209	5146	// }
4210	5147
4211		- static boolean allparams = true;
4212		-
4213		- static Vector<Object3D> listUI = new Vector<Object3D>();
4214		-
4215	5148	void EditSelection(boolean newWindow)
4216	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
4217	5156	// aConstraints.gridy = 0;
4218	5157	for (int i=0; i<group.selection.size(); i++)
4219	5158	{
4220	5159	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4221	5160	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4222		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5161	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4223	5162
4224	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
4225	5164	if(elem != group \|\| !newWindow)
4226	5165	{
4227		- // if (!(elem instanceof Composite))
4228		- // newWindow = false;
4229		- listUI.add(elem);
4230		- elem.openEditWindow(this, newWindow); //, false);
4231		- System.out.println("edit : " + elem);
4232		- elem.editWindow.refreshContents(true); // ? new
	5166	+ EditElement(elem, newWindow); // ? new
4233	5167	}
4234	5168	}
4235	5169	}
..	..	@@ -4292,9 +5226,7 @@
4292	5226
4293	5227	freezemodel = false;
4294	5228	}
4295		-
4296		- boolean flashIt = true;
4297		-
	5229	+
4298	5230	public void valueChanged(TreeSelectionEvent e)
4299	5231	//public boolean handleEvent(Event event)
4300	5232	{
..	..	@@ -4304,7 +5236,8 @@
4304	5236	//new Exception().printStackTrace();
4305	5237
4306	5238	freezemodel = true;
4307		-
	5239	+ ClearUnpinned();
	5240	+
4308	5241	/**/
4309	5242	//switch (event.id)
4310	5243	{
..	..	@@ -4312,7 +5245,6 @@
4312	5245	//case 702: // Event.LIST_DESELECT
4313	5246	group.deselectAll();
4314	5247	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4315		- objEditor.ClearInfo(); // .GetMaterial());
4316	5248	if (tps != null)
4317	5249	{
4318	5250	for (int i=0; i < tps.length; i++)
..	..	@@ -4321,10 +5253,8 @@
4321	5253
4322	5254	//if (child.parent != null)
4323	5255	//child.parent.addSelectee(child);
	5256	+ objEditor.SetMaterial(child);
4324	5257	group.addSelectee(child);
4325		- objEditor.SetMaterial(child); // .GetMaterial());
4326		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4327		- System.err.println("info : " + child.GetPath());
4328	5258	}
4329	5259	}
4330	5260	// else
..	..	@@ -4334,15 +5264,13 @@
4334	5264	// System.err.println("info : " + group.GetPath());
4335	5265	// }
4336	5266
4337		- objEditor.SetText(); // jan 2014
4338		-
4339	5267	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4340	5268	CameraPane.flash = true;
4341	5269
4342	5270	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4343	5271	// a camera
4344	5272	{
4345		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5273	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4346	5274	{
4347	5275	CameraPane.camerachangeframe = 0; // don't refuse it
4348	5276	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4351,6 +5279,13 @@
4351	5279	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4352	5280	}
4353	5281
	5282	+ if (tps != null && tps.length == 1)
	5283	+ {
	5284	+ EditSelection(false);
	5285	+ }
	5286	+
	5287	+ SetPinStates(tps != null && tps.length > 0);
	5288	+
4354	5289	refreshContents();
4355	5290	//return true;
4356	5291	}
..	..	@@ -4359,6 +5294,50 @@
4359	5294
4360	5295	freezemodel = false;
4361	5296	}
	5297	+
	5298	+ void SetPinStates(boolean enabled)
	5299	+ {
	5300	+ editButton.setEnabled(enabled);
	5301	+ uneditButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
	5303	+ flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
	5319	+ }
	5320	+
	5321	+ void refreshContents(boolean cp)
	5322	+ {
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5324	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5325	+ {
	5326	+ objEditor.ClearInfo(); // .GetMaterial());
	5327	+
	5328	+ for (int i=0; i < group.selection.Size(); i++)
	5329	+ {
	5330	+ Object3D child = (Object3D) group.selection.get(i);
	5331	+
	5332	+ objEditor.AddInfo(child, this, true);
	5333	+// System.err.println("info : " + child.GetPath());
	5334	+ }
	5335	+
	5336	+ objEditor.SetText(); // jan 2014
	5337	+ }
	5338	+
	5339	+ super.refreshContents(cp);
	5340	+ }
4362	5341
4363	5342	void linkSomething(Object3D thing)
4364	5343	{
..	..	@@ -4441,7 +5420,8 @@
4441	5420
4442	5421	if (cut)
4443	5422	{
4444		- Save();
	5423	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5424	+// Save();
4445	5425	//int indices[] = jList.getSelectedIndices();
4446	5426	//for (int i = indices.length - 1; i >= 0; i--)
4447	5427	//jList.remove(indices[i]);
..	..	@@ -4544,6 +5524,10 @@
4544	5524
4545	5525	void paste(boolean expand)
4546	5526	{
	5527	+ if (Globals.REPLACEONMAKE)
	5528	+ Save();
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
4547	5531	// if (GrafreeD.clipboard == null)
4548	5532	// return;
4549	5533	boolean first = true;
..	..	@@ -4603,6 +5587,7 @@
4603	5587	Grafreed.clipboard.get(0).parent = keepparent;
4604	5588	}
4605	5589
	5590	+ Globals.REPLACEONMAKE = keep;
4606	5591	ResetModel();
4607	5592	refreshContents();
4608	5593	}
..	..	@@ -4738,6 +5723,10 @@
4738	5723
4739	5724	void group(Object3D csg, boolean grab)
4740	5725	{
	5726	+ if (Globals.REPLACEONMAKE)
	5727	+ Save();
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
4741	5730	if (//false) // why??
4742	5731	!group.selection.isEmpty())
4743	5732	{
..	..	@@ -4851,10 +5840,15 @@
4851	5840	//node.add(csg);
4852	5841	//makeSomething(node);
4853	5842	makeSomething(csg);
	5843	+ Globals.REPLACEONMAKE = keep;
4854	5844	}
4855	5845
4856	5846	void Ungroup(Object3D g)
4857	5847	{
	5848	+ if (Globals.REPLACEONMAKE)
	5849	+ Save();
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
4858	5852	if (g instanceof HiddenObject)
4859	5853	{
4860	5854	HiddenObject h = (HiddenObject) g;
..	..	@@ -4871,6 +5865,7 @@
4871	5865	objEditor.makeSomething(g.get(i), false);
4872	5866	}
4873	5867	}
	5868	+ Globals.REPLACEONMAKE = keep;
4874	5869	}
4875	5870
4876	5871	void ungroup()
..	..	@@ -5159,10 +6154,43 @@
5159	6154	cButton clearpanelButton;
5160	6155	cButton unselectButton;
5161	6156
5162		- cButton saveButton;
5163		- cButton undoButton;
5164		- cButton redoButton;
	6157	+ cButton restoreCameraButton;
	6158	+
5165	6159	cButton oneStepButton;
	6160	+
	6161	+ cButton groupButton;
	6162	+ cButton ungroupButton;
	6163	+ cButton compositeButton;
	6164	+ cButton switchButton;
	6165	+ cButton loopButton;
	6166	+ cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
	6183	+
	6184	+ cButton gridButton;
	6185	+ cButton boxButton;
	6186	+ cButton sphereButton;
	6187	+ cButton coneButton;
	6188	+ cButton torusButton;
	6189	+ cButton superButton;
	6190	+ cButton kleinButton;
	6191	+ cButton particlesButton;
	6192	+ cButton overlayButton;
	6193	+ cButton lightButton;
5166	6194
5167	6195	cButton screenfitButton;
5168	6196	cButton screenfitpointButton;
..	..	@@ -5175,14 +6203,6 @@
5175	6203
5176	6204	cButton setsupportButton;
5177	6205
5178		- cButton twoButton;
5179		- cButton sixButton;
5180		- cButton threeButton;
5181		- cButton sevenButton;
5182		- cButton fourButton; // full panel
5183		- cButton oneButton; // full XYZ
5184		- //cButton currentLayout;
5185		-
5186	6206	//
5187	6207	//Composite
5188	6208	Object3D // to do !!
..	..	@@ -5192,11 +6212,11 @@
5192	6212	//JTree jTree;
5193	6213	private MenuItem lookAtItem;
5194	6214	private MenuItem lookFromItem;
5195		- private MenuItem switchItem;
	6215	+ private MenuItem switchViewItem;
5196	6216	private MenuItem cutItem;
5197	6217	private MenuItem undoItem;
5198	6218	private MenuItem redoItem;
5199		- private MenuItem duplicateItem;
	6219	+ private JMenuItem duplicateItem;
5200	6220	private MenuItem cloneItem;
5201	6221	private MenuItem cloneSupportItem;
5202	6222	private MenuItem overwriteGeoItem;
..	..	@@ -5224,7 +6244,7 @@
5224	6244	private MenuItem pasteLinkItem;
5225	6245	private MenuItem pasteCloneItem;
5226	6246	private MenuItem pasteExpandItem;
5227		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
5228	6248	private MenuItem clearAllItem;
5229	6249	private MenuItem genUVItem;
5230	6250	private MenuItem genNormalsMESHItem;
..	..	@@ -5259,6 +6279,10 @@
5259	6279	private MenuItem showleavesItem;
5260	6280	private MenuItem markleavesItem;
5261	6281	private MenuItem unmarkleavesItem;
	6282	+ private MenuItem rewindleavesItem;
	6283	+ private MenuItem unrewindleavesItem;
	6284	+ private MenuItem randomleavesItem;
	6285	+ private MenuItem unrandomleavesItem;
5262	6286
5263	6287	private MenuItem flipVItem;
5264	6288	private MenuItem unflipVItem;
..	..	@@ -5280,7 +6304,7 @@
5280	6304	private MenuItem frontItem;
5281	6305	private MenuItem cameraItem;
5282	6306	private MenuItem compositeItem;
5283		- private MenuItem randomItem;
	6307	+ private MenuItem switchItem;
5284	6308	private MenuItem physicsItem;
5285	6309	private MenuItem frameselectorItem;
5286	6310	private MenuItem scriptNodeItem;
..	..	@@ -5304,6 +6328,8 @@
5304	6328	private MenuItem attachBumpItem;
5305	6329	private MenuItem detachBumpItem;
5306	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5307	6333
5308	6334	private MenuItem particleItem;
5309	6335	private MenuItem ragdollItem;
..	..	@@ -5354,5 +6380,5 @@
5354	6380
5355	6381	Menu cameraMenu;
5356	6382	MenuItem editCameraItem;
5357		- MenuItem revertCameraItem;
	6383	+ MenuItem restoreCameraItem;
5358	6384	}