~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.versions == null)
	360	+ {
	361	+ copy.versions = new byte[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.versions == null)
	387	+ {
	388	+ copy.versions = new byte[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,79 @@
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);
606		-
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- saveButton.setToolTipText("Save changes");
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("New version");
609	936	saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
610	942
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Replace current");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
	956	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	957	+ redoButton.setToolTipText("Next version");
	958	+ redoButton.addActionListener(this);
	959	+ redoButton.setEnabled(false);
	960	+
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	962	liveCB.setToolTipText("Enable animation");
613	963	liveCB.addItemListener(this);
614	964
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	966	oneStepButton.setToolTipText("Animate one step forward");
617	967	oneStepButton.addActionListener(this);
618	968
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	970	fastCB.setToolTipText("Fast mode");
621	971	fastCB.addItemListener(this);
622	972
623		- oe.toolboxPanel.Return();
	973	+ //oe.toolboxPanel.Return();
624	974
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);
	975	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	976	+// trackCB.setToolTipText("Enable tracking");
	977	+// trackCB.addItemListener(this);
632	978
633	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	980	// screenfitpointButton.addActionListener(this);
..	..	@@ -638,35 +984,32 @@
638	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639	985	snapobjectButton.addActionListener(this);
640	986	snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ fourButton.addActionListener(this);
	990	+ fourButton.setToolTipText("Show control panel only");
641	991	}
642	992
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	993	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	994
649		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- twoButton.setToolTipText("Show center view only");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
651	997	twoButton.addActionListener(this);
652	998	this.fullscreenLayout = twoButton;
653	999
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");
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
662	1002	threeButton.addActionListener(this);
663		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- sevenButton.setToolTipText("3-column layout");
665		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
666	1009	//
667	1010
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
670	1013	rootButton.addActionListener(this);
671	1014
672	1015	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -675,30 +1018,30 @@
675	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
676	1019	//clearButton.addActionListener(this);
677	1020
	1021	+ cGridBag row1 = new cGridBag();
	1022	+
678	1023	// INSERT
679		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680	1025	gridButton.setToolTipText("Create grid");
681	1026	gridButton.addActionListener(this);
682	1027
683		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1029	boxButton.setToolTipText("Create box");
685	1030	boxButton.addActionListener(this);
686	1031
687		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1033	sphereButton.setToolTipText("Create sphere");
689	1034	sphereButton.addActionListener(this);
690	1035
691		- oe.toolboxPanel.Return();
692		-
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	1037	coneButton.setToolTipText("Create cone");
695	1038	coneButton.addActionListener(this);
696	1039
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	1041	torusButton.setToolTipText("Create torus");
699	1042	torusButton.addActionListener(this);
700	1043
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	1045	superButton.setToolTipText("Create superellipsoid");
703	1046	superButton.addActionListener(this);
704	1047
..	..	@@ -709,29 +1052,69 @@
709	1052	kleinButton.addActionListener(this);
710	1053	}
711	1054
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1056	particlesButton.setToolTipText("Create particle system");
714	1057	particlesButton.addActionListener(this);
715	1058
716		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ oe.toolboxPanel.add(row1);
	1060	+
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ groupButton.setToolTipText("Create group");
	1065	+ groupButton.addActionListener(this);
	1066	+
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ compositeButton.setToolTipText("Create composite");
	1069	+ compositeButton.addActionListener(this);
	1070	+
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
	1073	+ switchButton.addActionListener(this);
	1074	+
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ loopButton.setToolTipText("Create loop");
	1077	+ loopButton.addActionListener(this);
	1078	+
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ textureButton.setToolTipText("Create texture");
	1081	+ textureButton.addActionListener(this);
	1082	+
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	1084	overlayButton.setToolTipText("Create overlay");
718	1085	overlayButton.addActionListener(this);
719	1086
720		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1088	lightButton.setToolTipText("Create light");
722	1089	lightButton.addActionListener(this);
723	1090
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
	1106	+
724	1107	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	1108	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ editButton.setToolTipText("Pin selection controls");
727	1110	editButton.addActionListener(this);
728	1111
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
731	1114	uneditButton.addActionListener(this);
732	1115
733	1116	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	1117	+ allParamsButton.setToolTipText("Show all controle");
735	1118	allParamsButton.addActionListener(this);
736	1119
737	1120	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -742,8 +1125,13 @@
742	1125	unselectButton.setToolTipText("Unselect");
743	1126	unselectButton.addActionListener(this);
744	1127
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
	1131	+
745	1132	editCommandsPanel.preferredHeight = 1;
746	1133
	1134	+ SetPinStates(false);
747	1135	// oe.treePanel.add(commandsPanel);
748	1136	// oe.treePanel.Return();
749	1137
..	..	@@ -768,26 +1156,14 @@
768	1156	oe.treePanel.add(jSPPanel);
769	1157	oe.treePanel.Return();
770	1158
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	1159	oe.treePanel.add(copyOptionsPanel);
787	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
788	1164
789		-// mainPanel.setDividerLocation(0.5); //1.0);
790		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
791	1167
792	1168	//jList.addListSelectionListener(this);
793	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -795,7 +1171,7 @@
795	1171	//jTree.setEditable(true);
796	1172	oe.jTree.setDragEnabled(true);
797	1173	//jTree.setPreferredSize(new Dimension(10,10));
798		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
799	1175
800	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
801	1177
..	..	@@ -807,29 +1183,49 @@
807	1183	dgr.addDragGestureListener(this);
808	1184	}catch(Exception e) {}
809	1185	*/
810		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
811	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	1188	}
813	1189
814	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	1191	{
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
	1195	+
	1196	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1197	+ materialCB.setToolTipText("Copy material when dropped");
	1198	+ materialCB.addItemListener(this);
	1199	+
	1200	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1201	+ textureCB.setToolTipText("Copy texture when dropped");
	1202	+ textureCB.addItemListener(this);
	1203	+
	1204	+ panel.Return();
	1205	+
816	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	1207	boxCB.setToolTipText("Display bounding boxes");
818	1208	boxCB.addItemListener(this);
819	1209
820	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	1212	zoomBoxCB.addItemListener(this);
823	1213
824	1214	if (true) // Globals.ADVANCED)
825	1215	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
829	1223
830	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	1225	// localCB.addItemListener(this);
832	1226
	1227	+ panel.Return();
	1228	+
833	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	1230	crowdCB.setToolTipText("Used for crowds");
835	1231	crowdCB.addItemListener(this);
..	..	@@ -846,6 +1242,8 @@
846	1242	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	1243	// speakerMocapCB.addItemListener(this);
848	1244
	1245	+ panel.Return();
	1246	+
849	1247	if (false)
850	1248	{
851	1249	// handled in scripts
..	..	@@ -860,24 +1258,39 @@
860	1258	//constraints.gridy += 1;
861	1259	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	1260	smoothfocusCB.addItemListener(this);
	1261	+ panel.Return();
863	1262	}
864	1263
865	1264	//constraints.gridx += 1;
866	1265	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	1266	// debugCB.addItemListener(this);
868	1267
	1268	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1269	+ trackCB.setToolTipText("Enable tracking target");
	1270	+ trackCB.addItemListener(this);
	1271	+
869	1272	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	1273	+ oeilCB.setToolTipText("Move camera when tracking");
871	1274	oeilCB.addItemListener(this);
872	1275
873	1276	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	1277	+ shadowCB.setToolTipText("When live compute shadows");
875	1278	shadowCB.addItemListener(this);
876	1279
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	1280	+ panel.Return();
	1281	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1282	+ toggleTextureCB.setToolTipText("Load textures");
	1283	+ toggleTextureCB.addItemListener(this);
	1284	+
	1285	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1286	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1287	+ toggleSwitchCB.addItemListener(this);
	1288	+
	1289	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1290	+ autokeepCB.setToolTipText("On structure change");
	1291	+ autokeepCB.addItemListener(this);
880	1292
	1293	+ panel.Return();
881	1294	if (Globals.ADVANCED)
882	1295	{
883	1296	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +1301,15 @@
888	1301	}
889	1302
890	1303	cGridBag fill = new cGridBag();
891		-
892	1304	fill.preferredHeight = 200;
	1305	+ cGridBag fill2 = new cGridBag();
	1306	+ fill2.preferredHeight = 200;
	1307	+ cGridBag fill3 = new cGridBag();
	1308	+ fill3.preferredHeight = 200;
893	1309
894	1310	panel.add(fill);
	1311	+ panel.add(fill2);
	1312	+ panel.add(fill3);
895	1313
896	1314	}
897	1315
..	..	@@ -899,7 +1317,7 @@
899	1317	{
900	1318	cRadio radioButton = new cRadio(obj.name);
901	1319
902		- // Patch to avoid bug with transparency.
	1320	+ // June 2019. Patch to avoid bug with transparency.
903	1321	radioButton.hadMaterial = obj.material != null;
904	1322	if (!radioButton.hadMaterial)
905	1323	{
..	..	@@ -907,7 +1325,7 @@
907	1325	}
908	1326
909	1327	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1328	+ radioButton.layout = sixButton; // sevenButton;
911	1329	radioButton.SetCamera(cameraView.renderCamera, false);
912	1330	radioButton.addActionListener(this);
913	1331	radioPanel.add(radioButton);
..	..	@@ -936,7 +1354,9 @@
936	1354	cCheckBox slowCB;
937	1355	cCheckBox boxCB;
938	1356	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1357	+ cCheckBox freezeCB;
	1358	+ //cToggleButton trackCB;
	1359	+ cCheckBox trackCB;
940	1360	cCheckBox smoothfocusCB;
941	1361	// JCheckBox speakerMocapCB;
942	1362	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1365,7 @@
945	1365
946	1366	cCheckBox oeilCB;
947	1367	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1368	+ cCheckBox autokeepCB;
949	1369	cCheckBox lookAtCB;
950	1370
951	1371	// static int COLOR = 1;
..	..	@@ -1053,9 +1473,13 @@
1053	1473	{
1054	1474	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1475	}
1056		- else if(e.getSource() == autosaveCB)
	1476	+ else if(e.getSource() == freezeCB)
1057	1477	{
1058		- Globals.SAVEONMAKE ^= true;
	1478	+ Globals.FREEZEONMOVE ^= true;
	1479	+ }
	1480	+ else if(e.getSource() == autokeepCB)
	1481	+ {
	1482	+ Globals.REPLACEONMAKE ^= true;
1059	1483	}
1060	1484	else if(e.getSource() == lookAtCB)
1061	1485	{
..	..	@@ -1137,8 +1561,6 @@
1137	1561	}
1138	1562	}
1139	1563
1140		- String string = (String) object;
1141		-
1142	1564	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1565	// if( object instanceof java.io.File[])
1144	1566	// {
..	..	@@ -1146,6 +1568,8 @@
1146	1568	// objEditor.DropFile((java.io.File[]) object, true);
1147	1569	// return;
1148	1570	// }
	1571	+
	1572	+ String string = object.toString();
1149	1573
1150	1574	// File path for Mac and Windows
1151	1575	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1615,23 @@
1191	1615
1192	1616	assert target == objEditor.jTree;
1193	1617	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1618	+ Object3D destinationLeaf;
1194	1619	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1620	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1621	} catch (Exception e) {
1197	1622	System.out.println("destinationPath : " + destinationPath);
1198	1623	return;
1199	1624	}
1200	1625
	1626	+ for (int i=group.selection.size(); --i>=0;)
	1627	+ {
	1628	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1629	+
	1630	+ // Cannot move into itself
	1631	+ if (child == destinationLeaf)
	1632	+ return;
	1633	+ }
	1634	+
1201	1635	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1636	// {
1203	1637	loadClipboard(true);
..	..	@@ -1312,22 +1746,30 @@
1312	1746	{
1313	1747	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1748	//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);
	1749	+// gridItem = menu.add(new MenuItem("Grid"));
	1750	+// gridItem.addActionListener(this);
	1751	+// rectoidItem = menu.add(new MenuItem("Box"));
	1752	+// rectoidItem.addActionListener(this);
	1753	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1754	+// ellipsoidItem.addActionListener(this);
	1755	+// coneItem = menu.add(new MenuItem("Cone"));
	1756	+// coneItem.addActionListener(this);
	1757	+// torusItem = menu.add(new MenuItem("Torus"));
	1758	+// torusItem.addActionListener(this);
	1759	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1760	+// superItem.addActionListener(this);
	1761	+
	1762	+ cameraItem = menu.add(new MenuItem("Camera"));
	1763	+ cameraItem.addActionListener(this);
	1764	+
	1765	+ if (!Globals.ADVANCED)
	1766	+ {
1327	1767	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1768	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1769	+ }
	1770	+
	1771	+// particleItem = menu.add(new MenuItem("Particle system"));
	1772	+// particleItem.addActionListener(this);
1331	1773	if (Globals.ADVANCED)
1332	1774	{
1333	1775	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1795,15 @@
1353	1795	}
1354	1796	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1797	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);
	1798	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1799	+// overlayItem.addActionListener(this);
	1800	+// lightItem = menu.add(new MenuItem("Light"));
	1801	+// lightItem.addActionListener(this);
1360	1802	menu.add("-");
1361	1803	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1804	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1805	+// loopItem = menu.add(new MenuItem("Loop"));
	1806	+// loopItem.addActionListener(this);
1365	1807	doubleItem = menu.add(new MenuItem("Fork"));
1366	1808	doubleItem.addActionListener(this);
1367	1809	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1819,9 @@
1377	1819	animationItem.addItemListener(this);
1378	1820	animationItem.setState(Globals.ANIMATION);
1379	1821
	1822	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1823	+ archiveItem.addActionListener(this);
	1824	+
1380	1825	menu.add("-");
1381	1826	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1827	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +1834,8 @@
1389	1834	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	1835	reduce34MorphItem.addActionListener(this);
1391	1836	menu.add("-");
	1837	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1838	+ memoryItem.addActionListener(this);
1392	1839	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	1840	computeAOItem.addActionListener(this);
1394	1841
..	..	@@ -1397,8 +1844,6 @@
1397	1844	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	1845	mirrorItem.addActionListener(this);
1399	1846	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	1847	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	1848	analyzeItem.addActionListener(this);
1404	1849	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +1991,30 @@
1546	1991
1547	1992	makeSomething(shadow);
1548	1993	}
	1994	+
	1995	+ private void ClearUnpinned()
	1996	+ {
	1997	+ //for (Object3D obj : listUI)
	1998	+ for (int i=listUI.size(); --i>=0;)
	1999	+ {
	2000	+ Object3D obj = listUI.elementAt(i);
	2001	+ if (!obj.pinned)
	2002	+ {
	2003	+ obj.CloseUI();
	2004	+ listUI.remove(i);
	2005	+ }
	2006	+ }
	2007	+ }
	2008	+
	2009	+ private void EditElement(Object3D elem, boolean newWindow)
	2010	+ {
	2011	+ // if (!(elem instanceof Composite))
	2012	+ // newWindow = false;
	2013	+ listUI.add(elem);
	2014	+ elem.openEditWindow(this, newWindow); //, false);
	2015	+ System.out.println("edit : " + elem);
	2016	+ elem.editWindow.refreshContents(true); // ? new
	2017	+ }
1549	2018
1550	2019	/**
1551	2020	* applyExample
..	..	@@ -1790,7 +2259,7 @@
1790	2259	{
1791	2260	ScreenFit();
1792	2261	} else
1793		- if (source == switchItem)
	2262	+ if (source == switchViewItem)
1794	2263	{
1795	2264	cVector v1 = new cVector();
1796	2265	cVector v2 = new cVector();
..	..	@@ -1974,6 +2443,23 @@
1974	2443	{
1975	2444	makeSomething(new Light());
1976	2445	} else
	2446	+// if (source == skybox1Button \|\|
	2447	+// source == skybox2Button \|\|
	2448	+// source == skybox3Button \|\|
	2449	+// source == skybox4Button \|\|
	2450	+// source == skybox5Button \|\|
	2451	+// source == skybox6Button \|\|
	2452	+// source == skybox7Button \|\|
	2453	+// source == skybox11Button \|\|
	2454	+// source == skybox12Button \|\|
	2455	+// source == skybox13Button \|\|
	2456	+// source == skybox14Button \|\|
	2457	+// source == skybox15Button \|\|
	2458	+// source == skybox16Button \|\|
	2459	+// source == skybox17Button)
	2460	+// {
	2461	+// ChangeSkybox(source);
	2462	+// } else
1977	2463	if (source == csgItem)
1978	2464	{
1979	2465	group(new CSG());
..	..	@@ -2020,30 +2506,30 @@
2020	2506
2021	2507	group(g);
2022	2508	} else
2023		- if (source == loopItem)
	2509	+ if (source == loopItem \|\| source == loopButton)
2024	2510	{
2025	2511	Composite csg = new GroupLeaf();
2026	2512	csg.count = 5;
2027	2513	group(csg);
2028		- Composite child = new cGroup();
	2514	+ Composite child = new cGroup("Branch");
2029	2515	csg.addChild(child);
2030	2516	child.addChild(csg);
2031	2517	} else
2032	2518	if (source == doubleItem)
2033	2519	{
2034		- Composite csg = new GroupLeaf();
	2520	+ Composite csg = new GroupLeaf("Fork");
2035	2521	csg.count = 5;
2036	2522	group(csg);
2037		- Composite child = new cGroup();
	2523	+ Composite child = new cGroup("Branch A");
2038	2524	csg.addChild(child);
2039	2525	child.addChild(csg);
2040		- child = new cGroup();
	2526	+ child = new cGroup("Branch B");
2041	2527	csg.addChild(child);
2042	2528	child.addChild(csg);
2043	2529	} else
2044	2530	if (source == tripleItem)
2045	2531	{
2046		- Composite csg = new GroupLeaf();
	2532	+ Composite csg = new GroupLeaf("Trident");
2047	2533	csg.count = 4;
2048	2534	group(csg);
2049	2535	Composite child = new cGroup();
..	..	@@ -2059,7 +2545,7 @@
2059	2545	if (source == computeAOItem)
2060	2546	{
2061	2547	Globals.drawMode = CameraPane.OCCLUSION;
2062		- Globals.theRenderer.repaint();
	2548	+ cameraView.repaint();
2063	2549	} else
2064	2550	if (source == recompileItem)
2065	2551	{
..	..	@@ -2107,15 +2593,31 @@
2107	2593	} else
2108	2594	if (source == undoButton)
2109	2595	{
	2596	+ // Go to previous version
	2597	+ //if (!Undo())
	2598	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2110	2599	Undo();
	2600	+ } else
	2601	+ if (source == restoreButton)
	2602	+ {
	2603	+ // Restore current version
	2604	+ Restore();
	2605	+ } else
	2606	+ if (source == replaceButton)
	2607	+ {
	2608	+ // Overwrite current version
	2609	+ Replace();
2111	2610	} else
2112	2611	if (source == redoButton)
2113	2612	{
	2613	+ // Go to next version
2114	2614	Redo();
2115	2615	} else
2116	2616	if (source == saveButton)
2117	2617	{
2118		- Save();
	2618	+ // Save a new version
	2619	+ if (!Save(true))
	2620	+ java.awt.Toolkit.getDefaultToolkit().beep();
2119	2621	} else
2120	2622	if (source == oneStepButton)
2121	2623	{
..	..	@@ -2124,17 +2626,14 @@
2124	2626	} else
2125	2627	if (source == screenfitButton)
2126	2628	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2629	ScreenFit();
2129	2630	} else
2130	2631	if (source == screenfitpointButton)
2131	2632	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2633	ScreenFitPoint();
2134	2634	} else
2135	2635	if (source == snapobjectButton)
2136	2636	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2637	SnapObject();
2139	2638	} else
2140	2639	// if (event.getSource() == recompileButton)
..	..	@@ -2498,7 +2997,7 @@
2498	2997	{
2499	2998	StepAll();
2500	2999	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3000	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	3001	{
2503	3002	//int indices[] = jList.getSelectedIndices();
2504	3003	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +3009,9 @@
2510	3009	{
2511	3010	ClearSelection(true);
2512	3011	} else
2513		- if (source == grabItem)
	3012	+ if (source == grabItem \|\| source == groupButton)
2514	3013	{
2515		- group(new cGroup(), true);
	3014	+ group(new cGroup(), false); // true);
2516	3015	} else
2517	3016	if (source == hideItem)
2518	3017	{
..	..	@@ -2530,11 +3029,11 @@
2530	3029	{
2531	3030	makeSomething(new Camera());
2532	3031	} else
2533		- if (source == compositeItem)
	3032	+ if (source == compositeItem \|\| source == compositeButton)
2534	3033	{
2535	3034	group(new Composite());
2536	3035	} else
2537		- if (source == randomItem)
	3036	+ if (source == switchItem \|\| source == switchButton)
2538	3037	{
2539	3038	RandomNode random = new RandomNode();
2540	3039	group(random);
..	..	@@ -2636,7 +3135,7 @@
2636	3135	{
2637	3136	group(new cLinker());
2638	3137	} else
2639		- if (source == textureItem)
	3138	+ if (source == textureItem \|\| source == textureButton)
2640	3139	{
2641	3140	group(new TextureNode());
2642	3141	} else
..	..	@@ -2658,15 +3157,28 @@
2658	3157	} else
2659	3158	if (source == ungroupItem \|\| source == ungroupButton)
2660	3159	{
2661		- //ungroup();
	3160	+ boolean hasRoot = false;
	3161	+
2662	3162	for (int i=0; i<group.selection.size(); i++)
2663	3163	{
2664		- Ungroup(group.selection.get(i));
	3164	+ if (group.selection.get(i) == group)
	3165	+ {
	3166	+ hasRoot = true;
	3167	+ break;
	3168	+ }
2665	3169	}
2666	3170
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	3171	+ if (!hasRoot)
	3172	+ {
	3173	+ for (int i=0; i<group.selection.size(); i++)
	3174	+ {
	3175	+ Ungroup(group.selection.get(i));
	3176	+ }
	3177	+
	3178	+ ClearSelection(false);
	3179	+
	3180	+ refreshContents();
	3181	+ }
2670	3182	} else
2671	3183	if (source == genUVItem)
2672	3184	{
..	..	@@ -2967,7 +3479,7 @@
2967	3479	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3480	{
2969	3481	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3482	+ obj.ResetBumpTexture();
2971	3483	}
2972	3484
2973	3485	refreshContents();
..	..	@@ -2981,6 +3493,31 @@
2981	3493	obj.SetBumpTexture(obj.GetPigmentTexture());
2982	3494	}
2983	3495
	3496	+ refreshContents();
	3497	+ } else
	3498	+ if (source == embedTexturesItem)
	3499	+ {
	3500	+ Object3D obj;
	3501	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3502	+ {
	3503	+ obj = (Object3D)e.nextElement();
	3504	+ obj.EmbedTextures(true);
	3505	+ }
	3506	+
	3507	+ refreshContents();
	3508	+ } else
	3509	+ if (source == deEmbedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(false);
	3516	+ }
	3517	+
	3518	+ CameraPane.texturepigment.clear();
	3519	+ CameraPane.texturebump.clear();
	3520	+
2984	3521	refreshContents();
2985	3522	} else
2986	3523	if (source == flashSelectionButton)
..	..	@@ -3084,8 +3621,8 @@
3084	3621	// centralPanel.setVisible(true);
3085	3622	// XYZPanel.setVisible(true);
3086	3623	bigThree.ClearUI();
	3624	+ bigThree.add(scenePanel);
3087	3625	bigThree.add(centralPanel);
3088		- bigThree.add(XYZPanel);
3089	3626	bigThree.FlushUI();
3090	3627
3091	3628	cameraView.requestFocusInWindow();
..	..	@@ -3165,8 +3702,8 @@
3165	3702	// centralPanel.setVisible(true);
3166	3703	// XYZPanel.setVisible(false);
3167	3704	bigThree.ClearUI();
3168		- bigThree.add(scenePanel);
3169	3705	bigThree.add(centralPanel);
	3706	+ bigThree.add(scenePanel);
3170	3707	bigThree.FlushUI();
3171	3708
3172	3709	cameraView.requestFocusInWindow();
..	..	@@ -3258,6 +3795,12 @@
3258	3795	} else
3259	3796	if (source == editItem \|\| source == editButton)
3260	3797	{
	3798	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3799	+ {
	3800	+ Object3D child = (Object3D)e.nextElement();
	3801	+ child.pinned = true;
	3802	+ }
	3803	+
3261	3804	EditSelection(false);
3262	3805	} else
3263	3806	if (source == uneditButton)
..	..	@@ -3267,6 +3810,7 @@
3267	3810	Object3D child = (Object3D)e.nextElement();
3268	3811	if(child.editWindow != null)
3269	3812	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3813	+ child.pinned = false;
3270	3814	child.CloseUI();
3271	3815	listUI.remove(child);
3272	3816
..	..	@@ -3283,6 +3827,7 @@
3283	3827	//copy.ClearUI();
3284	3828	for (Object3D obj : listUI)
3285	3829	{
	3830	+ obj.pinned = false;
3286	3831	obj.CloseUI();
3287	3832	}
3288	3833	listUI.clear();
..	..	@@ -3292,7 +3837,7 @@
3292	3837	{
3293	3838	assert(copy == group);
3294	3839
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3840	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3841
3297	3842	for (Object3D obj : listUI)
3298	3843	{
..	..	@@ -3341,6 +3886,9 @@
3341	3886	}
3342	3887
3343	3888	copy = group;
	3889	+
	3890	+ SetUndoStates();
	3891	+
3344	3892	//Globals.theRenderer.object = group;
3345	3893	if(!useclient)
3346	3894	{
..	..	@@ -3367,6 +3915,13 @@
3367	3915	currentLayout = sevenButton;
3368	3916	*/
3369	3917	radio.layout.doClick();
	3918	+
	3919	+ ClearUnpinned();
	3920	+ //Grafreed.Assert(group != null);
	3921	+ //Grafreed.Assert(group.selection != null);
	3922	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3923	+ if (group.selection == null \|\| group.selection.size() == 1)
	3924	+ EditSelection(false);
3370	3925	keepparent = group.parent;
3371	3926	// PARENT = NULL or not???
3372	3927	//group.parent = null; // ROOT
..	..	@@ -3380,7 +3935,7 @@
3380	3935	cameraView.ProtectCamera();
3381	3936	cameraView.repaint();
3382	3937	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3938	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3939	{
3385	3940	cameraView.RevertCamera();
3386	3941	cameraView.repaint();
..	..	@@ -3959,7 +4514,7 @@
3959	4514
3960	4515	try
3961	4516	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4517	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3963	4518	}
3964	4519	catch (Exception e)
3965	4520	{
..	..	@@ -4434,12 +4989,14 @@
4434	4989	// }
4435	4990	// }
4436	4991
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4992	void EditSelection(boolean newWindow)
4442	4993	{
	4994	+ if (group.selection == null)
	4995	+ {
	4996	+ EditElement(group, newWindow); // ? new
	4997	+ return;
	4998	+ }
	4999	+
4443	5000	// aConstraints.gridy = 0;
4444	5001	for (int i=0; i<group.selection.size(); i++)
4445	5002	{
..	..	@@ -4450,12 +5007,7 @@
4450	5007	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	5008	if(elem != group \|\| !newWindow)
4452	5009	{
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
	5010	+ EditElement(elem, newWindow); // ? new
4459	5011	}
4460	5012	}
4461	5013	}
..	..	@@ -4530,7 +5082,8 @@
4530	5082	//new Exception().printStackTrace();
4531	5083
4532	5084	freezemodel = true;
4533		-
	5085	+ ClearUnpinned();
	5086	+
4534	5087	/**/
4535	5088	//switch (event.id)
4536	5089	{
..	..	@@ -4563,7 +5116,7 @@
4563	5116	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	5117	// a camera
4565	5118	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5119	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	5120	{
4568	5121	CameraPane.camerachangeframe = 0; // don't refuse it
4569	5122	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +5125,13 @@
4572	5125	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	5126	}
4574	5127
	5128	+ if (tps != null && tps.length == 1)
	5129	+ {
	5130	+ EditSelection(false);
	5131	+ }
	5132	+
	5133	+ SetPinStates(tps != null && tps.length > 0);
	5134	+
4575	5135	refreshContents();
4576	5136	//return true;
4577	5137	}
..	..	@@ -4581,9 +5141,18 @@
4581	5141	freezemodel = false;
4582	5142	}
4583	5143
	5144	+ void SetPinStates(boolean enabled)
	5145	+ {
	5146	+ editButton.setEnabled(enabled);
	5147	+ uneditButton.setEnabled(enabled);
	5148	+ unselectButton.setEnabled(enabled);
	5149	+ flashSelectionButton.setEnabled(enabled);
	5150	+ }
	5151	+
4584	5152	void refreshContents(boolean cp)
4585	5153	{
4586		- if (!Globals.MOUSEDRAGGED)
	5154	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5155	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	5156	{
4588	5157	objEditor.ClearInfo(); // .GetMaterial());
4589	5158
..	..	@@ -4682,8 +5251,8 @@
4682	5251
4683	5252	if (cut)
4684	5253	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	5254	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5255	+// Save();
4687	5256	//int indices[] = jList.getSelectedIndices();
4688	5257	//for (int i = indices.length - 1; i >= 0; i--)
4689	5258	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5355,10 @@
4786	5355
4787	5356	void paste(boolean expand)
4788	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4789	5362	// if (GrafreeD.clipboard == null)
4790	5363	// return;
4791	5364	boolean first = true;
..	..	@@ -4845,6 +5418,7 @@
4845	5418	Grafreed.clipboard.get(0).parent = keepparent;
4846	5419	}
4847	5420
	5421	+ Globals.REPLACEONMAKE = keep;
4848	5422	ResetModel();
4849	5423	refreshContents();
4850	5424	}
..	..	@@ -4980,6 +5554,10 @@
4980	5554
4981	5555	void group(Object3D csg, boolean grab)
4982	5556	{
	5557	+ if (Globals.REPLACEONMAKE)
	5558	+ Save();
	5559	+ boolean keep = Globals.REPLACEONMAKE;
	5560	+ Globals.REPLACEONMAKE = false;
4983	5561	if (//false) // why??
4984	5562	!group.selection.isEmpty())
4985	5563	{
..	..	@@ -5093,10 +5671,15 @@
5093	5671	//node.add(csg);
5094	5672	//makeSomething(node);
5095	5673	makeSomething(csg);
	5674	+ Globals.REPLACEONMAKE = keep;
5096	5675	}
5097	5676
5098	5677	void Ungroup(Object3D g)
5099	5678	{
	5679	+ if (Globals.REPLACEONMAKE)
	5680	+ Save();
	5681	+ boolean keep = Globals.REPLACEONMAKE;
	5682	+ Globals.REPLACEONMAKE = false;
5100	5683	if (g instanceof HiddenObject)
5101	5684	{
5102	5685	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5696,7 @@
5113	5696	objEditor.makeSomething(g.get(i), false);
5114	5697	}
5115	5698	}
	5699	+ Globals.REPLACEONMAKE = keep;
5116	5700	}
5117	5701
5118	5702	void ungroup()
..	..	@@ -5401,17 +5985,33 @@
5401	5985	cButton clearpanelButton;
5402	5986	cButton unselectButton;
5403	5987
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
	5988	+ cButton restoreCameraButton;
	5989	+
5409	5990	cButton saveButton;
5410	5991	cButton oneStepButton;
5411	5992
5412	5993	cButton groupButton;
5413	5994	cButton ungroupButton;
5414	5995	cButton compositeButton;
	5996	+ cButton switchButton;
	5997	+ cButton loopButton;
	5998	+ cButton textureButton;
	5999	+
	6000	+ cButton skybox1Button;
	6001	+ cButton skybox2Button;
	6002	+ cButton skybox3Button;
	6003	+ cButton skybox4Button;
	6004	+ cButton skybox5Button;
	6005	+ cButton skybox6Button;
	6006	+ cButton skybox7Button;
	6007	+
	6008	+ cButton skybox11Button;
	6009	+ cButton skybox12Button;
	6010	+ cButton skybox13Button;
	6011	+ cButton skybox14Button;
	6012	+ cButton skybox15Button;
	6013	+ cButton skybox16Button;
	6014	+ cButton skybox17Button;
5415	6015
5416	6016	cButton gridButton;
5417	6017	cButton boxButton;
..	..	@@ -5444,7 +6044,7 @@
5444	6044	//JTree jTree;
5445	6045	private MenuItem lookAtItem;
5446	6046	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	6047	+ private MenuItem switchViewItem;
5448	6048	private MenuItem cutItem;
5449	6049	private MenuItem undoItem;
5450	6050	private MenuItem redoItem;
..	..	@@ -5476,7 +6076,7 @@
5476	6076	private MenuItem pasteLinkItem;
5477	6077	private MenuItem pasteCloneItem;
5478	6078	private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	6079	+ private MenuItem deleteItem;
5480	6080	private MenuItem clearAllItem;
5481	6081	private MenuItem genUVItem;
5482	6082	private MenuItem genNormalsMESHItem;
..	..	@@ -5536,7 +6136,7 @@
5536	6136	private MenuItem frontItem;
5537	6137	private MenuItem cameraItem;
5538	6138	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	6139	+ private MenuItem switchItem;
5540	6140	private MenuItem physicsItem;
5541	6141	private MenuItem frameselectorItem;
5542	6142	private MenuItem scriptNodeItem;
..	..	@@ -5560,6 +6160,8 @@
5560	6160	private MenuItem attachBumpItem;
5561	6161	private MenuItem detachBumpItem;
5562	6162	private MenuItem pigmentBumpItem;
	6163	+ private MenuItem embedTexturesItem;
	6164	+ private MenuItem deEmbedTexturesItem;
5563	6165
5564	6166	private MenuItem particleItem;
5565	6167	private MenuItem ragdollItem;
..	..	@@ -5610,5 +6212,5 @@
5610	6212
5611	6213	Menu cameraMenu;
5612	6214	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	6215	+ MenuItem restoreCameraItem;
5614	6216	}