~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,237 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
26	257	//ObjEditor objEditor;
27	258	public void closeUI2()
28	259	{
..	..	@@ -60,6 +291,12 @@
60	291	this.copy = this.group = group;
61	292	//selectees = this.group.selectees;
62	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
63	300	if(ui)
64	301	SetupUI(objEditor);
65	302	}
..	..	@@ -80,10 +317,22 @@
80	317	SetupViews(objEditor);
81	318
82	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
83	328	}
84	329
85	330	void CloneSelection(boolean supports)
86	331	{
	332	+ if (Globals.REPLACEONMAKE)
	333	+ Save();
	334	+ boolean keep = Globals.REPLACEONMAKE;
	335	+ Globals.REPLACEONMAKE = false;
87	336	// Object3D keep = GrafreeD.clipboard;
88	337	//Object3D obj;
89	338	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +343,7 @@
94	343
95	344	makeSomething(clone, i==group.selection.size()-1);
96	345	}
	346	+ Globals.REPLACEONMAKE = keep;
97	347	}
98	348
99	349	void CloneClipboard(boolean supports)
..	..	@@ -150,11 +400,19 @@
150	400
151	401	void SetupMenu2(GroupEditor oe)
152	402	{
	403	+ oe.jTree = new cTree();
	404	+
153	405	Menu menu;
154	406	oe.menuBar.add(menu = new Menu("Edit"));
155	407	//editItem = menu.add(new MenuItem("Edit"));
156	408	//editItem.addActionListener(this);
157		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	409	+
	410	+// undoItem = menu.add(new MenuItem("Undo"));
	411	+// undoItem.addActionListener(this);
	412	+// redoItem = menu.add(new MenuItem("Redo"));
	413	+// redoItem.addActionListener(this);
	414	+// menu.add("-");
	415	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158	416	duplicateItem.addActionListener(this);
159	417	cloneItem = menu.add(new MenuItem("Clone"));
160	418	cloneItem.addActionListener(this);
..	..	@@ -170,7 +428,6 @@
170	428	copyItem.addActionListener(this);
171	429	pasteItem = menu.add(new MenuItem("Paste"));
172	430	pasteItem.addActionListener(this);
173		- menu.add("-");
174	431
175	432	menu.add("-");
176	433	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -182,8 +439,8 @@
182	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183	440	// pasteExpandItem.addActionListener(this);
184	441	menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
187	444
188	445	if (Globals.ADVANCED)
189	446	{
..	..	@@ -197,23 +454,23 @@
197	454	//zBufferItem.addActionListener(this);
198	455	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	456	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	457	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	458	+ restoreCameraItem.addActionListener(this);
202	459
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- cameraMenu.add("-");
	460	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	461	+// toggleFullScreenItem.addItemListener(this);
	462	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	463	+// cameraMenu.add("-");
	464	+//
	465	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	466	+// toggleTextureItem.addItemListener(this);
	467	+// toggleTextureItem.setState(CameraPane.textureon);
	468	+//
	469	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	470	+// toggleSwitchItem.addItemListener(this);
	471	+// toggleSwitchItem.setState(CameraPane.SWITCH);
207	472
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	473	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	474	toggleHandleItem.addItemListener(this);
218	475	toggleHandleItem.setState(CameraPane.HANDLES);
219	476
..	..	@@ -240,7 +497,7 @@
240	497
241	498	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	499	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	500	+ toggleDebugItem.setState(Globals.DEBUG);
244	501
245	502	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	503	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,14 +518,14 @@
261	518	// animationItem.addItemListener(this);
262	519	// animationItem.setState(CameraPane.ANIMATION);
263	520	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	521	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	522	editCameraItem.addActionListener(this);
266	523
267	524	if (Globals.ADVANCED)
268	525	{
269	526	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	527	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	528	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272	529	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273	530	oe.cameraMenu.add("-");
274	531	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -276,7 +533,7 @@
276	533	editLeafItem.addActionListener(this);
277	534	lookAtItem.addActionListener(this);
278	535	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	536	+ //switchViewItem.addActionListener(this);
280	537	}
281	538
282	539	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +578,29 @@
321	578	}
322	579
323	580	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	581	+// grabItem = menu.add(new MenuItem("Grab"));
	582	+// grabItem.addActionListener(this);
326	583	backItem = menu.add(new MenuItem("Back"));
327	584	backItem.addActionListener(this);
328	585	frontItem = menu.add(new MenuItem("Front"));
329	586	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	587	+// compositeItem = menu.add(new MenuItem("Composite"));
	588	+// compositeItem.addActionListener(this);
	589	+
	590	+ if (Globals.ADVANCED)
	591	+ {
332	592	hideItem = menu.add(new MenuItem("Hidden Group"));
333	593	hideItem.addActionListener(this);
	594	+ }
334	595	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	596	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- randomItem.addActionListener(this);
	597	+
	598	+// menu.add("-");
	599	+//
	600	+// switchItem = menu.add(new MenuItem("Switch node"));
	601	+// switchItem.addActionListener(this);
	602	+ if (Globals.ADVANCED)
	603	+ {
339	604	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	605	switchGeoItem.addActionListener(this);
341	606	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +608,6 @@
343	608	morphItem = menu.add(new MenuItem("Morph Group"));
344	609	morphItem.addActionListener(this);
345	610
346		- if (Globals.ADVANCED)
347		- {
348	611	menu.add("-");
349	612	physicsItem = menu.add(new MenuItem("Physics"));
350	613	physicsItem.addActionListener(this);
..	..	@@ -352,30 +615,29 @@
352	615	frameselectorItem.addActionListener(this);
353	616	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	617	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	618	}
358	619
359	620	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	621	+// textureItem = menu.add(new MenuItem("Texture"));
	622	+// textureItem.addActionListener(this);
362	623	billboardItem = menu.add(new MenuItem("Billboard"));
363	624	billboardItem.addActionListener(this);
364	625	csgItem = menu.add(new MenuItem("CSG"));
365	626	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	627	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	628	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	629	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	630	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	631	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	632	shadowZItem.addActionListener(this);
	633	+ attributeItem = menu.add(new MenuItem("Attribute"));
	634	+ attributeItem.addActionListener(this);
	635	+
372	636	if (Globals.ADVANCED)
373	637	{
374	638	menu.add("-");
375	639	linkerItem = menu.add(new MenuItem("Linker"));
376	640	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	641	templateItem = menu.add(new MenuItem("Template"));
380	642	templateItem.addActionListener(this);
381	643	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -404,7 +666,7 @@
404	666	genNormalsMESHItem.addActionListener(this);
405	667	if (Globals.ADVANCED)
406	668	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	670	genNormalsMINEItem.addActionListener(this);
409	671	}
410	672	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -464,6 +726,14 @@
464	726	markleavesItem.addActionListener(this);
465	727	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	728	unmarkleavesItem.addActionListener(this);
	729	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	730	+ rewindleavesItem.addActionListener(this);
	731	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	732	+ unrewindleavesItem.addActionListener(this);
	733	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	734	+ randomleavesItem.addActionListener(this);
	735	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	736	+ unrandomleavesItem.addActionListener(this);
467	737	menu.add("-");
468	738	flipVItem = menu.add(new MenuItem("Flip V"));
469	739	flipVItem.addActionListener(this);
..	..	@@ -489,10 +759,15 @@
489	759	attachBumpItem.addActionListener(this);
490	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
492	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493	764	detachPigmentItem.addActionListener(this);
494	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
496	771	menu.add("-");
497	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498	773	sortbysizeItem.addActionListener(this);
..	..	@@ -519,8 +794,21 @@
519	794	buildToolsMenu(menu);
520	795	}
521	796
	797	+
522	798	void SetupUI2(ObjEditor oe)
523	799	{
	800	+ // June 2019
	801	+ if (oe == null)
	802	+ {
	803	+ //super.SetupUI2(this);
	804	+ //return;
	805	+ }
	806	+
	807	+ if (copy != group)
	808	+ {
	809	+ //super.SetupUI2(this);
	810	+ }
	811	+
524	812	//new Exception().printStackTrace();
525	813
526	814	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -549,27 +837,79 @@
549	837	oe.radioPanel.add(dummyButton);
550	838	oe.buttonGroup.add(dummyButton);
551	839	*/
	840	+ cGridBag copyOptionsPanel = new cGridBag();
	841	+
	842	+ copyOptionsPanel.preferredHeight = 2;
	843	+
552	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	845
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	846	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	847	+ //minButton.setToolTipText("Minimize window");
	848	+ //minButton.addActionListener(this);
	849	+
	850	+ if (Globals.ADVANCED)
	851	+ {
	852	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	853	+ maxButton.setToolTipText("Maximize window");
	854	+ maxButton.addActionListener(this);
	855	+ }
	856	+
	857	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	858	+ fullButton.setToolTipText("Full-screen window");
	859	+ fullButton.addActionListener(this);
	860	+
	861	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	862	+ screenfitButton.setToolTipText("Screen fit");
	863	+ screenfitButton.addActionListener(this);
	864	+
	865	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	866	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	867	+ restoreCameraButton.addActionListener(this);
	868	+
	869	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	870	+ saveButton.setToolTipText("New version");
	871	+ saveButton.addActionListener(this);
	872	+
	873	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	874	+ undoButton.setToolTipText("Previous version");
	875	+ undoButton.addActionListener(this);
	876	+ undoButton.setEnabled(false);
	877	+
	878	+ cGridBag updown = new cGridBag().setVertical(true);
	879	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	880	+ restoreButton.setToolTipText("Restore current");
	881	+ restoreButton.addActionListener(this);
	882	+ restoreButton.setEnabled(false);
	883	+
	884	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	885	+ replaceButton.setToolTipText("Replace current");
	886	+ replaceButton.addActionListener(this);
	887	+ replaceButton.setEnabled(false);
	888	+
	889	+ copyOptionsPanel.add(updown);
	890	+
	891	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	892	+ redoButton.setToolTipText("Next version");
	893	+ redoButton.addActionListener(this);
	894	+ redoButton.setEnabled(false);
	895	+
	896	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
555	897	liveCB.setToolTipText("Enable animation");
556	898	liveCB.addItemListener(this);
557	899
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	900	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	901	oneStepButton.setToolTipText("Animate one step forward");
560	902	oneStepButton.addActionListener(this);
561	903
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	904	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	905	fastCB.setToolTipText("Fast mode");
564	906	fastCB.addItemListener(this);
565	907
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- screenfitButton.addActionListener(this);
	908	+ //oe.toolboxPanel.Return();
	909	+
	910	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	911	+// trackCB.setToolTipText("Enable tracking");
	912	+// trackCB.addItemListener(this);
573	913
574	914	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	915	// screenfitpointButton.addActionListener(this);
..	..	@@ -579,67 +919,155 @@
579	919	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	920	snapobjectButton.addActionListener(this);
581	921	snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	924	+ fourButton.addActionListener(this);
	925	+ fourButton.setToolTipText("Show control panel only");
582	926	}
583	927
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	928	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	929
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- twoButton.setToolTipText("Show center view only");
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
592	932	twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- fourButton.addActionListener(this);
595		- fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- sixButton.setToolTipText("2-column layout left");
598		- sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- threeButton.setToolTipText("2-column layout right");
	933	+ this.fullscreenLayout = twoButton;
	934	+
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
601	937	threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
605	944	//
606	945
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- rootButton.setToolTipText("Edit selection in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
609	948	rootButton.addActionListener(this);
610	949
611		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	951	closeButton.setToolTipText("Close tab");
613	952	closeButton.addActionListener(this);
614	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	954	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	955	+
	956	+ cGridBag row1 = new cGridBag();
618	957
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- editButton.setToolTipText("Edit selection");
	958	+ // INSERT
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	960	+ gridButton.setToolTipText("Create grid");
	961	+ gridButton.addActionListener(this);
	962	+
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	964	+ boxButton.setToolTipText("Create box");
	965	+ boxButton.addActionListener(this);
	966	+
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	968	+ sphereButton.setToolTipText("Create sphere");
	969	+ sphereButton.addActionListener(this);
	970	+
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	972	+ coneButton.setToolTipText("Create cone");
	973	+ coneButton.addActionListener(this);
	974	+
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	976	+ torusButton.setToolTipText("Create torus");
	977	+ torusButton.addActionListener(this);
	978	+
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	980	+ superButton.setToolTipText("Create superellipsoid");
	981	+ superButton.addActionListener(this);
	982	+
	983	+ if (Globals.ADVANCED)
	984	+ {
	985	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	986	+ kleinButton.setToolTipText("Create Klein bottle");
	987	+ kleinButton.addActionListener(this);
	988	+ }
	989	+
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	991	+ particlesButton.setToolTipText("Create particle system");
	992	+ particlesButton.addActionListener(this);
	993	+
	994	+ oe.toolboxPanel.add(row1);
	995	+
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ groupButton.setToolTipText("Create group");
	1000	+ groupButton.addActionListener(this);
	1001	+
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1003	+ compositeButton.setToolTipText("Create composite");
	1004	+ compositeButton.addActionListener(this);
	1005	+
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ switchButton.setToolTipText("Create item switcher");
	1008	+ switchButton.addActionListener(this);
	1009	+
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+ loopButton.setToolTipText("Create loop");
	1012	+ loopButton.addActionListener(this);
	1013	+
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ textureButton.setToolTipText("Create texture");
	1016	+ textureButton.addActionListener(this);
	1017	+
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ overlayButton.setToolTipText("Create overlay");
	1020	+ overlayButton.addActionListener(this);
	1021	+
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1023	+ lightButton.setToolTipText("Create light");
	1024	+ lightButton.addActionListener(this);
	1025	+
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
	1040	+
	1041	+ // EDIT panel
	1042	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1043	+ editButton.setToolTipText("Pin selection controls");
621	1044	editButton.addActionListener(this);
622	1045
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	1046	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ uneditButton.setToolTipText("Remove selection controls");
625	1048	uneditButton.addActionListener(this);
626	1049
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	1050	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1051	+ allParamsButton.setToolTipText("Show all controle");
629	1052	allParamsButton.addActionListener(this);
630	1053
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	1055	clearPanelButton.setToolTipText("Clear edit panel");
633	1056	clearPanelButton.addActionListener(this);
634	1057
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	1059	unselectButton.setToolTipText("Unselect");
637	1060	unselectButton.addActionListener(this);
638	1061
639		- commandsPanel.preferredHeight = 1;
	1062	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ flashSelectionButton.setToolTipText("Highlight selection");
	1064	+ flashSelectionButton.addActionListener(this);
640	1065
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	1066	+ editCommandsPanel.preferredHeight = 1;
	1067	+
	1068	+ SetPinStates(false);
	1069	+// oe.treePanel.add(commandsPanel);
	1070	+// oe.treePanel.Return();
643	1071
644	1072	// oe.aConstraints.gridx += 1;
645	1073	// oe.aConstraints.weighty = 0;
..	..	@@ -656,32 +1084,20 @@
656	1084
657	1085	JScrollPane jSP;
658	1086	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1087	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	1088	ResetModel();
661	1089
662	1090	oe.treePanel.add(jSPPanel);
663	1091	oe.treePanel.Return();
664	1092
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	1093	oe.treePanel.add(copyOptionsPanel);
681	1094	oe.treePanel.Return();
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1097	+ sliderPane.preferredHeight = 1;
682	1098
683		-// mainPanel.setDividerLocation(0.5); //1.0);
684		-// mainPanel.setResizeWeight(0.5);
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
685	1101
686	1102	//jList.addListSelectionListener(this);
687	1103	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -689,7 +1105,7 @@
689	1105	//jTree.setEditable(true);
690	1106	oe.jTree.setDragEnabled(true);
691	1107	//jTree.setPreferredSize(new Dimension(10,10));
692		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
693	1109
694	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
695	1111
..	..	@@ -701,29 +1117,49 @@
701	1117	dgr.addDragGestureListener(this);
702	1118	}catch(Exception e) {}
703	1119	*/
704		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
705	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	1122	}
707	1123
708	1124	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	1125	{
	1126	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1127	+ colorCB.setToolTipText("Copy color when dropped");
	1128	+ colorCB.addItemListener(this);
	1129	+
	1130	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1131	+ materialCB.setToolTipText("Copy material when dropped");
	1132	+ materialCB.addItemListener(this);
	1133	+
	1134	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1135	+ textureCB.setToolTipText("Copy texture when dropped");
	1136	+ textureCB.addItemListener(this);
	1137	+
	1138	+ panel.Return();
	1139	+
710	1140	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	1141	boxCB.setToolTipText("Display bounding boxes");
712	1142	boxCB.addItemListener(this);
713	1143
714	1144	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1145	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	1146	zoomBoxCB.addItemListener(this);
717	1147
718	1148	if (true) // Globals.ADVANCED)
719	1149	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- supportCB.addItemListener(this);
	1150	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1151	+// supportCB.setToolTipText("Enable rigging");
	1152	+// supportCB.addItemListener(this);
	1153	+
	1154	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1155	+ freezeCB.setToolTipText("Fast moving camera");
	1156	+ freezeCB.addItemListener(this);
723	1157
724	1158	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	1159	// localCB.addItemListener(this);
726	1160
	1161	+ panel.Return();
	1162	+
727	1163	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	1164	crowdCB.setToolTipText("Used for crowds");
729	1165	crowdCB.addItemListener(this);
..	..	@@ -740,6 +1176,8 @@
740	1176	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	1177	// speakerMocapCB.addItemListener(this);
742	1178
	1179	+ panel.Return();
	1180	+
743	1181	if (false)
744	1182	{
745	1183	// handled in scripts
..	..	@@ -754,34 +1192,74 @@
754	1192	//constraints.gridy += 1;
755	1193	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	1194	smoothfocusCB.addItemListener(this);
	1195	+ panel.Return();
757	1196	}
758	1197
759	1198	//constraints.gridx += 1;
760	1199	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	1200	// debugCB.addItemListener(this);
762	1201
	1202	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1203	+ trackCB.setToolTipText("Enable tracking target");
	1204	+ trackCB.addItemListener(this);
	1205	+
763	1206	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1207	+ oeilCB.setToolTipText("Move camera when tracking");
764	1208	oeilCB.addItemListener(this);
765	1209
	1210	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1211	+ shadowCB.setToolTipText("When live compute shadows");
	1212	+ shadowCB.addItemListener(this);
	1213	+
	1214	+ panel.Return();
	1215	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1216	+ toggleTextureCB.setToolTipText("Load textures");
	1217	+ toggleTextureCB.addItemListener(this);
	1218	+
	1219	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1220	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1221	+ toggleSwitchCB.addItemListener(this);
	1222	+
	1223	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1224	+ autokeepCB.setToolTipText("On structure change");
	1225	+ autokeepCB.addItemListener(this);
	1226	+
	1227	+ panel.Return();
	1228	+ if (Globals.ADVANCED)
	1229	+ {
766	1230	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	1231	lookAtCB.setToolTipText("Look-at target");
768	1232	lookAtCB.addItemListener(this);
	1233	+ }
769	1234
770	1235	}
771	1236
772	1237	cGridBag fill = new cGridBag();
773		-
774	1238	fill.preferredHeight = 200;
	1239	+ cGridBag fill2 = new cGridBag();
	1240	+ fill2.preferredHeight = 200;
	1241	+ cGridBag fill3 = new cGridBag();
	1242	+ fill3.preferredHeight = 200;
775	1243
776	1244	panel.add(fill);
	1245	+ panel.add(fill2);
	1246	+ panel.add(fill3);
777	1247
778	1248	}
779	1249
780	1250	void EditObject(Object3D obj)
781	1251	{
782	1252	cRadio radioButton = new cRadio(obj.name);
	1253	+
	1254	+ // June 2019. Patch to avoid bug with transparency.
	1255	+ radioButton.hadMaterial = obj.material != null;
	1256	+ if (!radioButton.hadMaterial)
	1257	+ {
	1258	+ obj.material = new cMaterial();
	1259	+ }
	1260	+
783	1261	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
785	1263	radioButton.SetCamera(cameraView.renderCamera, false);
786	1264	radioButton.addActionListener(this);
787	1265	radioPanel.add(radioButton);
..	..	@@ -791,6 +1269,8 @@
791	1269
792	1270	void SetupViews(ObjEditor oe)
793	1271	{
	1272	+ theFrame = this;
	1273	+
794	1274	oe.SetupViews();
795	1275
796	1276	System.out.println("SetupViews");
..	..	@@ -799,23 +1279,28 @@
799	1279	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1280	}
801	1281
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- JCheckBox smoothfocusCB;
	1282	+ cToggleButton liveCB;
	1283	+ cCheckBox supportCB;
	1284	+ cCheckBox localCB;
	1285	+ cCheckBox crowdCB;
	1286	+ cCheckBox smoothCB;
	1287	+ cToggleButton fastCB;
	1288	+ cCheckBox slowCB;
	1289	+ cCheckBox boxCB;
	1290	+ cCheckBox zoomBoxCB;
	1291	+ cCheckBox freezeCB;
	1292	+ //cToggleButton trackCB;
	1293	+ cCheckBox trackCB;
	1294	+ cCheckBox smoothfocusCB;
813	1295	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1296	+ cCheckBox speakerCameraCB;
	1297	+ cCheckBox speakerFocusCB;
	1298	+ cCheckBox debugCB;
	1299	+
	1300	+ cCheckBox oeilCB;
	1301	+ cCheckBox shadowCB;
	1302	+ cCheckBox autokeepCB;
	1303	+ cCheckBox lookAtCB;
819	1304
820	1305	// static int COLOR = 1;
821	1306	// static int MATERIAL = 2;
..	..	@@ -823,9 +1308,9 @@
823	1308
824	1309	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1310
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1311	+ cCheckBox colorCB;
	1312	+ cCheckBox materialCB;
	1313	+ cCheckBox textureCB;
829	1314
830	1315	public void itemStateChanged(ItemEvent e)
831	1316	{
..	..	@@ -853,6 +1338,7 @@
853	1338	} else if(e.getSource() == liveCB)
854	1339	{
855	1340	cameraView.ToggleLive();
	1341	+ refreshContents(false);
856	1342	}
857	1343	else if(e.getSource() == supportCB)
858	1344	{
..	..	@@ -917,6 +1403,18 @@
917	1403	{
918	1404	cameraView.ToggleOeil();
919	1405	}
	1406	+ else if(e.getSource() == shadowCB)
	1407	+ {
	1408	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1409	+ }
	1410	+ else if(e.getSource() == freezeCB)
	1411	+ {
	1412	+ Globals.FREEZEONMOVE ^= true;
	1413	+ }
	1414	+ else if(e.getSource() == autokeepCB)
	1415	+ {
	1416	+ Globals.REPLACEONMAKE ^= true;
	1417	+ }
920	1418	else if(e.getSource() == lookAtCB)
921	1419	{
922	1420	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1431,8 @@
933	1431
934	1432	/**/
935	1433	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1434	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1435	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1436	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1437	// We can't move the root node or an empty selection
939	1438	return;
..	..	@@ -996,8 +1495,6 @@
996	1495	}
997	1496	}
998	1497
999		- String string = (String) object;
1000		-
1001	1498	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1499	// if( object instanceof java.io.File[])
1003	1500	// {
..	..	@@ -1005,6 +1502,8 @@
1005	1502	// objEditor.DropFile((java.io.File[]) object, true);
1006	1503	// return;
1007	1504	// }
	1505	+
	1506	+ String string = object.toString();
1008	1507
1009	1508	// File path for Mac and Windows
1010	1509	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1549,33 @@
1050	1549
1051	1550	assert target == objEditor.jTree;
1052	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
1053	1553	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1555	} catch (Exception e) {
1056	1556	System.out.println("destinationPath : " + destinationPath);
1057	1557	return;
1058	1558	}
1059	1559
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1560	+ for (int i=group.selection.size(); --i>=0;)
1061	1561	{
	1562	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1563	+
	1564	+ // Cannot move into itself
	1565	+ if (child == destinationLeaf)
	1566	+ return;
	1567	+ }
	1568	+
	1569	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1570	+// {
1062	1571	loadClipboard(true);
1063	1572	objEditor.jTree.setSelectionPath(destinationPath);
1064	1573	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1574	+// } else {
	1575	+// loadClipboard(false);
	1576	+// objEditor.jTree.setSelectionPath(destinationPath);
	1577	+// pasteInto(false, false); // true); // ???
	1578	+// }
1070	1579	}
1071	1580	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1581	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1680,30 @@
1171	1680	{
1172	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1682	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- superItem.addActionListener(this);
	1683	+// gridItem = menu.add(new MenuItem("Grid"));
	1684	+// gridItem.addActionListener(this);
	1685	+// rectoidItem = menu.add(new MenuItem("Box"));
	1686	+// rectoidItem.addActionListener(this);
	1687	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1688	+// ellipsoidItem.addActionListener(this);
	1689	+// coneItem = menu.add(new MenuItem("Cone"));
	1690	+// coneItem.addActionListener(this);
	1691	+// torusItem = menu.add(new MenuItem("Torus"));
	1692	+// torusItem.addActionListener(this);
	1693	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1694	+// superItem.addActionListener(this);
	1695	+
	1696	+ cameraItem = menu.add(new MenuItem("Camera"));
	1697	+ cameraItem.addActionListener(this);
	1698	+
	1699	+ if (!Globals.ADVANCED)
	1700	+ {
1186	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1702	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
1190	1707	if (Globals.ADVANCED)
1191	1708	{
1192	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1729,15 @@
1212	1729	}
1213	1730	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1731	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- lightItem.addActionListener(this);
	1732	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1733	+// overlayItem.addActionListener(this);
	1734	+// lightItem = menu.add(new MenuItem("Light"));
	1735	+// lightItem.addActionListener(this);
1219	1736	menu.add("-");
1220	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1738	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1224	1741	doubleItem = menu.add(new MenuItem("Fork"));
1225	1742	doubleItem.addActionListener(this);
1226	1743	if (Globals.ADVANCED)
..	..	@@ -1236,6 +1753,9 @@
1236	1753	animationItem.addItemListener(this);
1237	1754	animationItem.setState(Globals.ANIMATION);
1238	1755
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
	1758	+
1239	1759	menu.add("-");
1240	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	1761	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +1768,8 @@
1248	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	1769	reduce34MorphItem.addActionListener(this);
1250	1770	menu.add("-");
	1771	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1772	+ memoryItem.addActionListener(this);
1251	1773	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	1774	computeAOItem.addActionListener(this);
1253	1775
..	..	@@ -1256,11 +1778,9 @@
1256	1778	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	1779	mirrorItem.addActionListener(this);
1258	1780	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1782	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1783	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1784	dumpItem.addActionListener(this);
1265	1785	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1786	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +1921,34 @@
1401	1921	shadow.material = new cMaterial(obj.material);
1402	1922	shadow.material.diffuse = 0.0001f;
1403	1923	shadow.material.specular = 0.0001f;
	1924	+ //shadow.projectedVertices[1].x = 300;
1404	1925
1405	1926	makeSomething(shadow);
1406	1927	}
	1928	+
	1929	+ private void ClearUnpinned()
	1930	+ {
	1931	+ //for (Object3D obj : listUI)
	1932	+ for (int i=listUI.size(); --i>=0;)
	1933	+ {
	1934	+ Object3D obj = listUI.elementAt(i);
	1935	+ if (!obj.pinned)
	1936	+ {
	1937	+ obj.CloseUI();
	1938	+ listUI.remove(i);
	1939	+ }
	1940	+ }
	1941	+ }
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1407	1952
1408	1953	/**
1409	1954	* applyExample
..	..	@@ -1648,7 +2193,7 @@
1648	2193	{
1649	2194	ScreenFit();
1650	2195	} else
1651		- if (source == switchItem)
	2196	+ if (source == switchViewItem)
1652	2197	{
1653	2198	cVector v1 = new cVector();
1654	2199	cVector v2 = new cVector();
..	..	@@ -1657,11 +2202,11 @@
1657	2202	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	2203	objEditor.cameraView.repaint();
1659	2204	} else
1660		- if (source == rectoidItem)
	2205	+ if (source == rectoidItem \|\| source == boxButton)
1661	2206	{
1662	2207	makeSomething(new Box());
1663	2208	} else
1664		- if (source == particleItem)
	2209	+ if (source == particleItem \|\| source == particlesButton)
1665	2210	{
1666	2211	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	2212	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2285,27 @@
1740	2285
1741	2286	makeSomething(obj);
1742	2287	} else
1743		- if (source == gridItem)
	2288	+ if (source == gridItem \|\| source == gridButton)
1744	2289	{
1745	2290	makeSomething(new Grid());
1746	2291	} else
1747		- if (source == ellipsoidItem)
	2292	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2293	{
1749	2294	makeSomething(new Sphere());
1750	2295	} else
1751		- if (source == coneItem)
	2296	+ if (source == coneItem \|\| source == coneButton)
1752	2297	{
1753	2298	makeSomething(new Cone());
1754	2299	} else
1755		- if (source == torusItem)
	2300	+ if (source == torusItem \|\| source == torusButton)
1756	2301	{
1757	2302	makeSomething(new Torus());
1758	2303	} else
1759		- if (source == superItem)
	2304	+ if (source == superItem \|\| source == superButton)
1760	2305	{
1761	2306	makeSomething(new Superellipsoid());
1762	2307	} else
1763		- if (source == kleinItem)
	2308	+ if (source == kleinItem \|\| source == kleinButton)
1764	2309	{
1765	2310	makeSomething(new Klein());
1766	2311	} else
..	..	@@ -1780,7 +2325,7 @@
1780	2325	{
1781	2326	makeSomething(new BezierSurface());
1782	2327	} else
1783		- if (source == overlayItem)
	2328	+ if (source == overlayItem \|\| source == overlayButton)
1784	2329	{
1785	2330	/*
1786	2331	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,10 +2373,27 @@
1828	2373	s.setup();
1829	2374	makeSomething(s);
1830	2375	} else
1831		- if (source == lightItem)
	2376	+ if (source == lightItem \|\| source == lightButton)
1832	2377	{
1833	2378	makeSomething(new Light());
1834	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
1835	2397	if (source == csgItem)
1836	2398	{
1837	2399	group(new CSG());
..	..	@@ -1878,30 +2440,30 @@
1878	2440
1879	2441	group(g);
1880	2442	} else
1881		- if (source == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
1882	2444	{
1883	2445	Composite csg = new GroupLeaf();
1884	2446	csg.count = 5;
1885	2447	group(csg);
1886		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
1887	2449	csg.addChild(child);
1888	2450	child.addChild(csg);
1889	2451	} else
1890	2452	if (source == doubleItem)
1891	2453	{
1892		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
1893	2455	csg.count = 5;
1894	2456	group(csg);
1895		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
1896	2458	csg.addChild(child);
1897	2459	child.addChild(csg);
1898		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
1899	2461	csg.addChild(child);
1900	2462	child.addChild(csg);
1901	2463	} else
1902	2464	if (source == tripleItem)
1903	2465	{
1904		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
1905	2467	csg.count = 4;
1906	2468	group(csg);
1907	2469	Composite child = new cGroup();
..	..	@@ -1917,7 +2479,7 @@
1917	2479	if (source == computeAOItem)
1918	2480	{
1919	2481	Globals.drawMode = CameraPane.OCCLUSION;
1920		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
1921	2483	} else
1922	2484	if (source == recompileItem)
1923	2485	{
..	..	@@ -1951,6 +2513,46 @@
1951	2513	{
1952	2514	DumpObject();
1953	2515	} else
	2516	+ if (source == minButton)
	2517	+ {
	2518	+ Minimize();
	2519	+ } else
	2520	+ if (source == maxButton)
	2521	+ {
	2522	+ Maximize();
	2523	+ } else
	2524	+ if (source == fullButton)
	2525	+ {
	2526	+ ToggleFullScreen();
	2527	+ } else
	2528	+ if (source == undoButton)
	2529	+ {
	2530	+ // Go to previous version
	2531	+ //if (!Undo())
	2532	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2533	+ Undo();
	2534	+ } else
	2535	+ if (source == restoreButton)
	2536	+ {
	2537	+ // Restore current version
	2538	+ Restore();
	2539	+ } else
	2540	+ if (source == replaceButton)
	2541	+ {
	2542	+ // Overwrite current version
	2543	+ Replace();
	2544	+ } else
	2545	+ if (source == redoButton)
	2546	+ {
	2547	+ // Go to next version
	2548	+ Redo();
	2549	+ } else
	2550	+ if (source == saveButton)
	2551	+ {
	2552	+ // Save a new version
	2553	+ if (!Save(true))
	2554	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2555	+ } else
1954	2556	if (source == oneStepButton)
1955	2557	{
1956	2558	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2560,14 @@
1958	2560	} else
1959	2561	if (source == screenfitButton)
1960	2562	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2563	ScreenFit();
1963	2564	} else
1964	2565	if (source == screenfitpointButton)
1965	2566	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2567	ScreenFitPoint();
1968	2568	} else
1969	2569	if (source == snapobjectButton)
1970	2570	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2571	SnapObject();
1973	2572	} else
1974	2573	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2603,14 @@
2004	2603	if (source == cutItem \|\| source == clearButton)
2005	2604	{
2006	2605	loadClipboard(true);
	2606	+ } else
	2607	+ if (source == undoItem)
	2608	+ {
	2609	+ Undo();
	2610	+ } else
	2611	+ if (source == redoItem)
	2612	+ {
	2613	+ Redo();
2007	2614	} else
2008	2615	if (source == duplicateItem)
2009	2616	{
..	..	@@ -2324,7 +2931,7 @@
2324	2931	{
2325	2932	StepAll();
2326	2933	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	2935	{
2329	2936	//int indices[] = jList.getSelectedIndices();
2330	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +2943,9 @@
2336	2943	{
2337	2944	ClearSelection(true);
2338	2945	} else
2339		- if (source == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2340	2947	{
2341		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2342	2949	} else
2343	2950	if (source == hideItem)
2344	2951	{
..	..	@@ -2356,11 +2963,11 @@
2356	2963	{
2357	2964	makeSomething(new Camera());
2358	2965	} else
2359		- if (source == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2360	2967	{
2361	2968	group(new Composite());
2362	2969	} else
2363		- if (source == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2364	2971	{
2365	2972	RandomNode random = new RandomNode();
2366	2973	group(random);
..	..	@@ -2462,7 +3069,7 @@
2462	3069	{
2463	3070	group(new cLinker());
2464	3071	} else
2465		- if (source == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2466	3073	{
2467	3074	group(new TextureNode());
2468	3075	} else
..	..	@@ -2482,17 +3089,30 @@
2482	3089	{
2483	3090	CastShadow(2);
2484	3091	} else
2485		- if (source == ungroupItem)
	3092	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	3093	{
2487		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2488	3096	for (int i=0; i<group.selection.size(); i++)
2489	3097	{
2490		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2491	3103	}
2492	3104
2493		- ClearSelection(false);
2494		-
2495		- refreshContents();
	3105	+ if (!hasRoot)
	3106	+ {
	3107	+ for (int i=0; i<group.selection.size(); i++)
	3108	+ {
	3109	+ Ungroup(group.selection.get(i));
	3110	+ }
	3111	+
	3112	+ ClearSelection(false);
	3113	+
	3114	+ refreshContents();
	3115	+ }
2496	3116	} else
2497	3117	if (source == genUVItem)
2498	3118	{
..	..	@@ -2504,7 +3124,7 @@
2504	3124	} else
2505	3125	if (source == genNormalsMESHItem)
2506	3126	{
2507		- GenNormals(true); // TODO
	3127	+ GenNormalsMESH();
2508	3128	} else
2509	3129	if (source == genNormalsORGANItem)
2510	3130	{
..	..	@@ -2569,6 +3189,22 @@
2569	3189	if (source == unmarkleavesItem)
2570	3190	{
2571	3191	MarkLeaves(false);
	3192	+ } else
	3193	+ if (source == rewindleavesItem)
	3194	+ {
	3195	+ RewindLeaves(true);
	3196	+ } else
	3197	+ if (source == unrewindleavesItem)
	3198	+ {
	3199	+ RewindLeaves(false);
	3200	+ } else
	3201	+ if (source == randomleavesItem)
	3202	+ {
	3203	+ RandomLeaves(true);
	3204	+ } else
	3205	+ if (source == unrandomleavesItem)
	3206	+ {
	3207	+ RandomLeaves(false);
2572	3208	} else
2573	3209	if (source == flipVItem)
2574	3210	{
..	..	@@ -2777,7 +3413,7 @@
2777	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2778	3414	{
2779	3415	obj = (Object3D)e.nextElement();
2780		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2781	3417	}
2782	3418
2783	3419	refreshContents();
..	..	@@ -2793,6 +3429,31 @@
2793	3429
2794	3430	refreshContents();
2795	3431	} else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
	3455	+ refreshContents();
	3456	+ } else
2796	3457	if (source == flashSelectionButton)
2797	3458	{
2798	3459	CameraPane.flash = true;
..	..	@@ -2804,6 +3465,10 @@
2804	3465	if (source == twoButton)
2805	3466	{
2806	3467	radio.layout = twoButton;
	3468	+
	3469	+ if (CameraPane.FULLSCREEN)
	3470	+ fullscreenLayout = radio.layout;
	3471	+
2807	3472	// bug
2808	3473	//gridPanel.setDividerLocation(1.0);
2809	3474	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3501,31 @@
2836	3501	bigThree.ClearUI();
2837	3502	bigThree.add(centralPanel);
2838	3503	bigThree.FlushUI();
	3504	+
	3505	+ cameraView.requestFocusInWindow();
	3506	+
	3507	+// refreshContents(true);
	3508	+//
	3509	+// try
	3510	+// {
	3511	+// java.awt.Robot bot = new java.awt.Robot();
	3512	+// int mask = InputEvent.BUTTON1_MASK;
	3513	+// bot.mouseMove(100, 100);
	3514	+// bot.mousePress(mask);
	3515	+// bot.mouseRelease(mask);
	3516	+// }
	3517	+// catch (Exception e)
	3518	+// {
	3519	+//
	3520	+// }
	3521	+
2839	3522	} else
2840	3523	if (source == threeButton)
2841	3524	{
2842	3525	radio.layout = threeButton;
	3526	+
	3527	+ if (CameraPane.FULLSCREEN)
	3528	+ fullscreenLayout = radio.layout;
2843	3529
2844	3530	// bigThree.remove(scenePanel);
2845	3531	// bigThree.remove(centralPanel);
..	..	@@ -2869,13 +3555,18 @@
2869	3555	// centralPanel.setVisible(true);
2870	3556	// XYZPanel.setVisible(true);
2871	3557	bigThree.ClearUI();
	3558	+ bigThree.add(scenePanel);
2872	3559	bigThree.add(centralPanel);
2873		- bigThree.add(XYZPanel);
2874	3560	bigThree.FlushUI();
	3561	+
	3562	+ cameraView.requestFocusInWindow();
2875	3563	} else
2876	3564	if (source == fourButton)
2877	3565	{
2878	3566	radio.layout = fourButton;
	3567	+
	3568	+ if (CameraPane.FULLSCREEN)
	3569	+ fullscreenLayout = radio.layout;
2879	3570
2880	3571	// bigThree.remove(scenePanel);
2881	3572	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3598,15 @@
2907	3598	bigThree.ClearUI();
2908	3599	bigThree.add(scenePanel);
2909	3600	bigThree.FlushUI();
	3601	+
	3602	+ cameraView.requestFocusInWindow();
2910	3603	} else
2911	3604	if (source == sixButton)
2912	3605	{
2913	3606	radio.layout = sixButton;
	3607	+
	3608	+ if (CameraPane.FULLSCREEN)
	3609	+ fullscreenLayout = radio.layout;
2914	3610
2915	3611	// bigThree.remove(scenePanel);
2916	3612	// bigThree.remove(centralPanel);
..	..	@@ -2940,13 +3636,18 @@
2940	3636	// centralPanel.setVisible(true);
2941	3637	// XYZPanel.setVisible(false);
2942	3638	bigThree.ClearUI();
2943		- bigThree.add(scenePanel);
2944	3639	bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
2945	3641	bigThree.FlushUI();
	3642	+
	3643	+ cameraView.requestFocusInWindow();
2946	3644	} else
2947	3645	if (source == sevenButton)
2948	3646	{
2949	3647	radio.layout = sevenButton;
	3648	+
	3649	+ if (CameraPane.FULLSCREEN)
	3650	+ fullscreenLayout = radio.layout;
2950	3651
2951	3652	// bigThree.remove(scenePanel);
2952	3653	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3681,8 @@
2980	3681	bigThree.add(centralPanel);
2981	3682	bigThree.add(XYZPanel);
2982	3683	bigThree.FlushUI();
	3684	+
	3685	+ cameraView.requestFocusInWindow();
2983	3686	} else
2984	3687	if (source == rootButton)
2985	3688	{
..	..	@@ -2991,6 +3694,7 @@
2991	3694	EditObject(obj);
2992	3695	}
2993	3696
	3697	+ cameraView.requestFocusInWindow();
2994	3698	refreshContents(true);
2995	3699	} else
2996	3700	if (source == closeButton)
..	..	@@ -3000,22 +3704,37 @@
3000	3704	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3705	{
3002	3706	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3707	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3708	{
	3709	+ // Patch to avoid bug with transparency.
	3710	+ if (!ab.hadMaterial)
	3711	+ {
	3712	+ ab.object.material = null;
	3713	+ }
	3714	+
3005	3715	buttonGroup.remove(ab);
3006	3716	radioPanel.remove(ab);
3007	3717
3008		- ab.GetObject().editWindow = null;
	3718	+ //ab.GetObject().editWindow = null;
	3719	+ ab.GetObject().manipWindow = null;
3009	3720	// ab.GetObject().objectUI = null; // ?????????
3010	3721
3011	3722	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3723	break;
3013	3724	}
3014	3725	}
	3726	+
	3727	+ cameraView.requestFocusInWindow();
3015	3728	refreshContents(true);
3016	3729	} else
3017	3730	if (source == editItem \|\| source == editButton)
3018	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
3019	3738	EditSelection(false);
3020	3739	} else
3021	3740	if (source == uneditButton)
..	..	@@ -3025,10 +3744,11 @@
3025	3744	Object3D child = (Object3D)e.nextElement();
3026	3745	if(child.editWindow != null)
3027	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
3028	3748	child.CloseUI();
3029	3749	listUI.remove(child);
3030	3750
3031		- child.editWindow = null; // ???????????
	3751	+ //child.editWindow = null; // ???????????
3032	3752	}
3033	3753	objEditor.ctrlPanel.FlushUI();
3034	3754	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3761,7 @@
3041	3761	//copy.ClearUI();
3042	3762	for (Object3D obj : listUI)
3043	3763	{
	3764	+ obj.pinned = false;
3044	3765	obj.CloseUI();
3045	3766	}
3046	3767	listUI.clear();
..	..	@@ -3050,7 +3771,7 @@
3050	3771	{
3051	3772	assert(copy == group);
3052	3773
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3775
3055	3776	for (Object3D obj : listUI)
3056	3777	{
..	..	@@ -3099,6 +3820,9 @@
3099	3820	}
3100	3821
3101	3822	copy = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
3102	3826	//Globals.theRenderer.object = group;
3103	3827	if(!useclient)
3104	3828	{
..	..	@@ -3115,7 +3839,9 @@
3115	3839	sideView.object = group;
3116	3840	}
3117	3841
3118		-// fix "+" issue group.editWindow = this;
	3842	+// fix "+" issue
	3843	+ //group.editWindow = this;
	3844	+ group.manipWindow = this;
3119	3845
3120	3846	/*
3121	3847	currentLayout = radio.layout;
..	..	@@ -3123,18 +3849,27 @@
3123	3849	currentLayout = sevenButton;
3124	3850	*/
3125	3851	radio.layout.doClick();
	3852	+
	3853	+ ClearUnpinned();
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
	3858	+ EditSelection(false);
3126	3859	keepparent = group.parent;
3127	3860	// PARENT = NULL or not???
3128	3861	//group.parent = null; // ROOT
3129	3862	//group.attributes = -1;
3130	3863	ResetModel();
	3864	+
	3865	+ cameraView.requestFocusInWindow();
3131	3866	refreshContents(true);
3132	3867	} else if (event.getSource() == editCameraItem)
3133	3868	{
3134	3869	cameraView.ProtectCamera();
3135	3870	cameraView.repaint();
3136	3871	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3872	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3873	{
3139	3874	cameraView.RevertCamera();
3140	3875	cameraView.repaint();
..	..	@@ -3151,7 +3886,6 @@
3151	3886	}
3152	3887
3153	3888	boolean useclient = false;
3154		- cRadio radio;
3155	3889
3156	3890	void ToggleRoot()
3157	3891	{
..	..	@@ -3390,7 +4124,8 @@
3390	4124
3391	4125	int size = obj.MemorySize();
3392	4126
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	4127	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4128	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	4129	}
3395	4130	}
3396	4131	catch (Exception e)
..	..	@@ -3471,6 +4206,13 @@
3471	4206	void GenNormals(boolean crease)
3472	4207	{
3473	4208	group.GenNormalsS(crease);
	4209	+
	4210	+ refreshContents();
	4211	+ }
	4212	+
	4213	+ void GenNormalsMESH()
	4214	+ {
	4215	+ group.GenNormalsMeshS();
3474	4216
3475	4217	refreshContents();
3476	4218	}
..	..	@@ -3706,7 +4448,7 @@
3706	4448
3707	4449	try
3708	4450	{
3709		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3710	4452	}
3711	4453	catch (Exception e)
3712	4454	{
..	..	@@ -4098,6 +4840,18 @@
4098	4840	refreshContents();
4099	4841	}
4100	4842
	4843	+ void RewindLeaves(boolean hide)
	4844	+ {
	4845	+ group.selection.RewindLeaves(hide);
	4846	+ refreshContents();
	4847	+ }
	4848	+
	4849	+ void RandomLeaves(boolean hide)
	4850	+ {
	4851	+ group.selection.RandomLeaves(hide);
	4852	+ refreshContents();
	4853	+ }
	4854	+
4101	4855	void SetTexRes(int tr)
4102	4856	{
4103	4857	group.selection.SetTexRes(tr);
..	..	@@ -4169,28 +4923,25 @@
4169	4923	// }
4170	4924	// }
4171	4925
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	4926	void EditSelection(boolean newWindow)
4177	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
4178	4934	// aConstraints.gridy = 0;
4179	4935	for (int i=0; i<group.selection.size(); i++)
4180	4936	{
4181	4937	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4938	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4939	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4940
4185	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4942	if(elem != group \|\| !newWindow)
4187	4943	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	4944	+ EditElement(elem, newWindow); // ? new
4194	4945	}
4195	4946	}
4196	4947	}
..	..	@@ -4265,7 +5016,8 @@
4265	5016	//new Exception().printStackTrace();
4266	5017
4267	5018	freezemodel = true;
4268		-
	5019	+ ClearUnpinned();
	5020	+
4269	5021	/**/
4270	5022	//switch (event.id)
4271	5023	{
..	..	@@ -4273,7 +5025,6 @@
4273	5025	//case 702: // Event.LIST_DESELECT
4274	5026	group.deselectAll();
4275	5027	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	5028	if (tps != null)
4278	5029	{
4279	5030	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +5033,8 @@
4282	5033
4283	5034	//if (child.parent != null)
4284	5035	//child.parent.addSelectee(child);
	5036	+ objEditor.SetMaterial(child);
4285	5037	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	5038	}
4290	5039	}
4291	5040	// else
..	..	@@ -4295,20 +5044,28 @@
4295	5044	// System.err.println("info : " + group.GetPath());
4296	5045	// }
4297	5046
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5047	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	5048	CameraPane.flash = true;
4302	5049
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5050	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	5051	// a camera
4305	5052	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5053	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5054	+ {
	5055	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5056	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5057	+ }
4308	5058	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	5059	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	5060	}
4311	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4312	5069	refreshContents();
4313	5070	//return true;
4314	5071	}
..	..	@@ -4317,6 +5074,35 @@
4317	5074
4318	5075	freezemodel = false;
4319	5076	}
	5077	+
	5078	+ void SetPinStates(boolean enabled)
	5079	+ {
	5080	+ editButton.setEnabled(enabled);
	5081	+ uneditButton.setEnabled(enabled);
	5082	+ unselectButton.setEnabled(enabled);
	5083	+ flashSelectionButton.setEnabled(enabled);
	5084	+ }
	5085	+
	5086	+ void refreshContents(boolean cp)
	5087	+ {
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5089	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5090	+ {
	5091	+ objEditor.ClearInfo(); // .GetMaterial());
	5092	+
	5093	+ for (int i=0; i < group.selection.Size(); i++)
	5094	+ {
	5095	+ Object3D child = (Object3D) group.selection.get(i);
	5096	+
	5097	+ objEditor.AddInfo(child, this, true);
	5098	+ System.err.println("info : " + child.GetPath());
	5099	+ }
	5100	+
	5101	+ objEditor.SetText(); // jan 2014
	5102	+ }
	5103	+
	5104	+ super.refreshContents(cp);
	5105	+ }
4320	5106
4321	5107	void linkSomething(Object3D thing)
4322	5108	{
..	..	@@ -4388,6 +5174,7 @@
4388	5174	{
4389	5175	if (group.selection.isEmpty())
4390	5176	return;
	5177	+
4391	5178	Grafreed.clipboardIsTempGroup = false;
4392	5179	Composite tGroup = null;
4393	5180	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +5185,8 @@
4398	5185
4399	5186	if (cut)
4400	5187	{
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4401	5190	//int indices[] = jList.getSelectedIndices();
4402	5191	//for (int i = indices.length - 1; i >= 0; i--)
4403	5192	//jList.remove(indices[i]);
..	..	@@ -4487,8 +5276,10 @@
4487	5276	}
4488	5277
4489	5278	}
	5279	+
4490	5280	if (Grafreed.clipboardIsTempGroup)
4491	5281	Grafreed.clipboard = tGroup;
	5282	+
4492	5283	if (cut)
4493	5284	{
4494	5285	ResetModel();
..	..	@@ -4498,6 +5289,10 @@
4498	5289
4499	5290	void paste(boolean expand)
4500	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4501	5296	// if (GrafreeD.clipboard == null)
4502	5297	// return;
4503	5298	boolean first = true;
..	..	@@ -4557,6 +5352,7 @@
4557	5352	Grafreed.clipboard.get(0).parent = keepparent;
4558	5353	}
4559	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4560	5356	ResetModel();
4561	5357	refreshContents();
4562	5358	}
..	..	@@ -4692,6 +5488,10 @@
4692	5488
4693	5489	void group(Object3D csg, boolean grab)
4694	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4695	5495	if (//false) // why??
4696	5496	!group.selection.isEmpty())
4697	5497	{
..	..	@@ -4805,10 +5605,15 @@
4805	5605	//node.add(csg);
4806	5606	//makeSomething(node);
4807	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
4808	5609	}
4809	5610
4810	5611	void Ungroup(Object3D g)
4811	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
4812	5617	if (g instanceof HiddenObject)
4813	5618	{
4814	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5630,7 @@
4825	5630	objEditor.makeSomething(g.get(i), false);
4826	5631	}
4827	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
4828	5634	}
4829	5635
4830	5636	void ungroup()
..	..	@@ -5113,7 +5919,44 @@
5113	5919	cButton clearpanelButton;
5114	5920	cButton unselectButton;
5115	5921
	5922	+ cButton restoreCameraButton;
	5923	+
	5924	+ cButton saveButton;
5116	5925	cButton oneStepButton;
	5926	+
	5927	+ cButton groupButton;
	5928	+ cButton ungroupButton;
	5929	+ cButton compositeButton;
	5930	+ cButton switchButton;
	5931	+ cButton loopButton;
	5932	+ cButton textureButton;
	5933	+
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
	5949	+
	5950	+ cButton gridButton;
	5951	+ cButton boxButton;
	5952	+ cButton sphereButton;
	5953	+ cButton coneButton;
	5954	+ cButton torusButton;
	5955	+ cButton superButton;
	5956	+ cButton kleinButton;
	5957	+ cButton particlesButton;
	5958	+ cButton overlayButton;
	5959	+ cButton lightButton;
5117	5960
5118	5961	cButton screenfitButton;
5119	5962	cButton screenfitpointButton;
..	..	@@ -5126,14 +5969,6 @@
5126	5969
5127	5970	cButton setsupportButton;
5128	5971
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	5972	//
5138	5973	//Composite
5139	5974	Object3D // to do !!
..	..	@@ -5143,9 +5978,11 @@
5143	5978	//JTree jTree;
5144	5979	private MenuItem lookAtItem;
5145	5980	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
5147	5982	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5983	+ private MenuItem undoItem;
	5984	+ private MenuItem redoItem;
	5985	+ private JMenuItem duplicateItem;
5149	5986	private MenuItem cloneItem;
5150	5987	private MenuItem cloneSupportItem;
5151	5988	private MenuItem overwriteGeoItem;
..	..	@@ -5173,7 +6010,7 @@
5173	6010	private MenuItem pasteLinkItem;
5174	6011	private MenuItem pasteCloneItem;
5175	6012	private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5177	6014	private MenuItem clearAllItem;
5178	6015	private MenuItem genUVItem;
5179	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5208,6 +6045,10 @@
5208	6045	private MenuItem showleavesItem;
5209	6046	private MenuItem markleavesItem;
5210	6047	private MenuItem unmarkleavesItem;
	6048	+ private MenuItem rewindleavesItem;
	6049	+ private MenuItem unrewindleavesItem;
	6050	+ private MenuItem randomleavesItem;
	6051	+ private MenuItem unrandomleavesItem;
5211	6052
5212	6053	private MenuItem flipVItem;
5213	6054	private MenuItem unflipVItem;
..	..	@@ -5229,7 +6070,7 @@
5229	6070	private MenuItem frontItem;
5230	6071	private MenuItem cameraItem;
5231	6072	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
5233	6074	private MenuItem physicsItem;
5234	6075	private MenuItem frameselectorItem;
5235	6076	private MenuItem scriptNodeItem;
..	..	@@ -5253,6 +6094,8 @@
5253	6094	private MenuItem attachBumpItem;
5254	6095	private MenuItem detachBumpItem;
5255	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5256	6099
5257	6100	private MenuItem particleItem;
5258	6101	private MenuItem ragdollItem;
..	..	@@ -5303,5 +6146,5 @@
5303	6146
5304	6147	Menu cameraMenu;
5305	6148	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	6149	+ MenuItem restoreCameraItem;
5307	6150	}