~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,237 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
26	257	//ObjEditor objEditor;
27	258	public void closeUI2()
28	259	{
..	..	@@ -60,6 +291,12 @@
60	291	this.copy = this.group = group;
61	292	//selectees = this.group.selectees;
62	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
63	300	if(ui)
64	301	SetupUI(objEditor);
65	302	}
..	..	@@ -80,10 +317,22 @@
80	317	SetupViews(objEditor);
81	318
82	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
83	328	}
84	329
85	330	void CloneSelection(boolean supports)
86	331	{
	332	+ if (Globals.REPLACEONMAKE)
	333	+ Save();
	334	+ boolean keep = Globals.REPLACEONMAKE;
	335	+ Globals.REPLACEONMAKE = false;
87	336	// Object3D keep = GrafreeD.clipboard;
88	337	//Object3D obj;
89	338	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +343,7 @@
94	343
95	344	makeSomething(clone, i==group.selection.size()-1);
96	345	}
	346	+ Globals.REPLACEONMAKE = keep;
97	347	}
98	348
99	349	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +400,8 @@
150	400
151	401	void SetupMenu2(GroupEditor oe)
152	402	{
	403	+ oe.jTree = new cTree();
	404	+
153	405	Menu menu;
154	406	oe.menuBar.add(menu = new Menu("Edit"));
155	407	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +412,7 @@
160	412	// redoItem = menu.add(new MenuItem("Redo"));
161	413	// redoItem.addActionListener(this);
162	414	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	415	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	416	duplicateItem.addActionListener(this);
165	417	cloneItem = menu.add(new MenuItem("Clone"));
166	418	cloneItem.addActionListener(this);
..	..	@@ -176,7 +428,6 @@
176	428	copyItem.addActionListener(this);
177	429	pasteItem = menu.add(new MenuItem("Paste"));
178	430	pasteItem.addActionListener(this);
179		- menu.add("-");
180	431
181	432	menu.add("-");
182	433	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +439,8 @@
188	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	440	// pasteExpandItem.addActionListener(this);
190	441	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
193	444
194	445	if (Globals.ADVANCED)
195	446	{
..	..	@@ -203,23 +454,23 @@
203	454	//zBufferItem.addActionListener(this);
204	455	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	456	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	457	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	458	+ restoreCameraItem.addActionListener(this);
208	459
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	460	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	461	+// toggleFullScreenItem.addItemListener(this);
	462	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	463	+// cameraMenu.add("-");
	464	+//
	465	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	466	+// toggleTextureItem.addItemListener(this);
	467	+// toggleTextureItem.setState(CameraPane.textureon);
	468	+//
	469	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	470	+// toggleSwitchItem.addItemListener(this);
	471	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	472
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"));
	473	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	474	toggleHandleItem.addItemListener(this);
224	475	toggleHandleItem.setState(CameraPane.HANDLES);
225	476
..	..	@@ -246,7 +497,7 @@
246	497
247	498	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	499	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	500	+ toggleDebugItem.setState(Globals.DEBUG);
250	501
251	502	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	503	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +525,7 @@
274	525	{
275	526	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	527	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	528	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	529	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	530	oe.cameraMenu.add("-");
280	531	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +533,7 @@
282	533	editLeafItem.addActionListener(this);
283	534	lookAtItem.addActionListener(this);
284	535	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	536	+ //switchViewItem.addActionListener(this);
286	537	}
287	538
288	539	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +578,29 @@
327	578	}
328	579
329	580	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	581	+// grabItem = menu.add(new MenuItem("Grab"));
	582	+// grabItem.addActionListener(this);
332	583	backItem = menu.add(new MenuItem("Back"));
333	584	backItem.addActionListener(this);
334	585	frontItem = menu.add(new MenuItem("Front"));
335	586	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	587	+// compositeItem = menu.add(new MenuItem("Composite"));
	588	+// compositeItem.addActionListener(this);
	589	+
	590	+ if (Globals.ADVANCED)
	591	+ {
338	592	hideItem = menu.add(new MenuItem("Hidden Group"));
339	593	hideItem.addActionListener(this);
	594	+ }
340	595	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	596	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	597	+
	598	+// menu.add("-");
	599	+//
	600	+// switchItem = menu.add(new MenuItem("Switch node"));
	601	+// switchItem.addActionListener(this);
	602	+ if (Globals.ADVANCED)
	603	+ {
345	604	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	605	switchGeoItem.addActionListener(this);
347	606	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +608,6 @@
349	608	morphItem = menu.add(new MenuItem("Morph Group"));
350	609	morphItem.addActionListener(this);
351	610
352		- if (Globals.ADVANCED)
353		- {
354	611	menu.add("-");
355	612	physicsItem = menu.add(new MenuItem("Physics"));
356	613	physicsItem.addActionListener(this);
..	..	@@ -358,30 +615,29 @@
358	615	frameselectorItem.addActionListener(this);
359	616	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	617	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	618	}
364	619
365	620	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	621	+// textureItem = menu.add(new MenuItem("Texture"));
	622	+// textureItem.addActionListener(this);
368	623	billboardItem = menu.add(new MenuItem("Billboard"));
369	624	billboardItem.addActionListener(this);
370	625	csgItem = menu.add(new MenuItem("CSG"));
371	626	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	627	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	628	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	629	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	630	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	631	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	632	shadowZItem.addActionListener(this);
	633	+ attributeItem = menu.add(new MenuItem("Attribute"));
	634	+ attributeItem.addActionListener(this);
	635	+
378	636	if (Globals.ADVANCED)
379	637	{
380	638	menu.add("-");
381	639	linkerItem = menu.add(new MenuItem("Linker"));
382	640	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	641	templateItem = menu.add(new MenuItem("Template"));
386	642	templateItem.addActionListener(this);
387	643	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +666,7 @@
410	666	genNormalsMESHItem.addActionListener(this);
411	667	if (Globals.ADVANCED)
412	668	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	670	genNormalsMINEItem.addActionListener(this);
415	671	}
416	672	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +759,15 @@
503	759	attachBumpItem.addActionListener(this);
504	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
506	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	764	detachPigmentItem.addActionListener(this);
508	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
510	771	menu.add("-");
511	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	773	sortbysizeItem.addActionListener(this);
..	..	@@ -533,8 +794,21 @@
533	794	buildToolsMenu(menu);
534	795	}
535	796
	797	+
536	798	void SetupUI2(ObjEditor oe)
537	799	{
	800	+ // June 2019
	801	+ if (oe == null)
	802	+ {
	803	+ //super.SetupUI2(this);
	804	+ //return;
	805	+ }
	806	+
	807	+ if (copy != group)
	808	+ {
	809	+ //super.SetupUI2(this);
	810	+ }
	811	+
538	812	//new Exception().printStackTrace();
539	813
540	814	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -563,39 +837,79 @@
563	837	oe.radioPanel.add(dummyButton);
564	838	oe.buttonGroup.add(dummyButton);
565	839	*/
	840	+ cGridBag copyOptionsPanel = new cGridBag();
	841	+
	842	+ copyOptionsPanel.preferredHeight = 2;
	843	+
566	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	845
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- undoButton.setToolTipText("Undo changes");
570		- undoButton.addActionListener(this);
	846	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	847	+ //minButton.setToolTipText("Minimize window");
	848	+ //minButton.addActionListener(this);
571	849
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- redoButton.setToolTipText("Redo changes");
574		- redoButton.addActionListener(this);
	850	+ if (Globals.ADVANCED)
	851	+ {
	852	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	853	+ maxButton.setToolTipText("Maximize window");
	854	+ maxButton.addActionListener(this);
	855	+ }
575	856
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- saveButton.setToolTipText("Save changes");
	857	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	858	+ fullButton.setToolTipText("Full-screen window");
	859	+ fullButton.addActionListener(this);
	860	+
	861	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	862	+ screenfitButton.setToolTipText("Screen fit");
	863	+ screenfitButton.addActionListener(this);
	864	+
	865	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	866	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	867	+ restoreCameraButton.addActionListener(this);
	868	+
	869	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	870	+ saveButton.setToolTipText("New version");
578	871	saveButton.addActionListener(this);
	872	+
	873	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	874	+ undoButton.setToolTipText("Previous version");
	875	+ undoButton.addActionListener(this);
	876	+ undoButton.setEnabled(false);
579	877
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	878	+ cGridBag updown = new cGridBag().setVertical(true);
	879	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	880	+ restoreButton.setToolTipText("Restore current");
	881	+ restoreButton.addActionListener(this);
	882	+ restoreButton.setEnabled(false);
	883	+
	884	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	885	+ replaceButton.setToolTipText("Replace current");
	886	+ replaceButton.addActionListener(this);
	887	+ replaceButton.setEnabled(false);
	888	+
	889	+ copyOptionsPanel.add(updown);
	890	+
	891	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	892	+ redoButton.setToolTipText("Next version");
	893	+ redoButton.addActionListener(this);
	894	+ redoButton.setEnabled(false);
	895	+
	896	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
581	897	liveCB.setToolTipText("Enable animation");
582	898	liveCB.addItemListener(this);
583	899
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	900	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	901	oneStepButton.setToolTipText("Animate one step forward");
586	902	oneStepButton.addActionListener(this);
587	903
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	904	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	905	fastCB.setToolTipText("Fast mode");
590	906	fastCB.addItemListener(this);
591	907
592		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
593		- trackCB.setToolTipText("Enable tracking");
594		- trackCB.addItemListener(this);
595		-
596		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- screenfitButton.setToolTipText("Screen fit");
598		- screenfitButton.addActionListener(this);
	908	+ //oe.toolboxPanel.Return();
	909	+
	910	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	911	+// trackCB.setToolTipText("Enable tracking");
	912	+// trackCB.addItemListener(this);
599	913
600	914	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	915	// screenfitpointButton.addActionListener(this);
..	..	@@ -605,67 +919,155 @@
605	919	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606	920	snapobjectButton.addActionListener(this);
607	921	snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	924	+ fourButton.addActionListener(this);
	925	+ fourButton.setToolTipText("Show control panel only");
608	926	}
609	927
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	928	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	929
614		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
615		-
616		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- twoButton.setToolTipText("Show center view only");
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
618	932	twoButton.addActionListener(this);
619		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- fourButton.addActionListener(this);
621		- fourButton.setToolTipText("Show left panel only");
622		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623		- sixButton.setToolTipText("2-column layout left");
624		- sixButton.addActionListener(this);
625		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- threeButton.setToolTipText("2-column layout right");
	933	+ this.fullscreenLayout = twoButton;
	934	+
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
627	937	threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- sevenButton.setToolTipText("3-column layout");
630		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
631	944	//
632	945
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- rootButton.setToolTipText("Edit selection in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
635	948	rootButton.addActionListener(this);
636	949
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	951	closeButton.setToolTipText("Close tab");
639	952	closeButton.addActionListener(this);
640	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	954	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	955	+
	956	+ cGridBag row1 = new cGridBag();
644	957
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	958	+ // INSERT
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	960	+ gridButton.setToolTipText("Create grid");
	961	+ gridButton.addActionListener(this);
	962	+
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	964	+ boxButton.setToolTipText("Create box");
	965	+ boxButton.addActionListener(this);
	966	+
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	968	+ sphereButton.setToolTipText("Create sphere");
	969	+ sphereButton.addActionListener(this);
	970	+
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	972	+ coneButton.setToolTipText("Create cone");
	973	+ coneButton.addActionListener(this);
	974	+
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	976	+ torusButton.setToolTipText("Create torus");
	977	+ torusButton.addActionListener(this);
	978	+
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	980	+ superButton.setToolTipText("Create superellipsoid");
	981	+ superButton.addActionListener(this);
	982	+
	983	+ if (Globals.ADVANCED)
	984	+ {
	985	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	986	+ kleinButton.setToolTipText("Create Klein bottle");
	987	+ kleinButton.addActionListener(this);
	988	+ }
	989	+
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	991	+ particlesButton.setToolTipText("Create particle system");
	992	+ particlesButton.addActionListener(this);
	993	+
	994	+ oe.toolboxPanel.add(row1);
	995	+
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ groupButton.setToolTipText("Create group");
	1000	+ groupButton.addActionListener(this);
	1001	+
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1003	+ compositeButton.setToolTipText("Create composite");
	1004	+ compositeButton.addActionListener(this);
	1005	+
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ switchButton.setToolTipText("Create item switcher");
	1008	+ switchButton.addActionListener(this);
	1009	+
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+ loopButton.setToolTipText("Create loop");
	1012	+ loopButton.addActionListener(this);
	1013	+
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ textureButton.setToolTipText("Create texture");
	1016	+ textureButton.addActionListener(this);
	1017	+
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ overlayButton.setToolTipText("Create overlay");
	1020	+ overlayButton.addActionListener(this);
	1021	+
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1023	+ lightButton.setToolTipText("Create light");
	1024	+ lightButton.addActionListener(this);
	1025	+
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
	1040	+
	1041	+ // EDIT panel
	1042	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1043	+ editButton.setToolTipText("Pin selection controls");
647	1044	editButton.addActionListener(this);
648	1045
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	1046	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ uneditButton.setToolTipText("Remove selection controls");
651	1048	uneditButton.addActionListener(this);
652	1049
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	1050	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1051	+ allParamsButton.setToolTipText("Show all controle");
655	1052	allParamsButton.addActionListener(this);
656	1053
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658	1055	clearPanelButton.setToolTipText("Clear edit panel");
659	1056	clearPanelButton.addActionListener(this);
660	1057
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	1059	unselectButton.setToolTipText("Unselect");
663	1060	unselectButton.addActionListener(this);
664	1061
665		- commandsPanel.preferredHeight = 1;
	1062	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ flashSelectionButton.setToolTipText("Highlight selection");
	1064	+ flashSelectionButton.addActionListener(this);
666	1065
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	1066	+ editCommandsPanel.preferredHeight = 1;
	1067	+
	1068	+ SetPinStates(false);
	1069	+// oe.treePanel.add(commandsPanel);
	1070	+// oe.treePanel.Return();
669	1071
670	1072	// oe.aConstraints.gridx += 1;
671	1073	// oe.aConstraints.weighty = 0;
..	..	@@ -682,32 +1084,20 @@
682	1084
683	1085	JScrollPane jSP;
684	1086	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1087	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	1088	ResetModel();
687	1089
688	1090	oe.treePanel.add(jSPPanel);
689	1091	oe.treePanel.Return();
690	1092
691		- cGridBag copyOptionsPanel = new cGridBag();
692		-
693		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
694		- colorCB.setToolTipText("Copy color when dropped");
695		- colorCB.addItemListener(this);
696		-
697		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
698		- materialCB.setToolTipText("Copy material when dropped");
699		- materialCB.addItemListener(this);
700		-
701		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
702		- textureCB.setToolTipText("Copy texture when dropped");
703		- textureCB.addItemListener(this);
704		-
705		- copyOptionsPanel.preferredHeight = 1;
706	1093	oe.treePanel.add(copyOptionsPanel);
707	1094	oe.treePanel.Return();
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1097	+ sliderPane.preferredHeight = 1;
708	1098
709		-// mainPanel.setDividerLocation(0.5); //1.0);
710		-// mainPanel.setResizeWeight(0.5);
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
711	1101
712	1102	//jList.addListSelectionListener(this);
713	1103	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -715,7 +1105,7 @@
715	1105	//jTree.setEditable(true);
716	1106	oe.jTree.setDragEnabled(true);
717	1107	//jTree.setPreferredSize(new Dimension(10,10));
718		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
719	1109
720	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
721	1111
..	..	@@ -727,29 +1117,49 @@
727	1117	dgr.addDragGestureListener(this);
728	1118	}catch(Exception e) {}
729	1119	*/
730		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
731	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
732	1122	}
733	1123
734	1124	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	1125	{
	1126	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1127	+ colorCB.setToolTipText("Copy color when dropped");
	1128	+ colorCB.addItemListener(this);
	1129	+
	1130	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1131	+ materialCB.setToolTipText("Copy material when dropped");
	1132	+ materialCB.addItemListener(this);
	1133	+
	1134	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1135	+ textureCB.setToolTipText("Copy texture when dropped");
	1136	+ textureCB.addItemListener(this);
	1137	+
	1138	+ panel.Return();
	1139	+
736	1140	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	1141	boxCB.setToolTipText("Display bounding boxes");
738	1142	boxCB.addItemListener(this);
739	1143
740	1144	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1145	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	1146	zoomBoxCB.addItemListener(this);
743	1147
744	1148	if (true) // Globals.ADVANCED)
745	1149	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	1150	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1151	+// supportCB.setToolTipText("Enable rigging");
	1152	+// supportCB.addItemListener(this);
	1153	+
	1154	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1155	+ freezeCB.setToolTipText("Fast moving camera");
	1156	+ freezeCB.addItemListener(this);
749	1157
750	1158	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	1159	// localCB.addItemListener(this);
752	1160
	1161	+ panel.Return();
	1162	+
753	1163	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	1164	crowdCB.setToolTipText("Used for crowds");
755	1165	crowdCB.addItemListener(this);
..	..	@@ -766,6 +1176,8 @@
766	1176	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	1177	// speakerMocapCB.addItemListener(this);
768	1178
	1179	+ panel.Return();
	1180	+
769	1181	if (false)
770	1182	{
771	1183	// handled in scripts
..	..	@@ -780,34 +1192,74 @@
780	1192	//constraints.gridy += 1;
781	1193	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	1194	smoothfocusCB.addItemListener(this);
	1195	+ panel.Return();
783	1196	}
784	1197
785	1198	//constraints.gridx += 1;
786	1199	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	1200	// debugCB.addItemListener(this);
788	1201
	1202	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1203	+ trackCB.setToolTipText("Enable tracking target");
	1204	+ trackCB.addItemListener(this);
	1205	+
789	1206	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1207	+ oeilCB.setToolTipText("Move camera when tracking");
790	1208	oeilCB.addItemListener(this);
791	1209
	1210	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1211	+ shadowCB.setToolTipText("When live compute shadows");
	1212	+ shadowCB.addItemListener(this);
	1213	+
	1214	+ panel.Return();
	1215	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1216	+ toggleTextureCB.setToolTipText("Load textures");
	1217	+ toggleTextureCB.addItemListener(this);
	1218	+
	1219	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1220	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1221	+ toggleSwitchCB.addItemListener(this);
	1222	+
	1223	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1224	+ autokeepCB.setToolTipText("On structure change");
	1225	+ autokeepCB.addItemListener(this);
	1226	+
	1227	+ panel.Return();
	1228	+ if (Globals.ADVANCED)
	1229	+ {
792	1230	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	1231	lookAtCB.setToolTipText("Look-at target");
794	1232	lookAtCB.addItemListener(this);
	1233	+ }
795	1234
796	1235	}
797	1236
798	1237	cGridBag fill = new cGridBag();
799		-
800	1238	fill.preferredHeight = 200;
	1239	+ cGridBag fill2 = new cGridBag();
	1240	+ fill2.preferredHeight = 200;
	1241	+ cGridBag fill3 = new cGridBag();
	1242	+ fill3.preferredHeight = 200;
801	1243
802	1244	panel.add(fill);
	1245	+ panel.add(fill2);
	1246	+ panel.add(fill3);
803	1247
804	1248	}
805	1249
806	1250	void EditObject(Object3D obj)
807	1251	{
808	1252	cRadio radioButton = new cRadio(obj.name);
	1253	+
	1254	+ // June 2019. Patch to avoid bug with transparency.
	1255	+ radioButton.hadMaterial = obj.material != null;
	1256	+ if (!radioButton.hadMaterial)
	1257	+ {
	1258	+ obj.material = new cMaterial();
	1259	+ }
	1260	+
809	1261	radioButton.SetObject(obj);
810		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
811	1263	radioButton.SetCamera(cameraView.renderCamera, false);
812	1264	radioButton.addActionListener(this);
813	1265	radioPanel.add(radioButton);
..	..	@@ -817,6 +1269,8 @@
817	1269
818	1270	void SetupViews(ObjEditor oe)
819	1271	{
	1272	+ theFrame = this;
	1273	+
820	1274	oe.SetupViews();
821	1275
822	1276	System.out.println("SetupViews");
..	..	@@ -825,23 +1279,28 @@
825	1279	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1280	}
827	1281
828		- JCheckBox liveCB;
829		- JCheckBox supportCB;
830		- JCheckBox localCB;
831		- JCheckBox crowdCB;
832		- JCheckBox smoothCB;
833		- JCheckBox fastCB;
834		- JCheckBox slowCB;
835		- JCheckBox boxCB;
836		- JCheckBox zoomBoxCB;
837		- JCheckBox trackCB;
838		- JCheckBox smoothfocusCB;
	1282	+ cToggleButton liveCB;
	1283	+ cCheckBox supportCB;
	1284	+ cCheckBox localCB;
	1285	+ cCheckBox crowdCB;
	1286	+ cCheckBox smoothCB;
	1287	+ cToggleButton fastCB;
	1288	+ cCheckBox slowCB;
	1289	+ cCheckBox boxCB;
	1290	+ cCheckBox zoomBoxCB;
	1291	+ cCheckBox freezeCB;
	1292	+ //cToggleButton trackCB;
	1293	+ cCheckBox trackCB;
	1294	+ cCheckBox smoothfocusCB;
839	1295	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1296	+ cCheckBox speakerCameraCB;
	1297	+ cCheckBox speakerFocusCB;
	1298	+ cCheckBox debugCB;
	1299	+
	1300	+ cCheckBox oeilCB;
	1301	+ cCheckBox shadowCB;
	1302	+ cCheckBox autokeepCB;
	1303	+ cCheckBox lookAtCB;
845	1304
846	1305	// static int COLOR = 1;
847	1306	// static int MATERIAL = 2;
..	..	@@ -849,9 +1308,9 @@
849	1308
850	1309	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1310
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1311	+ cCheckBox colorCB;
	1312	+ cCheckBox materialCB;
	1313	+ cCheckBox textureCB;
855	1314
856	1315	public void itemStateChanged(ItemEvent e)
857	1316	{
..	..	@@ -944,6 +1403,18 @@
944	1403	{
945	1404	cameraView.ToggleOeil();
946	1405	}
	1406	+ else if(e.getSource() == shadowCB)
	1407	+ {
	1408	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1409	+ }
	1410	+ else if(e.getSource() == freezeCB)
	1411	+ {
	1412	+ Globals.FREEZEONMOVE ^= true;
	1413	+ }
	1414	+ else if(e.getSource() == autokeepCB)
	1415	+ {
	1416	+ Globals.REPLACEONMAKE ^= true;
	1417	+ }
947	1418	else if(e.getSource() == lookAtCB)
948	1419	{
949	1420	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1431,8 @@
960	1431
961	1432	/**/
962	1433	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1434	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1435	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1436	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1437	// We can't move the root node or an empty selection
966	1438	return;
..	..	@@ -1023,8 +1495,6 @@
1023	1495	}
1024	1496	}
1025	1497
1026		- String string = (String) object;
1027		-
1028	1498	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1499	// if( object instanceof java.io.File[])
1030	1500	// {
..	..	@@ -1032,6 +1502,8 @@
1032	1502	// objEditor.DropFile((java.io.File[]) object, true);
1033	1503	// return;
1034	1504	// }
	1505	+
	1506	+ String string = object.toString();
1035	1507
1036	1508	// File path for Mac and Windows
1037	1509	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1549,33 @@
1077	1549
1078	1550	assert target == objEditor.jTree;
1079	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
1080	1553	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1555	} catch (Exception e) {
1083	1556	System.out.println("destinationPath : " + destinationPath);
1084	1557	return;
1085	1558	}
1086	1559
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1560	+ for (int i=group.selection.size(); --i>=0;)
1088	1561	{
	1562	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1563	+
	1564	+ // Cannot move into itself
	1565	+ if (child == destinationLeaf)
	1566	+ return;
	1567	+ }
	1568	+
	1569	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1570	+// {
1089	1571	loadClipboard(true);
1090	1572	objEditor.jTree.setSelectionPath(destinationPath);
1091	1573	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1574	+// } else {
	1575	+// loadClipboard(false);
	1576	+// objEditor.jTree.setSelectionPath(destinationPath);
	1577	+// pasteInto(false, false); // true); // ???
	1578	+// }
1097	1579	}
1098	1580	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1581	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1680,30 @@
1198	1680	{
1199	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1682	//heightFieldItem.addActionListener(this);
1201		- gridItem = menu.add(new MenuItem("Grid"));
1202		- gridItem.addActionListener(this);
1203		- rectoidItem = menu.add(new MenuItem("Box"));
1204		- rectoidItem.addActionListener(this);
1205		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1206		- ellipsoidItem.addActionListener(this);
1207		- coneItem = menu.add(new MenuItem("Cone"));
1208		- coneItem.addActionListener(this);
1209		- torusItem = menu.add(new MenuItem("Torus"));
1210		- torusItem.addActionListener(this);
1211		- superItem = menu.add(new MenuItem("Superellipsoid"));
1212		- superItem.addActionListener(this);
	1683	+// gridItem = menu.add(new MenuItem("Grid"));
	1684	+// gridItem.addActionListener(this);
	1685	+// rectoidItem = menu.add(new MenuItem("Box"));
	1686	+// rectoidItem.addActionListener(this);
	1687	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1688	+// ellipsoidItem.addActionListener(this);
	1689	+// coneItem = menu.add(new MenuItem("Cone"));
	1690	+// coneItem.addActionListener(this);
	1691	+// torusItem = menu.add(new MenuItem("Torus"));
	1692	+// torusItem.addActionListener(this);
	1693	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1694	+// superItem.addActionListener(this);
	1695	+
	1696	+ cameraItem = menu.add(new MenuItem("Camera"));
	1697	+ cameraItem.addActionListener(this);
	1698	+
	1699	+ if (!Globals.ADVANCED)
	1700	+ {
1213	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1702	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
1217	1707	if (Globals.ADVANCED)
1218	1708	{
1219	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1729,15 @@
1239	1729	}
1240	1730	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1731	bezierItem.addActionListener(this);
1242		- overlayItem = menu.add(new MenuItem("Overlay"));
1243		- overlayItem.addActionListener(this);
1244		- lightItem = menu.add(new MenuItem("Light"));
1245		- lightItem.addActionListener(this);
	1732	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1733	+// overlayItem.addActionListener(this);
	1734	+// lightItem = menu.add(new MenuItem("Light"));
	1735	+// lightItem.addActionListener(this);
1246	1736	menu.add("-");
1247	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1738	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1251	1741	doubleItem = menu.add(new MenuItem("Fork"));
1252	1742	doubleItem.addActionListener(this);
1253	1743	if (Globals.ADVANCED)
..	..	@@ -1263,6 +1753,9 @@
1263	1753	animationItem.addItemListener(this);
1264	1754	animationItem.setState(Globals.ANIMATION);
1265	1755
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
	1758	+
1266	1759	menu.add("-");
1267	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1268	1761	parseverticesItem.addActionListener(this);
..	..	@@ -1275,6 +1768,8 @@
1275	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1276	1769	reduce34MorphItem.addActionListener(this);
1277	1770	menu.add("-");
	1771	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1772	+ memoryItem.addActionListener(this);
1278	1773	menu.add(computeAOItem = new MenuItem("Compute AO"));
1279	1774	computeAOItem.addActionListener(this);
1280	1775
..	..	@@ -1283,8 +1778,6 @@
1283	1778	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1284	1779	mirrorItem.addActionListener(this);
1285	1780	menu.add("-");
1286		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1287		- memoryItem.addActionListener(this);
1288	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1289	1782	analyzeItem.addActionListener(this);
1290	1783	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1428,9 +1921,34 @@
1428	1921	shadow.material = new cMaterial(obj.material);
1429	1922	shadow.material.diffuse = 0.0001f;
1430	1923	shadow.material.specular = 0.0001f;
	1924	+ //shadow.projectedVertices[1].x = 300;
1431	1925
1432	1926	makeSomething(shadow);
1433	1927	}
	1928	+
	1929	+ private void ClearUnpinned()
	1930	+ {
	1931	+ //for (Object3D obj : listUI)
	1932	+ for (int i=listUI.size(); --i>=0;)
	1933	+ {
	1934	+ Object3D obj = listUI.elementAt(i);
	1935	+ if (!obj.pinned)
	1936	+ {
	1937	+ obj.CloseUI();
	1938	+ listUI.remove(i);
	1939	+ }
	1940	+ }
	1941	+ }
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1434	1952
1435	1953	/**
1436	1954	* applyExample
..	..	@@ -1675,7 +2193,7 @@
1675	2193	{
1676	2194	ScreenFit();
1677	2195	} else
1678		- if (source == switchItem)
	2196	+ if (source == switchViewItem)
1679	2197	{
1680	2198	cVector v1 = new cVector();
1681	2199	cVector v2 = new cVector();
..	..	@@ -1684,11 +2202,11 @@
1684	2202	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	2203	objEditor.cameraView.repaint();
1686	2204	} else
1687		- if (source == rectoidItem)
	2205	+ if (source == rectoidItem \|\| source == boxButton)
1688	2206	{
1689	2207	makeSomething(new Box());
1690	2208	} else
1691		- if (source == particleItem)
	2209	+ if (source == particleItem \|\| source == particlesButton)
1692	2210	{
1693	2211	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	2212	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +2285,27 @@
1767	2285
1768	2286	makeSomething(obj);
1769	2287	} else
1770		- if (source == gridItem)
	2288	+ if (source == gridItem \|\| source == gridButton)
1771	2289	{
1772	2290	makeSomething(new Grid());
1773	2291	} else
1774		- if (source == ellipsoidItem)
	2292	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2293	{
1776	2294	makeSomething(new Sphere());
1777	2295	} else
1778		- if (source == coneItem)
	2296	+ if (source == coneItem \|\| source == coneButton)
1779	2297	{
1780	2298	makeSomething(new Cone());
1781	2299	} else
1782		- if (source == torusItem)
	2300	+ if (source == torusItem \|\| source == torusButton)
1783	2301	{
1784	2302	makeSomething(new Torus());
1785	2303	} else
1786		- if (source == superItem)
	2304	+ if (source == superItem \|\| source == superButton)
1787	2305	{
1788	2306	makeSomething(new Superellipsoid());
1789	2307	} else
1790		- if (source == kleinItem)
	2308	+ if (source == kleinItem \|\| source == kleinButton)
1791	2309	{
1792	2310	makeSomething(new Klein());
1793	2311	} else
..	..	@@ -1807,7 +2325,7 @@
1807	2325	{
1808	2326	makeSomething(new BezierSurface());
1809	2327	} else
1810		- if (source == overlayItem)
	2328	+ if (source == overlayItem \|\| source == overlayButton)
1811	2329	{
1812	2330	/*
1813	2331	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,10 +2373,27 @@
1855	2373	s.setup();
1856	2374	makeSomething(s);
1857	2375	} else
1858		- if (source == lightItem)
	2376	+ if (source == lightItem \|\| source == lightButton)
1859	2377	{
1860	2378	makeSomething(new Light());
1861	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
1862	2397	if (source == csgItem)
1863	2398	{
1864	2399	group(new CSG());
..	..	@@ -1905,30 +2440,30 @@
1905	2440
1906	2441	group(g);
1907	2442	} else
1908		- if (source == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
1909	2444	{
1910	2445	Composite csg = new GroupLeaf();
1911	2446	csg.count = 5;
1912	2447	group(csg);
1913		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
1914	2449	csg.addChild(child);
1915	2450	child.addChild(csg);
1916	2451	} else
1917	2452	if (source == doubleItem)
1918	2453	{
1919		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
1920	2455	csg.count = 5;
1921	2456	group(csg);
1922		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
1923	2458	csg.addChild(child);
1924	2459	child.addChild(csg);
1925		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
1926	2461	csg.addChild(child);
1927	2462	child.addChild(csg);
1928	2463	} else
1929	2464	if (source == tripleItem)
1930	2465	{
1931		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
1932	2467	csg.count = 4;
1933	2468	group(csg);
1934	2469	Composite child = new cGroup();
..	..	@@ -1944,7 +2479,7 @@
1944	2479	if (source == computeAOItem)
1945	2480	{
1946	2481	Globals.drawMode = CameraPane.OCCLUSION;
1947		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
1948	2483	} else
1949	2484	if (source == recompileItem)
1950	2485	{
..	..	@@ -1978,17 +2513,45 @@
1978	2513	{
1979	2514	DumpObject();
1980	2515	} else
	2516	+ if (source == minButton)
	2517	+ {
	2518	+ Minimize();
	2519	+ } else
	2520	+ if (source == maxButton)
	2521	+ {
	2522	+ Maximize();
	2523	+ } else
	2524	+ if (source == fullButton)
	2525	+ {
	2526	+ ToggleFullScreen();
	2527	+ } else
1981	2528	if (source == undoButton)
1982	2529	{
	2530	+ // Go to previous version
	2531	+ //if (!Undo())
	2532	+ //java.awt.Toolkit.getDefaultToolkit().beep();
1983	2533	Undo();
	2534	+ } else
	2535	+ if (source == restoreButton)
	2536	+ {
	2537	+ // Restore current version
	2538	+ Restore();
	2539	+ } else
	2540	+ if (source == replaceButton)
	2541	+ {
	2542	+ // Overwrite current version
	2543	+ Replace();
1984	2544	} else
1985	2545	if (source == redoButton)
1986	2546	{
	2547	+ // Go to next version
1987	2548	Redo();
1988	2549	} else
1989	2550	if (source == saveButton)
1990	2551	{
1991		- Save();
	2552	+ // Save a new version
	2553	+ if (!Save(true))
	2554	+ java.awt.Toolkit.getDefaultToolkit().beep();
1992	2555	} else
1993	2556	if (source == oneStepButton)
1994	2557	{
..	..	@@ -1997,17 +2560,14 @@
1997	2560	} else
1998	2561	if (source == screenfitButton)
1999	2562	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2563	ScreenFit();
2002	2564	} else
2003	2565	if (source == screenfitpointButton)
2004	2566	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2567	ScreenFitPoint();
2007	2568	} else
2008	2569	if (source == snapobjectButton)
2009	2570	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2571	SnapObject();
2012	2572	} else
2013	2573	// if (event.getSource() == recompileButton)
..	..	@@ -2371,7 +2931,7 @@
2371	2931	{
2372	2932	StepAll();
2373	2933	} else
2374		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2375	2935	{
2376	2936	//int indices[] = jList.getSelectedIndices();
2377	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2383,9 +2943,9 @@
2383	2943	{
2384	2944	ClearSelection(true);
2385	2945	} else
2386		- if (source == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2387	2947	{
2388		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2389	2949	} else
2390	2950	if (source == hideItem)
2391	2951	{
..	..	@@ -2403,11 +2963,11 @@
2403	2963	{
2404	2964	makeSomething(new Camera());
2405	2965	} else
2406		- if (source == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2407	2967	{
2408	2968	group(new Composite());
2409	2969	} else
2410		- if (source == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2411	2971	{
2412	2972	RandomNode random = new RandomNode();
2413	2973	group(random);
..	..	@@ -2509,7 +3069,7 @@
2509	3069	{
2510	3070	group(new cLinker());
2511	3071	} else
2512		- if (source == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2513	3073	{
2514	3074	group(new TextureNode());
2515	3075	} else
..	..	@@ -2529,17 +3089,30 @@
2529	3089	{
2530	3090	CastShadow(2);
2531	3091	} else
2532		- if (source == ungroupItem)
	3092	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	3093	{
2534		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2535	3096	for (int i=0; i<group.selection.size(); i++)
2536	3097	{
2537		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2538	3103	}
2539	3104
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	3105	+ if (!hasRoot)
	3106	+ {
	3107	+ for (int i=0; i<group.selection.size(); i++)
	3108	+ {
	3109	+ Ungroup(group.selection.get(i));
	3110	+ }
	3111	+
	3112	+ ClearSelection(false);
	3113	+
	3114	+ refreshContents();
	3115	+ }
2543	3116	} else
2544	3117	if (source == genUVItem)
2545	3118	{
..	..	@@ -2840,7 +3413,7 @@
2840	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2841	3414	{
2842	3415	obj = (Object3D)e.nextElement();
2843		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2844	3417	}
2845	3418
2846	3419	refreshContents();
..	..	@@ -2856,6 +3429,31 @@
2856	3429
2857	3430	refreshContents();
2858	3431	} else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
	3455	+ refreshContents();
	3456	+ } else
2859	3457	if (source == flashSelectionButton)
2860	3458	{
2861	3459	CameraPane.flash = true;
..	..	@@ -2867,6 +3465,10 @@
2867	3465	if (source == twoButton)
2868	3466	{
2869	3467	radio.layout = twoButton;
	3468	+
	3469	+ if (CameraPane.FULLSCREEN)
	3470	+ fullscreenLayout = radio.layout;
	3471	+
2870	3472	// bug
2871	3473	//gridPanel.setDividerLocation(1.0);
2872	3474	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3501,31 @@
2899	3501	bigThree.ClearUI();
2900	3502	bigThree.add(centralPanel);
2901	3503	bigThree.FlushUI();
	3504	+
	3505	+ cameraView.requestFocusInWindow();
	3506	+
	3507	+// refreshContents(true);
	3508	+//
	3509	+// try
	3510	+// {
	3511	+// java.awt.Robot bot = new java.awt.Robot();
	3512	+// int mask = InputEvent.BUTTON1_MASK;
	3513	+// bot.mouseMove(100, 100);
	3514	+// bot.mousePress(mask);
	3515	+// bot.mouseRelease(mask);
	3516	+// }
	3517	+// catch (Exception e)
	3518	+// {
	3519	+//
	3520	+// }
	3521	+
2902	3522	} else
2903	3523	if (source == threeButton)
2904	3524	{
2905	3525	radio.layout = threeButton;
	3526	+
	3527	+ if (CameraPane.FULLSCREEN)
	3528	+ fullscreenLayout = radio.layout;
2906	3529
2907	3530	// bigThree.remove(scenePanel);
2908	3531	// bigThree.remove(centralPanel);
..	..	@@ -2932,13 +3555,18 @@
2932	3555	// centralPanel.setVisible(true);
2933	3556	// XYZPanel.setVisible(true);
2934	3557	bigThree.ClearUI();
	3558	+ bigThree.add(scenePanel);
2935	3559	bigThree.add(centralPanel);
2936		- bigThree.add(XYZPanel);
2937	3560	bigThree.FlushUI();
	3561	+
	3562	+ cameraView.requestFocusInWindow();
2938	3563	} else
2939	3564	if (source == fourButton)
2940	3565	{
2941	3566	radio.layout = fourButton;
	3567	+
	3568	+ if (CameraPane.FULLSCREEN)
	3569	+ fullscreenLayout = radio.layout;
2942	3570
2943	3571	// bigThree.remove(scenePanel);
2944	3572	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3598,15 @@
2970	3598	bigThree.ClearUI();
2971	3599	bigThree.add(scenePanel);
2972	3600	bigThree.FlushUI();
	3601	+
	3602	+ cameraView.requestFocusInWindow();
2973	3603	} else
2974	3604	if (source == sixButton)
2975	3605	{
2976	3606	radio.layout = sixButton;
	3607	+
	3608	+ if (CameraPane.FULLSCREEN)
	3609	+ fullscreenLayout = radio.layout;
2977	3610
2978	3611	// bigThree.remove(scenePanel);
2979	3612	// bigThree.remove(centralPanel);
..	..	@@ -3003,13 +3636,18 @@
3003	3636	// centralPanel.setVisible(true);
3004	3637	// XYZPanel.setVisible(false);
3005	3638	bigThree.ClearUI();
3006		- bigThree.add(scenePanel);
3007	3639	bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
3008	3641	bigThree.FlushUI();
	3642	+
	3643	+ cameraView.requestFocusInWindow();
3009	3644	} else
3010	3645	if (source == sevenButton)
3011	3646	{
3012	3647	radio.layout = sevenButton;
	3648	+
	3649	+ if (CameraPane.FULLSCREEN)
	3650	+ fullscreenLayout = radio.layout;
3013	3651
3014	3652	// bigThree.remove(scenePanel);
3015	3653	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3681,8 @@
3043	3681	bigThree.add(centralPanel);
3044	3682	bigThree.add(XYZPanel);
3045	3683	bigThree.FlushUI();
	3684	+
	3685	+ cameraView.requestFocusInWindow();
3046	3686	} else
3047	3687	if (source == rootButton)
3048	3688	{
..	..	@@ -3054,6 +3694,7 @@
3054	3694	EditObject(obj);
3055	3695	}
3056	3696
	3697	+ cameraView.requestFocusInWindow();
3057	3698	refreshContents(true);
3058	3699	} else
3059	3700	if (source == closeButton)
..	..	@@ -3063,22 +3704,37 @@
3063	3704	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3705	{
3065	3706	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3707	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3708	{
	3709	+ // Patch to avoid bug with transparency.
	3710	+ if (!ab.hadMaterial)
	3711	+ {
	3712	+ ab.object.material = null;
	3713	+ }
	3714	+
3068	3715	buttonGroup.remove(ab);
3069	3716	radioPanel.remove(ab);
3070	3717
3071		- ab.GetObject().editWindow = null;
	3718	+ //ab.GetObject().editWindow = null;
	3719	+ ab.GetObject().manipWindow = null;
3072	3720	// ab.GetObject().objectUI = null; // ?????????
3073	3721
3074	3722	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3723	break;
3076	3724	}
3077	3725	}
	3726	+
	3727	+ cameraView.requestFocusInWindow();
3078	3728	refreshContents(true);
3079	3729	} else
3080	3730	if (source == editItem \|\| source == editButton)
3081	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
3082	3738	EditSelection(false);
3083	3739	} else
3084	3740	if (source == uneditButton)
..	..	@@ -3088,6 +3744,7 @@
3088	3744	Object3D child = (Object3D)e.nextElement();
3089	3745	if(child.editWindow != null)
3090	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
3091	3748	child.CloseUI();
3092	3749	listUI.remove(child);
3093	3750
..	..	@@ -3104,6 +3761,7 @@
3104	3761	//copy.ClearUI();
3105	3762	for (Object3D obj : listUI)
3106	3763	{
	3764	+ obj.pinned = false;
3107	3765	obj.CloseUI();
3108	3766	}
3109	3767	listUI.clear();
..	..	@@ -3113,7 +3771,7 @@
3113	3771	{
3114	3772	assert(copy == group);
3115	3773
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3775
3118	3776	for (Object3D obj : listUI)
3119	3777	{
..	..	@@ -3162,6 +3820,9 @@
3162	3820	}
3163	3821
3164	3822	copy = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
3165	3826	//Globals.theRenderer.object = group;
3166	3827	if(!useclient)
3167	3828	{
..	..	@@ -3179,7 +3840,8 @@
3179	3840	}
3180	3841
3181	3842	// fix "+" issue
3182		- group.editWindow = this;
	3843	+ //group.editWindow = this;
	3844	+ group.manipWindow = this;
3183	3845
3184	3846	/*
3185	3847	currentLayout = radio.layout;
..	..	@@ -3187,18 +3849,27 @@
3187	3849	currentLayout = sevenButton;
3188	3850	*/
3189	3851	radio.layout.doClick();
	3852	+
	3853	+ ClearUnpinned();
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
	3858	+ EditSelection(false);
3190	3859	keepparent = group.parent;
3191	3860	// PARENT = NULL or not???
3192	3861	//group.parent = null; // ROOT
3193	3862	//group.attributes = -1;
3194	3863	ResetModel();
	3864	+
	3865	+ cameraView.requestFocusInWindow();
3195	3866	refreshContents(true);
3196	3867	} else if (event.getSource() == editCameraItem)
3197	3868	{
3198	3869	cameraView.ProtectCamera();
3199	3870	cameraView.repaint();
3200	3871	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3872	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3873	{
3203	3874	cameraView.RevertCamera();
3204	3875	cameraView.repaint();
..	..	@@ -3215,7 +3886,6 @@
3215	3886	}
3216	3887
3217	3888	boolean useclient = false;
3218		- cRadio radio;
3219	3889
3220	3890	void ToggleRoot()
3221	3891	{
..	..	@@ -3778,7 +4448,7 @@
3778	4448
3779	4449	try
3780	4450	{
3781		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3782	4452	}
3783	4453	catch (Exception e)
3784	4454	{
..	..	@@ -4253,28 +4923,25 @@
4253	4923	// }
4254	4924	// }
4255	4925
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	4926	void EditSelection(boolean newWindow)
4261	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
4262	4934	// aConstraints.gridy = 0;
4263	4935	for (int i=0; i<group.selection.size(); i++)
4264	4936	{
4265	4937	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	4938	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4939	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	4940
4269	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	4942	if(elem != group \|\| !newWindow)
4271	4943	{
4272		- // if (!(elem instanceof Composite))
4273		- // newWindow = false;
4274		- listUI.add(elem);
4275		- elem.openEditWindow(this, newWindow); //, false);
4276		- System.out.println("edit : " + elem);
4277		- elem.editWindow.refreshContents(true); // ? new
	4944	+ EditElement(elem, newWindow); // ? new
4278	4945	}
4279	4946	}
4280	4947	}
..	..	@@ -4349,7 +5016,8 @@
4349	5016	//new Exception().printStackTrace();
4350	5017
4351	5018	freezemodel = true;
4352		-
	5019	+ ClearUnpinned();
	5020	+
4353	5021	/**/
4354	5022	//switch (event.id)
4355	5023	{
..	..	@@ -4382,7 +5050,7 @@
4382	5050	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	5051	// a camera
4384	5052	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5053	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	5054	{
4387	5055	CameraPane.camerachangeframe = 0; // don't refuse it
4388	5056	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +5059,13 @@
4391	5059	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	5060	}
4393	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4394	5069	refreshContents();
4395	5070	//return true;
4396	5071	}
..	..	@@ -4400,9 +5075,18 @@
4400	5075	freezemodel = false;
4401	5076	}
4402	5077
	5078	+ void SetPinStates(boolean enabled)
	5079	+ {
	5080	+ editButton.setEnabled(enabled);
	5081	+ uneditButton.setEnabled(enabled);
	5082	+ unselectButton.setEnabled(enabled);
	5083	+ flashSelectionButton.setEnabled(enabled);
	5084	+ }
	5085	+
4403	5086	void refreshContents(boolean cp)
4404	5087	{
4405		- if (!Globals.MOUSEDRAGGED)
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5089	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	5090	{
4407	5091	objEditor.ClearInfo(); // .GetMaterial());
4408	5092
..	..	@@ -4501,7 +5185,8 @@
4501	5185
4502	5186	if (cut)
4503	5187	{
4504		- Save();
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4505	5190	//int indices[] = jList.getSelectedIndices();
4506	5191	//for (int i = indices.length - 1; i >= 0; i--)
4507	5192	//jList.remove(indices[i]);
..	..	@@ -4604,6 +5289,10 @@
4604	5289
4605	5290	void paste(boolean expand)
4606	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4607	5296	// if (GrafreeD.clipboard == null)
4608	5297	// return;
4609	5298	boolean first = true;
..	..	@@ -4663,6 +5352,7 @@
4663	5352	Grafreed.clipboard.get(0).parent = keepparent;
4664	5353	}
4665	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4666	5356	ResetModel();
4667	5357	refreshContents();
4668	5358	}
..	..	@@ -4798,6 +5488,10 @@
4798	5488
4799	5489	void group(Object3D csg, boolean grab)
4800	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4801	5495	if (//false) // why??
4802	5496	!group.selection.isEmpty())
4803	5497	{
..	..	@@ -4911,10 +5605,15 @@
4911	5605	//node.add(csg);
4912	5606	//makeSomething(node);
4913	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
4914	5609	}
4915	5610
4916	5611	void Ungroup(Object3D g)
4917	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
4918	5617	if (g instanceof HiddenObject)
4919	5618	{
4920	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -4931,6 +5630,7 @@
4931	5630	objEditor.makeSomething(g.get(i), false);
4932	5631	}
4933	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
4934	5634	}
4935	5635
4936	5636	void ungroup()
..	..	@@ -5219,10 +5919,44 @@
5219	5919	cButton clearpanelButton;
5220	5920	cButton unselectButton;
5221	5921
	5922	+ cButton restoreCameraButton;
	5923	+
5222	5924	cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
5225	5925	cButton oneStepButton;
	5926	+
	5927	+ cButton groupButton;
	5928	+ cButton ungroupButton;
	5929	+ cButton compositeButton;
	5930	+ cButton switchButton;
	5931	+ cButton loopButton;
	5932	+ cButton textureButton;
	5933	+
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
	5949	+
	5950	+ cButton gridButton;
	5951	+ cButton boxButton;
	5952	+ cButton sphereButton;
	5953	+ cButton coneButton;
	5954	+ cButton torusButton;
	5955	+ cButton superButton;
	5956	+ cButton kleinButton;
	5957	+ cButton particlesButton;
	5958	+ cButton overlayButton;
	5959	+ cButton lightButton;
5226	5960
5227	5961	cButton screenfitButton;
5228	5962	cButton screenfitpointButton;
..	..	@@ -5235,14 +5969,6 @@
5235	5969
5236	5970	cButton setsupportButton;
5237	5971
5238		- cButton twoButton;
5239		- cButton sixButton;
5240		- cButton threeButton;
5241		- cButton sevenButton;
5242		- cButton fourButton; // full panel
5243		- cButton oneButton; // full XYZ
5244		- //cButton currentLayout;
5245		-
5246	5972	//
5247	5973	//Composite
5248	5974	Object3D // to do !!
..	..	@@ -5252,11 +5978,11 @@
5252	5978	//JTree jTree;
5253	5979	private MenuItem lookAtItem;
5254	5980	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
5256	5982	private MenuItem cutItem;
5257	5983	private MenuItem undoItem;
5258	5984	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	5985	+ private JMenuItem duplicateItem;
5260	5986	private MenuItem cloneItem;
5261	5987	private MenuItem cloneSupportItem;
5262	5988	private MenuItem overwriteGeoItem;
..	..	@@ -5284,7 +6010,7 @@
5284	6010	private MenuItem pasteLinkItem;
5285	6011	private MenuItem pasteCloneItem;
5286	6012	private MenuItem pasteExpandItem;
5287		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5288	6014	private MenuItem clearAllItem;
5289	6015	private MenuItem genUVItem;
5290	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5344,7 +6070,7 @@
5344	6070	private MenuItem frontItem;
5345	6071	private MenuItem cameraItem;
5346	6072	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
5348	6074	private MenuItem physicsItem;
5349	6075	private MenuItem frameselectorItem;
5350	6076	private MenuItem scriptNodeItem;
..	..	@@ -5368,6 +6094,8 @@
5368	6094	private MenuItem attachBumpItem;
5369	6095	private MenuItem detachBumpItem;
5370	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5371	6099
5372	6100	private MenuItem particleItem;
5373	6101	private MenuItem ragdollItem;
..	..	@@ -5418,5 +6146,5 @@
5418	6146
5419	6147	Menu cameraMenu;
5420	6148	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	6149	+ MenuItem restoreCameraItem;
5422	6150	}