~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,314 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,6 +369,12 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
63	378	if(ui)
64	379	SetupUI(objEditor);
65	380	}
..	..	@@ -80,10 +395,22 @@
80	395	SetupViews(objEditor);
81	396
82	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
83	406	}
84	407
85	408	void CloneSelection(boolean supports)
86	409	{
	410	+ if (Globals.REPLACEONMAKE)
	411	+ Save();
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
87	414	// Object3D keep = GrafreeD.clipboard;
88	415	//Object3D obj;
89	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +421,7 @@
94	421
95	422	makeSomething(clone, i==group.selection.size()-1);
96	423	}
	424	+ Globals.REPLACEONMAKE = keep;
97	425	}
98	426
99	427	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +517,8 @@
189	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	518	// pasteExpandItem.addActionListener(this);
191	519	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
194	522
195	523	if (Globals.ADVANCED)
196	524	{
..	..	@@ -204,23 +532,23 @@
204	532	//zBufferItem.addActionListener(this);
205	533	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	534	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	535	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	536	+ restoreCameraItem.addActionListener(this);
209	537
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- cameraMenu.add("-");
	538	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	539	+// toggleFullScreenItem.addItemListener(this);
	540	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	541	+// cameraMenu.add("-");
	542	+//
	543	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	544	+// toggleTextureItem.addItemListener(this);
	545	+// toggleTextureItem.setState(CameraPane.textureon);
	546	+//
	547	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	548	+// toggleSwitchItem.addItemListener(this);
	549	+// toggleSwitchItem.setState(CameraPane.SWITCH);
214	550
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"));
	551	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	552	toggleHandleItem.addItemListener(this);
225	553	toggleHandleItem.setState(CameraPane.HANDLES);
226	554
..	..	@@ -275,7 +603,7 @@
275	603	{
276	604	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	605	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	606	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	607	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	608	oe.cameraMenu.add("-");
281	609	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -283,7 +611,7 @@
283	611	editLeafItem.addActionListener(this);
284	612	lookAtItem.addActionListener(this);
285	613	//lookFromItem.addActinoListener(this);
286		- //switchItem.addActionListener(this);
	614	+ //switchViewItem.addActionListener(this);
287	615	}
288	616
289	617	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -328,14 +656,14 @@
328	656	}
329	657
330	658	oe.menuBar.add(menu = new Menu("Group"));
331		- grabItem = menu.add(new MenuItem("Grab"));
332		- grabItem.addActionListener(this);
	659	+// grabItem = menu.add(new MenuItem("Grab"));
	660	+// grabItem.addActionListener(this);
333	661	backItem = menu.add(new MenuItem("Back"));
334	662	backItem.addActionListener(this);
335	663	frontItem = menu.add(new MenuItem("Front"));
336	664	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	665	+// compositeItem = menu.add(new MenuItem("Composite"));
	666	+// compositeItem.addActionListener(this);
339	667
340	668	if (Globals.ADVANCED)
341	669	{
..	..	@@ -345,10 +673,10 @@
345	673	ungroupItem = menu.add(new MenuItem("Ungroup"));
346	674	ungroupItem.addActionListener(this);
347	675
348		- menu.add("-");
349		-
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	676	+// menu.add("-");
	677	+//
	678	+// switchItem = menu.add(new MenuItem("Switch node"));
	679	+// switchItem.addActionListener(this);
352	680	if (Globals.ADVANCED)
353	681	{
354	682	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +693,11 @@
365	693	frameselectorItem.addActionListener(this);
366	694	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	695	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	696	}
371	697
372	698	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	699	+// textureItem = menu.add(new MenuItem("Texture"));
	700	+// textureItem.addActionListener(this);
375	701	billboardItem = menu.add(new MenuItem("Billboard"));
376	702	billboardItem.addActionListener(this);
377	703	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -382,13 +708,14 @@
382	708	shadowYItem.addActionListener(this);
383	709	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	710	shadowZItem.addActionListener(this);
	711	+ attributeItem = menu.add(new MenuItem("Attribute"));
	712	+ attributeItem.addActionListener(this);
	713	+
385	714	if (Globals.ADVANCED)
386	715	{
387	716	menu.add("-");
388	717	linkerItem = menu.add(new MenuItem("Linker"));
389	718	linkerItem.addActionListener(this);
390		- attributeItem = menu.add(new MenuItem("Attribute"));
391		- attributeItem.addActionListener(this);
392	719	templateItem = menu.add(new MenuItem("Template"));
393	720	templateItem.addActionListener(this);
394	721	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -417,7 +744,7 @@
417	744	genNormalsMESHItem.addActionListener(this);
418	745	if (Globals.ADVANCED)
419	746	{
420		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
421	748	genNormalsMINEItem.addActionListener(this);
422	749	}
423	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -510,10 +837,15 @@
510	837	attachBumpItem.addActionListener(this);
511	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
512	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
513	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
514	842	detachPigmentItem.addActionListener(this);
515	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
516	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
517	849	menu.add("-");
518	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
519	851	sortbysizeItem.addActionListener(this);
..	..	@@ -540,6 +872,7 @@
540	872	buildToolsMenu(menu);
541	873	}
542	874
	875	+
543	876	void SetupUI2(ObjEditor oe)
544	877	{
545	878	// June 2019
..	..	@@ -582,53 +915,83 @@
582	915	oe.radioPanel.add(dummyButton);
583	916	oe.buttonGroup.add(dummyButton);
584	917	*/
	918	+ cGridBag copyOptionsPanel = new cGridBag();
	919	+
	920	+ copyOptionsPanel.preferredHeight = 2;
	921	+
585	922	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	923
587	924	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	925	//minButton.setToolTipText("Minimize window");
589	926	//minButton.addActionListener(this);
590	927
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ maxButton.setToolTipText("Maximize window");
	932	+ maxButton.addActionListener(this);
	933	+ }
594	934
595	935	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	936	fullButton.setToolTipText("Full-screen window");
597	937	fullButton.addActionListener(this);
598	938
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
	939	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	940	+ screenfitButton.setToolTipText("Screen fit");
	941	+ screenfitButton.addActionListener(this);
	942	+
	943	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	944	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	945	+ restoreCameraButton.addActionListener(this);
602	946
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604		- redoButton.setToolTipText("Redo changes");
605		- redoButton.addActionListener(this);
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
606	959
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- saveButton.setToolTipText("Save changes");
609		- saveButton.addActionListener(this);
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
610	965
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
	970	+
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	979	liveCB.setToolTipText("Enable animation");
613	980	liveCB.addItemListener(this);
614	981
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	983	oneStepButton.setToolTipText("Animate one step forward");
617	984	oneStepButton.addActionListener(this);
618	985
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	987	fastCB.setToolTipText("Fast mode");
621	988	fastCB.addItemListener(this);
622	989
623		- oe.toolboxPanel.Return();
	990	+ //oe.toolboxPanel.Return();
624	991
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);
	992	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	993	+// trackCB.setToolTipText("Enable tracking");
	994	+// trackCB.addItemListener(this);
632	995
633	996	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	997	// screenfitpointButton.addActionListener(this);
..	..	@@ -638,35 +1001,32 @@
638	1001	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639	1002	snapobjectButton.addActionListener(this);
640	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
641	1008	}
642	1009
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	1010	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	1011
649		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- twoButton.setToolTipText("Show center view only");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
651	1014	twoButton.addActionListener(this);
652	1015	this.fullscreenLayout = twoButton;
653	1016
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");
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
662	1019	threeButton.addActionListener(this);
663		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- sevenButton.setToolTipText("3-column layout");
665		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
666	1026	//
667	1027
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
670	1030	rootButton.addActionListener(this);
671	1031
672	1032	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -675,30 +1035,30 @@
675	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
676	1036	//clearButton.addActionListener(this);
677	1037
	1038	+ cGridBag row1 = new cGridBag();
	1039	+
678	1040	// INSERT
679		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680	1042	gridButton.setToolTipText("Create grid");
681	1043	gridButton.addActionListener(this);
682	1044
683		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1046	boxButton.setToolTipText("Create box");
685	1047	boxButton.addActionListener(this);
686	1048
687		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1050	sphereButton.setToolTipText("Create sphere");
689	1051	sphereButton.addActionListener(this);
690	1052
691		- oe.toolboxPanel.Return();
692		-
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	1054	coneButton.setToolTipText("Create cone");
695	1055	coneButton.addActionListener(this);
696	1056
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	1058	torusButton.setToolTipText("Create torus");
699	1059	torusButton.addActionListener(this);
700	1060
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	1062	superButton.setToolTipText("Create superellipsoid");
703	1063	superButton.addActionListener(this);
704	1064
..	..	@@ -709,41 +1069,86 @@
709	1069	kleinButton.addActionListener(this);
710	1070	}
711	1071
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1073	particlesButton.setToolTipText("Create particle system");
714	1074	particlesButton.addActionListener(this);
715	1075
716		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ oe.toolboxPanel.add(row1);
	1077	+
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ groupButton.setToolTipText("Create group");
	1082	+ groupButton.addActionListener(this);
	1083	+
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ compositeButton.setToolTipText("Create composite");
	1086	+ compositeButton.addActionListener(this);
	1087	+
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ switchButton.setToolTipText("Create item switcher");
	1090	+ switchButton.addActionListener(this);
	1091	+
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ loopButton.setToolTipText("Create loop");
	1094	+ loopButton.addActionListener(this);
	1095	+
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ textureButton.setToolTipText("Create texture");
	1098	+ textureButton.addActionListener(this);
	1099	+
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	1101	overlayButton.setToolTipText("Create overlay");
718	1102	overlayButton.addActionListener(this);
719	1103
720		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1105	lightButton.setToolTipText("Create light");
722	1106	lightButton.addActionListener(this);
723	1107
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.skyboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
	1123	+
724	1124	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	1125	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ editButton.setToolTipText("Pin selection controls");
727	1127	editButton.addActionListener(this);
728	1128
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	1129	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
731	1131	uneditButton.addActionListener(this);
732	1132
733	1133	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	1134	+ allParamsButton.setToolTipText("Show all controle");
735	1135	allParamsButton.addActionListener(this);
736	1136
737		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1138	clearPanelButton.setToolTipText("Clear edit panel");
739	1139	clearPanelButton.addActionListener(this);
740	1140
741		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742		- unselectButton.setToolTipText("Unselect");
743		- unselectButton.addActionListener(this);
	1141	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ //unselectButton.setToolTipText("Unselect");
	1143	+ //unselectButton.addActionListener(this);
744	1144
	1145	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ flashSelectionButton.setToolTipText("Highlight selection");
	1147	+ flashSelectionButton.addActionListener(this);
	1148	+
745	1149	editCommandsPanel.preferredHeight = 1;
746	1150
	1151	+ SetPinStates(false);
747	1152	// oe.treePanel.add(commandsPanel);
748	1153	// oe.treePanel.Return();
749	1154
..	..	@@ -768,26 +1173,14 @@
768	1173	oe.treePanel.add(jSPPanel);
769	1174	oe.treePanel.Return();
770	1175
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	1176	oe.treePanel.add(copyOptionsPanel);
787	1177	oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
788	1181
789		-// mainPanel.setDividerLocation(0.5); //1.0);
790		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
791	1184
792	1185	//jList.addListSelectionListener(this);
793	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -795,7 +1188,7 @@
795	1188	//jTree.setEditable(true);
796	1189	oe.jTree.setDragEnabled(true);
797	1190	//jTree.setPreferredSize(new Dimension(10,10));
798		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
799	1192
800	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
801	1194
..	..	@@ -807,29 +1200,49 @@
807	1200	dgr.addDragGestureListener(this);
808	1201	}catch(Exception e) {}
809	1202	*/
810		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
811	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	1205	}
813	1206
814	1207	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	1208	{
	1209	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1210	+ colorCB.setToolTipText("Copy color when dropped");
	1211	+ colorCB.addItemListener(this);
	1212	+
	1213	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1214	+ materialCB.setToolTipText("Copy material when dropped");
	1215	+ materialCB.addItemListener(this);
	1216	+
	1217	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1218	+ textureCB.setToolTipText("Copy texture when dropped");
	1219	+ textureCB.addItemListener(this);
	1220	+
	1221	+ panel.Return();
	1222	+
816	1223	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	1224	boxCB.setToolTipText("Display bounding boxes");
818	1225	boxCB.addItemListener(this);
819	1226
820	1227	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1228	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	1229	zoomBoxCB.addItemListener(this);
823	1230
824	1231	if (true) // Globals.ADVANCED)
825	1232	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	1233	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1234	+// supportCB.setToolTipText("Enable rigging");
	1235	+// supportCB.addItemListener(this);
	1236	+
	1237	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1238	+ freezeCB.setToolTipText("Fast moving camera");
	1239	+ freezeCB.addItemListener(this);
829	1240
830	1241	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	1242	// localCB.addItemListener(this);
832	1243
	1244	+ panel.Return();
	1245	+
833	1246	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	1247	crowdCB.setToolTipText("Used for crowds");
835	1248	crowdCB.addItemListener(this);
..	..	@@ -838,14 +1251,19 @@
838	1251	smoothCB.setToolTipText("Snapping delay");
839	1252	smoothCB.addItemListener(this);
840	1253
841		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
842		- slowCB.setToolTipText("Smooth interpolation");
843		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
844	1260
845	1261	// constraints.gridy += 1;
846	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	1263	// speakerMocapCB.addItemListener(this);
848	1264
	1265	+ panel.Return();
	1266	+
849	1267	if (false)
850	1268	{
851	1269	// handled in scripts
..	..	@@ -860,24 +1278,39 @@
860	1278	//constraints.gridy += 1;
861	1279	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	1280	smoothfocusCB.addItemListener(this);
	1281	+ panel.Return();
863	1282	}
864	1283
865	1284	//constraints.gridx += 1;
866	1285	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	1286	// debugCB.addItemListener(this);
868	1287
	1288	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1289	+ trackCB.setToolTipText("Enable tracking target");
	1290	+ trackCB.addItemListener(this);
	1291	+
869	1292	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	1293	+ oeilCB.setToolTipText("Move camera when tracking");
871	1294	oeilCB.addItemListener(this);
872	1295
873	1296	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	1297	+ shadowCB.setToolTipText("When live compute shadows");
875	1298	shadowCB.addItemListener(this);
876	1299
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	1300	+ panel.Return();
	1301	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1302	+ toggleTextureCB.setToolTipText("Load textures");
	1303	+ toggleTextureCB.addItemListener(this);
	1304	+
	1305	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1306	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1307	+ toggleSwitchCB.addItemListener(this);
	1308	+
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
880	1312
	1313	+ panel.Return();
881	1314	if (Globals.ADVANCED)
882	1315	{
883	1316	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +1321,15 @@
888	1321	}
889	1322
890	1323	cGridBag fill = new cGridBag();
891		-
892	1324	fill.preferredHeight = 200;
	1325	+ cGridBag fill2 = new cGridBag();
	1326	+ fill2.preferredHeight = 200;
	1327	+ cGridBag fill3 = new cGridBag();
	1328	+ fill3.preferredHeight = 200;
893	1329
894	1330	panel.add(fill);
	1331	+ panel.add(fill2);
	1332	+ panel.add(fill3);
895	1333
896	1334	}
897	1335
..	..	@@ -899,7 +1337,7 @@
899	1337	{
900	1338	cRadio radioButton = new cRadio(obj.name);
901	1339
902		- // Patch to avoid bug with transparency.
	1340	+ // June 2019. Patch to avoid bug with transparency.
903	1341	radioButton.hadMaterial = obj.material != null;
904	1342	if (!radioButton.hadMaterial)
905	1343	{
..	..	@@ -907,7 +1345,7 @@
907	1345	}
908	1346
909	1347	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
911	1349	radioButton.SetCamera(cameraView.renderCamera, false);
912	1350	radioButton.addActionListener(this);
913	1351	radioPanel.add(radioButton);
..	..	@@ -932,11 +1370,15 @@
932	1370	cCheckBox localCB;
933	1371	cCheckBox crowdCB;
934	1372	cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
935	1375	cToggleButton fastCB;
936	1376	cCheckBox slowCB;
937	1377	cCheckBox boxCB;
938	1378	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1379	+ cCheckBox freezeCB;
	1380	+ //cToggleButton trackCB;
	1381	+ cCheckBox trackCB;
940	1382	cCheckBox smoothfocusCB;
941	1383	// JCheckBox speakerMocapCB;
942	1384	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1387,7 @@
945	1387
946	1388	cCheckBox oeilCB;
947	1389	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1390	+ cCheckBox autokeepCB;
949	1391	cCheckBox lookAtCB;
950	1392
951	1393	// static int COLOR = 1;
..	..	@@ -1001,6 +1443,12 @@
1001	1443	cameraView.ToggleInertia();
1002	1444	cameraView.repaint();
1003	1445	}
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
	1451	+ }
1004	1452	else if(e.getSource() == localCB)
1005	1453	{
1006	1454	cameraView.ToggleLocal();
..	..	@@ -1053,9 +1501,13 @@
1053	1501	{
1054	1502	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1503	}
1056		- else if(e.getSource() == autosaveCB)
	1504	+ else if(e.getSource() == freezeCB)
1057	1505	{
1058		- Globals.SAVEONMAKE ^= true;
	1506	+ Globals.FREEZEONMOVE ^= true;
	1507	+ }
	1508	+ else if(e.getSource() == autokeepCB)
	1509	+ {
	1510	+ Globals.REPLACEONMAKE ^= true;
1059	1511	}
1060	1512	else if(e.getSource() == lookAtCB)
1061	1513	{
..	..	@@ -1137,8 +1589,6 @@
1137	1589	}
1138	1590	}
1139	1591
1140		- String string = (String) object;
1141		-
1142	1592	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1593	// if( object instanceof java.io.File[])
1144	1594	// {
..	..	@@ -1146,6 +1596,8 @@
1146	1596	// objEditor.DropFile((java.io.File[]) object, true);
1147	1597	// return;
1148	1598	// }
	1599	+
	1600	+ String string = object.toString();
1149	1601
1150	1602	// File path for Mac and Windows
1151	1603	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1643,23 @@
1191	1643
1192	1644	assert target == objEditor.jTree;
1193	1645	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1646	+ Object3D destinationLeaf;
1194	1647	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1648	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1649	} catch (Exception e) {
1197	1650	System.out.println("destinationPath : " + destinationPath);
1198	1651	return;
1199	1652	}
1200	1653
	1654	+ for (int i=group.selection.size(); --i>=0;)
	1655	+ {
	1656	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1657	+
	1658	+ // Cannot move into itself
	1659	+ if (child == destinationLeaf)
	1660	+ return;
	1661	+ }
	1662	+
1201	1663	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1664	// {
1203	1665	loadClipboard(true);
..	..	@@ -1312,22 +1774,30 @@
1312	1774	{
1313	1775	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1776	//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);
	1777	+// gridItem = menu.add(new MenuItem("Grid"));
	1778	+// gridItem.addActionListener(this);
	1779	+// rectoidItem = menu.add(new MenuItem("Box"));
	1780	+// rectoidItem.addActionListener(this);
	1781	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1782	+// ellipsoidItem.addActionListener(this);
	1783	+// coneItem = menu.add(new MenuItem("Cone"));
	1784	+// coneItem.addActionListener(this);
	1785	+// torusItem = menu.add(new MenuItem("Torus"));
	1786	+// torusItem.addActionListener(this);
	1787	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1788	+// superItem.addActionListener(this);
	1789	+
	1790	+ cameraItem = menu.add(new MenuItem("Camera"));
	1791	+ cameraItem.addActionListener(this);
	1792	+
	1793	+ if (!Globals.ADVANCED)
	1794	+ {
1327	1795	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1796	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1797	+ }
	1798	+
	1799	+// particleItem = menu.add(new MenuItem("Particle system"));
	1800	+// particleItem.addActionListener(this);
1331	1801	if (Globals.ADVANCED)
1332	1802	{
1333	1803	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1823,15 @@
1353	1823	}
1354	1824	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1825	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);
	1826	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1827	+// overlayItem.addActionListener(this);
	1828	+// lightItem = menu.add(new MenuItem("Light"));
	1829	+// lightItem.addActionListener(this);
1360	1830	menu.add("-");
1361	1831	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1832	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1833	+// loopItem = menu.add(new MenuItem("Loop"));
	1834	+// loopItem.addActionListener(this);
1365	1835	doubleItem = menu.add(new MenuItem("Fork"));
1366	1836	doubleItem.addActionListener(this);
1367	1837	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1847,9 @@
1377	1847	animationItem.addItemListener(this);
1378	1848	animationItem.setState(Globals.ANIMATION);
1379	1849
	1850	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1851	+ archiveItem.addActionListener(this);
	1852	+
1380	1853	menu.add("-");
1381	1854	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1855	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +1862,8 @@
1389	1862	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	1863	reduce34MorphItem.addActionListener(this);
1391	1864	menu.add("-");
	1865	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1866	+ memoryItem.addActionListener(this);
1392	1867	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	1868	computeAOItem.addActionListener(this);
1394	1869
..	..	@@ -1397,8 +1872,6 @@
1397	1872	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	1873	mirrorItem.addActionListener(this);
1399	1874	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	1875	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	1876	analyzeItem.addActionListener(this);
1404	1877	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +2019,30 @@
1546	2019
1547	2020	makeSomething(shadow);
1548	2021	}
	2022	+
	2023	+ private void ClearUnpinned()
	2024	+ {
	2025	+ //for (Object3D obj : listUI)
	2026	+ for (int i=listUI.size(); --i>=0;)
	2027	+ {
	2028	+ Object3D obj = listUI.elementAt(i);
	2029	+ if (!obj.pinned)
	2030	+ {
	2031	+ obj.CloseUI();
	2032	+ listUI.remove(i);
	2033	+ }
	2034	+ }
	2035	+ }
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1549	2046
1550	2047	/**
1551	2048	* applyExample
..	..	@@ -1790,7 +2287,7 @@
1790	2287	{
1791	2288	ScreenFit();
1792	2289	} else
1793		- if (source == switchItem)
	2290	+ if (source == switchViewItem)
1794	2291	{
1795	2292	cVector v1 = new cVector();
1796	2293	cVector v2 = new cVector();
..	..	@@ -1974,6 +2471,23 @@
1974	2471	{
1975	2472	makeSomething(new Light());
1976	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
1977	2491	if (source == csgItem)
1978	2492	{
1979	2493	group(new CSG());
..	..	@@ -2020,30 +2534,30 @@
2020	2534
2021	2535	group(g);
2022	2536	} else
2023		- if (source == loopItem)
	2537	+ if (source == loopItem \|\| source == loopButton)
2024	2538	{
2025	2539	Composite csg = new GroupLeaf();
2026	2540	csg.count = 5;
2027	2541	group(csg);
2028		- Composite child = new cGroup();
	2542	+ Composite child = new cGroup("Branch");
2029	2543	csg.addChild(child);
2030	2544	child.addChild(csg);
2031	2545	} else
2032	2546	if (source == doubleItem)
2033	2547	{
2034		- Composite csg = new GroupLeaf();
	2548	+ Composite csg = new GroupLeaf("Fork");
2035	2549	csg.count = 5;
2036	2550	group(csg);
2037		- Composite child = new cGroup();
	2551	+ Composite child = new cGroup("Branch A");
2038	2552	csg.addChild(child);
2039	2553	child.addChild(csg);
2040		- child = new cGroup();
	2554	+ child = new cGroup("Branch B");
2041	2555	csg.addChild(child);
2042	2556	child.addChild(csg);
2043	2557	} else
2044	2558	if (source == tripleItem)
2045	2559	{
2046		- Composite csg = new GroupLeaf();
	2560	+ Composite csg = new GroupLeaf("Trident");
2047	2561	csg.count = 4;
2048	2562	group(csg);
2049	2563	Composite child = new cGroup();
..	..	@@ -2059,7 +2573,7 @@
2059	2573	if (source == computeAOItem)
2060	2574	{
2061	2575	Globals.drawMode = CameraPane.OCCLUSION;
2062		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
2063	2577	} else
2064	2578	if (source == recompileItem)
2065	2579	{
..	..	@@ -2074,7 +2588,7 @@
2074	2588	if (source == invariantsItem)
2075	2589	{
2076	2590	System.out.println("Invariants:");
2077		- Grafreed.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
2078	2592	} else
2079	2593	if (source == memoryItem)
2080	2594	{
..	..	@@ -2105,17 +2619,40 @@
2105	2619	{
2106	2620	ToggleFullScreen();
2107	2621	} else
2108		- if (source == undoButton)
	2622	+ if (source == previousVersionButton)
2109	2623	{
2110		- Undo();
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
2111	2628	} else
2112		- if (source == redoButton)
	2629	+ if (source == restoreButton)
2113	2630	{
2114		- Redo();
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
2115	2634	} else
2116		- if (source == saveButton)
	2635	+ if (source == replaceButton)
2117	2636	{
2118		- Save();
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
	2649	+ if (!Save(true))
	2650	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
2119	2656	} else
2120	2657	if (source == oneStepButton)
2121	2658	{
..	..	@@ -2124,17 +2661,14 @@
2124	2661	} else
2125	2662	if (source == screenfitButton)
2126	2663	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2664	ScreenFit();
2129	2665	} else
2130	2666	if (source == screenfitpointButton)
2131	2667	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2668	ScreenFitPoint();
2134	2669	} else
2135	2670	if (source == snapobjectButton)
2136	2671	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2672	SnapObject();
2139	2673	} else
2140	2674	// if (event.getSource() == recompileButton)
..	..	@@ -2173,11 +2707,11 @@
2173	2707	} else
2174	2708	if (source == undoItem)
2175	2709	{
2176		- Undo();
	2710	+ PreviousVersion();
2177	2711	} else
2178	2712	if (source == redoItem)
2179	2713	{
2180		- Redo();
	2714	+ NextVersion();
2181	2715	} else
2182	2716	if (source == duplicateItem)
2183	2717	{
..	..	@@ -2498,7 +3032,7 @@
2498	3032	{
2499	3033	StepAll();
2500	3034	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	3036	{
2503	3037	//int indices[] = jList.getSelectedIndices();
2504	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +3044,9 @@
2510	3044	{
2511	3045	ClearSelection(true);
2512	3046	} else
2513		- if (source == grabItem)
	3047	+ if (source == grabItem \|\| source == groupButton)
2514	3048	{
2515		- group(new cGroup(), true);
	3049	+ group(new cGroup(), false); // true);
2516	3050	} else
2517	3051	if (source == hideItem)
2518	3052	{
..	..	@@ -2530,11 +3064,11 @@
2530	3064	{
2531	3065	makeSomething(new Camera());
2532	3066	} else
2533		- if (source == compositeItem)
	3067	+ if (source == compositeItem \|\| source == compositeButton)
2534	3068	{
2535	3069	group(new Composite());
2536	3070	} else
2537		- if (source == randomItem)
	3071	+ if (source == switchItem \|\| source == switchButton)
2538	3072	{
2539	3073	RandomNode random = new RandomNode();
2540	3074	group(random);
..	..	@@ -2636,7 +3170,7 @@
2636	3170	{
2637	3171	group(new cLinker());
2638	3172	} else
2639		- if (source == textureItem)
	3173	+ if (source == textureItem \|\| source == textureButton)
2640	3174	{
2641	3175	group(new TextureNode());
2642	3176	} else
..	..	@@ -2658,15 +3192,28 @@
2658	3192	} else
2659	3193	if (source == ungroupItem \|\| source == ungroupButton)
2660	3194	{
2661		- //ungroup();
	3195	+ boolean hasRoot = false;
	3196	+
2662	3197	for (int i=0; i<group.selection.size(); i++)
2663	3198	{
2664		- Ungroup(group.selection.get(i));
	3199	+ if (group.selection.get(i) == group)
	3200	+ {
	3201	+ hasRoot = true;
	3202	+ break;
	3203	+ }
2665	3204	}
2666	3205
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	3206	+ if (!hasRoot)
	3207	+ {
	3208	+ for (int i=0; i<group.selection.size(); i++)
	3209	+ {
	3210	+ Ungroup(group.selection.get(i));
	3211	+ }
	3212	+
	3213	+ ClearSelection(false);
	3214	+
	3215	+ refreshContents();
	3216	+ }
2670	3217	} else
2671	3218	if (source == genUVItem)
2672	3219	{
..	..	@@ -2967,7 +3514,7 @@
2967	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3515	{
2969	3516	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
2971	3518	}
2972	3519
2973	3520	refreshContents();
..	..	@@ -2981,6 +3528,31 @@
2981	3528	obj.SetBumpTexture(obj.GetPigmentTexture());
2982	3529	}
2983	3530
	3531	+ refreshContents();
	3532	+ } else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
2984	3556	refreshContents();
2985	3557	} else
2986	3558	if (source == flashSelectionButton)
..	..	@@ -3084,8 +3656,8 @@
3084	3656	// centralPanel.setVisible(true);
3085	3657	// XYZPanel.setVisible(true);
3086	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
3087	3660	bigThree.add(centralPanel);
3088		- bigThree.add(XYZPanel);
3089	3661	bigThree.FlushUI();
3090	3662
3091	3663	cameraView.requestFocusInWindow();
..	..	@@ -3165,8 +3737,8 @@
3165	3737	// centralPanel.setVisible(true);
3166	3738	// XYZPanel.setVisible(false);
3167	3739	bigThree.ClearUI();
3168		- bigThree.add(scenePanel);
3169	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
3170	3742	bigThree.FlushUI();
3171	3743
3172	3744	cameraView.requestFocusInWindow();
..	..	@@ -3258,6 +3830,12 @@
3258	3830	} else
3259	3831	if (source == editItem \|\| source == editButton)
3260	3832	{
	3833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3834	+ {
	3835	+ Object3D child = (Object3D)e.nextElement();
	3836	+ child.pinned = true;
	3837	+ }
	3838	+
3261	3839	EditSelection(false);
3262	3840	} else
3263	3841	if (source == uneditButton)
..	..	@@ -3266,9 +3844,10 @@
3266	3844	{
3267	3845	Object3D child = (Object3D)e.nextElement();
3268	3846	if(child.editWindow != null)
3269		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3847	+ child.pinned = false;
3270	3848	child.CloseUI();
3271	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3272	3851
3273	3852	//child.editWindow = null; // ???????????
3274	3853	}
..	..	@@ -3283,16 +3862,18 @@
3283	3862	//copy.ClearUI();
3284	3863	for (Object3D obj : listUI)
3285	3864	{
	3865	+ obj.pinned = false;
3286	3866	obj.CloseUI();
3287	3867	}
3288	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
3289	3870	refreshContents(true);
3290	3871	} else
3291	3872	if (source == allParamsButton)
3292	3873	{
3293	3874	assert(copy == group);
3294	3875
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3876	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3877
3297	3878	for (Object3D obj : listUI)
3298	3879	{
..	..	@@ -3341,6 +3922,9 @@
3341	3922	}
3342	3923
3343	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
3344	3928	//Globals.theRenderer.object = group;
3345	3929	if(!useclient)
3346	3930	{
..	..	@@ -3367,6 +3951,14 @@
3367	3951	currentLayout = sevenButton;
3368	3952	*/
3369	3953	radio.layout.doClick();
	3954	+
	3955	+ ClearUnpinned();
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
	3961	+ EditSelection(false);
3370	3962	keepparent = group.parent;
3371	3963	// PARENT = NULL or not???
3372	3964	//group.parent = null; // ROOT
..	..	@@ -3378,11 +3970,13 @@
3378	3970	} else if (event.getSource() == editCameraItem)
3379	3971	{
3380	3972	cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
3381	3974	cameraView.repaint();
3382	3975	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3976	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3977	{
3385	3978	cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
3386	3980	cameraView.repaint();
3387	3981	return;
3388	3982	// } else if (event.getSource() == textureButton)
..	..	@@ -3959,7 +4553,7 @@
3959	4553
3960	4554	try
3961	4555	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3963	4557	}
3964	4558	catch (Exception e)
3965	4559	{
..	..	@@ -4434,12 +5028,14 @@
4434	5028	// }
4435	5029	// }
4436	5030
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	5031	void EditSelection(boolean newWindow)
4442	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4443	5039	// aConstraints.gridy = 0;
4444	5040	for (int i=0; i<group.selection.size(); i++)
4445	5041	{
..	..	@@ -4450,12 +5046,7 @@
4450	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	5047	if(elem != group \|\| !newWindow)
4452	5048	{
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
	5049	+ EditElement(elem, newWindow); // ? new
4459	5050	}
4460	5051	}
4461	5052	}
..	..	@@ -4518,9 +5109,7 @@
4518	5109
4519	5110	freezemodel = false;
4520	5111	}
4521		-
4522		- boolean flashIt = true;
4523		-
	5112	+
4524	5113	public void valueChanged(TreeSelectionEvent e)
4525	5114	//public boolean handleEvent(Event event)
4526	5115	{
..	..	@@ -4530,7 +5119,8 @@
4530	5119	//new Exception().printStackTrace();
4531	5120
4532	5121	freezemodel = true;
4533		-
	5122	+ ClearUnpinned();
	5123	+
4534	5124	/**/
4535	5125	//switch (event.id)
4536	5126	{
..	..	@@ -4563,7 +5153,7 @@
4563	5153	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	5154	// a camera
4565	5155	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5156	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	5157	{
4568	5158	CameraPane.camerachangeframe = 0; // don't refuse it
4569	5159	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +5162,13 @@
4572	5162	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	5163	}
4574	5164
	5165	+ if (tps != null && tps.length == 1)
	5166	+ {
	5167	+ EditSelection(false);
	5168	+ }
	5169	+
	5170	+ SetPinStates(tps != null && tps.length > 0);
	5171	+
4575	5172	refreshContents();
4576	5173	//return true;
4577	5174	}
..	..	@@ -4581,9 +5178,20 @@
4581	5178	freezemodel = false;
4582	5179	}
4583	5180
	5181	+ void SetPinStates(boolean enabled)
	5182	+ {
	5183	+ editButton.setEnabled(enabled);
	5184	+ uneditButton.setEnabled(enabled);
	5185	+ //unselectButton.setEnabled(enabled);
	5186	+ flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5189	+ }
	5190	+
4584	5191	void refreshContents(boolean cp)
4585	5192	{
4586		- if (!Globals.MOUSEDRAGGED)
	5193	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5194	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	5195	{
4588	5196	objEditor.ClearInfo(); // .GetMaterial());
4589	5197
..	..	@@ -4682,8 +5290,8 @@
4682	5290
4683	5291	if (cut)
4684	5292	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	5293	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5294	+// Save();
4687	5295	//int indices[] = jList.getSelectedIndices();
4688	5296	//for (int i = indices.length - 1; i >= 0; i--)
4689	5297	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5394,10 @@
4786	5394
4787	5395	void paste(boolean expand)
4788	5396	{
	5397	+ if (Globals.REPLACEONMAKE)
	5398	+ Save();
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4789	5401	// if (GrafreeD.clipboard == null)
4790	5402	// return;
4791	5403	boolean first = true;
..	..	@@ -4845,6 +5457,7 @@
4845	5457	Grafreed.clipboard.get(0).parent = keepparent;
4846	5458	}
4847	5459
	5460	+ Globals.REPLACEONMAKE = keep;
4848	5461	ResetModel();
4849	5462	refreshContents();
4850	5463	}
..	..	@@ -4980,6 +5593,10 @@
4980	5593
4981	5594	void group(Object3D csg, boolean grab)
4982	5595	{
	5596	+ if (Globals.REPLACEONMAKE)
	5597	+ Save();
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
4983	5600	if (//false) // why??
4984	5601	!group.selection.isEmpty())
4985	5602	{
..	..	@@ -5093,10 +5710,15 @@
5093	5710	//node.add(csg);
5094	5711	//makeSomething(node);
5095	5712	makeSomething(csg);
	5713	+ Globals.REPLACEONMAKE = keep;
5096	5714	}
5097	5715
5098	5716	void Ungroup(Object3D g)
5099	5717	{
	5718	+ if (Globals.REPLACEONMAKE)
	5719	+ Save();
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
5100	5722	if (g instanceof HiddenObject)
5101	5723	{
5102	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5735,7 @@
5113	5735	objEditor.makeSomething(g.get(i), false);
5114	5736	}
5115	5737	}
	5738	+ Globals.REPLACEONMAKE = keep;
5116	5739	}
5117	5740
5118	5741	void ungroup()
..	..	@@ -5401,17 +6024,32 @@
5401	6024	cButton clearpanelButton;
5402	6025	cButton unselectButton;
5403	6026
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
5409		- cButton saveButton;
	6027	+ cButton restoreCameraButton;
	6028	+
5410	6029	cButton oneStepButton;
5411	6030
5412	6031	cButton groupButton;
5413	6032	cButton ungroupButton;
5414	6033	cButton compositeButton;
	6034	+ cButton switchButton;
	6035	+ cButton loopButton;
	6036	+ cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
5415	6053
5416	6054	cButton gridButton;
5417	6055	cButton boxButton;
..	..	@@ -5444,7 +6082,7 @@
5444	6082	//JTree jTree;
5445	6083	private MenuItem lookAtItem;
5446	6084	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	6085	+ private MenuItem switchViewItem;
5448	6086	private MenuItem cutItem;
5449	6087	private MenuItem undoItem;
5450	6088	private MenuItem redoItem;
..	..	@@ -5476,7 +6114,7 @@
5476	6114	private MenuItem pasteLinkItem;
5477	6115	private MenuItem pasteCloneItem;
5478	6116	private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5480	6118	private MenuItem clearAllItem;
5481	6119	private MenuItem genUVItem;
5482	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5536,7 +6174,7 @@
5536	6174	private MenuItem frontItem;
5537	6175	private MenuItem cameraItem;
5538	6176	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	6177	+ private MenuItem switchItem;
5540	6178	private MenuItem physicsItem;
5541	6179	private MenuItem frameselectorItem;
5542	6180	private MenuItem scriptNodeItem;
..	..	@@ -5560,6 +6198,8 @@
5560	6198	private MenuItem attachBumpItem;
5561	6199	private MenuItem detachBumpItem;
5562	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5563	6203
5564	6204	private MenuItem particleItem;
5565	6205	private MenuItem ragdollItem;
..	..	@@ -5610,5 +6250,5 @@
5610	6250
5611	6251	Menu cameraMenu;
5612	6252	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	6253	+ MenuItem restoreCameraItem;
5614	6254	}