~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.versionlist == null)
	360	+ {
	361	+ copy.versionlist = new Object3D[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.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[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
..	..	@@ -246,7 +562,7 @@
246	562
247	563	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	564	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
250	566
251	567	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	568	toggleFrustumItem.addItemListener(this);
..	..	@@ -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,8 +859,21 @@
533	859	buildToolsMenu(menu);
534	860	}
535	861
	862	+
536	863	void SetupUI2(ObjEditor oe)
537	864	{
	865	+ // June 2019
	866	+ if (oe == null)
	867	+ {
	868	+ //super.SetupUI2(this);
	869	+ //return;
	870	+ }
	871	+
	872	+ if (copy != group)
	873	+ {
	874	+ //super.SetupUI2(this);
	875	+ }
	876	+
538	877	//new Exception().printStackTrace();
539	878
540	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -563,39 +902,79 @@
563	902	oe.radioPanel.add(dummyButton);
564	903	oe.buttonGroup.add(dummyButton);
565	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
566	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	910
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- undoButton.setToolTipText("Undo changes");
570		- undoButton.addActionListener(this);
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
571	914
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- redoButton.setToolTipText("Redo changes");
574		- redoButton.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	+ }
575	921
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- saveButton.setToolTipText("Save changes");
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ fullButton.setToolTipText("Full-screen window");
	924	+ fullButton.addActionListener(this);
	925	+
	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);
	933	+
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("Duplicate current version");
578	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);
579	942
580		- 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("Undo (restore current version)");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Save (replace current version)");
	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);
581	962	liveCB.setToolTipText("Enable animation");
582	963	liveCB.addItemListener(this);
583	964
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	966	oneStepButton.setToolTipText("Animate one step forward");
586	967	oneStepButton.addActionListener(this);
587	968
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	970	fastCB.setToolTipText("Fast mode");
590	971	fastCB.addItemListener(this);
591	972
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);
	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);
599	978
600	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	980	// screenfitpointButton.addActionListener(this);
..	..	@@ -605,67 +984,156 @@
605	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606	985	snapobjectButton.addActionListener(this);
607	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");
608	991	}
609	992
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	994
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");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
618	997	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");
	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");
627	1002	threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- sevenButton.setToolTipText("3-column layout");
630		- 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);
631	1009	//
632	1010
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- 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");
635	1013	rootButton.addActionListener(this);
636	1014
637		- 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);
638	1016	closeButton.setToolTipText("Close tab");
639	1017	closeButton.addActionListener(this);
640	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	1019	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
644	1022
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- 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");
647	1110	editButton.addActionListener(this);
648	1111
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Unpin and remove selection controls");
651	1114	uneditButton.addActionListener(this);
652	1115
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
655	1118	allParamsButton.addActionListener(this);
656	1119
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658	1121	clearPanelButton.setToolTipText("Clear edit panel");
659	1122	clearPanelButton.addActionListener(this);
660	1123
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	1125	unselectButton.setToolTipText("Unselect");
663	1126	unselectButton.addActionListener(this);
664	1127
665		- 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);
666	1131
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
669	1137
670	1138	// oe.aConstraints.gridx += 1;
671	1139	// oe.aConstraints.weighty = 0;
..	..	@@ -682,32 +1150,20 @@
682	1150
683	1151	JScrollPane jSP;
684	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	1154	ResetModel();
687	1155
688	1156	oe.treePanel.add(jSPPanel);
689	1157	oe.treePanel.Return();
690	1158
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	1159	oe.treePanel.add(copyOptionsPanel);
707	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
708	1164
709		-// mainPanel.setDividerLocation(0.5); //1.0);
710		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
711	1167
712	1168	//jList.addListSelectionListener(this);
713	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -715,7 +1171,7 @@
715	1171	//jTree.setEditable(true);
716	1172	oe.jTree.setDragEnabled(true);
717	1173	//jTree.setPreferredSize(new Dimension(10,10));
718		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
719	1175
720	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
721	1177
..	..	@@ -727,29 +1183,49 @@
727	1183	dgr.addDragGestureListener(this);
728	1184	}catch(Exception e) {}
729	1185	*/
730		- radio.layout = sevenButton;
	1186	+ radio.layout = threeButton; // sixButton;
731	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
732	1188	}
733	1189
734	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	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	+
736	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	1207	boxCB.setToolTipText("Display bounding boxes");
738	1208	boxCB.addItemListener(this);
739	1209
740	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	1212	zoomBoxCB.addItemListener(this);
743	1213
744	1214	if (true) // Globals.ADVANCED)
745	1215	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- 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);
749	1223
750	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	1225	// localCB.addItemListener(this);
752	1226
	1227	+ panel.Return();
	1228	+
753	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	1230	crowdCB.setToolTipText("Used for crowds");
755	1231	crowdCB.addItemListener(this);
..	..	@@ -758,14 +1234,19 @@
758	1234	smoothCB.setToolTipText("Snapping delay");
759	1235	smoothCB.addItemListener(this);
760	1236
761		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
762		- slowCB.setToolTipText("Smooth interpolation");
763		- 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);
764	1243
765	1244	// constraints.gridy += 1;
766	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	1246	// speakerMocapCB.addItemListener(this);
768	1247
	1248	+ panel.Return();
	1249	+
769	1250	if (false)
770	1251	{
771	1252	// handled in scripts
..	..	@@ -780,34 +1261,74 @@
780	1261	//constraints.gridy += 1;
781	1262	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
783	1265	}
784	1266
785	1267	//constraints.gridx += 1;
786	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	1269	// debugCB.addItemListener(this);
788	1270
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
789	1275	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
790	1277	oeilCB.addItemListener(this);
791	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	+ {
792	1299	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	1300	lookAtCB.setToolTipText("Look-at target");
794	1301	lookAtCB.addItemListener(this);
	1302	+ }
795	1303
796	1304	}
797	1305
798	1306	cGridBag fill = new cGridBag();
799		-
800	1307	fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
801	1312
802	1313	panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
803	1316
804	1317	}
805	1318
806	1319	void EditObject(Object3D obj)
807	1320	{
808	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	+
809	1330	radioButton.SetObject(obj);
810		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = threeButton; // sixButton;
811	1332	radioButton.SetCamera(cameraView.renderCamera, false);
812	1333	radioButton.addActionListener(this);
813	1334	radioPanel.add(radioButton);
..	..	@@ -817,6 +1338,8 @@
817	1338
818	1339	void SetupViews(ObjEditor oe)
819	1340	{
	1341	+ theFrame = this;
	1342	+
820	1343	oe.SetupViews();
821	1344
822	1345	System.out.println("SetupViews");
..	..	@@ -825,23 +1348,30 @@
825	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1349	}
827	1350
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;
	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;
839	1366	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
845	1375
846	1376	// static int COLOR = 1;
847	1377	// static int MATERIAL = 2;
..	..	@@ -849,9 +1379,9 @@
849	1379
850	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1381
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
855	1385
856	1386	public void itemStateChanged(ItemEvent e)
857	1387	{
..	..	@@ -895,6 +1425,12 @@
895	1425	{
896	1426	cameraView.ToggleInertia();
897	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
898	1434	}
899	1435	else if(e.getSource() == localCB)
900	1436	{
..	..	@@ -944,6 +1480,18 @@
944	1480	{
945	1481	cameraView.ToggleOeil();
946	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	+ }
947	1495	else if(e.getSource() == lookAtCB)
948	1496	{
949	1497	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1508,8 @@
960	1508
961	1509	/**/
962	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1514	// We can't move the root node or an empty selection
966	1515	return;
..	..	@@ -1023,8 +1572,6 @@
1023	1572	}
1024	1573	}
1025	1574
1026		- String string = (String) object;
1027		-
1028	1575	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1576	// if( object instanceof java.io.File[])
1030	1577	// {
..	..	@@ -1032,6 +1579,8 @@
1032	1579	// objEditor.DropFile((java.io.File[]) object, true);
1033	1580	// return;
1034	1581	// }
	1582	+
	1583	+ String string = object.toString();
1035	1584
1036	1585	// File path for Mac and Windows
1037	1586	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1626,33 @@
1077	1626
1078	1627	assert target == objEditor.jTree;
1079	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
1080	1630	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1632	} catch (Exception e) {
1083	1633	System.out.println("destinationPath : " + destinationPath);
1084	1634	return;
1085	1635	}
1086	1636
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
1088	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	+// {
1089	1648	loadClipboard(true);
1090	1649	objEditor.jTree.setSelectionPath(destinationPath);
1091	1650	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
1097	1656	}
1098	1657	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1757,30 @@
1198	1757	{
1199	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1759	//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);
	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	+ {
1213	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1779	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
1217	1784	if (Globals.ADVANCED)
1218	1785	{
1219	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1806,15 @@
1239	1806	}
1240	1807	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1808	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);
	1809	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1810	+// overlayItem.addActionListener(this);
	1811	+// lightItem = menu.add(new MenuItem("Light"));
	1812	+// lightItem.addActionListener(this);
1246	1813	menu.add("-");
1247	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1815	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1251	1818	doubleItem = menu.add(new MenuItem("Fork"));
1252	1819	doubleItem.addActionListener(this);
1253	1820	if (Globals.ADVANCED)
..	..	@@ -1263,6 +1830,9 @@
1263	1830	animationItem.addItemListener(this);
1264	1831	animationItem.setState(Globals.ANIMATION);
1265	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1266	1836	menu.add("-");
1267	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1268	1838	parseverticesItem.addActionListener(this);
..	..	@@ -1275,6 +1845,8 @@
1275	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1276	1846	reduce34MorphItem.addActionListener(this);
1277	1847	menu.add("-");
	1848	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1849	+ memoryItem.addActionListener(this);
1278	1850	menu.add(computeAOItem = new MenuItem("Compute AO"));
1279	1851	computeAOItem.addActionListener(this);
1280	1852
..	..	@@ -1283,8 +1855,6 @@
1283	1855	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1284	1856	mirrorItem.addActionListener(this);
1285	1857	menu.add("-");
1286		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1287		- memoryItem.addActionListener(this);
1288	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1289	1859	analyzeItem.addActionListener(this);
1290	1860	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1428,9 +1998,34 @@
1428	1998	shadow.material = new cMaterial(obj.material);
1429	1999	shadow.material.diffuse = 0.0001f;
1430	2000	shadow.material.specular = 0.0001f;
	2001	+ //shadow.projectedVertices[1].x = 300;
1431	2002
1432	2003	makeSomething(shadow);
1433	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	+ }
1434	2029
1435	2030	/**
1436	2031	* applyExample
..	..	@@ -1675,7 +2270,7 @@
1675	2270	{
1676	2271	ScreenFit();
1677	2272	} else
1678		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1679	2274	{
1680	2275	cVector v1 = new cVector();
1681	2276	cVector v2 = new cVector();
..	..	@@ -1684,11 +2279,11 @@
1684	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	2280	objEditor.cameraView.repaint();
1686	2281	} else
1687		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1688	2283	{
1689	2284	makeSomething(new Box());
1690	2285	} else
1691		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1692	2287	{
1693	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +2362,27 @@
1767	2362
1768	2363	makeSomething(obj);
1769	2364	} else
1770		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1771	2366	{
1772	2367	makeSomething(new Grid());
1773	2368	} else
1774		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2370	{
1776	2371	makeSomething(new Sphere());
1777	2372	} else
1778		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1779	2374	{
1780	2375	makeSomething(new Cone());
1781	2376	} else
1782		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1783	2378	{
1784	2379	makeSomething(new Torus());
1785	2380	} else
1786		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1787	2382	{
1788	2383	makeSomething(new Superellipsoid());
1789	2384	} else
1790		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1791	2386	{
1792	2387	makeSomething(new Klein());
1793	2388	} else
..	..	@@ -1807,7 +2402,7 @@
1807	2402	{
1808	2403	makeSomething(new BezierSurface());
1809	2404	} else
1810		- if (source == overlayItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1811	2406	{
1812	2407	/*
1813	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,10 +2450,27 @@
1855	2450	s.setup();
1856	2451	makeSomething(s);
1857	2452	} else
1858		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1859	2454	{
1860	2455	makeSomething(new Light());
1861	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
1862	2474	if (source == csgItem)
1863	2475	{
1864	2476	group(new CSG());
..	..	@@ -1905,30 +2517,30 @@
1905	2517
1906	2518	group(g);
1907	2519	} else
1908		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1909	2521	{
1910	2522	Composite csg = new GroupLeaf();
1911	2523	csg.count = 5;
1912	2524	group(csg);
1913		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1914	2526	csg.addChild(child);
1915	2527	child.addChild(csg);
1916	2528	} else
1917	2529	if (source == doubleItem)
1918	2530	{
1919		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1920	2532	csg.count = 5;
1921	2533	group(csg);
1922		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1923	2535	csg.addChild(child);
1924	2536	child.addChild(csg);
1925		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1926	2538	csg.addChild(child);
1927	2539	child.addChild(csg);
1928	2540	} else
1929	2541	if (source == tripleItem)
1930	2542	{
1931		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1932	2544	csg.count = 4;
1933	2545	group(csg);
1934	2546	Composite child = new cGroup();
..	..	@@ -1944,7 +2556,7 @@
1944	2556	if (source == computeAOItem)
1945	2557	{
1946	2558	Globals.drawMode = CameraPane.OCCLUSION;
1947		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1948	2560	} else
1949	2561	if (source == recompileItem)
1950	2562	{
..	..	@@ -1978,17 +2590,47 @@
1978	2590	{
1979	2591	DumpObject();
1980	2592	} else
	2593	+ if (source == minButton)
	2594	+ {
	2595	+ Minimize();
	2596	+ } else
	2597	+ if (source == maxButton)
	2598	+ {
	2599	+ Maximize();
	2600	+ } else
	2601	+ if (source == fullButton)
	2602	+ {
	2603	+ ToggleFullScreen();
	2604	+ } else
1981	2605	if (source == undoButton)
1982	2606	{
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
1983	2610	Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ restoreButton.setEnabled(false);
	2617	+ } else
	2618	+ if (source == replaceButton)
	2619	+ {
	2620	+ // Overwrite current version
	2621	+ Replace();
	2622	+ replaceButton.setEnabled(false);
1984	2623	} else
1985	2624	if (source == redoButton)
1986	2625	{
	2626	+ // Go to next version
1987	2627	Redo();
1988	2628	} else
1989	2629	if (source == saveButton)
1990	2630	{
1991		- Save();
	2631	+ // Save a new version
	2632	+ if (!Save(true))
	2633	+ java.awt.Toolkit.getDefaultToolkit().beep();
1992	2634	} else
1993	2635	if (source == oneStepButton)
1994	2636	{
..	..	@@ -1997,17 +2639,14 @@
1997	2639	} else
1998	2640	if (source == screenfitButton)
1999	2641	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2642	ScreenFit();
2002	2643	} else
2003	2644	if (source == screenfitpointButton)
2004	2645	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2646	ScreenFitPoint();
2007	2647	} else
2008	2648	if (source == snapobjectButton)
2009	2649	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2650	SnapObject();
2012	2651	} else
2013	2652	// if (event.getSource() == recompileButton)
..	..	@@ -2371,7 +3010,7 @@
2371	3010	{
2372	3011	StepAll();
2373	3012	} else
2374		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3013	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2375	3014	{
2376	3015	//int indices[] = jList.getSelectedIndices();
2377	3016	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2383,9 +3022,9 @@
2383	3022	{
2384	3023	ClearSelection(true);
2385	3024	} else
2386		- if (source == grabItem)
	3025	+ if (source == grabItem \|\| source == groupButton)
2387	3026	{
2388		- group(new cGroup(), true);
	3027	+ group(new cGroup(), false); // true);
2389	3028	} else
2390	3029	if (source == hideItem)
2391	3030	{
..	..	@@ -2403,11 +3042,11 @@
2403	3042	{
2404	3043	makeSomething(new Camera());
2405	3044	} else
2406		- if (source == compositeItem)
	3045	+ if (source == compositeItem \|\| source == compositeButton)
2407	3046	{
2408	3047	group(new Composite());
2409	3048	} else
2410		- if (source == randomItem)
	3049	+ if (source == switchItem \|\| source == switchButton)
2411	3050	{
2412	3051	RandomNode random = new RandomNode();
2413	3052	group(random);
..	..	@@ -2509,7 +3148,7 @@
2509	3148	{
2510	3149	group(new cLinker());
2511	3150	} else
2512		- if (source == textureItem)
	3151	+ if (source == textureItem \|\| source == textureButton)
2513	3152	{
2514	3153	group(new TextureNode());
2515	3154	} else
..	..	@@ -2529,17 +3168,30 @@
2529	3168	{
2530	3169	CastShadow(2);
2531	3170	} else
2532		- if (source == ungroupItem)
	3171	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	3172	{
2534		- //ungroup();
	3173	+ boolean hasRoot = false;
	3174	+
2535	3175	for (int i=0; i<group.selection.size(); i++)
2536	3176	{
2537		- Ungroup(group.selection.get(i));
	3177	+ if (group.selection.get(i) == group)
	3178	+ {
	3179	+ hasRoot = true;
	3180	+ break;
	3181	+ }
2538	3182	}
2539	3183
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	3184	+ if (!hasRoot)
	3185	+ {
	3186	+ for (int i=0; i<group.selection.size(); i++)
	3187	+ {
	3188	+ Ungroup(group.selection.get(i));
	3189	+ }
	3190	+
	3191	+ ClearSelection(false);
	3192	+
	3193	+ refreshContents();
	3194	+ }
2543	3195	} else
2544	3196	if (source == genUVItem)
2545	3197	{
..	..	@@ -2840,7 +3492,7 @@
2840	3492	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2841	3493	{
2842	3494	obj = (Object3D)e.nextElement();
2843		- obj.SetBumpTexture(null);
	3495	+ obj.ResetBumpTexture();
2844	3496	}
2845	3497
2846	3498	refreshContents();
..	..	@@ -2856,6 +3508,31 @@
2856	3508
2857	3509	refreshContents();
2858	3510	} else
	3511	+ if (source == embedTexturesItem)
	3512	+ {
	3513	+ Object3D obj;
	3514	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3515	+ {
	3516	+ obj = (Object3D)e.nextElement();
	3517	+ obj.EmbedTextures(true);
	3518	+ }
	3519	+
	3520	+ refreshContents();
	3521	+ } else
	3522	+ if (source == deEmbedTexturesItem)
	3523	+ {
	3524	+ Object3D obj;
	3525	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3526	+ {
	3527	+ obj = (Object3D)e.nextElement();
	3528	+ obj.EmbedTextures(false);
	3529	+ }
	3530	+
	3531	+ CameraPane.texturepigment.clear();
	3532	+ CameraPane.texturebump.clear();
	3533	+
	3534	+ refreshContents();
	3535	+ } else
2859	3536	if (source == flashSelectionButton)
2860	3537	{
2861	3538	CameraPane.flash = true;
..	..	@@ -2867,6 +3544,10 @@
2867	3544	if (source == twoButton)
2868	3545	{
2869	3546	radio.layout = twoButton;
	3547	+
	3548	+ if (CameraPane.FULLSCREEN)
	3549	+ fullscreenLayout = radio.layout;
	3550	+
2870	3551	// bug
2871	3552	//gridPanel.setDividerLocation(1.0);
2872	3553	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3580,31 @@
2899	3580	bigThree.ClearUI();
2900	3581	bigThree.add(centralPanel);
2901	3582	bigThree.FlushUI();
	3583	+
	3584	+ cameraView.requestFocusInWindow();
	3585	+
	3586	+// refreshContents(true);
	3587	+//
	3588	+// try
	3589	+// {
	3590	+// java.awt.Robot bot = new java.awt.Robot();
	3591	+// int mask = InputEvent.BUTTON1_MASK;
	3592	+// bot.mouseMove(100, 100);
	3593	+// bot.mousePress(mask);
	3594	+// bot.mouseRelease(mask);
	3595	+// }
	3596	+// catch (Exception e)
	3597	+// {
	3598	+//
	3599	+// }
	3600	+
2902	3601	} else
2903	3602	if (source == threeButton)
2904	3603	{
2905	3604	radio.layout = threeButton;
	3605	+
	3606	+ if (CameraPane.FULLSCREEN)
	3607	+ fullscreenLayout = radio.layout;
2906	3608
2907	3609	// bigThree.remove(scenePanel);
2908	3610	// bigThree.remove(centralPanel);
..	..	@@ -2932,13 +3634,18 @@
2932	3634	// centralPanel.setVisible(true);
2933	3635	// XYZPanel.setVisible(true);
2934	3636	bigThree.ClearUI();
	3637	+ bigThree.add(scenePanel);
2935	3638	bigThree.add(centralPanel);
2936		- bigThree.add(XYZPanel);
2937	3639	bigThree.FlushUI();
	3640	+
	3641	+ cameraView.requestFocusInWindow();
2938	3642	} else
2939	3643	if (source == fourButton)
2940	3644	{
2941	3645	radio.layout = fourButton;
	3646	+
	3647	+ if (CameraPane.FULLSCREEN)
	3648	+ fullscreenLayout = radio.layout;
2942	3649
2943	3650	// bigThree.remove(scenePanel);
2944	3651	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3677,15 @@
2970	3677	bigThree.ClearUI();
2971	3678	bigThree.add(scenePanel);
2972	3679	bigThree.FlushUI();
	3680	+
	3681	+ cameraView.requestFocusInWindow();
2973	3682	} else
2974	3683	if (source == sixButton)
2975	3684	{
2976	3685	radio.layout = sixButton;
	3686	+
	3687	+ if (CameraPane.FULLSCREEN)
	3688	+ fullscreenLayout = radio.layout;
2977	3689
2978	3690	// bigThree.remove(scenePanel);
2979	3691	// bigThree.remove(centralPanel);
..	..	@@ -3003,13 +3715,18 @@
3003	3715	// centralPanel.setVisible(true);
3004	3716	// XYZPanel.setVisible(false);
3005	3717	bigThree.ClearUI();
3006		- bigThree.add(scenePanel);
3007	3718	bigThree.add(centralPanel);
	3719	+ bigThree.add(scenePanel);
3008	3720	bigThree.FlushUI();
	3721	+
	3722	+ cameraView.requestFocusInWindow();
3009	3723	} else
3010	3724	if (source == sevenButton)
3011	3725	{
3012	3726	radio.layout = sevenButton;
	3727	+
	3728	+ if (CameraPane.FULLSCREEN)
	3729	+ fullscreenLayout = radio.layout;
3013	3730
3014	3731	// bigThree.remove(scenePanel);
3015	3732	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3760,8 @@
3043	3760	bigThree.add(centralPanel);
3044	3761	bigThree.add(XYZPanel);
3045	3762	bigThree.FlushUI();
	3763	+
	3764	+ cameraView.requestFocusInWindow();
3046	3765	} else
3047	3766	if (source == rootButton)
3048	3767	{
..	..	@@ -3054,6 +3773,7 @@
3054	3773	EditObject(obj);
3055	3774	}
3056	3775
	3776	+ cameraView.requestFocusInWindow();
3057	3777	refreshContents(true);
3058	3778	} else
3059	3779	if (source == closeButton)
..	..	@@ -3063,22 +3783,37 @@
3063	3783	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3784	{
3065	3785	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3786	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3787	{
	3788	+ // Patch to avoid bug with transparency.
	3789	+ if (!ab.hadMaterial)
	3790	+ {
	3791	+ ab.object.material = null;
	3792	+ }
	3793	+
3068	3794	buttonGroup.remove(ab);
3069	3795	radioPanel.remove(ab);
3070	3796
3071		- ab.GetObject().editWindow = null;
	3797	+ //ab.GetObject().editWindow = null;
	3798	+ ab.GetObject().manipWindow = null;
3072	3799	// ab.GetObject().objectUI = null; // ?????????
3073	3800
3074	3801	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3802	break;
3076	3803	}
3077	3804	}
	3805	+
	3806	+ cameraView.requestFocusInWindow();
3078	3807	refreshContents(true);
3079	3808	} else
3080	3809	if (source == editItem \|\| source == editButton)
3081	3810	{
	3811	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3812	+ {
	3813	+ Object3D child = (Object3D)e.nextElement();
	3814	+ child.pinned = true;
	3815	+ }
	3816	+
3082	3817	EditSelection(false);
3083	3818	} else
3084	3819	if (source == uneditButton)
..	..	@@ -3087,9 +3822,10 @@
3087	3822	{
3088	3823	Object3D child = (Object3D)e.nextElement();
3089	3824	if(child.editWindow != null)
3090		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3825	+ child.pinned = false;
3091	3826	child.CloseUI();
3092	3827	listUI.remove(child);
	3828	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	3829
3094	3830	//child.editWindow = null; // ???????????
3095	3831	}
..	..	@@ -3104,16 +3840,18 @@
3104	3840	//copy.ClearUI();
3105	3841	for (Object3D obj : listUI)
3106	3842	{
	3843	+ obj.pinned = false;
3107	3844	obj.CloseUI();
3108	3845	}
3109	3846	listUI.clear();
	3847	+ SetPinStates(group.selection.size() > 0);
3110	3848	refreshContents(true);
3111	3849	} else
3112	3850	if (source == allParamsButton)
3113	3851	{
3114	3852	assert(copy == group);
3115	3853
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3854	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3855
3118	3856	for (Object3D obj : listUI)
3119	3857	{
..	..	@@ -3162,6 +3900,9 @@
3162	3900	}
3163	3901
3164	3902	copy = group;
	3903	+
	3904	+ SetUndoStates();
	3905	+
3165	3906	//Globals.theRenderer.object = group;
3166	3907	if(!useclient)
3167	3908	{
..	..	@@ -3179,7 +3920,8 @@
3179	3920	}
3180	3921
3181	3922	// fix "+" issue
3182		- group.editWindow = this;
	3923	+ //group.editWindow = this;
	3924	+ group.manipWindow = this;
3183	3925
3184	3926	/*
3185	3927	currentLayout = radio.layout;
..	..	@@ -3187,20 +3929,32 @@
3187	3929	currentLayout = sevenButton;
3188	3930	*/
3189	3931	radio.layout.doClick();
	3932	+
	3933	+ ClearUnpinned();
	3934	+
	3935	+ //Grafreed.Assert(group != null);
	3936	+ //Grafreed.Assert(group.selection != null);
	3937	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3938	+ if (group.selection == null \|\| group.selection.size() == 1)
	3939	+ EditSelection(false);
3190	3940	keepparent = group.parent;
3191	3941	// PARENT = NULL or not???
3192	3942	//group.parent = null; // ROOT
3193	3943	//group.attributes = -1;
3194	3944	ResetModel();
	3945	+
	3946	+ cameraView.requestFocusInWindow();
3195	3947	refreshContents(true);
3196	3948	} else if (event.getSource() == editCameraItem)
3197	3949	{
3198	3950	cameraView.ProtectCamera();
	3951	+ cameraView.requestFocusInWindow();
3199	3952	cameraView.repaint();
3200	3953	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3954	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3955	{
3203	3956	cameraView.RevertCamera();
	3957	+ cameraView.requestFocusInWindow();
3204	3958	cameraView.repaint();
3205	3959	return;
3206	3960	// } else if (event.getSource() == textureButton)
..	..	@@ -3215,7 +3969,6 @@
3215	3969	}
3216	3970
3217	3971	boolean useclient = false;
3218		- cRadio radio;
3219	3972
3220	3973	void ToggleRoot()
3221	3974	{
..	..	@@ -3778,7 +4531,7 @@
3778	4531
3779	4532	try
3780	4533	{
3781		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4534	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3782	4535	}
3783	4536	catch (Exception e)
3784	4537	{
..	..	@@ -4253,28 +5006,25 @@
4253	5006	// }
4254	5007	// }
4255	5008
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	5009	void EditSelection(boolean newWindow)
4261	5010	{
	5011	+ if (group.selection == null)
	5012	+ {
	5013	+ EditElement(group, newWindow); // ? new
	5014	+ return;
	5015	+ }
	5016	+
4262	5017	// aConstraints.gridy = 0;
4263	5018	for (int i=0; i<group.selection.size(); i++)
4264	5019	{
4265	5020	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	5021	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5022	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	5023
4269	5024	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	5025	if(elem != group \|\| !newWindow)
4271	5026	{
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
	5027	+ EditElement(elem, newWindow); // ? new
4278	5028	}
4279	5029	}
4280	5030	}
..	..	@@ -4337,9 +5087,7 @@
4337	5087
4338	5088	freezemodel = false;
4339	5089	}
4340		-
4341		- boolean flashIt = true;
4342		-
	5090	+
4343	5091	public void valueChanged(TreeSelectionEvent e)
4344	5092	//public boolean handleEvent(Event event)
4345	5093	{
..	..	@@ -4349,7 +5097,8 @@
4349	5097	//new Exception().printStackTrace();
4350	5098
4351	5099	freezemodel = true;
4352		-
	5100	+ ClearUnpinned();
	5101	+
4353	5102	/**/
4354	5103	//switch (event.id)
4355	5104	{
..	..	@@ -4382,7 +5131,7 @@
4382	5131	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	5132	// a camera
4384	5133	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5134	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	5135	{
4387	5136	CameraPane.camerachangeframe = 0; // don't refuse it
4388	5137	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +5140,13 @@
4391	5140	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	5141	}
4393	5142
	5143	+ if (tps != null && tps.length == 1)
	5144	+ {
	5145	+ EditSelection(false);
	5146	+ }
	5147	+
	5148	+ SetPinStates(tps != null && tps.length > 0);
	5149	+
4394	5150	refreshContents();
4395	5151	//return true;
4396	5152	}
..	..	@@ -4400,9 +5156,20 @@
4400	5156	freezemodel = false;
4401	5157	}
4402	5158
	5159	+ void SetPinStates(boolean enabled)
	5160	+ {
	5161	+ editButton.setEnabled(enabled);
	5162	+ uneditButton.setEnabled(enabled);
	5163	+ unselectButton.setEnabled(enabled);
	5164	+ flashSelectionButton.setEnabled(enabled);
	5165	+
	5166	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5167	+ }
	5168	+
4403	5169	void refreshContents(boolean cp)
4404	5170	{
4405		- if (!Globals.MOUSEDRAGGED)
	5171	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5172	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	5173	{
4407	5174	objEditor.ClearInfo(); // .GetMaterial());
4408	5175
..	..	@@ -4501,7 +5268,8 @@
4501	5268
4502	5269	if (cut)
4503	5270	{
4504		- Save();
	5271	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5272	+// Save();
4505	5273	//int indices[] = jList.getSelectedIndices();
4506	5274	//for (int i = indices.length - 1; i >= 0; i--)
4507	5275	//jList.remove(indices[i]);
..	..	@@ -4604,6 +5372,10 @@
4604	5372
4605	5373	void paste(boolean expand)
4606	5374	{
	5375	+ if (Globals.REPLACEONMAKE)
	5376	+ Save();
	5377	+ boolean keep = Globals.REPLACEONMAKE;
	5378	+ Globals.REPLACEONMAKE = false;
4607	5379	// if (GrafreeD.clipboard == null)
4608	5380	// return;
4609	5381	boolean first = true;
..	..	@@ -4663,6 +5435,7 @@
4663	5435	Grafreed.clipboard.get(0).parent = keepparent;
4664	5436	}
4665	5437
	5438	+ Globals.REPLACEONMAKE = keep;
4666	5439	ResetModel();
4667	5440	refreshContents();
4668	5441	}
..	..	@@ -4798,6 +5571,10 @@
4798	5571
4799	5572	void group(Object3D csg, boolean grab)
4800	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4801	5578	if (//false) // why??
4802	5579	!group.selection.isEmpty())
4803	5580	{
..	..	@@ -4911,10 +5688,15 @@
4911	5688	//node.add(csg);
4912	5689	//makeSomething(node);
4913	5690	makeSomething(csg);
	5691	+ Globals.REPLACEONMAKE = keep;
4914	5692	}
4915	5693
4916	5694	void Ungroup(Object3D g)
4917	5695	{
	5696	+ if (Globals.REPLACEONMAKE)
	5697	+ Save();
	5698	+ boolean keep = Globals.REPLACEONMAKE;
	5699	+ Globals.REPLACEONMAKE = false;
4918	5700	if (g instanceof HiddenObject)
4919	5701	{
4920	5702	HiddenObject h = (HiddenObject) g;
..	..	@@ -4931,6 +5713,7 @@
4931	5713	objEditor.makeSomething(g.get(i), false);
4932	5714	}
4933	5715	}
	5716	+ Globals.REPLACEONMAKE = keep;
4934	5717	}
4935	5718
4936	5719	void ungroup()
..	..	@@ -5219,10 +6002,44 @@
5219	6002	cButton clearpanelButton;
5220	6003	cButton unselectButton;
5221	6004
	6005	+ cButton restoreCameraButton;
	6006	+
5222	6007	cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
5225	6008	cButton oneStepButton;
	6009	+
	6010	+ cButton groupButton;
	6011	+ cButton ungroupButton;
	6012	+ cButton compositeButton;
	6013	+ cButton switchButton;
	6014	+ cButton loopButton;
	6015	+ cButton textureButton;
	6016	+
	6017	+ cButton skybox1Button;
	6018	+ cButton skybox2Button;
	6019	+ cButton skybox3Button;
	6020	+ cButton skybox4Button;
	6021	+ cButton skybox5Button;
	6022	+ cButton skybox6Button;
	6023	+ cButton skybox7Button;
	6024	+
	6025	+ cButton skybox11Button;
	6026	+ cButton skybox12Button;
	6027	+ cButton skybox13Button;
	6028	+ cButton skybox14Button;
	6029	+ cButton skybox15Button;
	6030	+ cButton skybox16Button;
	6031	+ cButton skybox17Button;
	6032	+
	6033	+ cButton gridButton;
	6034	+ cButton boxButton;
	6035	+ cButton sphereButton;
	6036	+ cButton coneButton;
	6037	+ cButton torusButton;
	6038	+ cButton superButton;
	6039	+ cButton kleinButton;
	6040	+ cButton particlesButton;
	6041	+ cButton overlayButton;
	6042	+ cButton lightButton;
5226	6043
5227	6044	cButton screenfitButton;
5228	6045	cButton screenfitpointButton;
..	..	@@ -5235,14 +6052,6 @@
5235	6052
5236	6053	cButton setsupportButton;
5237	6054
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	6055	//
5247	6056	//Composite
5248	6057	Object3D // to do !!
..	..	@@ -5252,11 +6061,11 @@
5252	6061	//JTree jTree;
5253	6062	private MenuItem lookAtItem;
5254	6063	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	6064	+ private MenuItem switchViewItem;
5256	6065	private MenuItem cutItem;
5257	6066	private MenuItem undoItem;
5258	6067	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	6068	+ private JMenuItem duplicateItem;
5260	6069	private MenuItem cloneItem;
5261	6070	private MenuItem cloneSupportItem;
5262	6071	private MenuItem overwriteGeoItem;
..	..	@@ -5284,7 +6093,7 @@
5284	6093	private MenuItem pasteLinkItem;
5285	6094	private MenuItem pasteCloneItem;
5286	6095	private MenuItem pasteExpandItem;
5287		- private MenuItem clearItem;
	6096	+ private MenuItem deleteItem;
5288	6097	private MenuItem clearAllItem;
5289	6098	private MenuItem genUVItem;
5290	6099	private MenuItem genNormalsMESHItem;
..	..	@@ -5344,7 +6153,7 @@
5344	6153	private MenuItem frontItem;
5345	6154	private MenuItem cameraItem;
5346	6155	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	6156	+ private MenuItem switchItem;
5348	6157	private MenuItem physicsItem;
5349	6158	private MenuItem frameselectorItem;
5350	6159	private MenuItem scriptNodeItem;
..	..	@@ -5368,6 +6177,8 @@
5368	6177	private MenuItem attachBumpItem;
5369	6178	private MenuItem detachBumpItem;
5370	6179	private MenuItem pigmentBumpItem;
	6180	+ private MenuItem embedTexturesItem;
	6181	+ private MenuItem deEmbedTexturesItem;
5371	6182
5372	6183	private MenuItem particleItem;
5373	6184	private MenuItem ragdollItem;
..	..	@@ -5418,5 +6229,5 @@
5418	6229
5419	6230	Menu cameraMenu;
5420	6231	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	6232	+ MenuItem restoreCameraItem;
5422	6233	}