~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versionlist == null)
	360	+ {
	361	+ copy.versionlist = new Object3D[100];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -80,10 +382,22 @@
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +408,7 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +504,8 @@
189	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	505	// pasteExpandItem.addActionListener(this);
191	506	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
194	509
195	510	if (Globals.ADVANCED)
196	511	{
..	..	@@ -204,23 +519,23 @@
204	519	//zBufferItem.addActionListener(this);
205	520	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	521	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
209	524
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- cameraMenu.add("-");
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
214	537
215		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
216		- toggleTextureItem.addItemListener(this);
217		- toggleTextureItem.setState(CameraPane.textureon);
218		-
219		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
220		- toggleSwitchItem.addItemListener(this);
221		- toggleSwitchItem.setState(CameraPane.SWITCH);
222		-
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	539	toggleHandleItem.addItemListener(this);
225	540	toggleHandleItem.setState(CameraPane.HANDLES);
226	541
..	..	@@ -275,7 +590,7 @@
275	590	{
276	591	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	592	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	594	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	595	oe.cameraMenu.add("-");
281	596	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -283,7 +598,7 @@
283	598	editLeafItem.addActionListener(this);
284	599	lookAtItem.addActionListener(this);
285	600	//lookFromItem.addActinoListener(this);
286		- //switchItem.addActionListener(this);
	601	+ //switchViewItem.addActionListener(this);
287	602	}
288	603
289	604	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -328,14 +643,14 @@
328	643	}
329	644
330	645	oe.menuBar.add(menu = new Menu("Group"));
331		- grabItem = menu.add(new MenuItem("Grab"));
332		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
333	648	backItem = menu.add(new MenuItem("Back"));
334	649	backItem.addActionListener(this);
335	650	frontItem = menu.add(new MenuItem("Front"));
336	651	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
339	654
340	655	if (Globals.ADVANCED)
341	656	{
..	..	@@ -345,10 +660,10 @@
345	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
346	661	ungroupItem.addActionListener(this);
347	662
348		- menu.add("-");
349		-
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
352	667	if (Globals.ADVANCED)
353	668	{
354	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +680,11 @@
365	680	frameselectorItem.addActionListener(this);
366	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	682	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	683	}
371	684
372	685	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
375	688	billboardItem = menu.add(new MenuItem("Billboard"));
376	689	billboardItem.addActionListener(this);
377	690	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -382,13 +695,14 @@
382	695	shadowYItem.addActionListener(this);
383	696	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
385	701	if (Globals.ADVANCED)
386	702	{
387	703	menu.add("-");
388	704	linkerItem = menu.add(new MenuItem("Linker"));
389	705	linkerItem.addActionListener(this);
390		- attributeItem = menu.add(new MenuItem("Attribute"));
391		- attributeItem.addActionListener(this);
392	706	templateItem = menu.add(new MenuItem("Template"));
393	707	templateItem.addActionListener(this);
394	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -417,7 +731,7 @@
417	731	genNormalsMESHItem.addActionListener(this);
418	732	if (Globals.ADVANCED)
419	733	{
420		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
421	735	genNormalsMINEItem.addActionListener(this);
422	736	}
423	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -510,10 +824,15 @@
510	824	attachBumpItem.addActionListener(this);
511	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
512	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
513	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
514	829	detachPigmentItem.addActionListener(this);
515	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
516	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
517	836	menu.add("-");
518	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
519	838	sortbysizeItem.addActionListener(this);
..	..	@@ -540,6 +859,7 @@
540	859	buildToolsMenu(menu);
541	860	}
542	861
	862	+
543	863	void SetupUI2(ObjEditor oe)
544	864	{
545	865	// June 2019
..	..	@@ -582,53 +902,83 @@
582	902	oe.radioPanel.add(dummyButton);
583	903	oe.buttonGroup.add(dummyButton);
584	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
585	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	910
587	911	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	912	//minButton.setToolTipText("Minimize window");
589	913	//minButton.addActionListener(this);
590	914
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
594	921
595	922	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	923	fullButton.setToolTipText("Full-screen window");
597	924	fullButton.addActionListener(this);
598	925
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
602	933
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604		- redoButton.setToolTipText("Redo changes");
605		- redoButton.addActionListener(this);
	934	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveVersionButton.setToolTipText("Duplicate current version");
	936	+ saveVersionButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ deleteVersionButton.setToolTipText("Delete current version");
	940	+ deleteVersionButton.addActionListener(this);
	941	+
	942	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	943	+ previousVersionButton.setToolTipText("Previous version");
	944	+ previousVersionButton.addActionListener(this);
	945	+ previousVersionButton.setEnabled(false);
606	946
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- saveButton.setToolTipText("Save changes");
609		- saveButton.addActionListener(this);
	947	+ cGridBag updown = new cGridBag().setVertical(true);
	948	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	949	+ restoreButton.setToolTipText("Undo (restore current version)");
	950	+ restoreButton.addActionListener(this);
	951	+ restoreButton.setEnabled(false);
610	952
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	953	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	954	+ replaceButton.setToolTipText("Save (replace current version)");
	955	+ replaceButton.addActionListener(this);
	956	+ replaceButton.setEnabled(false);
	957	+
	958	+ copyOptionsPanel.add(updown);
	959	+
	960	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	961	+ nextVersionButton.setToolTipText("Next version");
	962	+ nextVersionButton.addActionListener(this);
	963	+ nextVersionButton.setEnabled(false);
	964	+
	965	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	966	liveCB.setToolTipText("Enable animation");
613	967	liveCB.addItemListener(this);
614	968
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	969	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	970	oneStepButton.setToolTipText("Animate one step forward");
617	971	oneStepButton.addActionListener(this);
618	972
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	973	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	974	fastCB.setToolTipText("Fast mode");
621	975	fastCB.addItemListener(this);
622	976
623		- oe.toolboxPanel.Return();
	977	+ //oe.toolboxPanel.Return();
624	978
625		- oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
626		- trackCB.setToolTipText("Enable tracking");
627		- trackCB.addItemListener(this);
628		-
629		- oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- screenfitButton.setToolTipText("Screen fit");
631		- screenfitButton.addActionListener(this);
	979	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	980	+// trackCB.setToolTipText("Enable tracking");
	981	+// trackCB.addItemListener(this);
632	982
633	983	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	984	// screenfitpointButton.addActionListener(this);
..	..	@@ -638,35 +988,32 @@
638	988	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639	989	snapobjectButton.addActionListener(this);
640	990	snapobjectButton.setToolTipText("Snap Object");
	991	+
	992	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	993	+ fourButton.addActionListener(this);
	994	+ fourButton.setToolTipText("Show control panel only");
641	995	}
642	996
643		- oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- flashSelectionButton.setToolTipText("Highlight selection");
645		- flashSelectionButton.addActionListener(this);
646		-
647	997	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	998
649		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- twoButton.setToolTipText("Show center view only");
	999	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1000	+ twoButton.setToolTipText("Show 3D view only");
651	1001	twoButton.addActionListener(this);
652	1002	this.fullscreenLayout = twoButton;
653	1003
654		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
655		- fourButton.addActionListener(this);
656		- fourButton.setToolTipText("Show left panel only");
657		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- sixButton.setToolTipText("2-column layout left");
659		- sixButton.addActionListener(this);
660		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661		- threeButton.setToolTipText("2-column layout right");
	1004	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1005	+ threeButton.setToolTipText("Show controls and 3D view");
662	1006	threeButton.addActionListener(this);
663		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- sevenButton.setToolTipText("3-column layout");
665		- sevenButton.addActionListener(this);
	1007	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1008	+ sixButton.setToolTipText("Show 3D view and controls");
	1009	+ sixButton.addActionListener(this);
	1010	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+// sevenButton.setToolTipText("3-column layout");
	1012	+// sevenButton.addActionListener(this);
666	1013	//
667	1014
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	1015	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1016	+ rootButton.setToolTipText("Open selection in new tab");
670	1017	rootButton.addActionListener(this);
671	1018
672	1019	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -675,30 +1022,30 @@
675	1022	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
676	1023	//clearButton.addActionListener(this);
677	1024
	1025	+ cGridBag row1 = new cGridBag();
	1026	+
678	1027	// INSERT
679		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1028	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680	1029	gridButton.setToolTipText("Create grid");
681	1030	gridButton.addActionListener(this);
682	1031
683		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1033	boxButton.setToolTipText("Create box");
685	1034	boxButton.addActionListener(this);
686	1035
687		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1037	sphereButton.setToolTipText("Create sphere");
689	1038	sphereButton.addActionListener(this);
690	1039
691		- oe.toolboxPanel.Return();
692		-
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	1041	coneButton.setToolTipText("Create cone");
695	1042	coneButton.addActionListener(this);
696	1043
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	1045	torusButton.setToolTipText("Create torus");
699	1046	torusButton.addActionListener(this);
700	1047
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	1049	superButton.setToolTipText("Create superellipsoid");
703	1050	superButton.addActionListener(this);
704	1051
..	..	@@ -709,32 +1056,72 @@
709	1056	kleinButton.addActionListener(this);
710	1057	}
711	1058
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1060	particlesButton.setToolTipText("Create particle system");
714	1061	particlesButton.addActionListener(this);
715	1062
716		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ oe.toolboxPanel.add(row1);
	1064	+
	1065	+ cGridBag row2 = new cGridBag();
	1066	+
	1067	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ groupButton.setToolTipText("Create group");
	1069	+ groupButton.addActionListener(this);
	1070	+
	1071	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ compositeButton.setToolTipText("Create composite");
	1073	+ compositeButton.addActionListener(this);
	1074	+
	1075	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ switchButton.setToolTipText("Create item switcher");
	1077	+ switchButton.addActionListener(this);
	1078	+
	1079	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ loopButton.setToolTipText("Create loop");
	1081	+ loopButton.addActionListener(this);
	1082	+
	1083	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ textureButton.setToolTipText("Create texture");
	1085	+ textureButton.addActionListener(this);
	1086	+
	1087	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	1088	overlayButton.setToolTipText("Create overlay");
718	1089	overlayButton.addActionListener(this);
719	1090
720		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1092	lightButton.setToolTipText("Create light");
722	1093	lightButton.addActionListener(this);
723	1094
	1095	+ oe.toolboxPanel.add(row2);
	1096	+
	1097	+ // ENVYMAPS
	1098	+ cGridBag skyboxpane = new cGridBag();
	1099	+ skyboxpane.preferredHeight = 100;
	1100	+
	1101	+ oe.toolboxPanel.add(skyboxpane);
	1102	+
	1103	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1104	+ skyboxpane.add(skyboxpanel);
	1105	+
	1106	+ AddSkyboxTab0(skyboxpanel);
	1107	+ AddSkyboxTab1(skyboxpanel);
	1108	+ AddSkyboxTab2(skyboxpanel);
	1109	+ AddSkyboxTab3(skyboxpanel);
	1110	+
724	1111	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	1112	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ editButton.setToolTipText("Pin selection controls");
727	1114	editButton.addActionListener(this);
728	1115
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	1116	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ uneditButton.setToolTipText("Unpin and remove selection controls");
731	1118	uneditButton.addActionListener(this);
732	1119
733	1120	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	1121	+ allParamsButton.setToolTipText("Show all controle");
735	1122	allParamsButton.addActionListener(this);
736	1123
737		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1125	clearPanelButton.setToolTipText("Clear edit panel");
739	1126	clearPanelButton.addActionListener(this);
740	1127
..	..	@@ -742,8 +1129,13 @@
742	1129	unselectButton.setToolTipText("Unselect");
743	1130	unselectButton.addActionListener(this);
744	1131
	1132	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ flashSelectionButton.setToolTipText("Highlight selection");
	1134	+ flashSelectionButton.addActionListener(this);
	1135	+
745	1136	editCommandsPanel.preferredHeight = 1;
746	1137
	1138	+ SetPinStates(false);
747	1139	// oe.treePanel.add(commandsPanel);
748	1140	// oe.treePanel.Return();
749	1141
..	..	@@ -768,26 +1160,14 @@
768	1160	oe.treePanel.add(jSPPanel);
769	1161	oe.treePanel.Return();
770	1162
771		- cGridBag copyOptionsPanel = new cGridBag();
772		-
773		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
774		- colorCB.setToolTipText("Copy color when dropped");
775		- colorCB.addItemListener(this);
776		-
777		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
778		- materialCB.setToolTipText("Copy material when dropped");
779		- materialCB.addItemListener(this);
780		-
781		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
782		- textureCB.setToolTipText("Copy texture when dropped");
783		- textureCB.addItemListener(this);
784		-
785		- copyOptionsPanel.preferredHeight = 1;
786	1163	oe.treePanel.add(copyOptionsPanel);
787	1164	oe.treePanel.Return();
	1165	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1166	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1167	+ sliderPane.preferredHeight = 1;
788	1168
789		-// mainPanel.setDividerLocation(0.5); //1.0);
790		-// mainPanel.setResizeWeight(0.5);
	1169	+// mainPanel.setDividerLocation(0.1); //1.0);
	1170	+ mainPanel.setResizeWeight(0.4);
791	1171
792	1172	//jList.addListSelectionListener(this);
793	1173	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -795,7 +1175,7 @@
795	1175	//jTree.setEditable(true);
796	1176	oe.jTree.setDragEnabled(true);
797	1177	//jTree.setPreferredSize(new Dimension(10,10));
798		- jSP.setPreferredSize(new Dimension(100,200));
	1178	+ //jSP.setPreferredSize(new Dimension(100,200));
799	1179
800	1180	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
801	1181
..	..	@@ -807,29 +1187,49 @@
807	1187	dgr.addDragGestureListener(this);
808	1188	}catch(Exception e) {}
809	1189	*/
810		- radio.layout = sevenButton;
	1190	+ radio.layout = threeButton; // sixButton;
811	1191	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	1192	}
813	1193
814	1194	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	1195	{
	1196	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1197	+ colorCB.setToolTipText("Copy color when dropped");
	1198	+ colorCB.addItemListener(this);
	1199	+
	1200	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1201	+ materialCB.setToolTipText("Copy material when dropped");
	1202	+ materialCB.addItemListener(this);
	1203	+
	1204	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1205	+ textureCB.setToolTipText("Copy texture when dropped");
	1206	+ textureCB.addItemListener(this);
	1207	+
	1208	+ panel.Return();
	1209	+
816	1210	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	1211	boxCB.setToolTipText("Display bounding boxes");
818	1212	boxCB.addItemListener(this);
819	1213
820	1214	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1215	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	1216	zoomBoxCB.addItemListener(this);
823	1217
824	1218	if (true) // Globals.ADVANCED)
825	1219	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	1220	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1221	+// supportCB.setToolTipText("Enable rigging");
	1222	+// supportCB.addItemListener(this);
	1223	+
	1224	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1225	+ freezeCB.setToolTipText("Fast moving camera");
	1226	+ freezeCB.addItemListener(this);
829	1227
830	1228	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	1229	// localCB.addItemListener(this);
832	1230
	1231	+ panel.Return();
	1232	+
833	1233	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	1234	crowdCB.setToolTipText("Used for crowds");
835	1235	crowdCB.addItemListener(this);
..	..	@@ -838,14 +1238,19 @@
838	1238	smoothCB.setToolTipText("Snapping delay");
839	1239	smoothCB.addItemListener(this);
840	1240
841		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
842		- slowCB.setToolTipText("Smooth interpolation");
843		- slowCB.addItemListener(this);
	1241	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1242	+// slowCB.setToolTipText("Smooth interpolation");
	1243	+// slowCB.addItemListener(this);
	1244	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1245	+ minshaderCB.setToolTipText("Minimal fast shader");
	1246	+ minshaderCB.addItemListener(this);
844	1247
845	1248	// constraints.gridy += 1;
846	1249	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	1250	// speakerMocapCB.addItemListener(this);
848	1251
	1252	+ panel.Return();
	1253	+
849	1254	if (false)
850	1255	{
851	1256	// handled in scripts
..	..	@@ -860,24 +1265,39 @@
860	1265	//constraints.gridy += 1;
861	1266	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	1267	smoothfocusCB.addItemListener(this);
	1268	+ panel.Return();
863	1269	}
864	1270
865	1271	//constraints.gridx += 1;
866	1272	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	1273	// debugCB.addItemListener(this);
868	1274
	1275	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1276	+ trackCB.setToolTipText("Enable tracking target");
	1277	+ trackCB.addItemListener(this);
	1278	+
869	1279	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	1280	+ oeilCB.setToolTipText("Move camera when tracking");
871	1281	oeilCB.addItemListener(this);
872	1282
873	1283	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	1284	+ shadowCB.setToolTipText("When live compute shadows");
875	1285	shadowCB.addItemListener(this);
876	1286
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	1287	+ panel.Return();
	1288	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1289	+ toggleTextureCB.setToolTipText("Load textures");
	1290	+ toggleTextureCB.addItemListener(this);
	1291	+
	1292	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1293	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1294	+ toggleSwitchCB.addItemListener(this);
	1295	+
	1296	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1297	+ autokeepCB.setToolTipText("On structure change");
	1298	+ autokeepCB.addItemListener(this);
880	1299
	1300	+ panel.Return();
881	1301	if (Globals.ADVANCED)
882	1302	{
883	1303	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +1308,15 @@
888	1308	}
889	1309
890	1310	cGridBag fill = new cGridBag();
891		-
892	1311	fill.preferredHeight = 200;
	1312	+ cGridBag fill2 = new cGridBag();
	1313	+ fill2.preferredHeight = 200;
	1314	+ cGridBag fill3 = new cGridBag();
	1315	+ fill3.preferredHeight = 200;
893	1316
894	1317	panel.add(fill);
	1318	+ panel.add(fill2);
	1319	+ panel.add(fill3);
895	1320
896	1321	}
897	1322
..	..	@@ -899,7 +1324,7 @@
899	1324	{
900	1325	cRadio radioButton = new cRadio(obj.name);
901	1326
902		- // Patch to avoid bug with transparency.
	1327	+ // June 2019. Patch to avoid bug with transparency.
903	1328	radioButton.hadMaterial = obj.material != null;
904	1329	if (!radioButton.hadMaterial)
905	1330	{
..	..	@@ -907,7 +1332,7 @@
907	1332	}
908	1333
909	1334	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1335	+ radioButton.layout = threeButton; // sixButton;
911	1336	radioButton.SetCamera(cameraView.renderCamera, false);
912	1337	radioButton.addActionListener(this);
913	1338	radioPanel.add(radioButton);
..	..	@@ -932,11 +1357,15 @@
932	1357	cCheckBox localCB;
933	1358	cCheckBox crowdCB;
934	1359	cCheckBox smoothCB;
	1360	+ cCheckBox minshaderCB;
	1361	+
935	1362	cToggleButton fastCB;
936	1363	cCheckBox slowCB;
937	1364	cCheckBox boxCB;
938	1365	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1366	+ cCheckBox freezeCB;
	1367	+ //cToggleButton trackCB;
	1368	+ cCheckBox trackCB;
940	1369	cCheckBox smoothfocusCB;
941	1370	// JCheckBox speakerMocapCB;
942	1371	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1374,7 @@
945	1374
946	1375	cCheckBox oeilCB;
947	1376	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1377	+ cCheckBox autokeepCB;
949	1378	cCheckBox lookAtCB;
950	1379
951	1380	// static int COLOR = 1;
..	..	@@ -1001,6 +1430,12 @@
1001	1430	cameraView.ToggleInertia();
1002	1431	cameraView.repaint();
1003	1432	}
	1433	+ else if(e.getSource() == minshaderCB)
	1434	+ {
	1435	+ Globals.MINSHADER ^= true;
	1436	+ cameraView.programInitialized = false;
	1437	+ cameraView.repaint();
	1438	+ }
1004	1439	else if(e.getSource() == localCB)
1005	1440	{
1006	1441	cameraView.ToggleLocal();
..	..	@@ -1053,9 +1488,13 @@
1053	1488	{
1054	1489	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1490	}
1056		- else if(e.getSource() == autosaveCB)
	1491	+ else if(e.getSource() == freezeCB)
1057	1492	{
1058		- Globals.SAVEONMAKE ^= true;
	1493	+ Globals.FREEZEONMOVE ^= true;
	1494	+ }
	1495	+ else if(e.getSource() == autokeepCB)
	1496	+ {
	1497	+ Globals.REPLACEONMAKE ^= true;
1059	1498	}
1060	1499	else if(e.getSource() == lookAtCB)
1061	1500	{
..	..	@@ -1137,8 +1576,6 @@
1137	1576	}
1138	1577	}
1139	1578
1140		- String string = (String) object;
1141		-
1142	1579	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1580	// if( object instanceof java.io.File[])
1144	1581	// {
..	..	@@ -1146,6 +1583,8 @@
1146	1583	// objEditor.DropFile((java.io.File[]) object, true);
1147	1584	// return;
1148	1585	// }
	1586	+
	1587	+ String string = object.toString();
1149	1588
1150	1589	// File path for Mac and Windows
1151	1590	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1630,23 @@
1191	1630
1192	1631	assert target == objEditor.jTree;
1193	1632	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1633	+ Object3D destinationLeaf;
1194	1634	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1635	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1636	} catch (Exception e) {
1197	1637	System.out.println("destinationPath : " + destinationPath);
1198	1638	return;
1199	1639	}
1200	1640
	1641	+ for (int i=group.selection.size(); --i>=0;)
	1642	+ {
	1643	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1644	+
	1645	+ // Cannot move into itself
	1646	+ if (child == destinationLeaf)
	1647	+ return;
	1648	+ }
	1649	+
1201	1650	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1651	// {
1203	1652	loadClipboard(true);
..	..	@@ -1312,22 +1761,30 @@
1312	1761	{
1313	1762	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1763	//heightFieldItem.addActionListener(this);
1315		- gridItem = menu.add(new MenuItem("Grid"));
1316		- gridItem.addActionListener(this);
1317		- rectoidItem = menu.add(new MenuItem("Box"));
1318		- rectoidItem.addActionListener(this);
1319		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1320		- ellipsoidItem.addActionListener(this);
1321		- coneItem = menu.add(new MenuItem("Cone"));
1322		- coneItem.addActionListener(this);
1323		- torusItem = menu.add(new MenuItem("Torus"));
1324		- torusItem.addActionListener(this);
1325		- superItem = menu.add(new MenuItem("Superellipsoid"));
1326		- superItem.addActionListener(this);
	1764	+// gridItem = menu.add(new MenuItem("Grid"));
	1765	+// gridItem.addActionListener(this);
	1766	+// rectoidItem = menu.add(new MenuItem("Box"));
	1767	+// rectoidItem.addActionListener(this);
	1768	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1769	+// ellipsoidItem.addActionListener(this);
	1770	+// coneItem = menu.add(new MenuItem("Cone"));
	1771	+// coneItem.addActionListener(this);
	1772	+// torusItem = menu.add(new MenuItem("Torus"));
	1773	+// torusItem.addActionListener(this);
	1774	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1775	+// superItem.addActionListener(this);
	1776	+
	1777	+ cameraItem = menu.add(new MenuItem("Camera"));
	1778	+ cameraItem.addActionListener(this);
	1779	+
	1780	+ if (!Globals.ADVANCED)
	1781	+ {
1327	1782	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1783	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1784	+ }
	1785	+
	1786	+// particleItem = menu.add(new MenuItem("Particle system"));
	1787	+// particleItem.addActionListener(this);
1331	1788	if (Globals.ADVANCED)
1332	1789	{
1333	1790	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1810,15 @@
1353	1810	}
1354	1811	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1812	bezierItem.addActionListener(this);
1356		- overlayItem = menu.add(new MenuItem("Overlay"));
1357		- overlayItem.addActionListener(this);
1358		- lightItem = menu.add(new MenuItem("Light"));
1359		- lightItem.addActionListener(this);
	1813	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1814	+// overlayItem.addActionListener(this);
	1815	+// lightItem = menu.add(new MenuItem("Light"));
	1816	+// lightItem.addActionListener(this);
1360	1817	menu.add("-");
1361	1818	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1819	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1820	+// loopItem = menu.add(new MenuItem("Loop"));
	1821	+// loopItem.addActionListener(this);
1365	1822	doubleItem = menu.add(new MenuItem("Fork"));
1366	1823	doubleItem.addActionListener(this);
1367	1824	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1834,9 @@
1377	1834	animationItem.addItemListener(this);
1378	1835	animationItem.setState(Globals.ANIMATION);
1379	1836
	1837	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1838	+ archiveItem.addActionListener(this);
	1839	+
1380	1840	menu.add("-");
1381	1841	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1842	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +1849,8 @@
1389	1849	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	1850	reduce34MorphItem.addActionListener(this);
1391	1851	menu.add("-");
	1852	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1853	+ memoryItem.addActionListener(this);
1392	1854	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	1855	computeAOItem.addActionListener(this);
1394	1856
..	..	@@ -1397,8 +1859,6 @@
1397	1859	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	1860	mirrorItem.addActionListener(this);
1399	1861	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	1862	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	1863	analyzeItem.addActionListener(this);
1404	1864	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +2006,30 @@
1546	2006
1547	2007	makeSomething(shadow);
1548	2008	}
	2009	+
	2010	+ private void ClearUnpinned()
	2011	+ {
	2012	+ //for (Object3D obj : listUI)
	2013	+ for (int i=listUI.size(); --i>=0;)
	2014	+ {
	2015	+ Object3D obj = listUI.elementAt(i);
	2016	+ if (!obj.pinned)
	2017	+ {
	2018	+ obj.CloseUI();
	2019	+ listUI.remove(i);
	2020	+ }
	2021	+ }
	2022	+ }
	2023	+
	2024	+ private void EditElement(Object3D elem, boolean newWindow)
	2025	+ {
	2026	+ // if (!(elem instanceof Composite))
	2027	+ // newWindow = false;
	2028	+ listUI.add(elem);
	2029	+ elem.openEditWindow(this, newWindow); //, false);
	2030	+ System.out.println("edit : " + elem);
	2031	+ elem.editWindow.refreshContents(true); // ? new
	2032	+ }
1549	2033
1550	2034	/**
1551	2035	* applyExample
..	..	@@ -1790,7 +2274,7 @@
1790	2274	{
1791	2275	ScreenFit();
1792	2276	} else
1793		- if (source == switchItem)
	2277	+ if (source == switchViewItem)
1794	2278	{
1795	2279	cVector v1 = new cVector();
1796	2280	cVector v2 = new cVector();
..	..	@@ -1974,6 +2458,23 @@
1974	2458	{
1975	2459	makeSomething(new Light());
1976	2460	} else
	2461	+// if (source == skybox1Button \|\|
	2462	+// source == skybox2Button \|\|
	2463	+// source == skybox3Button \|\|
	2464	+// source == skybox4Button \|\|
	2465	+// source == skybox5Button \|\|
	2466	+// source == skybox6Button \|\|
	2467	+// source == skybox7Button \|\|
	2468	+// source == skybox11Button \|\|
	2469	+// source == skybox12Button \|\|
	2470	+// source == skybox13Button \|\|
	2471	+// source == skybox14Button \|\|
	2472	+// source == skybox15Button \|\|
	2473	+// source == skybox16Button \|\|
	2474	+// source == skybox17Button)
	2475	+// {
	2476	+// ChangeSkybox(source);
	2477	+// } else
1977	2478	if (source == csgItem)
1978	2479	{
1979	2480	group(new CSG());
..	..	@@ -2020,30 +2521,30 @@
2020	2521
2021	2522	group(g);
2022	2523	} else
2023		- if (source == loopItem)
	2524	+ if (source == loopItem \|\| source == loopButton)
2024	2525	{
2025	2526	Composite csg = new GroupLeaf();
2026	2527	csg.count = 5;
2027	2528	group(csg);
2028		- Composite child = new cGroup();
	2529	+ Composite child = new cGroup("Branch");
2029	2530	csg.addChild(child);
2030	2531	child.addChild(csg);
2031	2532	} else
2032	2533	if (source == doubleItem)
2033	2534	{
2034		- Composite csg = new GroupLeaf();
	2535	+ Composite csg = new GroupLeaf("Fork");
2035	2536	csg.count = 5;
2036	2537	group(csg);
2037		- Composite child = new cGroup();
	2538	+ Composite child = new cGroup("Branch A");
2038	2539	csg.addChild(child);
2039	2540	child.addChild(csg);
2040		- child = new cGroup();
	2541	+ child = new cGroup("Branch B");
2041	2542	csg.addChild(child);
2042	2543	child.addChild(csg);
2043	2544	} else
2044	2545	if (source == tripleItem)
2045	2546	{
2046		- Composite csg = new GroupLeaf();
	2547	+ Composite csg = new GroupLeaf("Trident");
2047	2548	csg.count = 4;
2048	2549	group(csg);
2049	2550	Composite child = new cGroup();
..	..	@@ -2059,7 +2560,7 @@
2059	2560	if (source == computeAOItem)
2060	2561	{
2061	2562	Globals.drawMode = CameraPane.OCCLUSION;
2062		- Globals.theRenderer.repaint();
	2563	+ cameraView.repaint();
2063	2564	} else
2064	2565	if (source == recompileItem)
2065	2566	{
..	..	@@ -2074,7 +2575,7 @@
2074	2575	if (source == invariantsItem)
2075	2576	{
2076	2577	System.out.println("Invariants:");
2077		- Grafreed.grafreeD.universe.invariants();
	2578	+ Grafreed.grafreed.universe.invariants();
2078	2579	} else
2079	2580	if (source == memoryItem)
2080	2581	{
..	..	@@ -2105,17 +2606,40 @@
2105	2606	{
2106	2607	ToggleFullScreen();
2107	2608	} else
2108		- if (source == undoButton)
	2609	+ if (source == previousVersionButton)
2109	2610	{
2110		- Undo();
	2611	+ // Go to previous version
	2612	+ //if (!Undo())
	2613	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2614	+ PreviousVersion();
2111	2615	} else
2112		- if (source == redoButton)
	2616	+ if (source == restoreButton)
2113	2617	{
2114		- Redo();
	2618	+ // Restore current version
	2619	+ Restore();
	2620	+ restoreButton.setEnabled(false);
2115	2621	} else
2116		- if (source == saveButton)
	2622	+ if (source == replaceButton)
2117	2623	{
2118		- Save();
	2624	+ // Overwrite current version
	2625	+ Replace();
	2626	+ replaceButton.setEnabled(false);
	2627	+ } else
	2628	+ if (source == nextVersionButton)
	2629	+ {
	2630	+ // Go to next version
	2631	+ NextVersion();
	2632	+ } else
	2633	+ if (source == saveVersionButton)
	2634	+ {
	2635	+ // Save a new version
	2636	+ if (!Save(true))
	2637	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2638	+ } else
	2639	+ if (source == deleteVersionButton)
	2640	+ {
	2641	+ // Delete a new version
	2642	+ DeleteVersion();
2119	2643	} else
2120	2644	if (source == oneStepButton)
2121	2645	{
..	..	@@ -2124,17 +2648,14 @@
2124	2648	} else
2125	2649	if (source == screenfitButton)
2126	2650	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2651	ScreenFit();
2129	2652	} else
2130	2653	if (source == screenfitpointButton)
2131	2654	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2655	ScreenFitPoint();
2134	2656	} else
2135	2657	if (source == snapobjectButton)
2136	2658	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2659	SnapObject();
2139	2660	} else
2140	2661	// if (event.getSource() == recompileButton)
..	..	@@ -2173,11 +2694,11 @@
2173	2694	} else
2174	2695	if (source == undoItem)
2175	2696	{
2176		- Undo();
	2697	+ PreviousVersion();
2177	2698	} else
2178	2699	if (source == redoItem)
2179	2700	{
2180		- Redo();
	2701	+ NextVersion();
2181	2702	} else
2182	2703	if (source == duplicateItem)
2183	2704	{
..	..	@@ -2498,7 +3019,7 @@
2498	3019	{
2499	3020	StepAll();
2500	3021	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3022	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	3023	{
2503	3024	//int indices[] = jList.getSelectedIndices();
2504	3025	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +3031,9 @@
2510	3031	{
2511	3032	ClearSelection(true);
2512	3033	} else
2513		- if (source == grabItem)
	3034	+ if (source == grabItem \|\| source == groupButton)
2514	3035	{
2515		- group(new cGroup(), true);
	3036	+ group(new cGroup(), false); // true);
2516	3037	} else
2517	3038	if (source == hideItem)
2518	3039	{
..	..	@@ -2530,11 +3051,11 @@
2530	3051	{
2531	3052	makeSomething(new Camera());
2532	3053	} else
2533		- if (source == compositeItem)
	3054	+ if (source == compositeItem \|\| source == compositeButton)
2534	3055	{
2535	3056	group(new Composite());
2536	3057	} else
2537		- if (source == randomItem)
	3058	+ if (source == switchItem \|\| source == switchButton)
2538	3059	{
2539	3060	RandomNode random = new RandomNode();
2540	3061	group(random);
..	..	@@ -2636,7 +3157,7 @@
2636	3157	{
2637	3158	group(new cLinker());
2638	3159	} else
2639		- if (source == textureItem)
	3160	+ if (source == textureItem \|\| source == textureButton)
2640	3161	{
2641	3162	group(new TextureNode());
2642	3163	} else
..	..	@@ -2658,15 +3179,28 @@
2658	3179	} else
2659	3180	if (source == ungroupItem \|\| source == ungroupButton)
2660	3181	{
2661		- //ungroup();
	3182	+ boolean hasRoot = false;
	3183	+
2662	3184	for (int i=0; i<group.selection.size(); i++)
2663	3185	{
2664		- Ungroup(group.selection.get(i));
	3186	+ if (group.selection.get(i) == group)
	3187	+ {
	3188	+ hasRoot = true;
	3189	+ break;
	3190	+ }
2665	3191	}
2666	3192
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	3193	+ if (!hasRoot)
	3194	+ {
	3195	+ for (int i=0; i<group.selection.size(); i++)
	3196	+ {
	3197	+ Ungroup(group.selection.get(i));
	3198	+ }
	3199	+
	3200	+ ClearSelection(false);
	3201	+
	3202	+ refreshContents();
	3203	+ }
2670	3204	} else
2671	3205	if (source == genUVItem)
2672	3206	{
..	..	@@ -2967,7 +3501,7 @@
2967	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3502	{
2969	3503	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3504	+ obj.ResetBumpTexture();
2971	3505	}
2972	3506
2973	3507	refreshContents();
..	..	@@ -2981,6 +3515,31 @@
2981	3515	obj.SetBumpTexture(obj.GetPigmentTexture());
2982	3516	}
2983	3517
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == embedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(true);
	3527	+ }
	3528	+
	3529	+ refreshContents();
	3530	+ } else
	3531	+ if (source == deEmbedTexturesItem)
	3532	+ {
	3533	+ Object3D obj;
	3534	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3535	+ {
	3536	+ obj = (Object3D)e.nextElement();
	3537	+ obj.EmbedTextures(false);
	3538	+ }
	3539	+
	3540	+ CameraPane.texturepigment.clear();
	3541	+ CameraPane.texturebump.clear();
	3542	+
2984	3543	refreshContents();
2985	3544	} else
2986	3545	if (source == flashSelectionButton)
..	..	@@ -3084,8 +3643,8 @@
3084	3643	// centralPanel.setVisible(true);
3085	3644	// XYZPanel.setVisible(true);
3086	3645	bigThree.ClearUI();
	3646	+ bigThree.add(scenePanel);
3087	3647	bigThree.add(centralPanel);
3088		- bigThree.add(XYZPanel);
3089	3648	bigThree.FlushUI();
3090	3649
3091	3650	cameraView.requestFocusInWindow();
..	..	@@ -3165,8 +3724,8 @@
3165	3724	// centralPanel.setVisible(true);
3166	3725	// XYZPanel.setVisible(false);
3167	3726	bigThree.ClearUI();
3168		- bigThree.add(scenePanel);
3169	3727	bigThree.add(centralPanel);
	3728	+ bigThree.add(scenePanel);
3170	3729	bigThree.FlushUI();
3171	3730
3172	3731	cameraView.requestFocusInWindow();
..	..	@@ -3258,6 +3817,12 @@
3258	3817	} else
3259	3818	if (source == editItem \|\| source == editButton)
3260	3819	{
	3820	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3821	+ {
	3822	+ Object3D child = (Object3D)e.nextElement();
	3823	+ child.pinned = true;
	3824	+ }
	3825	+
3261	3826	EditSelection(false);
3262	3827	} else
3263	3828	if (source == uneditButton)
..	..	@@ -3266,9 +3831,10 @@
3266	3831	{
3267	3832	Object3D child = (Object3D)e.nextElement();
3268	3833	if(child.editWindow != null)
3269		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3834	+ child.pinned = false;
3270	3835	child.CloseUI();
3271	3836	listUI.remove(child);
	3837	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3272	3838
3273	3839	//child.editWindow = null; // ???????????
3274	3840	}
..	..	@@ -3283,16 +3849,18 @@
3283	3849	//copy.ClearUI();
3284	3850	for (Object3D obj : listUI)
3285	3851	{
	3852	+ obj.pinned = false;
3286	3853	obj.CloseUI();
3287	3854	}
3288	3855	listUI.clear();
	3856	+ SetPinStates(group.selection.size() > 0);
3289	3857	refreshContents(true);
3290	3858	} else
3291	3859	if (source == allParamsButton)
3292	3860	{
3293	3861	assert(copy == group);
3294	3862
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3863	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3864
3297	3865	for (Object3D obj : listUI)
3298	3866	{
..	..	@@ -3341,6 +3909,9 @@
3341	3909	}
3342	3910
3343	3911	copy = group;
	3912	+
	3913	+ SetUndoStates();
	3914	+
3344	3915	//Globals.theRenderer.object = group;
3345	3916	if(!useclient)
3346	3917	{
..	..	@@ -3367,6 +3938,14 @@
3367	3938	currentLayout = sevenButton;
3368	3939	*/
3369	3940	radio.layout.doClick();
	3941	+
	3942	+ ClearUnpinned();
	3943	+
	3944	+ //Grafreed.Assert(group != null);
	3945	+ //Grafreed.Assert(group.selection != null);
	3946	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3947	+ if (group.selection == null \|\| group.selection.size() == 1)
	3948	+ EditSelection(false);
3370	3949	keepparent = group.parent;
3371	3950	// PARENT = NULL or not???
3372	3951	//group.parent = null; // ROOT
..	..	@@ -3378,11 +3957,13 @@
3378	3957	} else if (event.getSource() == editCameraItem)
3379	3958	{
3380	3959	cameraView.ProtectCamera();
	3960	+ cameraView.requestFocusInWindow();
3381	3961	cameraView.repaint();
3382	3962	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3963	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3964	{
3385	3965	cameraView.RevertCamera();
	3966	+ cameraView.requestFocusInWindow();
3386	3967	cameraView.repaint();
3387	3968	return;
3388	3969	// } else if (event.getSource() == textureButton)
..	..	@@ -3959,7 +4540,7 @@
3959	4540
3960	4541	try
3961	4542	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4543	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3963	4544	}
3964	4545	catch (Exception e)
3965	4546	{
..	..	@@ -4434,12 +5015,14 @@
4434	5015	// }
4435	5016	// }
4436	5017
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	5018	void EditSelection(boolean newWindow)
4442	5019	{
	5020	+ if (group.selection == null)
	5021	+ {
	5022	+ EditElement(group, newWindow); // ? new
	5023	+ return;
	5024	+ }
	5025	+
4443	5026	// aConstraints.gridy = 0;
4444	5027	for (int i=0; i<group.selection.size(); i++)
4445	5028	{
..	..	@@ -4450,12 +5033,7 @@
4450	5033	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	5034	if(elem != group \|\| !newWindow)
4452	5035	{
4453		- // if (!(elem instanceof Composite))
4454		- // newWindow = false;
4455		- listUI.add(elem);
4456		- elem.openEditWindow(this, newWindow); //, false);
4457		- System.out.println("edit : " + elem);
4458		- elem.editWindow.refreshContents(true); // ? new
	5036	+ EditElement(elem, newWindow); // ? new
4459	5037	}
4460	5038	}
4461	5039	}
..	..	@@ -4518,9 +5096,7 @@
4518	5096
4519	5097	freezemodel = false;
4520	5098	}
4521		-
4522		- boolean flashIt = true;
4523		-
	5099	+
4524	5100	public void valueChanged(TreeSelectionEvent e)
4525	5101	//public boolean handleEvent(Event event)
4526	5102	{
..	..	@@ -4530,7 +5106,8 @@
4530	5106	//new Exception().printStackTrace();
4531	5107
4532	5108	freezemodel = true;
4533		-
	5109	+ ClearUnpinned();
	5110	+
4534	5111	/**/
4535	5112	//switch (event.id)
4536	5113	{
..	..	@@ -4563,7 +5140,7 @@
4563	5140	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	5141	// a camera
4565	5142	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5143	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	5144	{
4568	5145	CameraPane.camerachangeframe = 0; // don't refuse it
4569	5146	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +5149,13 @@
4572	5149	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	5150	}
4574	5151
	5152	+ if (tps != null && tps.length == 1)
	5153	+ {
	5154	+ EditSelection(false);
	5155	+ }
	5156	+
	5157	+ SetPinStates(tps != null && tps.length > 0);
	5158	+
4575	5159	refreshContents();
4576	5160	//return true;
4577	5161	}
..	..	@@ -4581,9 +5165,20 @@
4581	5165	freezemodel = false;
4582	5166	}
4583	5167
	5168	+ void SetPinStates(boolean enabled)
	5169	+ {
	5170	+ editButton.setEnabled(enabled);
	5171	+ uneditButton.setEnabled(enabled);
	5172	+ unselectButton.setEnabled(enabled);
	5173	+ flashSelectionButton.setEnabled(enabled);
	5174	+
	5175	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5176	+ }
	5177	+
4584	5178	void refreshContents(boolean cp)
4585	5179	{
4586		- if (!Globals.MOUSEDRAGGED)
	5180	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5181	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	5182	{
4588	5183	objEditor.ClearInfo(); // .GetMaterial());
4589	5184
..	..	@@ -4682,8 +5277,8 @@
4682	5277
4683	5278	if (cut)
4684	5279	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	5280	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5281	+// Save();
4687	5282	//int indices[] = jList.getSelectedIndices();
4688	5283	//for (int i = indices.length - 1; i >= 0; i--)
4689	5284	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5381,10 @@
4786	5381
4787	5382	void paste(boolean expand)
4788	5383	{
	5384	+ if (Globals.REPLACEONMAKE)
	5385	+ Save();
	5386	+ boolean keep = Globals.REPLACEONMAKE;
	5387	+ Globals.REPLACEONMAKE = false;
4789	5388	// if (GrafreeD.clipboard == null)
4790	5389	// return;
4791	5390	boolean first = true;
..	..	@@ -4845,6 +5444,7 @@
4845	5444	Grafreed.clipboard.get(0).parent = keepparent;
4846	5445	}
4847	5446
	5447	+ Globals.REPLACEONMAKE = keep;
4848	5448	ResetModel();
4849	5449	refreshContents();
4850	5450	}
..	..	@@ -4980,6 +5580,10 @@
4980	5580
4981	5581	void group(Object3D csg, boolean grab)
4982	5582	{
	5583	+ if (Globals.REPLACEONMAKE)
	5584	+ Save();
	5585	+ boolean keep = Globals.REPLACEONMAKE;
	5586	+ Globals.REPLACEONMAKE = false;
4983	5587	if (//false) // why??
4984	5588	!group.selection.isEmpty())
4985	5589	{
..	..	@@ -5093,10 +5697,15 @@
5093	5697	//node.add(csg);
5094	5698	//makeSomething(node);
5095	5699	makeSomething(csg);
	5700	+ Globals.REPLACEONMAKE = keep;
5096	5701	}
5097	5702
5098	5703	void Ungroup(Object3D g)
5099	5704	{
	5705	+ if (Globals.REPLACEONMAKE)
	5706	+ Save();
	5707	+ boolean keep = Globals.REPLACEONMAKE;
	5708	+ Globals.REPLACEONMAKE = false;
5100	5709	if (g instanceof HiddenObject)
5101	5710	{
5102	5711	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5722,7 @@
5113	5722	objEditor.makeSomething(g.get(i), false);
5114	5723	}
5115	5724	}
	5725	+ Globals.REPLACEONMAKE = keep;
5116	5726	}
5117	5727
5118	5728	void ungroup()
..	..	@@ -5401,17 +6011,32 @@
5401	6011	cButton clearpanelButton;
5402	6012	cButton unselectButton;
5403	6013
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
5409		- cButton saveButton;
	6014	+ cButton restoreCameraButton;
	6015	+
5410	6016	cButton oneStepButton;
5411	6017
5412	6018	cButton groupButton;
5413	6019	cButton ungroupButton;
5414	6020	cButton compositeButton;
	6021	+ cButton switchButton;
	6022	+ cButton loopButton;
	6023	+ cButton textureButton;
	6024	+
	6025	+ cButton skybox1Button;
	6026	+ cButton skybox2Button;
	6027	+ cButton skybox3Button;
	6028	+ cButton skybox4Button;
	6029	+ cButton skybox5Button;
	6030	+ cButton skybox6Button;
	6031	+ cButton skybox7Button;
	6032	+
	6033	+ cButton skybox11Button;
	6034	+ cButton skybox12Button;
	6035	+ cButton skybox13Button;
	6036	+ cButton skybox14Button;
	6037	+ cButton skybox15Button;
	6038	+ cButton skybox16Button;
	6039	+ cButton skybox17Button;
5415	6040
5416	6041	cButton gridButton;
5417	6042	cButton boxButton;
..	..	@@ -5444,7 +6069,7 @@
5444	6069	//JTree jTree;
5445	6070	private MenuItem lookAtItem;
5446	6071	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	6072	+ private MenuItem switchViewItem;
5448	6073	private MenuItem cutItem;
5449	6074	private MenuItem undoItem;
5450	6075	private MenuItem redoItem;
..	..	@@ -5476,7 +6101,7 @@
5476	6101	private MenuItem pasteLinkItem;
5477	6102	private MenuItem pasteCloneItem;
5478	6103	private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	6104	+ private MenuItem deleteItem;
5480	6105	private MenuItem clearAllItem;
5481	6106	private MenuItem genUVItem;
5482	6107	private MenuItem genNormalsMESHItem;
..	..	@@ -5536,7 +6161,7 @@
5536	6161	private MenuItem frontItem;
5537	6162	private MenuItem cameraItem;
5538	6163	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	6164	+ private MenuItem switchItem;
5540	6165	private MenuItem physicsItem;
5541	6166	private MenuItem frameselectorItem;
5542	6167	private MenuItem scriptNodeItem;
..	..	@@ -5560,6 +6185,8 @@
5560	6185	private MenuItem attachBumpItem;
5561	6186	private MenuItem detachBumpItem;
5562	6187	private MenuItem pigmentBumpItem;
	6188	+ private MenuItem embedTexturesItem;
	6189	+ private MenuItem deEmbedTexturesItem;
5563	6190
5564	6191	private MenuItem particleItem;
5565	6192	private MenuItem ragdollItem;
..	..	@@ -5610,5 +6237,5 @@
5610	6237
5611	6238	Menu cameraMenu;
5612	6239	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	6240	+ MenuItem restoreCameraItem;
5614	6241	}