~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
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 + "/preview.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("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	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 AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versions == null)
	360	+ {
	361	+ copy.versions = new byte[100][];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -80,10 +382,22 @@
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versions == null)
	387	+ {
	388	+ copy.versions = new byte[100][];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +408,7 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +465,8 @@
150	465
151	466	void SetupMenu2(GroupEditor oe)
152	467	{
	468	+ oe.jTree = new cTree();
	469	+
153	470	Menu menu;
154	471	oe.menuBar.add(menu = new Menu("Edit"));
155	472	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +477,7 @@
160	477	// redoItem = menu.add(new MenuItem("Redo"));
161	478	// redoItem.addActionListener(this);
162	479	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	481	duplicateItem.addActionListener(this);
165	482	cloneItem = menu.add(new MenuItem("Clone"));
166	483	cloneItem.addActionListener(this);
..	..	@@ -176,7 +493,6 @@
176	493	copyItem.addActionListener(this);
177	494	pasteItem = menu.add(new MenuItem("Paste"));
178	495	pasteItem.addActionListener(this);
179		- menu.add("-");
180	496
181	497	menu.add("-");
182	498	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +504,8 @@
188	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	505	// pasteExpandItem.addActionListener(this);
190	506	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
193	509
194	510	if (Globals.ADVANCED)
195	511	{
..	..	@@ -203,23 +519,23 @@
203	519	//zBufferItem.addActionListener(this);
204	520	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	521	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
208	524
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	537
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"));
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	539	toggleHandleItem.addItemListener(this);
224	540	toggleHandleItem.setState(CameraPane.HANDLES);
225	541
..	..	@@ -274,7 +590,7 @@
274	590	{
275	591	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	592	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	594	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	595	oe.cameraMenu.add("-");
280	596	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +598,7 @@
282	598	editLeafItem.addActionListener(this);
283	599	lookAtItem.addActionListener(this);
284	600	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	601	+ //switchViewItem.addActionListener(this);
286	602	}
287	603
288	604	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +643,29 @@
327	643	}
328	644
329	645	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
332	648	backItem = menu.add(new MenuItem("Back"));
333	649	backItem.addActionListener(this);
334	650	frontItem = menu.add(new MenuItem("Front"));
335	651	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
338	657	hideItem = menu.add(new MenuItem("Hidden Group"));
339	658	hideItem.addActionListener(this);
	659	+ }
340	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	661	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
345	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	670	switchGeoItem.addActionListener(this);
347	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +673,6 @@
349	673	morphItem = menu.add(new MenuItem("Morph Group"));
350	674	morphItem.addActionListener(this);
351	675
352		- if (Globals.ADVANCED)
353		- {
354	676	menu.add("-");
355	677	physicsItem = menu.add(new MenuItem("Physics"));
356	678	physicsItem.addActionListener(this);
..	..	@@ -358,30 +680,29 @@
358	680	frameselectorItem.addActionListener(this);
359	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	682	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	683	}
364	684
365	685	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
368	688	billboardItem = menu.add(new MenuItem("Billboard"));
369	689	billboardItem.addActionListener(this);
370	690	csgItem = menu.add(new MenuItem("CSG"));
371	691	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	693	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	695	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
378	701	if (Globals.ADVANCED)
379	702	{
380	703	menu.add("-");
381	704	linkerItem = menu.add(new MenuItem("Linker"));
382	705	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	706	templateItem = menu.add(new MenuItem("Template"));
386	707	templateItem.addActionListener(this);
387	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +731,7 @@
410	731	genNormalsMESHItem.addActionListener(this);
411	732	if (Globals.ADVANCED)
412	733	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	735	genNormalsMINEItem.addActionListener(this);
415	736	}
416	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +824,15 @@
503	824	attachBumpItem.addActionListener(this);
504	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
506	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	829	detachPigmentItem.addActionListener(this);
508	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
510	836	menu.add("-");
511	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	838	sortbysizeItem.addActionListener(this);
..	..	@@ -533,6 +859,7 @@
533	859	buildToolsMenu(menu);
534	860	}
535	861
	862	+
536	863	void SetupUI2(ObjEditor oe)
537	864	{
538	865	// June 2019
..	..	@@ -575,51 +902,79 @@
575	902	oe.radioPanel.add(dummyButton);
576	903	oe.buttonGroup.add(dummyButton);
577	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
578	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	910
580	911	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	912	//minButton.setToolTipText("Minimize window");
582	913	//minButton.addActionListener(this);
583	914
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
587	921
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	923	fullButton.setToolTipText("Full-screen window");
590	924	fullButton.addActionListener(this);
591	925
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
595	933
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
599		-
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("Duplicate current version");
602	936	saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
603	942
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current version (undo latest change)");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Replace current version (save latest change)");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
	956	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	957	+ redoButton.setToolTipText("Next version");
	958	+ redoButton.addActionListener(this);
	959	+ redoButton.setEnabled(false);
	960	+
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
605	962	liveCB.setToolTipText("Enable animation");
606	963	liveCB.addItemListener(this);
607	964
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	966	oneStepButton.setToolTipText("Animate one step forward");
610	967	oneStepButton.addActionListener(this);
611	968
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	970	fastCB.setToolTipText("Fast mode");
614	971	fastCB.addItemListener(this);
615	972
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- screenfitButton.setToolTipText("Screen fit");
622		- screenfitButton.addActionListener(this);
	973	+ //oe.toolboxPanel.Return();
	974	+
	975	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	976	+// trackCB.setToolTipText("Enable tracking");
	977	+// trackCB.addItemListener(this);
623	978
624	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	980	// screenfitpointButton.addActionListener(this);
..	..	@@ -629,67 +984,156 @@
629	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	985	snapobjectButton.addActionListener(this);
631	986	snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ fourButton.addActionListener(this);
	990	+ fourButton.setToolTipText("Show control panel only");
632	991	}
633	992
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	994
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- twoButton.setToolTipText("Show center view only");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
642	997	twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- fourButton.addActionListener(this);
645		- fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- sixButton.setToolTipText("2-column layout left");
648		- sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- threeButton.setToolTipText("2-column layout right");
	998	+ this.fullscreenLayout = twoButton;
	999	+
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
651	1002	threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
655	1009	//
656	1010
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
659	1013	rootButton.addActionListener(this);
660	1014
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	1016	closeButton.setToolTipText("Close tab");
663	1017	closeButton.addActionListener(this);
664	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	1019	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
668	1022
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	1023	+ // INSERT
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ gridButton.setToolTipText("Create grid");
	1026	+ gridButton.addActionListener(this);
	1027	+
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ boxButton.setToolTipText("Create box");
	1030	+ boxButton.addActionListener(this);
	1031	+
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ sphereButton.setToolTipText("Create sphere");
	1034	+ sphereButton.addActionListener(this);
	1035	+
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ coneButton.setToolTipText("Create cone");
	1038	+ coneButton.addActionListener(this);
	1039	+
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ torusButton.setToolTipText("Create torus");
	1042	+ torusButton.addActionListener(this);
	1043	+
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ superButton.setToolTipText("Create superellipsoid");
	1046	+ superButton.addActionListener(this);
	1047	+
	1048	+ if (Globals.ADVANCED)
	1049	+ {
	1050	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ kleinButton.setToolTipText("Create Klein bottle");
	1052	+ kleinButton.addActionListener(this);
	1053	+ }
	1054	+
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ particlesButton.setToolTipText("Create particle system");
	1057	+ particlesButton.addActionListener(this);
	1058	+
	1059	+ oe.toolboxPanel.add(row1);
	1060	+
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ groupButton.setToolTipText("Create group");
	1065	+ groupButton.addActionListener(this);
	1066	+
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ compositeButton.setToolTipText("Create composite");
	1069	+ compositeButton.addActionListener(this);
	1070	+
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
	1073	+ switchButton.addActionListener(this);
	1074	+
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ loopButton.setToolTipText("Create loop");
	1077	+ loopButton.addActionListener(this);
	1078	+
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ textureButton.setToolTipText("Create texture");
	1081	+ textureButton.addActionListener(this);
	1082	+
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ overlayButton.setToolTipText("Create overlay");
	1085	+ overlayButton.addActionListener(this);
	1086	+
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ lightButton.setToolTipText("Create light");
	1089	+ lightButton.addActionListener(this);
	1090	+
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
	1106	+
	1107	+ // EDIT panel
	1108	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ editButton.setToolTipText("Pin selection controls");
671	1110	editButton.addActionListener(this);
672	1111
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
675	1114	uneditButton.addActionListener(this);
676	1115
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
679	1118	allParamsButton.addActionListener(this);
680	1119
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	1121	clearPanelButton.setToolTipText("Clear edit panel");
683	1122	clearPanelButton.addActionListener(this);
684	1123
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	1125	unselectButton.setToolTipText("Unselect");
687	1126	unselectButton.addActionListener(this);
688	1127
689		- commandsPanel.preferredHeight = 1;
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
690	1131
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
693	1137
694	1138	// oe.aConstraints.gridx += 1;
695	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -706,32 +1150,20 @@
706	1150
707	1151	JScrollPane jSP;
708	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1154	ResetModel();
711	1155
712	1156	oe.treePanel.add(jSPPanel);
713	1157	oe.treePanel.Return();
714	1158
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730	1159	oe.treePanel.add(copyOptionsPanel);
731	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
732	1164
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
735	1167
736	1168	//jList.addListSelectionListener(this);
737	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1171,7 @@
739	1171	//jTree.setEditable(true);
740	1172	oe.jTree.setDragEnabled(true);
741	1173	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1175
744	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1177
..	..	@@ -751,29 +1183,49 @@
751	1183	dgr.addDragGestureListener(this);
752	1184	}catch(Exception e) {}
753	1185	*/
754		- radio.layout = sevenButton;
	1186	+ radio.layout = threeButton; // sixButton;
755	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1188	}
757	1189
758	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1191	{
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
	1195	+
	1196	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1197	+ materialCB.setToolTipText("Copy material when dropped");
	1198	+ materialCB.addItemListener(this);
	1199	+
	1200	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1201	+ textureCB.setToolTipText("Copy texture when dropped");
	1202	+ textureCB.addItemListener(this);
	1203	+
	1204	+ panel.Return();
	1205	+
760	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1207	boxCB.setToolTipText("Display bounding boxes");
762	1208	boxCB.addItemListener(this);
763	1209
764	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1212	zoomBoxCB.addItemListener(this);
767	1213
768	1214	if (true) // Globals.ADVANCED)
769	1215	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
773	1223
774	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1225	// localCB.addItemListener(this);
776	1226
	1227	+ panel.Return();
	1228	+
777	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1230	crowdCB.setToolTipText("Used for crowds");
779	1231	crowdCB.addItemListener(this);
..	..	@@ -782,14 +1234,19 @@
782	1234	smoothCB.setToolTipText("Snapping delay");
783	1235	smoothCB.addItemListener(this);
784	1236
785		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
786		- slowCB.setToolTipText("Smooth interpolation");
787		- slowCB.addItemListener(this);
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
788	1243
789	1244	// constraints.gridy += 1;
790	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1246	// speakerMocapCB.addItemListener(this);
792	1247
	1248	+ panel.Return();
	1249	+
793	1250	if (false)
794	1251	{
795	1252	// handled in scripts
..	..	@@ -804,34 +1261,74 @@
804	1261	//constraints.gridy += 1;
805	1262	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
807	1265	}
808	1266
809	1267	//constraints.gridx += 1;
810	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1269	// debugCB.addItemListener(this);
812	1270
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
813	1275	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
814	1277	oeilCB.addItemListener(this);
815	1278
	1279	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1280	+ shadowCB.setToolTipText("When live compute shadows");
	1281	+ shadowCB.addItemListener(this);
	1282	+
	1283	+ panel.Return();
	1284	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1285	+ toggleTextureCB.setToolTipText("Load textures");
	1286	+ toggleTextureCB.addItemListener(this);
	1287	+
	1288	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1289	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1290	+ toggleSwitchCB.addItemListener(this);
	1291	+
	1292	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1293	+ autokeepCB.setToolTipText("On structure change");
	1294	+ autokeepCB.addItemListener(this);
	1295	+
	1296	+ panel.Return();
	1297	+ if (Globals.ADVANCED)
	1298	+ {
816	1299	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1300	lookAtCB.setToolTipText("Look-at target");
818	1301	lookAtCB.addItemListener(this);
	1302	+ }
819	1303
820	1304	}
821	1305
822	1306	cGridBag fill = new cGridBag();
823		-
824	1307	fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
825	1312
826	1313	panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
827	1316
828	1317	}
829	1318
830	1319	void EditObject(Object3D obj)
831	1320	{
832	1321	cRadio radioButton = new cRadio(obj.name);
	1322	+
	1323	+ // June 2019. Patch to avoid bug with transparency.
	1324	+ radioButton.hadMaterial = obj.material != null;
	1325	+ if (!radioButton.hadMaterial)
	1326	+ {
	1327	+ obj.material = new cMaterial();
	1328	+ }
	1329	+
833	1330	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = threeButton; // sixButton;
835	1332	radioButton.SetCamera(cameraView.renderCamera, false);
836	1333	radioButton.addActionListener(this);
837	1334	radioPanel.add(radioButton);
..	..	@@ -851,23 +1348,30 @@
851	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1349	}
853	1350
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- JCheckBox smoothfocusCB;
	1351	+ cToggleButton liveCB;
	1352	+ cCheckBox supportCB;
	1353	+ cCheckBox localCB;
	1354	+ cCheckBox crowdCB;
	1355	+ cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
	1358	+ cToggleButton fastCB;
	1359	+ cCheckBox slowCB;
	1360	+ cCheckBox boxCB;
	1361	+ cCheckBox zoomBoxCB;
	1362	+ cCheckBox freezeCB;
	1363	+ //cToggleButton trackCB;
	1364	+ cCheckBox trackCB;
	1365	+ cCheckBox smoothfocusCB;
865	1366	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
871	1375
872	1376	// static int COLOR = 1;
873	1377	// static int MATERIAL = 2;
..	..	@@ -875,9 +1379,9 @@
875	1379
876	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1381
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
881	1385
882	1386	public void itemStateChanged(ItemEvent e)
883	1387	{
..	..	@@ -921,6 +1425,12 @@
921	1425	{
922	1426	cameraView.ToggleInertia();
923	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
924	1434	}
925	1435	else if(e.getSource() == localCB)
926	1436	{
..	..	@@ -970,6 +1480,18 @@
970	1480	{
971	1481	cameraView.ToggleOeil();
972	1482	}
	1483	+ else if(e.getSource() == shadowCB)
	1484	+ {
	1485	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1486	+ }
	1487	+ else if(e.getSource() == freezeCB)
	1488	+ {
	1489	+ Globals.FREEZEONMOVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == autokeepCB)
	1492	+ {
	1493	+ Globals.REPLACEONMAKE ^= true;
	1494	+ }
973	1495	else if(e.getSource() == lookAtCB)
974	1496	{
975	1497	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1508,8 @@
986	1508
987	1509	/**/
988	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1514	// We can't move the root node or an empty selection
992	1515	return;
..	..	@@ -1049,8 +1572,6 @@
1049	1572	}
1050	1573	}
1051	1574
1052		- String string = (String) object;
1053		-
1054	1575	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1576	// if( object instanceof java.io.File[])
1056	1577	// {
..	..	@@ -1058,6 +1579,8 @@
1058	1579	// objEditor.DropFile((java.io.File[]) object, true);
1059	1580	// return;
1060	1581	// }
	1582	+
	1583	+ String string = object.toString();
1061	1584
1062	1585	// File path for Mac and Windows
1063	1586	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1626,33 @@
1103	1626
1104	1627	assert target == objEditor.jTree;
1105	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
1106	1630	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1632	} catch (Exception e) {
1109	1633	System.out.println("destinationPath : " + destinationPath);
1110	1634	return;
1111	1635	}
1112	1636
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
1114	1638	{
	1639	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1640	+
	1641	+ // Cannot move into itself
	1642	+ if (child == destinationLeaf)
	1643	+ return;
	1644	+ }
	1645	+
	1646	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1647	+// {
1115	1648	loadClipboard(true);
1116	1649	objEditor.jTree.setSelectionPath(destinationPath);
1117	1650	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
1123	1656	}
1124	1657	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1224,22 +1757,30 @@
1224	1757	{
1225	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1759	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- superItem.addActionListener(this);
	1760	+// gridItem = menu.add(new MenuItem("Grid"));
	1761	+// gridItem.addActionListener(this);
	1762	+// rectoidItem = menu.add(new MenuItem("Box"));
	1763	+// rectoidItem.addActionListener(this);
	1764	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1765	+// ellipsoidItem.addActionListener(this);
	1766	+// coneItem = menu.add(new MenuItem("Cone"));
	1767	+// coneItem.addActionListener(this);
	1768	+// torusItem = menu.add(new MenuItem("Torus"));
	1769	+// torusItem.addActionListener(this);
	1770	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1771	+// superItem.addActionListener(this);
	1772	+
	1773	+ cameraItem = menu.add(new MenuItem("Camera"));
	1774	+ cameraItem.addActionListener(this);
	1775	+
	1776	+ if (!Globals.ADVANCED)
	1777	+ {
1239	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1779	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
1243	1784	if (Globals.ADVANCED)
1244	1785	{
1245	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1806,15 @@
1265	1806	}
1266	1807	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1808	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- lightItem.addActionListener(this);
	1809	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1810	+// overlayItem.addActionListener(this);
	1811	+// lightItem = menu.add(new MenuItem("Light"));
	1812	+// lightItem.addActionListener(this);
1272	1813	menu.add("-");
1273	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1815	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1277	1818	doubleItem = menu.add(new MenuItem("Fork"));
1278	1819	doubleItem.addActionListener(this);
1279	1820	if (Globals.ADVANCED)
..	..	@@ -1289,6 +1830,9 @@
1289	1830	animationItem.addItemListener(this);
1290	1831	animationItem.setState(Globals.ANIMATION);
1291	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1292	1836	menu.add("-");
1293	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	1838	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +1845,8 @@
1301	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	1846	reduce34MorphItem.addActionListener(this);
1303	1847	menu.add("-");
	1848	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1849	+ memoryItem.addActionListener(this);
1304	1850	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	1851	computeAOItem.addActionListener(this);
1306	1852
..	..	@@ -1309,8 +1855,6 @@
1309	1855	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	1856	mirrorItem.addActionListener(this);
1311	1857	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	1859	analyzeItem.addActionListener(this);
1316	1860	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +1998,34 @@
1454	1998	shadow.material = new cMaterial(obj.material);
1455	1999	shadow.material.diffuse = 0.0001f;
1456	2000	shadow.material.specular = 0.0001f;
	2001	+ //shadow.projectedVertices[1].x = 300;
1457	2002
1458	2003	makeSomething(shadow);
1459	2004	}
	2005	+
	2006	+ private void ClearUnpinned()
	2007	+ {
	2008	+ //for (Object3D obj : listUI)
	2009	+ for (int i=listUI.size(); --i>=0;)
	2010	+ {
	2011	+ Object3D obj = listUI.elementAt(i);
	2012	+ if (!obj.pinned)
	2013	+ {
	2014	+ obj.CloseUI();
	2015	+ listUI.remove(i);
	2016	+ }
	2017	+ }
	2018	+ }
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
	2028	+ }
1460	2029
1461	2030	/**
1462	2031	* applyExample
..	..	@@ -1701,7 +2270,7 @@
1701	2270	{
1702	2271	ScreenFit();
1703	2272	} else
1704		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1705	2274	{
1706	2275	cVector v1 = new cVector();
1707	2276	cVector v2 = new cVector();
..	..	@@ -1710,11 +2279,11 @@
1710	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2280	objEditor.cameraView.repaint();
1712	2281	} else
1713		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1714	2283	{
1715	2284	makeSomething(new Box());
1716	2285	} else
1717		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1718	2287	{
1719	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2362,27 @@
1793	2362
1794	2363	makeSomething(obj);
1795	2364	} else
1796		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1797	2366	{
1798	2367	makeSomething(new Grid());
1799	2368	} else
1800		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2370	{
1802	2371	makeSomething(new Sphere());
1803	2372	} else
1804		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1805	2374	{
1806	2375	makeSomething(new Cone());
1807	2376	} else
1808		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1809	2378	{
1810	2379	makeSomething(new Torus());
1811	2380	} else
1812		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1813	2382	{
1814	2383	makeSomething(new Superellipsoid());
1815	2384	} else
1816		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1817	2386	{
1818	2387	makeSomething(new Klein());
1819	2388	} else
..	..	@@ -1833,7 +2402,7 @@
1833	2402	{
1834	2403	makeSomething(new BezierSurface());
1835	2404	} else
1836		- if (source == overlayItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1837	2406	{
1838	2407	/*
1839	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2450,27 @@
1881	2450	s.setup();
1882	2451	makeSomething(s);
1883	2452	} else
1884		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1885	2454	{
1886	2455	makeSomething(new Light());
1887	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
1888	2474	if (source == csgItem)
1889	2475	{
1890	2476	group(new CSG());
..	..	@@ -1931,30 +2517,30 @@
1931	2517
1932	2518	group(g);
1933	2519	} else
1934		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1935	2521	{
1936	2522	Composite csg = new GroupLeaf();
1937	2523	csg.count = 5;
1938	2524	group(csg);
1939		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1940	2526	csg.addChild(child);
1941	2527	child.addChild(csg);
1942	2528	} else
1943	2529	if (source == doubleItem)
1944	2530	{
1945		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1946	2532	csg.count = 5;
1947	2533	group(csg);
1948		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1949	2535	csg.addChild(child);
1950	2536	child.addChild(csg);
1951		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1952	2538	csg.addChild(child);
1953	2539	child.addChild(csg);
1954	2540	} else
1955	2541	if (source == tripleItem)
1956	2542	{
1957		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1958	2544	csg.count = 4;
1959	2545	group(csg);
1960	2546	Composite child = new cGroup();
..	..	@@ -1970,7 +2556,7 @@
1970	2556	if (source == computeAOItem)
1971	2557	{
1972	2558	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1974	2560	} else
1975	2561	if (source == recompileItem)
1976	2562	{
..	..	@@ -2018,15 +2604,31 @@
2018	2604	} else
2019	2605	if (source == undoButton)
2020	2606	{
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2021	2610	Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ } else
	2617	+ if (source == replaceButton)
	2618	+ {
	2619	+ // Overwrite current version
	2620	+ Replace();
2022	2621	} else
2023	2622	if (source == redoButton)
2024	2623	{
	2624	+ // Go to next version
2025	2625	Redo();
2026	2626	} else
2027	2627	if (source == saveButton)
2028	2628	{
2029		- Save();
	2629	+ // Save a new version
	2630	+ if (!Save(true))
	2631	+ java.awt.Toolkit.getDefaultToolkit().beep();
2030	2632	} else
2031	2633	if (source == oneStepButton)
2032	2634	{
..	..	@@ -2035,17 +2637,14 @@
2035	2637	} else
2036	2638	if (source == screenfitButton)
2037	2639	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2640	ScreenFit();
2040	2641	} else
2041	2642	if (source == screenfitpointButton)
2042	2643	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2644	ScreenFitPoint();
2045	2645	} else
2046	2646	if (source == snapobjectButton)
2047	2647	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2648	SnapObject();
2050	2649	} else
2051	2650	// if (event.getSource() == recompileButton)
..	..	@@ -2409,7 +3008,7 @@
2409	3008	{
2410	3009	StepAll();
2411	3010	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	3012	{
2414	3013	//int indices[] = jList.getSelectedIndices();
2415	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +3020,9 @@
2421	3020	{
2422	3021	ClearSelection(true);
2423	3022	} else
2424		- if (source == grabItem)
	3023	+ if (source == grabItem \|\| source == groupButton)
2425	3024	{
2426		- group(new cGroup(), true);
	3025	+ group(new cGroup(), false); // true);
2427	3026	} else
2428	3027	if (source == hideItem)
2429	3028	{
..	..	@@ -2441,11 +3040,11 @@
2441	3040	{
2442	3041	makeSomething(new Camera());
2443	3042	} else
2444		- if (source == compositeItem)
	3043	+ if (source == compositeItem \|\| source == compositeButton)
2445	3044	{
2446	3045	group(new Composite());
2447	3046	} else
2448		- if (source == randomItem)
	3047	+ if (source == switchItem \|\| source == switchButton)
2449	3048	{
2450	3049	RandomNode random = new RandomNode();
2451	3050	group(random);
..	..	@@ -2547,7 +3146,7 @@
2547	3146	{
2548	3147	group(new cLinker());
2549	3148	} else
2550		- if (source == textureItem)
	3149	+ if (source == textureItem \|\| source == textureButton)
2551	3150	{
2552	3151	group(new TextureNode());
2553	3152	} else
..	..	@@ -2567,17 +3166,30 @@
2567	3166	{
2568	3167	CastShadow(2);
2569	3168	} else
2570		- if (source == ungroupItem)
	3169	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3170	{
2572		- //ungroup();
	3171	+ boolean hasRoot = false;
	3172	+
2573	3173	for (int i=0; i<group.selection.size(); i++)
2574	3174	{
2575		- Ungroup(group.selection.get(i));
	3175	+ if (group.selection.get(i) == group)
	3176	+ {
	3177	+ hasRoot = true;
	3178	+ break;
	3179	+ }
2576	3180	}
2577	3181
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3182	+ if (!hasRoot)
	3183	+ {
	3184	+ for (int i=0; i<group.selection.size(); i++)
	3185	+ {
	3186	+ Ungroup(group.selection.get(i));
	3187	+ }
	3188	+
	3189	+ ClearSelection(false);
	3190	+
	3191	+ refreshContents();
	3192	+ }
2581	3193	} else
2582	3194	if (source == genUVItem)
2583	3195	{
..	..	@@ -2878,7 +3490,7 @@
2878	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3491	{
2880	3492	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
2882	3494	}
2883	3495
2884	3496	refreshContents();
..	..	@@ -2894,6 +3506,31 @@
2894	3506
2895	3507	refreshContents();
2896	3508	} else
	3509	+ if (source == embedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(true);
	3516	+ }
	3517	+
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == deEmbedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(false);
	3527	+ }
	3528	+
	3529	+ CameraPane.texturepigment.clear();
	3530	+ CameraPane.texturebump.clear();
	3531	+
	3532	+ refreshContents();
	3533	+ } else
2897	3534	if (source == flashSelectionButton)
2898	3535	{
2899	3536	CameraPane.flash = true;
..	..	@@ -2905,6 +3542,10 @@
2905	3542	if (source == twoButton)
2906	3543	{
2907	3544	radio.layout = twoButton;
	3545	+
	3546	+ if (CameraPane.FULLSCREEN)
	3547	+ fullscreenLayout = radio.layout;
	3548	+
2908	3549	// bug
2909	3550	//gridPanel.setDividerLocation(1.0);
2910	3551	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2960,6 +3601,9 @@
2960	3601	{
2961	3602	radio.layout = threeButton;
2962	3603
	3604	+ if (CameraPane.FULLSCREEN)
	3605	+ fullscreenLayout = radio.layout;
	3606	+
2963	3607	// bigThree.remove(scenePanel);
2964	3608	// bigThree.remove(centralPanel);
2965	3609	// bigThree.remove(XYZPanel);
..	..	@@ -2988,8 +3632,8 @@
2988	3632	// centralPanel.setVisible(true);
2989	3633	// XYZPanel.setVisible(true);
2990	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
2991	3636	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3637	bigThree.FlushUI();
2994	3638
2995	3639	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3641,9 @@
2997	3641	if (source == fourButton)
2998	3642	{
2999	3643	radio.layout = fourButton;
	3644	+
	3645	+ if (CameraPane.FULLSCREEN)
	3646	+ fullscreenLayout = radio.layout;
3000	3647
3001	3648	// bigThree.remove(scenePanel);
3002	3649	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3682,9 @@
3035	3682	{
3036	3683	radio.layout = sixButton;
3037	3684
	3685	+ if (CameraPane.FULLSCREEN)
	3686	+ fullscreenLayout = radio.layout;
	3687	+
3038	3688	// bigThree.remove(scenePanel);
3039	3689	// bigThree.remove(centralPanel);
3040	3690	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3713,8 @@
3063	3713	// centralPanel.setVisible(true);
3064	3714	// XYZPanel.setVisible(false);
3065	3715	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
3068	3718	bigThree.FlushUI();
3069	3719
3070	3720	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3722,9 @@
3072	3722	if (source == sevenButton)
3073	3723	{
3074	3724	radio.layout = sevenButton;
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
3075	3728
3076	3729	// bigThree.remove(scenePanel);
3077	3730	// bigThree.remove(centralPanel);
..	..	@@ -3128,12 +3781,19 @@
3128	3781	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3782	{
3130	3783	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3784	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3785	{
	3786	+ // Patch to avoid bug with transparency.
	3787	+ if (!ab.hadMaterial)
	3788	+ {
	3789	+ ab.object.material = null;
	3790	+ }
	3791	+
3133	3792	buttonGroup.remove(ab);
3134	3793	radioPanel.remove(ab);
3135	3794
3136		- ab.GetObject().editWindow = null;
	3795	+ //ab.GetObject().editWindow = null;
	3796	+ ab.GetObject().manipWindow = null;
3137	3797	// ab.GetObject().objectUI = null; // ?????????
3138	3798
3139	3799	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3806,12 @@
3146	3806	} else
3147	3807	if (source == editItem \|\| source == editButton)
3148	3808	{
	3809	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3810	+ {
	3811	+ Object3D child = (Object3D)e.nextElement();
	3812	+ child.pinned = true;
	3813	+ }
	3814	+
3149	3815	EditSelection(false);
3150	3816	} else
3151	3817	if (source == uneditButton)
..	..	@@ -3155,6 +3821,7 @@
3155	3821	Object3D child = (Object3D)e.nextElement();
3156	3822	if(child.editWindow != null)
3157	3823	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3824	+ child.pinned = false;
3158	3825	child.CloseUI();
3159	3826	listUI.remove(child);
3160	3827
..	..	@@ -3171,6 +3838,7 @@
3171	3838	//copy.ClearUI();
3172	3839	for (Object3D obj : listUI)
3173	3840	{
	3841	+ obj.pinned = false;
3174	3842	obj.CloseUI();
3175	3843	}
3176	3844	listUI.clear();
..	..	@@ -3180,7 +3848,7 @@
3180	3848	{
3181	3849	assert(copy == group);
3182	3850
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3851	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	3852
3185	3853	for (Object3D obj : listUI)
3186	3854	{
..	..	@@ -3229,6 +3897,9 @@
3229	3897	}
3230	3898
3231	3899	copy = group;
	3900	+
	3901	+ SetUndoStates();
	3902	+
3232	3903	//Globals.theRenderer.object = group;
3233	3904	if(!useclient)
3234	3905	{
..	..	@@ -3247,6 +3918,7 @@
3247	3918
3248	3919	// fix "+" issue
3249	3920	//group.editWindow = this;
	3921	+ group.manipWindow = this;
3250	3922
3251	3923	/*
3252	3924	currentLayout = radio.layout;
..	..	@@ -3254,6 +3926,13 @@
3254	3926	currentLayout = sevenButton;
3255	3927	*/
3256	3928	radio.layout.doClick();
	3929	+
	3930	+ ClearUnpinned();
	3931	+ //Grafreed.Assert(group != null);
	3932	+ //Grafreed.Assert(group.selection != null);
	3933	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3934	+ if (group.selection == null \|\| group.selection.size() == 1)
	3935	+ EditSelection(false);
3257	3936	keepparent = group.parent;
3258	3937	// PARENT = NULL or not???
3259	3938	//group.parent = null; // ROOT
..	..	@@ -3265,11 +3944,13 @@
3265	3944	} else if (event.getSource() == editCameraItem)
3266	3945	{
3267	3946	cameraView.ProtectCamera();
	3947	+ cameraView.requestFocusInWindow();
3268	3948	cameraView.repaint();
3269	3949	return;
3270		- } else if (event.getSource() == revertCameraItem)
	3950	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	3951	{
3272	3952	cameraView.RevertCamera();
	3953	+ cameraView.requestFocusInWindow();
3273	3954	cameraView.repaint();
3274	3955	return;
3275	3956	// } else if (event.getSource() == textureButton)
..	..	@@ -3846,7 +4527,7 @@
3846	4527
3847	4528	try
3848	4529	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4530	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4531	}
3851	4532	catch (Exception e)
3852	4533	{
..	..	@@ -4321,28 +5002,25 @@
4321	5002	// }
4322	5003	// }
4323	5004
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	5005	void EditSelection(boolean newWindow)
4329	5006	{
	5007	+ if (group.selection == null)
	5008	+ {
	5009	+ EditElement(group, newWindow); // ? new
	5010	+ return;
	5011	+ }
	5012	+
4330	5013	// aConstraints.gridy = 0;
4331	5014	for (int i=0; i<group.selection.size(); i++)
4332	5015	{
4333	5016	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	5017	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5018	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	5019
4337	5020	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	5021	if(elem != group \|\| !newWindow)
4339	5022	{
4340		- // if (!(elem instanceof Composite))
4341		- // newWindow = false;
4342		- listUI.add(elem);
4343		- elem.openEditWindow(this, newWindow); //, false);
4344		- System.out.println("edit : " + elem);
4345		- elem.editWindow.refreshContents(true); // ? new
	5023	+ EditElement(elem, newWindow); // ? new
4346	5024	}
4347	5025	}
4348	5026	}
..	..	@@ -4417,7 +5095,8 @@
4417	5095	//new Exception().printStackTrace();
4418	5096
4419	5097	freezemodel = true;
4420		-
	5098	+ ClearUnpinned();
	5099	+
4421	5100	/**/
4422	5101	//switch (event.id)
4423	5102	{
..	..	@@ -4450,7 +5129,7 @@
4450	5129	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5130	// a camera
4452	5131	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5132	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	5133	{
4455	5134	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5135	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5138,13 @@
4459	5138	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5139	}
4461	5140
	5141	+ if (tps != null && tps.length == 1)
	5142	+ {
	5143	+ EditSelection(false);
	5144	+ }
	5145	+
	5146	+ SetPinStates(tps != null && tps.length > 0);
	5147	+
4462	5148	refreshContents();
4463	5149	//return true;
4464	5150	}
..	..	@@ -4468,9 +5154,18 @@
4468	5154	freezemodel = false;
4469	5155	}
4470	5156
	5157	+ void SetPinStates(boolean enabled)
	5158	+ {
	5159	+ editButton.setEnabled(enabled);
	5160	+ uneditButton.setEnabled(enabled);
	5161	+ unselectButton.setEnabled(enabled);
	5162	+ flashSelectionButton.setEnabled(enabled);
	5163	+ }
	5164	+
4471	5165	void refreshContents(boolean cp)
4472	5166	{
4473		- if (!Globals.MOUSEDRAGGED)
	5167	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5168	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5169	{
4475	5170	objEditor.ClearInfo(); // .GetMaterial());
4476	5171
..	..	@@ -4569,7 +5264,8 @@
4569	5264
4570	5265	if (cut)
4571	5266	{
4572		- Save();
	5267	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5268	+// Save();
4573	5269	//int indices[] = jList.getSelectedIndices();
4574	5270	//for (int i = indices.length - 1; i >= 0; i--)
4575	5271	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5368,10 @@
4672	5368
4673	5369	void paste(boolean expand)
4674	5370	{
	5371	+ if (Globals.REPLACEONMAKE)
	5372	+ Save();
	5373	+ boolean keep = Globals.REPLACEONMAKE;
	5374	+ Globals.REPLACEONMAKE = false;
4675	5375	// if (GrafreeD.clipboard == null)
4676	5376	// return;
4677	5377	boolean first = true;
..	..	@@ -4731,6 +5431,7 @@
4731	5431	Grafreed.clipboard.get(0).parent = keepparent;
4732	5432	}
4733	5433
	5434	+ Globals.REPLACEONMAKE = keep;
4734	5435	ResetModel();
4735	5436	refreshContents();
4736	5437	}
..	..	@@ -4866,6 +5567,10 @@
4866	5567
4867	5568	void group(Object3D csg, boolean grab)
4868	5569	{
	5570	+ if (Globals.REPLACEONMAKE)
	5571	+ Save();
	5572	+ boolean keep = Globals.REPLACEONMAKE;
	5573	+ Globals.REPLACEONMAKE = false;
4869	5574	if (//false) // why??
4870	5575	!group.selection.isEmpty())
4871	5576	{
..	..	@@ -4979,10 +5684,15 @@
4979	5684	//node.add(csg);
4980	5685	//makeSomething(node);
4981	5686	makeSomething(csg);
	5687	+ Globals.REPLACEONMAKE = keep;
4982	5688	}
4983	5689
4984	5690	void Ungroup(Object3D g)
4985	5691	{
	5692	+ if (Globals.REPLACEONMAKE)
	5693	+ Save();
	5694	+ boolean keep = Globals.REPLACEONMAKE;
	5695	+ Globals.REPLACEONMAKE = false;
4986	5696	if (g instanceof HiddenObject)
4987	5697	{
4988	5698	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5709,7 @@
4999	5709	objEditor.makeSomething(g.get(i), false);
5000	5710	}
5001	5711	}
	5712	+ Globals.REPLACEONMAKE = keep;
5002	5713	}
5003	5714
5004	5715	void ungroup()
..	..	@@ -5287,13 +5998,44 @@
5287	5998	cButton clearpanelButton;
5288	5999	cButton unselectButton;
5289	6000
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
	6001	+ cButton restoreCameraButton;
	6002	+
5295	6003	cButton saveButton;
5296	6004	cButton oneStepButton;
	6005	+
	6006	+ cButton groupButton;
	6007	+ cButton ungroupButton;
	6008	+ cButton compositeButton;
	6009	+ cButton switchButton;
	6010	+ cButton loopButton;
	6011	+ cButton textureButton;
	6012	+
	6013	+ cButton skybox1Button;
	6014	+ cButton skybox2Button;
	6015	+ cButton skybox3Button;
	6016	+ cButton skybox4Button;
	6017	+ cButton skybox5Button;
	6018	+ cButton skybox6Button;
	6019	+ cButton skybox7Button;
	6020	+
	6021	+ cButton skybox11Button;
	6022	+ cButton skybox12Button;
	6023	+ cButton skybox13Button;
	6024	+ cButton skybox14Button;
	6025	+ cButton skybox15Button;
	6026	+ cButton skybox16Button;
	6027	+ cButton skybox17Button;
	6028	+
	6029	+ cButton gridButton;
	6030	+ cButton boxButton;
	6031	+ cButton sphereButton;
	6032	+ cButton coneButton;
	6033	+ cButton torusButton;
	6034	+ cButton superButton;
	6035	+ cButton kleinButton;
	6036	+ cButton particlesButton;
	6037	+ cButton overlayButton;
	6038	+ cButton lightButton;
5297	6039
5298	6040	cButton screenfitButton;
5299	6041	cButton screenfitpointButton;
..	..	@@ -5315,11 +6057,11 @@
5315	6057	//JTree jTree;
5316	6058	private MenuItem lookAtItem;
5317	6059	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
	6060	+ private MenuItem switchViewItem;
5319	6061	private MenuItem cutItem;
5320	6062	private MenuItem undoItem;
5321	6063	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
	6064	+ private JMenuItem duplicateItem;
5323	6065	private MenuItem cloneItem;
5324	6066	private MenuItem cloneSupportItem;
5325	6067	private MenuItem overwriteGeoItem;
..	..	@@ -5347,7 +6089,7 @@
5347	6089	private MenuItem pasteLinkItem;
5348	6090	private MenuItem pasteCloneItem;
5349	6091	private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6092	+ private MenuItem deleteItem;
5351	6093	private MenuItem clearAllItem;
5352	6094	private MenuItem genUVItem;
5353	6095	private MenuItem genNormalsMESHItem;
..	..	@@ -5407,7 +6149,7 @@
5407	6149	private MenuItem frontItem;
5408	6150	private MenuItem cameraItem;
5409	6151	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6152	+ private MenuItem switchItem;
5411	6153	private MenuItem physicsItem;
5412	6154	private MenuItem frameselectorItem;
5413	6155	private MenuItem scriptNodeItem;
..	..	@@ -5431,6 +6173,8 @@
5431	6173	private MenuItem attachBumpItem;
5432	6174	private MenuItem detachBumpItem;
5433	6175	private MenuItem pigmentBumpItem;
	6176	+ private MenuItem embedTexturesItem;
	6177	+ private MenuItem deEmbedTexturesItem;
5434	6178
5435	6179	private MenuItem particleItem;
5436	6180	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6225,5 @@
5481	6225
5482	6226	Menu cameraMenu;
5483	6227	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6228	+ MenuItem restoreCameraItem;
5485	6229	}