~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,240 @@
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("default", "skycube", 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("park", "Stairs", 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", "Ryfjallet", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("penguins", "wrath", row5);
	152	+ AddSkyboxButton("penguins", "yonder", row5);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "Greenlands", row6);
	160	+ AddSkyboxButton("daz", "MountainTrail", row6);
	161	+ AddSkyboxButton("daz", "Oasis", row6);
	162	+ /*
	163	+Autumn
	164	+Greenlands
	165	+MountainTrail
	166	+Oasis
	167	+TheRock
	168	+TopOfTheWorld
	169	+Winter
	170	+ */
	171	+
	172	+ tab0.add(row0);
	173	+ tab0.add(row1);
	174	+ tab0.add(row2);
	175	+ tab0.add(row3);
	176	+ tab0.add(row4);
	177	+ tab0.add(row5);
	178	+ tab0.add(row6);
	179	+
	180	+ for (int i=5; --i>=0;)
	181	+ {
	182	+ //oe.toolboxPanel.Return();
	183	+ //tab0.add(new cGridBag());
	184	+ }
	185	+ }
	186	+
	187	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	188	+ {
	189	+ cGridBag tab0 = new cGridBag().setVertical(true);
	190	+
	191	+ tab0.setName("Night");
	192	+ skyboxpanel.add(tab0);
	193	+
	194	+ cGridBag row0 = new cGridBag();
	195	+ cGridBag row1 = new cGridBag();
	196	+ cGridBag row2 = new cGridBag();
	197	+ cGridBag row3 = new cGridBag();
	198	+ cGridBag row4 = new cGridBag();
	199	+ cGridBag row5 = new cGridBag();
	200	+ cGridBag row6 = new cGridBag();
	201	+
	202	+ AddSkyboxButton("night", "NightPath", row0);
	203	+ AddSkyboxButton("night", "PondNight", row0);
	204	+ AddSkyboxButton("night", "Powerlines", row0);
	205	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	206	+
	207	+ AddSkyboxButton("urban", "CNTower", row1);
	208	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	209	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	210	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	211	+
	212	+ AddSkyboxButton("penguins", "kenon_star", row2);
	213	+ AddSkyboxButton("indoors", "DallasW", row2);
	214	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	215	+ AddSkyboxButton("indoors", "Vasa", row2);
	216	+
	217	+ AddSkyboxButton("winter", "Backyard", row3);
	218	+ AddSkyboxButton("winter", "Creek", row3);
	219	+ AddSkyboxButton("winter", "FootballField3", row3);
	220	+ AddSkyboxButton("winter", "Forest", row3);
	221	+
	222	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	223	+ AddSkyboxButton("winter", "House", row4);
	224	+ AddSkyboxButton("winter", "IceLake", row4);
	225	+ AddSkyboxButton("winter", "IceRiver", row4);
	226	+
	227	+ AddSkyboxButton("winter", "Park3", row5);
	228	+ AddSkyboxButton("winter", "PondWinter", row5);
	229	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	230	+ AddSkyboxButton("winter", "Vindelalven", row5);
	231	+
	232	+ AddSkyboxButton("daz", "TheRock", row6);
	233	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	234	+ AddSkyboxButton("daz", "Winter", row6);
	235	+ AddSkyboxButton("penguins", "desertdawn", row6);
	236	+
	237	+ tab0.add(row0);
	238	+ tab0.add(row1);
	239	+ tab0.add(row2);
	240	+ tab0.add(row3);
	241	+ tab0.add(row4);
	242	+ tab0.add(row5);
	243	+ tab0.add(row6);
	244	+
	245	+ for (int i=5; --i>=0;)
	246	+ {
	247	+ //oe.toolboxPanel.Return();
	248	+ //tab0.add(new cGridBag());
	249	+ }
	250	+ }
	251	+
	252	+ public void ChangeSkybox(String name)
	253	+ {
	254	+ //cameraView.envyoff = false;
	255	+ group.skyboxname = name;
	256	+ group.skyboxext = "jpg";
	257	+ cameraView.repaint();
	258	+ }
	259	+
26	260	//ObjEditor objEditor;
27	261	public void closeUI2()
28	262	{
..	..	@@ -60,6 +294,12 @@
60	294	this.copy = this.group = group;
61	295	//selectees = this.group.selectees;
62	296
	297	+ if (copy.versions == null)
	298	+ {
	299	+ copy.versions = new byte[100][];
	300	+ copy.versionindex = -1;
	301	+ }
	302	+
63	303	if(ui)
64	304	SetupUI(objEditor);
65	305	}
..	..	@@ -80,10 +320,22 @@
80	320	SetupViews(objEditor);
81	321
82	322	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	323	+
	324	+ if (copy.versions == null)
	325	+ {
	326	+ copy.versions = new byte[100][];
	327	+ copy.versionindex = -1;
	328	+
	329	+ Save(true);
	330	+ }
83	331	}
84	332
85	333	void CloneSelection(boolean supports)
86	334	{
	335	+ if (Globals.REPLACEONMAKE)
	336	+ Save();
	337	+ boolean keep = Globals.REPLACEONMAKE;
	338	+ Globals.REPLACEONMAKE = false;
87	339	// Object3D keep = GrafreeD.clipboard;
88	340	//Object3D obj;
89	341	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +346,7 @@
94	346
95	347	makeSomething(clone, i==group.selection.size()-1);
96	348	}
	349	+ Globals.REPLACEONMAKE = keep;
97	350	}
98	351
99	352	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +403,8 @@
150	403
151	404	void SetupMenu2(GroupEditor oe)
152	405	{
	406	+ oe.jTree = new cTree();
	407	+
153	408	Menu menu;
154	409	oe.menuBar.add(menu = new Menu("Edit"));
155	410	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +415,7 @@
160	415	// redoItem = menu.add(new MenuItem("Redo"));
161	416	// redoItem.addActionListener(this);
162	417	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	418	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	419	duplicateItem.addActionListener(this);
165	420	cloneItem = menu.add(new MenuItem("Clone"));
166	421	cloneItem.addActionListener(this);
..	..	@@ -187,8 +442,8 @@
187	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	443	// pasteExpandItem.addActionListener(this);
189	444	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
192	447
193	448	if (Globals.ADVANCED)
194	449	{
..	..	@@ -202,23 +457,23 @@
202	457	//zBufferItem.addActionListener(this);
203	458	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	459	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	460	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	461	+ restoreCameraItem.addActionListener(this);
207	462
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	463	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	464	+// toggleFullScreenItem.addItemListener(this);
	465	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	466	+// cameraMenu.add("-");
	467	+//
	468	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	469	+// toggleTextureItem.addItemListener(this);
	470	+// toggleTextureItem.setState(CameraPane.textureon);
	471	+//
	472	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	473	+// toggleSwitchItem.addItemListener(this);
	474	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	475
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	476	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	477	toggleHandleItem.addItemListener(this);
223	478	toggleHandleItem.setState(CameraPane.HANDLES);
224	479
..	..	@@ -273,7 +528,7 @@
273	528	{
274	529	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	530	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	531	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	532	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	533	oe.cameraMenu.add("-");
279	534	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +536,7 @@
281	536	editLeafItem.addActionListener(this);
282	537	lookAtItem.addActionListener(this);
283	538	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	539	+ //switchViewItem.addActionListener(this);
285	540	}
286	541
287	542	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +581,29 @@
326	581	}
327	582
328	583	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	584	+// grabItem = menu.add(new MenuItem("Grab"));
	585	+// grabItem.addActionListener(this);
331	586	backItem = menu.add(new MenuItem("Back"));
332	587	backItem.addActionListener(this);
333	588	frontItem = menu.add(new MenuItem("Front"));
334	589	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	590	+// compositeItem = menu.add(new MenuItem("Composite"));
	591	+// compositeItem.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
337	595	hideItem = menu.add(new MenuItem("Hidden Group"));
338	596	hideItem.addActionListener(this);
	597	+ }
339	598	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	599	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	600	+
	601	+// menu.add("-");
	602	+//
	603	+// switchItem = menu.add(new MenuItem("Switch node"));
	604	+// switchItem.addActionListener(this);
	605	+ if (Globals.ADVANCED)
	606	+ {
344	607	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	608	switchGeoItem.addActionListener(this);
346	609	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +611,6 @@
348	611	morphItem = menu.add(new MenuItem("Morph Group"));
349	612	morphItem.addActionListener(this);
350	613
351		- if (Globals.ADVANCED)
352		- {
353	614	menu.add("-");
354	615	physicsItem = menu.add(new MenuItem("Physics"));
355	616	physicsItem.addActionListener(this);
..	..	@@ -357,13 +618,11 @@
357	618	frameselectorItem.addActionListener(this);
358	619	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	620	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	621	}
363	622
364	623	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	624	+// textureItem = menu.add(new MenuItem("Texture"));
	625	+// textureItem.addActionListener(this);
367	626	billboardItem = menu.add(new MenuItem("Billboard"));
368	627	billboardItem.addActionListener(this);
369	628	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +633,14 @@
374	633	shadowYItem.addActionListener(this);
375	634	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	635	shadowZItem.addActionListener(this);
	636	+ attributeItem = menu.add(new MenuItem("Attribute"));
	637	+ attributeItem.addActionListener(this);
	638	+
377	639	if (Globals.ADVANCED)
378	640	{
379	641	menu.add("-");
380	642	linkerItem = menu.add(new MenuItem("Linker"));
381	643	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	644	templateItem = menu.add(new MenuItem("Template"));
385	645	templateItem.addActionListener(this);
386	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +669,7 @@
409	669	genNormalsMESHItem.addActionListener(this);
410	670	if (Globals.ADVANCED)
411	671	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	673	genNormalsMINEItem.addActionListener(this);
414	674	}
415	675	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -502,10 +762,15 @@
502	762	attachBumpItem.addActionListener(this);
503	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
505	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	767	detachPigmentItem.addActionListener(this);
507	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	769	detachBumpItem.addActionListener(this);
	770	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	771	+ embedTexturesItem.addActionListener(this);
	772	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	773	+ deEmbedTexturesItem.addActionListener(this);
509	774	menu.add("-");
510	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	776	sortbysizeItem.addActionListener(this);
..	..	@@ -532,6 +797,7 @@
532	797	buildToolsMenu(menu);
533	798	}
534	799
	800	+
535	801	void SetupUI2(ObjEditor oe)
536	802	{
537	803	// June 2019
..	..	@@ -574,51 +840,79 @@
574	840	oe.radioPanel.add(dummyButton);
575	841	oe.buttonGroup.add(dummyButton);
576	842	*/
	843	+ cGridBag copyOptionsPanel = new cGridBag();
	844	+
	845	+ copyOptionsPanel.preferredHeight = 2;
	846	+
577	847	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	848
579	849	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	850	//minButton.setToolTipText("Minimize window");
581	851	//minButton.addActionListener(this);
582	852
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	853	+ if (Globals.ADVANCED)
	854	+ {
	855	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	856	+ maxButton.setToolTipText("Maximize window");
	857	+ maxButton.addActionListener(this);
	858	+ }
586	859
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	860	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	861	fullButton.setToolTipText("Full-screen window");
589	862	fullButton.addActionListener(this);
590	863
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
	864	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	865	+ screenfitButton.setToolTipText("Screen fit");
	866	+ screenfitButton.addActionListener(this);
	867	+
	868	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	869	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	870	+ restoreCameraButton.addActionListener(this);
594	871
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
	872	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	873	+ saveButton.setToolTipText("New version");
601	874	saveButton.addActionListener(this);
	875	+
	876	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	877	+ undoButton.setToolTipText("Previous version");
	878	+ undoButton.addActionListener(this);
	879	+ undoButton.setEnabled(false);
602	880
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	881	+ cGridBag updown = new cGridBag().setVertical(true);
	882	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	883	+ restoreButton.setToolTipText("Restore current");
	884	+ restoreButton.addActionListener(this);
	885	+ restoreButton.setEnabled(false);
	886	+
	887	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	888	+ replaceButton.setToolTipText("Replace current");
	889	+ replaceButton.addActionListener(this);
	890	+ replaceButton.setEnabled(false);
	891	+
	892	+ copyOptionsPanel.add(updown);
	893	+
	894	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	895	+ redoButton.setToolTipText("Next version");
	896	+ redoButton.addActionListener(this);
	897	+ redoButton.setEnabled(false);
	898	+
	899	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	900	liveCB.setToolTipText("Enable animation");
605	901	liveCB.addItemListener(this);
606	902
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	904	oneStepButton.setToolTipText("Animate one step forward");
609	905	oneStepButton.addActionListener(this);
610	906
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	908	fastCB.setToolTipText("Fast mode");
613	909	fastCB.addItemListener(this);
614	910
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	911	+ //oe.toolboxPanel.Return();
	912	+
	913	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	914	+// trackCB.setToolTipText("Enable tracking");
	915	+// trackCB.addItemListener(this);
622	916
623	917	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	918	// screenfitpointButton.addActionListener(this);
..	..	@@ -628,51 +922,136 @@
628	922	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	923	snapobjectButton.addActionListener(this);
630	924	snapobjectButton.setToolTipText("Snap Object");
	925	+
	926	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ fourButton.addActionListener(this);
	928	+ fourButton.setToolTipText("Show control panel only");
631	929	}
632	930
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	931	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	932
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638		-
639		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640		- twoButton.setToolTipText("Show center view only");
	933	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	934	+ twoButton.setToolTipText("Show 3D view only");
641	935	twoButton.addActionListener(this);
642		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- fourButton.addActionListener(this);
644		- fourButton.setToolTipText("Show left panel only");
645		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- sixButton.setToolTipText("2-column layout left");
647		- sixButton.addActionListener(this);
648		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- threeButton.setToolTipText("2-column layout right");
	936	+ this.fullscreenLayout = twoButton;
	937	+
	938	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ threeButton.setToolTipText("Show controls and 3D view");
650	940	threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
	941	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+ sixButton.setToolTipText("Show 3D view and controls");
	943	+ sixButton.addActionListener(this);
	944	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+// sevenButton.setToolTipText("3-column layout");
	946	+// sevenButton.addActionListener(this);
654	947	//
655	948
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	949	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ rootButton.setToolTipText("Open selection in new tab");
658	951	rootButton.addActionListener(this);
659	952
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	953	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	954	closeButton.setToolTipText("Close tab");
662	955	closeButton.addActionListener(this);
663	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	957	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	958	+
	959	+ cGridBag row1 = new cGridBag();
	960	+
	961	+ // INSERT
	962	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	963	+ gridButton.setToolTipText("Create grid");
	964	+ gridButton.addActionListener(this);
	965	+
	966	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ boxButton.setToolTipText("Create box");
	968	+ boxButton.addActionListener(this);
	969	+
	970	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	971	+ sphereButton.setToolTipText("Create sphere");
	972	+ sphereButton.addActionListener(this);
	973	+
	974	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	975	+ coneButton.setToolTipText("Create cone");
	976	+ coneButton.addActionListener(this);
	977	+
	978	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	979	+ torusButton.setToolTipText("Create torus");
	980	+ torusButton.addActionListener(this);
	981	+
	982	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	983	+ superButton.setToolTipText("Create superellipsoid");
	984	+ superButton.addActionListener(this);
	985	+
	986	+ if (Globals.ADVANCED)
	987	+ {
	988	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ kleinButton.setToolTipText("Create Klein bottle");
	990	+ kleinButton.addActionListener(this);
	991	+ }
	992	+
	993	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	994	+ particlesButton.setToolTipText("Create particle system");
	995	+ particlesButton.addActionListener(this);
	996	+
	997	+ oe.toolboxPanel.add(row1);
	998	+
	999	+ cGridBag row2 = new cGridBag();
	1000	+
	1001	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1002	+ groupButton.setToolTipText("Create group");
	1003	+ groupButton.addActionListener(this);
	1004	+
	1005	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ compositeButton.setToolTipText("Create composite");
	1007	+ compositeButton.addActionListener(this);
	1008	+
	1009	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1010	+ switchButton.setToolTipText("Create item switcher");
	1011	+ switchButton.addActionListener(this);
	1012	+
	1013	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1014	+ loopButton.setToolTipText("Create loop");
	1015	+ loopButton.addActionListener(this);
	1016	+
	1017	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ textureButton.setToolTipText("Create texture");
	1019	+ textureButton.addActionListener(this);
	1020	+
	1021	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ overlayButton.setToolTipText("Create overlay");
	1023	+ overlayButton.addActionListener(this);
	1024	+
	1025	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ lightButton.setToolTipText("Create light");
	1027	+ lightButton.addActionListener(this);
	1028	+
	1029	+ oe.toolboxPanel.add(row2);
	1030	+
	1031	+ // ENVYMAPS
	1032	+ cGridBag skyboxpane = new cGridBag();
	1033	+ skyboxpane.preferredHeight = 100;
	1034	+
	1035	+ oe.toolboxPanel.add(skyboxpane);
	1036	+
	1037	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1038	+ skyboxpane.add(skyboxpanel);
	1039	+
	1040	+ AddSkyboxTab0(skyboxpanel);
	1041	+ AddSkyboxTab1(skyboxpanel);
	1042	+ AddSkyboxTab2(skyboxpanel);
	1043	+
	1044	+ // EDIT panel
	1045	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ editButton.setToolTipText("Pin selection controls");
668	1047	editButton.addActionListener(this);
669	1048
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1049	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ uneditButton.setToolTipText("Remove selection controls");
672	1051	uneditButton.addActionListener(this);
673	1052
674	1053	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1054	+ allParamsButton.setToolTipText("Show all controle");
676	1055	allParamsButton.addActionListener(this);
677	1056
678	1057	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +1062,13 @@
683	1062	unselectButton.setToolTipText("Unselect");
684	1063	unselectButton.addActionListener(this);
685	1064
	1065	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+ flashSelectionButton.setToolTipText("Highlight selection");
	1067	+ flashSelectionButton.addActionListener(this);
	1068	+
686	1069	editCommandsPanel.preferredHeight = 1;
687	1070
	1071	+ SetPinStates(false);
688	1072	// oe.treePanel.add(commandsPanel);
689	1073	// oe.treePanel.Return();
690	1074
..	..	@@ -703,32 +1087,20 @@
703	1087
704	1088	JScrollPane jSP;
705	1089	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1090	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1091	ResetModel();
708	1092
709	1093	oe.treePanel.add(jSPPanel);
710	1094	oe.treePanel.Return();
711	1095
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727	1096	oe.treePanel.add(copyOptionsPanel);
728	1097	oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
729	1101
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
732	1104
733	1105	//jList.addListSelectionListener(this);
734	1106	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1108,7 @@
736	1108	//jTree.setEditable(true);
737	1109	oe.jTree.setDragEnabled(true);
738	1110	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1112
741	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1114
..	..	@@ -748,29 +1120,49 @@
748	1120	dgr.addDragGestureListener(this);
749	1121	}catch(Exception e) {}
750	1122	*/
751		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
752	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1125	}
754	1126
755	1127	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1128	{
	1129	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1130	+ colorCB.setToolTipText("Copy color when dropped");
	1131	+ colorCB.addItemListener(this);
	1132	+
	1133	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1134	+ materialCB.setToolTipText("Copy material when dropped");
	1135	+ materialCB.addItemListener(this);
	1136	+
	1137	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1138	+ textureCB.setToolTipText("Copy texture when dropped");
	1139	+ textureCB.addItemListener(this);
	1140	+
	1141	+ panel.Return();
	1142	+
757	1143	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1144	boxCB.setToolTipText("Display bounding boxes");
759	1145	boxCB.addItemListener(this);
760	1146
761	1147	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1148	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1149	zoomBoxCB.addItemListener(this);
764	1150
765	1151	if (true) // Globals.ADVANCED)
766	1152	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1153	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1154	+// supportCB.setToolTipText("Enable rigging");
	1155	+// supportCB.addItemListener(this);
	1156	+
	1157	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1158	+ freezeCB.setToolTipText("Fast moving camera");
	1159	+ freezeCB.addItemListener(this);
770	1160
771	1161	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1162	// localCB.addItemListener(this);
773	1163
	1164	+ panel.Return();
	1165	+
774	1166	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1167	crowdCB.setToolTipText("Used for crowds");
776	1168	crowdCB.addItemListener(this);
..	..	@@ -787,6 +1179,8 @@
787	1179	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1180	// speakerMocapCB.addItemListener(this);
789	1181
	1182	+ panel.Return();
	1183	+
790	1184	if (false)
791	1185	{
792	1186	// handled in scripts
..	..	@@ -801,34 +1195,74 @@
801	1195	//constraints.gridy += 1;
802	1196	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1197	smoothfocusCB.addItemListener(this);
	1198	+ panel.Return();
804	1199	}
805	1200
806	1201	//constraints.gridx += 1;
807	1202	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1203	// debugCB.addItemListener(this);
809	1204
	1205	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1206	+ trackCB.setToolTipText("Enable tracking target");
	1207	+ trackCB.addItemListener(this);
	1208	+
810	1209	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1210	+ oeilCB.setToolTipText("Move camera when tracking");
811	1211	oeilCB.addItemListener(this);
812	1212
	1213	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1214	+ shadowCB.setToolTipText("When live compute shadows");
	1215	+ shadowCB.addItemListener(this);
	1216	+
	1217	+ panel.Return();
	1218	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1219	+ toggleTextureCB.setToolTipText("Load textures");
	1220	+ toggleTextureCB.addItemListener(this);
	1221	+
	1222	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1223	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1224	+ toggleSwitchCB.addItemListener(this);
	1225	+
	1226	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1227	+ autokeepCB.setToolTipText("On structure change");
	1228	+ autokeepCB.addItemListener(this);
	1229	+
	1230	+ panel.Return();
	1231	+ if (Globals.ADVANCED)
	1232	+ {
813	1233	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	1234	lookAtCB.setToolTipText("Look-at target");
815	1235	lookAtCB.addItemListener(this);
	1236	+ }
816	1237
817	1238	}
818	1239
819	1240	cGridBag fill = new cGridBag();
820		-
821	1241	fill.preferredHeight = 200;
	1242	+ cGridBag fill2 = new cGridBag();
	1243	+ fill2.preferredHeight = 200;
	1244	+ cGridBag fill3 = new cGridBag();
	1245	+ fill3.preferredHeight = 200;
822	1246
823	1247	panel.add(fill);
	1248	+ panel.add(fill2);
	1249	+ panel.add(fill3);
824	1250
825	1251	}
826	1252
827	1253	void EditObject(Object3D obj)
828	1254	{
829	1255	cRadio radioButton = new cRadio(obj.name);
	1256	+
	1257	+ // June 2019. Patch to avoid bug with transparency.
	1258	+ radioButton.hadMaterial = obj.material != null;
	1259	+ if (!radioButton.hadMaterial)
	1260	+ {
	1261	+ obj.material = new cMaterial();
	1262	+ }
	1263	+
830	1264	radioButton.SetObject(obj);
831		- radioButton.layout = sevenButton;
	1265	+ radioButton.layout = sixButton; // sevenButton;
832	1266	radioButton.SetCamera(cameraView.renderCamera, false);
833	1267	radioButton.addActionListener(this);
834	1268	radioPanel.add(radioButton);
..	..	@@ -848,23 +1282,28 @@
848	1282	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1283	}
850	1284
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	1285	+ cToggleButton liveCB;
	1286	+ cCheckBox supportCB;
	1287	+ cCheckBox localCB;
	1288	+ cCheckBox crowdCB;
	1289	+ cCheckBox smoothCB;
	1290	+ cToggleButton fastCB;
	1291	+ cCheckBox slowCB;
	1292	+ cCheckBox boxCB;
	1293	+ cCheckBox zoomBoxCB;
	1294	+ cCheckBox freezeCB;
	1295	+ //cToggleButton trackCB;
	1296	+ cCheckBox trackCB;
	1297	+ cCheckBox smoothfocusCB;
862	1298	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1299	+ cCheckBox speakerCameraCB;
	1300	+ cCheckBox speakerFocusCB;
	1301	+ cCheckBox debugCB;
	1302	+
	1303	+ cCheckBox oeilCB;
	1304	+ cCheckBox shadowCB;
	1305	+ cCheckBox autokeepCB;
	1306	+ cCheckBox lookAtCB;
868	1307
869	1308	// static int COLOR = 1;
870	1309	// static int MATERIAL = 2;
..	..	@@ -872,9 +1311,9 @@
872	1311
873	1312	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1313
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1314	+ cCheckBox colorCB;
	1315	+ cCheckBox materialCB;
	1316	+ cCheckBox textureCB;
878	1317
879	1318	public void itemStateChanged(ItemEvent e)
880	1319	{
..	..	@@ -967,6 +1406,18 @@
967	1406	{
968	1407	cameraView.ToggleOeil();
969	1408	}
	1409	+ else if(e.getSource() == shadowCB)
	1410	+ {
	1411	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1412	+ }
	1413	+ else if(e.getSource() == freezeCB)
	1414	+ {
	1415	+ Globals.FREEZEONMOVE ^= true;
	1416	+ }
	1417	+ else if(e.getSource() == autokeepCB)
	1418	+ {
	1419	+ Globals.REPLACEONMAKE ^= true;
	1420	+ }
970	1421	else if(e.getSource() == lookAtCB)
971	1422	{
972	1423	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1434,8 @@
983	1434
984	1435	/**/
985	1436	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1437	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1438	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1439	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1440	// We can't move the root node or an empty selection
989	1441	return;
..	..	@@ -1046,8 +1498,6 @@
1046	1498	}
1047	1499	}
1048	1500
1049		- String string = (String) object;
1050		-
1051	1501	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1502	// if( object instanceof java.io.File[])
1053	1503	// {
..	..	@@ -1055,6 +1505,8 @@
1055	1505	// objEditor.DropFile((java.io.File[]) object, true);
1056	1506	// return;
1057	1507	// }
	1508	+
	1509	+ String string = object.toString();
1058	1510
1059	1511	// File path for Mac and Windows
1060	1512	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1552,33 @@
1100	1552
1101	1553	assert target == objEditor.jTree;
1102	1554	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1555	+ Object3D destinationLeaf;
1103	1556	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1557	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1558	} catch (Exception e) {
1106	1559	System.out.println("destinationPath : " + destinationPath);
1107	1560	return;
1108	1561	}
1109	1562
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1563	+ for (int i=group.selection.size(); --i>=0;)
1111	1564	{
	1565	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1566	+
	1567	+ // Cannot move into itself
	1568	+ if (child == destinationLeaf)
	1569	+ return;
	1570	+ }
	1571	+
	1572	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1573	+// {
1112	1574	loadClipboard(true);
1113	1575	objEditor.jTree.setSelectionPath(destinationPath);
1114	1576	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1577	+// } else {
	1578	+// loadClipboard(false);
	1579	+// objEditor.jTree.setSelectionPath(destinationPath);
	1580	+// pasteInto(false, false); // true); // ???
	1581	+// }
1120	1582	}
1121	1583	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1584	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1683,30 @@
1221	1683	{
1222	1684	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1685	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	1686	+// gridItem = menu.add(new MenuItem("Grid"));
	1687	+// gridItem.addActionListener(this);
	1688	+// rectoidItem = menu.add(new MenuItem("Box"));
	1689	+// rectoidItem.addActionListener(this);
	1690	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1691	+// ellipsoidItem.addActionListener(this);
	1692	+// coneItem = menu.add(new MenuItem("Cone"));
	1693	+// coneItem.addActionListener(this);
	1694	+// torusItem = menu.add(new MenuItem("Torus"));
	1695	+// torusItem.addActionListener(this);
	1696	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1697	+// superItem.addActionListener(this);
	1698	+
	1699	+ cameraItem = menu.add(new MenuItem("Camera"));
	1700	+ cameraItem.addActionListener(this);
	1701	+
	1702	+ if (!Globals.ADVANCED)
	1703	+ {
1236	1704	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1705	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1706	+ }
	1707	+
	1708	+// particleItem = menu.add(new MenuItem("Particle system"));
	1709	+// particleItem.addActionListener(this);
1240	1710	if (Globals.ADVANCED)
1241	1711	{
1242	1712	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1732,15 @@
1262	1732	}
1263	1733	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1734	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1735	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1736	+// overlayItem.addActionListener(this);
	1737	+// lightItem = menu.add(new MenuItem("Light"));
	1738	+// lightItem.addActionListener(this);
1269	1739	menu.add("-");
1270	1740	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1741	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1742	+// loopItem = menu.add(new MenuItem("Loop"));
	1743	+// loopItem.addActionListener(this);
1274	1744	doubleItem = menu.add(new MenuItem("Fork"));
1275	1745	doubleItem.addActionListener(this);
1276	1746	if (Globals.ADVANCED)
..	..	@@ -1286,6 +1756,9 @@
1286	1756	animationItem.addItemListener(this);
1287	1757	animationItem.setState(Globals.ANIMATION);
1288	1758
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
	1761	+
1289	1762	menu.add("-");
1290	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1291	1764	parseverticesItem.addActionListener(this);
..	..	@@ -1298,6 +1771,8 @@
1298	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1299	1772	reduce34MorphItem.addActionListener(this);
1300	1773	menu.add("-");
	1774	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1775	+ memoryItem.addActionListener(this);
1301	1776	menu.add(computeAOItem = new MenuItem("Compute AO"));
1302	1777	computeAOItem.addActionListener(this);
1303	1778
..	..	@@ -1306,8 +1781,6 @@
1306	1781	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1307	1782	mirrorItem.addActionListener(this);
1308	1783	menu.add("-");
1309		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310		- memoryItem.addActionListener(this);
1311	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1312	1785	analyzeItem.addActionListener(this);
1313	1786	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1455,6 +1928,30 @@
1455	1928
1456	1929	makeSomething(shadow);
1457	1930	}
	1931	+
	1932	+ private void ClearUnpinned()
	1933	+ {
	1934	+ //for (Object3D obj : listUI)
	1935	+ for (int i=listUI.size(); --i>=0;)
	1936	+ {
	1937	+ Object3D obj = listUI.elementAt(i);
	1938	+ if (!obj.pinned)
	1939	+ {
	1940	+ obj.CloseUI();
	1941	+ listUI.remove(i);
	1942	+ }
	1943	+ }
	1944	+ }
	1945	+
	1946	+ private void EditElement(Object3D elem, boolean newWindow)
	1947	+ {
	1948	+ // if (!(elem instanceof Composite))
	1949	+ // newWindow = false;
	1950	+ listUI.add(elem);
	1951	+ elem.openEditWindow(this, newWindow); //, false);
	1952	+ System.out.println("edit : " + elem);
	1953	+ elem.editWindow.refreshContents(true); // ? new
	1954	+ }
1458	1955
1459	1956	/**
1460	1957	* applyExample
..	..	@@ -1699,7 +2196,7 @@
1699	2196	{
1700	2197	ScreenFit();
1701	2198	} else
1702		- if (source == switchItem)
	2199	+ if (source == switchViewItem)
1703	2200	{
1704	2201	cVector v1 = new cVector();
1705	2202	cVector v2 = new cVector();
..	..	@@ -1708,11 +2205,11 @@
1708	2205	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	2206	objEditor.cameraView.repaint();
1710	2207	} else
1711		- if (source == rectoidItem)
	2208	+ if (source == rectoidItem \|\| source == boxButton)
1712	2209	{
1713	2210	makeSomething(new Box());
1714	2211	} else
1715		- if (source == particleItem)
	2212	+ if (source == particleItem \|\| source == particlesButton)
1716	2213	{
1717	2214	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	2215	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +2288,27 @@
1791	2288
1792	2289	makeSomething(obj);
1793	2290	} else
1794		- if (source == gridItem)
	2291	+ if (source == gridItem \|\| source == gridButton)
1795	2292	{
1796	2293	makeSomething(new Grid());
1797	2294	} else
1798		- if (source == ellipsoidItem)
	2295	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2296	{
1800	2297	makeSomething(new Sphere());
1801	2298	} else
1802		- if (source == coneItem)
	2299	+ if (source == coneItem \|\| source == coneButton)
1803	2300	{
1804	2301	makeSomething(new Cone());
1805	2302	} else
1806		- if (source == torusItem)
	2303	+ if (source == torusItem \|\| source == torusButton)
1807	2304	{
1808	2305	makeSomething(new Torus());
1809	2306	} else
1810		- if (source == superItem)
	2307	+ if (source == superItem \|\| source == superButton)
1811	2308	{
1812	2309	makeSomething(new Superellipsoid());
1813	2310	} else
1814		- if (source == kleinItem)
	2311	+ if (source == kleinItem \|\| source == kleinButton)
1815	2312	{
1816	2313	makeSomething(new Klein());
1817	2314	} else
..	..	@@ -1831,7 +2328,7 @@
1831	2328	{
1832	2329	makeSomething(new BezierSurface());
1833	2330	} else
1834		- if (source == overlayItem)
	2331	+ if (source == overlayItem \|\| source == overlayButton)
1835	2332	{
1836	2333	/*
1837	2334	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,10 +2376,27 @@
1879	2376	s.setup();
1880	2377	makeSomething(s);
1881	2378	} else
1882		- if (source == lightItem)
	2379	+ if (source == lightItem \|\| source == lightButton)
1883	2380	{
1884	2381	makeSomething(new Light());
1885	2382	} else
	2383	+// if (source == skybox1Button \|\|
	2384	+// source == skybox2Button \|\|
	2385	+// source == skybox3Button \|\|
	2386	+// source == skybox4Button \|\|
	2387	+// source == skybox5Button \|\|
	2388	+// source == skybox6Button \|\|
	2389	+// source == skybox7Button \|\|
	2390	+// source == skybox11Button \|\|
	2391	+// source == skybox12Button \|\|
	2392	+// source == skybox13Button \|\|
	2393	+// source == skybox14Button \|\|
	2394	+// source == skybox15Button \|\|
	2395	+// source == skybox16Button \|\|
	2396	+// source == skybox17Button)
	2397	+// {
	2398	+// ChangeSkybox(source);
	2399	+// } else
1886	2400	if (source == csgItem)
1887	2401	{
1888	2402	group(new CSG());
..	..	@@ -1929,30 +2443,30 @@
1929	2443
1930	2444	group(g);
1931	2445	} else
1932		- if (source == loopItem)
	2446	+ if (source == loopItem \|\| source == loopButton)
1933	2447	{
1934	2448	Composite csg = new GroupLeaf();
1935	2449	csg.count = 5;
1936	2450	group(csg);
1937		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
1938	2452	csg.addChild(child);
1939	2453	child.addChild(csg);
1940	2454	} else
1941	2455	if (source == doubleItem)
1942	2456	{
1943		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
1944	2458	csg.count = 5;
1945	2459	group(csg);
1946		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
1947	2461	csg.addChild(child);
1948	2462	child.addChild(csg);
1949		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
1950	2464	csg.addChild(child);
1951	2465	child.addChild(csg);
1952	2466	} else
1953	2467	if (source == tripleItem)
1954	2468	{
1955		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
1956	2470	csg.count = 4;
1957	2471	group(csg);
1958	2472	Composite child = new cGroup();
..	..	@@ -1968,7 +2482,7 @@
1968	2482	if (source == computeAOItem)
1969	2483	{
1970	2484	Globals.drawMode = CameraPane.OCCLUSION;
1971		- Globals.theRenderer.repaint();
	2485	+ cameraView.repaint();
1972	2486	} else
1973	2487	if (source == recompileItem)
1974	2488	{
..	..	@@ -2016,15 +2530,31 @@
2016	2530	} else
2017	2531	if (source == undoButton)
2018	2532	{
	2533	+ // Go to previous version
	2534	+ //if (!Undo())
	2535	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2019	2536	Undo();
	2537	+ } else
	2538	+ if (source == restoreButton)
	2539	+ {
	2540	+ // Restore current version
	2541	+ Restore();
	2542	+ } else
	2543	+ if (source == replaceButton)
	2544	+ {
	2545	+ // Overwrite current version
	2546	+ Replace();
2020	2547	} else
2021	2548	if (source == redoButton)
2022	2549	{
	2550	+ // Go to next version
2023	2551	Redo();
2024	2552	} else
2025	2553	if (source == saveButton)
2026	2554	{
2027		- Save();
	2555	+ // Save a new version
	2556	+ if (!Save(true))
	2557	+ java.awt.Toolkit.getDefaultToolkit().beep();
2028	2558	} else
2029	2559	if (source == oneStepButton)
2030	2560	{
..	..	@@ -2033,17 +2563,14 @@
2033	2563	} else
2034	2564	if (source == screenfitButton)
2035	2565	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2566	ScreenFit();
2038	2567	} else
2039	2568	if (source == screenfitpointButton)
2040	2569	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2570	ScreenFitPoint();
2043	2571	} else
2044	2572	if (source == snapobjectButton)
2045	2573	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2574	SnapObject();
2048	2575	} else
2049	2576	// if (event.getSource() == recompileButton)
..	..	@@ -2407,7 +2934,7 @@
2407	2934	{
2408	2935	StepAll();
2409	2936	} else
2410		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2411	2938	{
2412	2939	//int indices[] = jList.getSelectedIndices();
2413	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2419,9 +2946,9 @@
2419	2946	{
2420	2947	ClearSelection(true);
2421	2948	} else
2422		- if (source == grabItem)
	2949	+ if (source == grabItem \|\| source == groupButton)
2423	2950	{
2424		- group(new cGroup(), true);
	2951	+ group(new cGroup(), false); // true);
2425	2952	} else
2426	2953	if (source == hideItem)
2427	2954	{
..	..	@@ -2439,11 +2966,11 @@
2439	2966	{
2440	2967	makeSomething(new Camera());
2441	2968	} else
2442		- if (source == compositeItem)
	2969	+ if (source == compositeItem \|\| source == compositeButton)
2443	2970	{
2444	2971	group(new Composite());
2445	2972	} else
2446		- if (source == randomItem)
	2973	+ if (source == switchItem \|\| source == switchButton)
2447	2974	{
2448	2975	RandomNode random = new RandomNode();
2449	2976	group(random);
..	..	@@ -2545,7 +3072,7 @@
2545	3072	{
2546	3073	group(new cLinker());
2547	3074	} else
2548		- if (source == textureItem)
	3075	+ if (source == textureItem \|\| source == textureButton)
2549	3076	{
2550	3077	group(new TextureNode());
2551	3078	} else
..	..	@@ -2565,17 +3092,30 @@
2565	3092	{
2566	3093	CastShadow(2);
2567	3094	} else
2568		- if (source == ungroupItem)
	3095	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	3096	{
2570		- //ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
2571	3099	for (int i=0; i<group.selection.size(); i++)
2572	3100	{
2573		- Ungroup(group.selection.get(i));
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
2574	3106	}
2575	3107
2576		- ClearSelection(false);
2577		-
2578		- refreshContents();
	3108	+ if (!hasRoot)
	3109	+ {
	3110	+ for (int i=0; i<group.selection.size(); i++)
	3111	+ {
	3112	+ Ungroup(group.selection.get(i));
	3113	+ }
	3114	+
	3115	+ ClearSelection(false);
	3116	+
	3117	+ refreshContents();
	3118	+ }
2579	3119	} else
2580	3120	if (source == genUVItem)
2581	3121	{
..	..	@@ -2876,7 +3416,7 @@
2876	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2877	3417	{
2878	3418	obj = (Object3D)e.nextElement();
2879		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
2880	3420	}
2881	3421
2882	3422	refreshContents();
..	..	@@ -2892,6 +3432,31 @@
2892	3432
2893	3433	refreshContents();
2894	3434	} else
	3435	+ if (source == embedTexturesItem)
	3436	+ {
	3437	+ Object3D obj;
	3438	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3439	+ {
	3440	+ obj = (Object3D)e.nextElement();
	3441	+ obj.EmbedTextures(true);
	3442	+ }
	3443	+
	3444	+ refreshContents();
	3445	+ } else
	3446	+ if (source == deEmbedTexturesItem)
	3447	+ {
	3448	+ Object3D obj;
	3449	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3450	+ {
	3451	+ obj = (Object3D)e.nextElement();
	3452	+ obj.EmbedTextures(false);
	3453	+ }
	3454	+
	3455	+ CameraPane.texturepigment.clear();
	3456	+ CameraPane.texturebump.clear();
	3457	+
	3458	+ refreshContents();
	3459	+ } else
2895	3460	if (source == flashSelectionButton)
2896	3461	{
2897	3462	CameraPane.flash = true;
..	..	@@ -2903,6 +3468,10 @@
2903	3468	if (source == twoButton)
2904	3469	{
2905	3470	radio.layout = twoButton;
	3471	+
	3472	+ if (CameraPane.FULLSCREEN)
	3473	+ fullscreenLayout = radio.layout;
	3474	+
2906	3475	// bug
2907	3476	//gridPanel.setDividerLocation(1.0);
2908	3477	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3527,9 @@
2958	3527	{
2959	3528	radio.layout = threeButton;
2960	3529
	3530	+ if (CameraPane.FULLSCREEN)
	3531	+ fullscreenLayout = radio.layout;
	3532	+
2961	3533	// bigThree.remove(scenePanel);
2962	3534	// bigThree.remove(centralPanel);
2963	3535	// bigThree.remove(XYZPanel);
..	..	@@ -2986,8 +3558,8 @@
2986	3558	// centralPanel.setVisible(true);
2987	3559	// XYZPanel.setVisible(true);
2988	3560	bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
2989	3562	bigThree.add(centralPanel);
2990		- bigThree.add(XYZPanel);
2991	3563	bigThree.FlushUI();
2992	3564
2993	3565	cameraView.requestFocusInWindow();
..	..	@@ -2995,6 +3567,9 @@
2995	3567	if (source == fourButton)
2996	3568	{
2997	3569	radio.layout = fourButton;
	3570	+
	3571	+ if (CameraPane.FULLSCREEN)
	3572	+ fullscreenLayout = radio.layout;
2998	3573
2999	3574	// bigThree.remove(scenePanel);
3000	3575	// bigThree.remove(centralPanel);
..	..	@@ -3033,6 +3608,9 @@
3033	3608	{
3034	3609	radio.layout = sixButton;
3035	3610
	3611	+ if (CameraPane.FULLSCREEN)
	3612	+ fullscreenLayout = radio.layout;
	3613	+
3036	3614	// bigThree.remove(scenePanel);
3037	3615	// bigThree.remove(centralPanel);
3038	3616	// bigThree.remove(XYZPanel);
..	..	@@ -3061,8 +3639,8 @@
3061	3639	// centralPanel.setVisible(true);
3062	3640	// XYZPanel.setVisible(false);
3063	3641	bigThree.ClearUI();
3064		- bigThree.add(scenePanel);
3065	3642	bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
3066	3644	bigThree.FlushUI();
3067	3645
3068	3646	cameraView.requestFocusInWindow();
..	..	@@ -3070,6 +3648,9 @@
3070	3648	if (source == sevenButton)
3071	3649	{
3072	3650	radio.layout = sevenButton;
	3651	+
	3652	+ if (CameraPane.FULLSCREEN)
	3653	+ fullscreenLayout = radio.layout;
3073	3654
3074	3655	// bigThree.remove(scenePanel);
3075	3656	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3707,19 @@
3126	3707	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3708	{
3128	3709	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3710	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3711	{
	3712	+ // Patch to avoid bug with transparency.
	3713	+ if (!ab.hadMaterial)
	3714	+ {
	3715	+ ab.object.material = null;
	3716	+ }
	3717	+
3131	3718	buttonGroup.remove(ab);
3132	3719	radioPanel.remove(ab);
3133	3720
3134		- ab.GetObject().editWindow = null;
	3721	+ //ab.GetObject().editWindow = null;
	3722	+ ab.GetObject().manipWindow = null;
3135	3723	// ab.GetObject().objectUI = null; // ?????????
3136	3724
3137	3725	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3732,12 @@
3144	3732	} else
3145	3733	if (source == editItem \|\| source == editButton)
3146	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
3147	3741	EditSelection(false);
3148	3742	} else
3149	3743	if (source == uneditButton)
..	..	@@ -3153,6 +3747,7 @@
3153	3747	Object3D child = (Object3D)e.nextElement();
3154	3748	if(child.editWindow != null)
3155	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
3156	3751	child.CloseUI();
3157	3752	listUI.remove(child);
3158	3753
..	..	@@ -3169,6 +3764,7 @@
3169	3764	//copy.ClearUI();
3170	3765	for (Object3D obj : listUI)
3171	3766	{
	3767	+ obj.pinned = false;
3172	3768	obj.CloseUI();
3173	3769	}
3174	3770	listUI.clear();
..	..	@@ -3178,7 +3774,7 @@
3178	3774	{
3179	3775	assert(copy == group);
3180	3776
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3778
3183	3779	for (Object3D obj : listUI)
3184	3780	{
..	..	@@ -3227,6 +3823,9 @@
3227	3823	}
3228	3824
3229	3825	copy = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
3230	3829	//Globals.theRenderer.object = group;
3231	3830	if(!useclient)
3232	3831	{
..	..	@@ -3245,6 +3844,7 @@
3245	3844
3246	3845	// fix "+" issue
3247	3846	//group.editWindow = this;
	3847	+ group.manipWindow = this;
3248	3848
3249	3849	/*
3250	3850	currentLayout = radio.layout;
..	..	@@ -3252,6 +3852,13 @@
3252	3852	currentLayout = sevenButton;
3253	3853	*/
3254	3854	radio.layout.doClick();
	3855	+
	3856	+ ClearUnpinned();
	3857	+ //Grafreed.Assert(group != null);
	3858	+ //Grafreed.Assert(group.selection != null);
	3859	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3860	+ if (group.selection == null \|\| group.selection.size() == 1)
	3861	+ EditSelection(false);
3255	3862	keepparent = group.parent;
3256	3863	// PARENT = NULL or not???
3257	3864	//group.parent = null; // ROOT
..	..	@@ -3265,7 +3872,7 @@
3265	3872	cameraView.ProtectCamera();
3266	3873	cameraView.repaint();
3267	3874	return;
3268		- } else if (event.getSource() == revertCameraItem)
	3875	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	3876	{
3270	3877	cameraView.RevertCamera();
3271	3878	cameraView.repaint();
..	..	@@ -3844,7 +4451,7 @@
3844	4451
3845	4452	try
3846	4453	{
3847		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4454	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3848	4455	}
3849	4456	catch (Exception e)
3850	4457	{
..	..	@@ -4319,28 +4926,25 @@
4319	4926	// }
4320	4927	// }
4321	4928
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	4929	void EditSelection(boolean newWindow)
4327	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
4328	4937	// aConstraints.gridy = 0;
4329	4938	for (int i=0; i<group.selection.size(); i++)
4330	4939	{
4331	4940	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	4941	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4942	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	4943
4335	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	4945	if(elem != group \|\| !newWindow)
4337	4946	{
4338		- // if (!(elem instanceof Composite))
4339		- // newWindow = false;
4340		- listUI.add(elem);
4341		- elem.openEditWindow(this, newWindow); //, false);
4342		- System.out.println("edit : " + elem);
4343		- elem.editWindow.refreshContents(true); // ? new
	4947	+ EditElement(elem, newWindow); // ? new
4344	4948	}
4345	4949	}
4346	4950	}
..	..	@@ -4415,7 +5019,8 @@
4415	5019	//new Exception().printStackTrace();
4416	5020
4417	5021	freezemodel = true;
4418		-
	5022	+ ClearUnpinned();
	5023	+
4419	5024	/**/
4420	5025	//switch (event.id)
4421	5026	{
..	..	@@ -4448,7 +5053,7 @@
4448	5053	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	5054	// a camera
4450	5055	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5056	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	5057	{
4453	5058	CameraPane.camerachangeframe = 0; // don't refuse it
4454	5059	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +5062,13 @@
4457	5062	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	5063	}
4459	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
4460	5072	refreshContents();
4461	5073	//return true;
4462	5074	}
..	..	@@ -4466,9 +5078,18 @@
4466	5078	freezemodel = false;
4467	5079	}
4468	5080
	5081	+ void SetPinStates(boolean enabled)
	5082	+ {
	5083	+ editButton.setEnabled(enabled);
	5084	+ uneditButton.setEnabled(enabled);
	5085	+ unselectButton.setEnabled(enabled);
	5086	+ flashSelectionButton.setEnabled(enabled);
	5087	+ }
	5088	+
4469	5089	void refreshContents(boolean cp)
4470	5090	{
4471		- if (!Globals.MOUSEDRAGGED)
	5091	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5092	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	5093	{
4473	5094	objEditor.ClearInfo(); // .GetMaterial());
4474	5095
..	..	@@ -4567,7 +5188,8 @@
4567	5188
4568	5189	if (cut)
4569	5190	{
4570		- Save();
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4571	5193	//int indices[] = jList.getSelectedIndices();
4572	5194	//for (int i = indices.length - 1; i >= 0; i--)
4573	5195	//jList.remove(indices[i]);
..	..	@@ -4670,6 +5292,10 @@
4670	5292
4671	5293	void paste(boolean expand)
4672	5294	{
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4673	5299	// if (GrafreeD.clipboard == null)
4674	5300	// return;
4675	5301	boolean first = true;
..	..	@@ -4729,6 +5355,7 @@
4729	5355	Grafreed.clipboard.get(0).parent = keepparent;
4730	5356	}
4731	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4732	5359	ResetModel();
4733	5360	refreshContents();
4734	5361	}
..	..	@@ -4864,6 +5491,10 @@
4864	5491
4865	5492	void group(Object3D csg, boolean grab)
4866	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
4867	5498	if (//false) // why??
4868	5499	!group.selection.isEmpty())
4869	5500	{
..	..	@@ -4977,10 +5608,15 @@
4977	5608	//node.add(csg);
4978	5609	//makeSomething(node);
4979	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
4980	5612	}
4981	5613
4982	5614	void Ungroup(Object3D g)
4983	5615	{
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
4984	5620	if (g instanceof HiddenObject)
4985	5621	{
4986	5622	HiddenObject h = (HiddenObject) g;
..	..	@@ -4997,6 +5633,7 @@
4997	5633	objEditor.makeSomething(g.get(i), false);
4998	5634	}
4999	5635	}
	5636	+ Globals.REPLACEONMAKE = keep;
5000	5637	}
5001	5638
5002	5639	void ungroup()
..	..	@@ -5285,13 +5922,44 @@
5285	5922	cButton clearpanelButton;
5286	5923	cButton unselectButton;
5287	5924
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
	5925	+ cButton restoreCameraButton;
	5926	+
5293	5927	cButton saveButton;
5294	5928	cButton oneStepButton;
	5929	+
	5930	+ cButton groupButton;
	5931	+ cButton ungroupButton;
	5932	+ cButton compositeButton;
	5933	+ cButton switchButton;
	5934	+ cButton loopButton;
	5935	+ cButton textureButton;
	5936	+
	5937	+ cButton skybox1Button;
	5938	+ cButton skybox2Button;
	5939	+ cButton skybox3Button;
	5940	+ cButton skybox4Button;
	5941	+ cButton skybox5Button;
	5942	+ cButton skybox6Button;
	5943	+ cButton skybox7Button;
	5944	+
	5945	+ cButton skybox11Button;
	5946	+ cButton skybox12Button;
	5947	+ cButton skybox13Button;
	5948	+ cButton skybox14Button;
	5949	+ cButton skybox15Button;
	5950	+ cButton skybox16Button;
	5951	+ cButton skybox17Button;
	5952	+
	5953	+ cButton gridButton;
	5954	+ cButton boxButton;
	5955	+ cButton sphereButton;
	5956	+ cButton coneButton;
	5957	+ cButton torusButton;
	5958	+ cButton superButton;
	5959	+ cButton kleinButton;
	5960	+ cButton particlesButton;
	5961	+ cButton overlayButton;
	5962	+ cButton lightButton;
5295	5963
5296	5964	cButton screenfitButton;
5297	5965	cButton screenfitpointButton;
..	..	@@ -5313,11 +5981,11 @@
5313	5981	//JTree jTree;
5314	5982	private MenuItem lookAtItem;
5315	5983	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	5984	+ private MenuItem switchViewItem;
5317	5985	private MenuItem cutItem;
5318	5986	private MenuItem undoItem;
5319	5987	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	5988	+ private JMenuItem duplicateItem;
5321	5989	private MenuItem cloneItem;
5322	5990	private MenuItem cloneSupportItem;
5323	5991	private MenuItem overwriteGeoItem;
..	..	@@ -5345,7 +6013,7 @@
5345	6013	private MenuItem pasteLinkItem;
5346	6014	private MenuItem pasteCloneItem;
5347	6015	private MenuItem pasteExpandItem;
5348		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
5349	6017	private MenuItem clearAllItem;
5350	6018	private MenuItem genUVItem;
5351	6019	private MenuItem genNormalsMESHItem;
..	..	@@ -5405,7 +6073,7 @@
5405	6073	private MenuItem frontItem;
5406	6074	private MenuItem cameraItem;
5407	6075	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	6076	+ private MenuItem switchItem;
5409	6077	private MenuItem physicsItem;
5410	6078	private MenuItem frameselectorItem;
5411	6079	private MenuItem scriptNodeItem;
..	..	@@ -5429,6 +6097,8 @@
5429	6097	private MenuItem attachBumpItem;
5430	6098	private MenuItem detachBumpItem;
5431	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
5432	6102
5433	6103	private MenuItem particleItem;
5434	6104	private MenuItem ragdollItem;
..	..	@@ -5479,5 +6149,5 @@
5479	6149
5480	6150	Menu cameraMenu;
5481	6151	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	6152	+ MenuItem restoreCameraItem;
5483	6153	}