~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,237 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
26	257	//ObjEditor objEditor;
27	258	public void closeUI2()
28	259	{
..	..	@@ -60,6 +291,12 @@
60	291	this.copy = this.group = group;
61	292	//selectees = this.group.selectees;
62	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
63	300	if(ui)
64	301	SetupUI(objEditor);
65	302	}
..	..	@@ -80,10 +317,22 @@
80	317	SetupViews(objEditor);
81	318
82	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
83	328	}
84	329
85	330	void CloneSelection(boolean supports)
86	331	{
	332	+ if (Globals.REPLACEONMAKE)
	333	+ Save();
	334	+ boolean keep = Globals.REPLACEONMAKE;
	335	+ Globals.REPLACEONMAKE = false;
87	336	// Object3D keep = GrafreeD.clipboard;
88	337	//Object3D obj;
89	338	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +343,7 @@
94	343
95	344	makeSomething(clone, i==group.selection.size()-1);
96	345	}
	346	+ Globals.REPLACEONMAKE = keep;
97	347	}
98	348
99	349	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +439,8 @@
189	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	440	// pasteExpandItem.addActionListener(this);
191	441	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
194	444
195	445	if (Globals.ADVANCED)
196	446	{
..	..	@@ -204,23 +454,23 @@
204	454	//zBufferItem.addActionListener(this);
205	455	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	456	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	457	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	458	+ restoreCameraItem.addActionListener(this);
209	459
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- cameraMenu.add("-");
	460	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	461	+// toggleFullScreenItem.addItemListener(this);
	462	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	463	+// cameraMenu.add("-");
	464	+//
	465	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	466	+// toggleTextureItem.addItemListener(this);
	467	+// toggleTextureItem.setState(CameraPane.textureon);
	468	+//
	469	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	470	+// toggleSwitchItem.addItemListener(this);
	471	+// toggleSwitchItem.setState(CameraPane.SWITCH);
214	472
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"));
	473	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	474	toggleHandleItem.addItemListener(this);
225	475	toggleHandleItem.setState(CameraPane.HANDLES);
226	476
..	..	@@ -275,7 +525,7 @@
275	525	{
276	526	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	527	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	528	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	529	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	530	oe.cameraMenu.add("-");
281	531	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -283,7 +533,7 @@
283	533	editLeafItem.addActionListener(this);
284	534	lookAtItem.addActionListener(this);
285	535	//lookFromItem.addActinoListener(this);
286		- //switchItem.addActionListener(this);
	536	+ //switchViewItem.addActionListener(this);
287	537	}
288	538
289	539	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -328,14 +578,14 @@
328	578	}
329	579
330	580	oe.menuBar.add(menu = new Menu("Group"));
331		- grabItem = menu.add(new MenuItem("Grab"));
332		- grabItem.addActionListener(this);
	581	+// grabItem = menu.add(new MenuItem("Grab"));
	582	+// grabItem.addActionListener(this);
333	583	backItem = menu.add(new MenuItem("Back"));
334	584	backItem.addActionListener(this);
335	585	frontItem = menu.add(new MenuItem("Front"));
336	586	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	587	+// compositeItem = menu.add(new MenuItem("Composite"));
	588	+// compositeItem.addActionListener(this);
339	589
340	590	if (Globals.ADVANCED)
341	591	{
..	..	@@ -345,10 +595,10 @@
345	595	ungroupItem = menu.add(new MenuItem("Ungroup"));
346	596	ungroupItem.addActionListener(this);
347	597
348		- menu.add("-");
349		-
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	598	+// menu.add("-");
	599	+//
	600	+// switchItem = menu.add(new MenuItem("Switch node"));
	601	+// switchItem.addActionListener(this);
352	602	if (Globals.ADVANCED)
353	603	{
354	604	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +615,11 @@
365	615	frameselectorItem.addActionListener(this);
366	616	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	617	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	618	}
371	619
372	620	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	621	+// textureItem = menu.add(new MenuItem("Texture"));
	622	+// textureItem.addActionListener(this);
375	623	billboardItem = menu.add(new MenuItem("Billboard"));
376	624	billboardItem.addActionListener(this);
377	625	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -382,13 +630,14 @@
382	630	shadowYItem.addActionListener(this);
383	631	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	632	shadowZItem.addActionListener(this);
	633	+ attributeItem = menu.add(new MenuItem("Attribute"));
	634	+ attributeItem.addActionListener(this);
	635	+
385	636	if (Globals.ADVANCED)
386	637	{
387	638	menu.add("-");
388	639	linkerItem = menu.add(new MenuItem("Linker"));
389	640	linkerItem.addActionListener(this);
390		- attributeItem = menu.add(new MenuItem("Attribute"));
391		- attributeItem.addActionListener(this);
392	641	templateItem = menu.add(new MenuItem("Template"));
393	642	templateItem.addActionListener(this);
394	643	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -417,7 +666,7 @@
417	666	genNormalsMESHItem.addActionListener(this);
418	667	if (Globals.ADVANCED)
419	668	{
420		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
421	670	genNormalsMINEItem.addActionListener(this);
422	671	}
423	672	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -510,10 +759,15 @@
510	759	attachBumpItem.addActionListener(this);
511	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
512	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
513	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
514	764	detachPigmentItem.addActionListener(this);
515	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
516	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
517	771	menu.add("-");
518	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
519	773	sortbysizeItem.addActionListener(this);
..	..	@@ -540,6 +794,7 @@
540	794	buildToolsMenu(menu);
541	795	}
542	796
	797	+
543	798	void SetupUI2(ObjEditor oe)
544	799	{
545	800	// June 2019
..	..	@@ -582,53 +837,79 @@
582	837	oe.radioPanel.add(dummyButton);
583	838	oe.buttonGroup.add(dummyButton);
584	839	*/
	840	+ cGridBag copyOptionsPanel = new cGridBag();
	841	+
	842	+ copyOptionsPanel.preferredHeight = 2;
	843	+
585	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	845
587	846	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	847	//minButton.setToolTipText("Minimize window");
589	848	//minButton.addActionListener(this);
590	849
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	850	+ if (Globals.ADVANCED)
	851	+ {
	852	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	853	+ maxButton.setToolTipText("Maximize window");
	854	+ maxButton.addActionListener(this);
	855	+ }
594	856
595	857	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	858	fullButton.setToolTipText("Full-screen window");
597	859	fullButton.addActionListener(this);
598	860
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
	861	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	862	+ screenfitButton.setToolTipText("Screen fit");
	863	+ screenfitButton.addActionListener(this);
	864	+
	865	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	866	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	867	+ restoreCameraButton.addActionListener(this);
602	868
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");
	869	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	870	+ saveButton.setToolTipText("New version");
609	871	saveButton.addActionListener(this);
	872	+
	873	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	874	+ undoButton.setToolTipText("Previous version");
	875	+ undoButton.addActionListener(this);
	876	+ undoButton.setEnabled(false);
610	877
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	878	+ cGridBag updown = new cGridBag().setVertical(true);
	879	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	880	+ restoreButton.setToolTipText("Restore current");
	881	+ restoreButton.addActionListener(this);
	882	+ restoreButton.setEnabled(false);
	883	+
	884	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	885	+ replaceButton.setToolTipText("Replace current");
	886	+ replaceButton.addActionListener(this);
	887	+ replaceButton.setEnabled(false);
	888	+
	889	+ copyOptionsPanel.add(updown);
	890	+
	891	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	892	+ redoButton.setToolTipText("Next version");
	893	+ redoButton.addActionListener(this);
	894	+ redoButton.setEnabled(false);
	895	+
	896	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	897	liveCB.setToolTipText("Enable animation");
613	898	liveCB.addItemListener(this);
614	899
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	900	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	901	oneStepButton.setToolTipText("Animate one step forward");
617	902	oneStepButton.addActionListener(this);
618	903
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	904	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	905	fastCB.setToolTipText("Fast mode");
621	906	fastCB.addItemListener(this);
622	907
623		- oe.toolboxPanel.Return();
	908	+ //oe.toolboxPanel.Return();
624	909
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);
	910	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	911	+// trackCB.setToolTipText("Enable tracking");
	912	+// trackCB.addItemListener(this);
632	913
633	914	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	915	// screenfitpointButton.addActionListener(this);
..	..	@@ -638,35 +919,32 @@
638	919	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639	920	snapobjectButton.addActionListener(this);
640	921	snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	924	+ fourButton.addActionListener(this);
	925	+ fourButton.setToolTipText("Show control panel only");
641	926	}
642	927
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	928	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	929
649		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- twoButton.setToolTipText("Show center view only");
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
651	932	twoButton.addActionListener(this);
652	933	this.fullscreenLayout = twoButton;
653	934
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");
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
662	937	threeButton.addActionListener(this);
663		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- sevenButton.setToolTipText("3-column layout");
665		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
666	944	//
667	945
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
670	948	rootButton.addActionListener(this);
671	949
672	950	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -675,30 +953,30 @@
675	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
676	954	//clearButton.addActionListener(this);
677	955
	956	+ cGridBag row1 = new cGridBag();
	957	+
678	958	// INSERT
679		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680	960	gridButton.setToolTipText("Create grid");
681	961	gridButton.addActionListener(this);
682	962
683		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	964	boxButton.setToolTipText("Create box");
685	965	boxButton.addActionListener(this);
686	966
687		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	968	sphereButton.setToolTipText("Create sphere");
689	969	sphereButton.addActionListener(this);
690	970
691		- oe.toolboxPanel.Return();
692		-
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	972	coneButton.setToolTipText("Create cone");
695	973	coneButton.addActionListener(this);
696	974
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	976	torusButton.setToolTipText("Create torus");
699	977	torusButton.addActionListener(this);
700	978
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	980	superButton.setToolTipText("Create superellipsoid");
703	981	superButton.addActionListener(this);
704	982
..	..	@@ -709,29 +987,68 @@
709	987	kleinButton.addActionListener(this);
710	988	}
711	989
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	991	particlesButton.setToolTipText("Create particle system");
714	992	particlesButton.addActionListener(this);
715	993
716		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	994	+ oe.toolboxPanel.add(row1);
	995	+
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ groupButton.setToolTipText("Create group");
	1000	+ groupButton.addActionListener(this);
	1001	+
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1003	+ compositeButton.setToolTipText("Create composite");
	1004	+ compositeButton.addActionListener(this);
	1005	+
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ switchButton.setToolTipText("Create item switcher");
	1008	+ switchButton.addActionListener(this);
	1009	+
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+ loopButton.setToolTipText("Create loop");
	1012	+ loopButton.addActionListener(this);
	1013	+
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ textureButton.setToolTipText("Create texture");
	1016	+ textureButton.addActionListener(this);
	1017	+
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	1019	overlayButton.setToolTipText("Create overlay");
718	1020	overlayButton.addActionListener(this);
719	1021
720		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1023	lightButton.setToolTipText("Create light");
722	1024	lightButton.addActionListener(this);
723	1025
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
	1040	+
724	1041	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	1042	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1043	+ editButton.setToolTipText("Pin selection controls");
727	1044	editButton.addActionListener(this);
728	1045
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	1046	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ uneditButton.setToolTipText("Remove selection controls");
731	1048	uneditButton.addActionListener(this);
732	1049
733	1050	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	1051	+ allParamsButton.setToolTipText("Show all controle");
735	1052	allParamsButton.addActionListener(this);
736	1053
737	1054	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -742,8 +1059,13 @@
742	1059	unselectButton.setToolTipText("Unselect");
743	1060	unselectButton.addActionListener(this);
744	1061
	1062	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ flashSelectionButton.setToolTipText("Highlight selection");
	1064	+ flashSelectionButton.addActionListener(this);
	1065	+
745	1066	editCommandsPanel.preferredHeight = 1;
746	1067
	1068	+ SetPinStates(false);
747	1069	// oe.treePanel.add(commandsPanel);
748	1070	// oe.treePanel.Return();
749	1071
..	..	@@ -768,26 +1090,14 @@
768	1090	oe.treePanel.add(jSPPanel);
769	1091	oe.treePanel.Return();
770	1092
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	1093	oe.treePanel.add(copyOptionsPanel);
787	1094	oe.treePanel.Return();
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1097	+ sliderPane.preferredHeight = 1;
788	1098
789		-// mainPanel.setDividerLocation(0.5); //1.0);
790		-// mainPanel.setResizeWeight(0.5);
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
791	1101
792	1102	//jList.addListSelectionListener(this);
793	1103	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -795,7 +1105,7 @@
795	1105	//jTree.setEditable(true);
796	1106	oe.jTree.setDragEnabled(true);
797	1107	//jTree.setPreferredSize(new Dimension(10,10));
798		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
799	1109
800	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
801	1111
..	..	@@ -807,29 +1117,49 @@
807	1117	dgr.addDragGestureListener(this);
808	1118	}catch(Exception e) {}
809	1119	*/
810		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
811	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	1122	}
813	1123
814	1124	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	1125	{
	1126	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1127	+ colorCB.setToolTipText("Copy color when dropped");
	1128	+ colorCB.addItemListener(this);
	1129	+
	1130	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1131	+ materialCB.setToolTipText("Copy material when dropped");
	1132	+ materialCB.addItemListener(this);
	1133	+
	1134	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1135	+ textureCB.setToolTipText("Copy texture when dropped");
	1136	+ textureCB.addItemListener(this);
	1137	+
	1138	+ panel.Return();
	1139	+
816	1140	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	1141	boxCB.setToolTipText("Display bounding boxes");
818	1142	boxCB.addItemListener(this);
819	1143
820	1144	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1145	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	1146	zoomBoxCB.addItemListener(this);
823	1147
824	1148	if (true) // Globals.ADVANCED)
825	1149	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	1150	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1151	+// supportCB.setToolTipText("Enable rigging");
	1152	+// supportCB.addItemListener(this);
	1153	+
	1154	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1155	+ freezeCB.setToolTipText("Fast moving camera");
	1156	+ freezeCB.addItemListener(this);
829	1157
830	1158	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	1159	// localCB.addItemListener(this);
832	1160
	1161	+ panel.Return();
	1162	+
833	1163	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	1164	crowdCB.setToolTipText("Used for crowds");
835	1165	crowdCB.addItemListener(this);
..	..	@@ -846,6 +1176,8 @@
846	1176	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	1177	// speakerMocapCB.addItemListener(this);
848	1178
	1179	+ panel.Return();
	1180	+
849	1181	if (false)
850	1182	{
851	1183	// handled in scripts
..	..	@@ -860,24 +1192,39 @@
860	1192	//constraints.gridy += 1;
861	1193	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	1194	smoothfocusCB.addItemListener(this);
	1195	+ panel.Return();
863	1196	}
864	1197
865	1198	//constraints.gridx += 1;
866	1199	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	1200	// debugCB.addItemListener(this);
868	1201
	1202	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1203	+ trackCB.setToolTipText("Enable tracking target");
	1204	+ trackCB.addItemListener(this);
	1205	+
869	1206	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	1207	+ oeilCB.setToolTipText("Move camera when tracking");
871	1208	oeilCB.addItemListener(this);
872	1209
873	1210	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	1211	+ shadowCB.setToolTipText("When live compute shadows");
875	1212	shadowCB.addItemListener(this);
876	1213
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	1214	+ panel.Return();
	1215	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1216	+ toggleTextureCB.setToolTipText("Load textures");
	1217	+ toggleTextureCB.addItemListener(this);
	1218	+
	1219	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1220	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1221	+ toggleSwitchCB.addItemListener(this);
	1222	+
	1223	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1224	+ autokeepCB.setToolTipText("On structure change");
	1225	+ autokeepCB.addItemListener(this);
880	1226
	1227	+ panel.Return();
881	1228	if (Globals.ADVANCED)
882	1229	{
883	1230	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +1235,15 @@
888	1235	}
889	1236
890	1237	cGridBag fill = new cGridBag();
891		-
892	1238	fill.preferredHeight = 200;
	1239	+ cGridBag fill2 = new cGridBag();
	1240	+ fill2.preferredHeight = 200;
	1241	+ cGridBag fill3 = new cGridBag();
	1242	+ fill3.preferredHeight = 200;
893	1243
894	1244	panel.add(fill);
	1245	+ panel.add(fill2);
	1246	+ panel.add(fill3);
895	1247
896	1248	}
897	1249
..	..	@@ -899,7 +1251,7 @@
899	1251	{
900	1252	cRadio radioButton = new cRadio(obj.name);
901	1253
902		- // Patch to avoid bug with transparency.
	1254	+ // June 2019. Patch to avoid bug with transparency.
903	1255	radioButton.hadMaterial = obj.material != null;
904	1256	if (!radioButton.hadMaterial)
905	1257	{
..	..	@@ -907,7 +1259,7 @@
907	1259	}
908	1260
909	1261	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
911	1263	radioButton.SetCamera(cameraView.renderCamera, false);
912	1264	radioButton.addActionListener(this);
913	1265	radioPanel.add(radioButton);
..	..	@@ -936,7 +1288,9 @@
936	1288	cCheckBox slowCB;
937	1289	cCheckBox boxCB;
938	1290	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1291	+ cCheckBox freezeCB;
	1292	+ //cToggleButton trackCB;
	1293	+ cCheckBox trackCB;
940	1294	cCheckBox smoothfocusCB;
941	1295	// JCheckBox speakerMocapCB;
942	1296	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1299,7 @@
945	1299
946	1300	cCheckBox oeilCB;
947	1301	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1302	+ cCheckBox autokeepCB;
949	1303	cCheckBox lookAtCB;
950	1304
951	1305	// static int COLOR = 1;
..	..	@@ -1053,9 +1407,13 @@
1053	1407	{
1054	1408	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1409	}
1056		- else if(e.getSource() == autosaveCB)
	1410	+ else if(e.getSource() == freezeCB)
1057	1411	{
1058		- Globals.SAVEONMAKE ^= true;
	1412	+ Globals.FREEZEONMOVE ^= true;
	1413	+ }
	1414	+ else if(e.getSource() == autokeepCB)
	1415	+ {
	1416	+ Globals.REPLACEONMAKE ^= true;
1059	1417	}
1060	1418	else if(e.getSource() == lookAtCB)
1061	1419	{
..	..	@@ -1137,8 +1495,6 @@
1137	1495	}
1138	1496	}
1139	1497
1140		- String string = (String) object;
1141		-
1142	1498	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1499	// if( object instanceof java.io.File[])
1144	1500	// {
..	..	@@ -1146,6 +1502,8 @@
1146	1502	// objEditor.DropFile((java.io.File[]) object, true);
1147	1503	// return;
1148	1504	// }
	1505	+
	1506	+ String string = object.toString();
1149	1507
1150	1508	// File path for Mac and Windows
1151	1509	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1549,23 @@
1191	1549
1192	1550	assert target == objEditor.jTree;
1193	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
1194	1553	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1555	} catch (Exception e) {
1197	1556	System.out.println("destinationPath : " + destinationPath);
1198	1557	return;
1199	1558	}
1200	1559
	1560	+ for (int i=group.selection.size(); --i>=0;)
	1561	+ {
	1562	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1563	+
	1564	+ // Cannot move into itself
	1565	+ if (child == destinationLeaf)
	1566	+ return;
	1567	+ }
	1568	+
1201	1569	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1570	// {
1203	1571	loadClipboard(true);
..	..	@@ -1312,22 +1680,30 @@
1312	1680	{
1313	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1682	//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);
	1683	+// gridItem = menu.add(new MenuItem("Grid"));
	1684	+// gridItem.addActionListener(this);
	1685	+// rectoidItem = menu.add(new MenuItem("Box"));
	1686	+// rectoidItem.addActionListener(this);
	1687	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1688	+// ellipsoidItem.addActionListener(this);
	1689	+// coneItem = menu.add(new MenuItem("Cone"));
	1690	+// coneItem.addActionListener(this);
	1691	+// torusItem = menu.add(new MenuItem("Torus"));
	1692	+// torusItem.addActionListener(this);
	1693	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1694	+// superItem.addActionListener(this);
	1695	+
	1696	+ cameraItem = menu.add(new MenuItem("Camera"));
	1697	+ cameraItem.addActionListener(this);
	1698	+
	1699	+ if (!Globals.ADVANCED)
	1700	+ {
1327	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1702	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
1331	1707	if (Globals.ADVANCED)
1332	1708	{
1333	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1729,15 @@
1353	1729	}
1354	1730	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1731	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);
	1732	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1733	+// overlayItem.addActionListener(this);
	1734	+// lightItem = menu.add(new MenuItem("Light"));
	1735	+// lightItem.addActionListener(this);
1360	1736	menu.add("-");
1361	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1738	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1365	1741	doubleItem = menu.add(new MenuItem("Fork"));
1366	1742	doubleItem.addActionListener(this);
1367	1743	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1753,9 @@
1377	1753	animationItem.addItemListener(this);
1378	1754	animationItem.setState(Globals.ANIMATION);
1379	1755
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
	1758	+
1380	1759	menu.add("-");
1381	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1761	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +1768,8 @@
1389	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	1769	reduce34MorphItem.addActionListener(this);
1391	1770	menu.add("-");
	1771	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1772	+ memoryItem.addActionListener(this);
1392	1773	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	1774	computeAOItem.addActionListener(this);
1394	1775
..	..	@@ -1397,8 +1778,6 @@
1397	1778	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	1779	mirrorItem.addActionListener(this);
1399	1780	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	1782	analyzeItem.addActionListener(this);
1404	1783	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +1925,30 @@
1546	1925
1547	1926	makeSomething(shadow);
1548	1927	}
	1928	+
	1929	+ private void ClearUnpinned()
	1930	+ {
	1931	+ //for (Object3D obj : listUI)
	1932	+ for (int i=listUI.size(); --i>=0;)
	1933	+ {
	1934	+ Object3D obj = listUI.elementAt(i);
	1935	+ if (!obj.pinned)
	1936	+ {
	1937	+ obj.CloseUI();
	1938	+ listUI.remove(i);
	1939	+ }
	1940	+ }
	1941	+ }
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1549	1952
1550	1953	/**
1551	1954	* applyExample
..	..	@@ -1790,7 +2193,7 @@
1790	2193	{
1791	2194	ScreenFit();
1792	2195	} else
1793		- if (source == switchItem)
	2196	+ if (source == switchViewItem)
1794	2197	{
1795	2198	cVector v1 = new cVector();
1796	2199	cVector v2 = new cVector();
..	..	@@ -1974,6 +2377,23 @@
1974	2377	{
1975	2378	makeSomething(new Light());
1976	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
1977	2397	if (source == csgItem)
1978	2398	{
1979	2399	group(new CSG());
..	..	@@ -2020,30 +2440,30 @@
2020	2440
2021	2441	group(g);
2022	2442	} else
2023		- if (source == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
2024	2444	{
2025	2445	Composite csg = new GroupLeaf();
2026	2446	csg.count = 5;
2027	2447	group(csg);
2028		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
2029	2449	csg.addChild(child);
2030	2450	child.addChild(csg);
2031	2451	} else
2032	2452	if (source == doubleItem)
2033	2453	{
2034		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
2035	2455	csg.count = 5;
2036	2456	group(csg);
2037		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
2038	2458	csg.addChild(child);
2039	2459	child.addChild(csg);
2040		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
2041	2461	csg.addChild(child);
2042	2462	child.addChild(csg);
2043	2463	} else
2044	2464	if (source == tripleItem)
2045	2465	{
2046		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
2047	2467	csg.count = 4;
2048	2468	group(csg);
2049	2469	Composite child = new cGroup();
..	..	@@ -2059,7 +2479,7 @@
2059	2479	if (source == computeAOItem)
2060	2480	{
2061	2481	Globals.drawMode = CameraPane.OCCLUSION;
2062		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
2063	2483	} else
2064	2484	if (source == recompileItem)
2065	2485	{
..	..	@@ -2107,15 +2527,31 @@
2107	2527	} else
2108	2528	if (source == undoButton)
2109	2529	{
	2530	+ // Go to previous version
	2531	+ //if (!Undo())
	2532	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2110	2533	Undo();
	2534	+ } else
	2535	+ if (source == restoreButton)
	2536	+ {
	2537	+ // Restore current version
	2538	+ Restore();
	2539	+ } else
	2540	+ if (source == replaceButton)
	2541	+ {
	2542	+ // Overwrite current version
	2543	+ Replace();
2111	2544	} else
2112	2545	if (source == redoButton)
2113	2546	{
	2547	+ // Go to next version
2114	2548	Redo();
2115	2549	} else
2116	2550	if (source == saveButton)
2117	2551	{
2118		- Save();
	2552	+ // Save a new version
	2553	+ if (!Save(true))
	2554	+ java.awt.Toolkit.getDefaultToolkit().beep();
2119	2555	} else
2120	2556	if (source == oneStepButton)
2121	2557	{
..	..	@@ -2124,17 +2560,14 @@
2124	2560	} else
2125	2561	if (source == screenfitButton)
2126	2562	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2563	ScreenFit();
2129	2564	} else
2130	2565	if (source == screenfitpointButton)
2131	2566	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2567	ScreenFitPoint();
2134	2568	} else
2135	2569	if (source == snapobjectButton)
2136	2570	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2571	SnapObject();
2139	2572	} else
2140	2573	// if (event.getSource() == recompileButton)
..	..	@@ -2498,7 +2931,7 @@
2498	2931	{
2499	2932	StepAll();
2500	2933	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	2935	{
2503	2936	//int indices[] = jList.getSelectedIndices();
2504	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +2943,9 @@
2510	2943	{
2511	2944	ClearSelection(true);
2512	2945	} else
2513		- if (source == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2514	2947	{
2515		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2516	2949	} else
2517	2950	if (source == hideItem)
2518	2951	{
..	..	@@ -2530,11 +2963,11 @@
2530	2963	{
2531	2964	makeSomething(new Camera());
2532	2965	} else
2533		- if (source == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2534	2967	{
2535	2968	group(new Composite());
2536	2969	} else
2537		- if (source == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2538	2971	{
2539	2972	RandomNode random = new RandomNode();
2540	2973	group(random);
..	..	@@ -2636,7 +3069,7 @@
2636	3069	{
2637	3070	group(new cLinker());
2638	3071	} else
2639		- if (source == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2640	3073	{
2641	3074	group(new TextureNode());
2642	3075	} else
..	..	@@ -2658,15 +3091,28 @@
2658	3091	} else
2659	3092	if (source == ungroupItem \|\| source == ungroupButton)
2660	3093	{
2661		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2662	3096	for (int i=0; i<group.selection.size(); i++)
2663	3097	{
2664		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2665	3103	}
2666	3104
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	3105	+ if (!hasRoot)
	3106	+ {
	3107	+ for (int i=0; i<group.selection.size(); i++)
	3108	+ {
	3109	+ Ungroup(group.selection.get(i));
	3110	+ }
	3111	+
	3112	+ ClearSelection(false);
	3113	+
	3114	+ refreshContents();
	3115	+ }
2670	3116	} else
2671	3117	if (source == genUVItem)
2672	3118	{
..	..	@@ -2967,7 +3413,7 @@
2967	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3414	{
2969	3415	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2971	3417	}
2972	3418
2973	3419	refreshContents();
..	..	@@ -2981,6 +3427,31 @@
2981	3427	obj.SetBumpTexture(obj.GetPigmentTexture());
2982	3428	}
2983	3429
	3430	+ refreshContents();
	3431	+ } else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
2984	3455	refreshContents();
2985	3456	} else
2986	3457	if (source == flashSelectionButton)
..	..	@@ -3084,8 +3555,8 @@
3084	3555	// centralPanel.setVisible(true);
3085	3556	// XYZPanel.setVisible(true);
3086	3557	bigThree.ClearUI();
	3558	+ bigThree.add(scenePanel);
3087	3559	bigThree.add(centralPanel);
3088		- bigThree.add(XYZPanel);
3089	3560	bigThree.FlushUI();
3090	3561
3091	3562	cameraView.requestFocusInWindow();
..	..	@@ -3165,8 +3636,8 @@
3165	3636	// centralPanel.setVisible(true);
3166	3637	// XYZPanel.setVisible(false);
3167	3638	bigThree.ClearUI();
3168		- bigThree.add(scenePanel);
3169	3639	bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
3170	3641	bigThree.FlushUI();
3171	3642
3172	3643	cameraView.requestFocusInWindow();
..	..	@@ -3258,6 +3729,12 @@
3258	3729	} else
3259	3730	if (source == editItem \|\| source == editButton)
3260	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
3261	3738	EditSelection(false);
3262	3739	} else
3263	3740	if (source == uneditButton)
..	..	@@ -3267,6 +3744,7 @@
3267	3744	Object3D child = (Object3D)e.nextElement();
3268	3745	if(child.editWindow != null)
3269	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
3270	3748	child.CloseUI();
3271	3749	listUI.remove(child);
3272	3750
..	..	@@ -3283,6 +3761,7 @@
3283	3761	//copy.ClearUI();
3284	3762	for (Object3D obj : listUI)
3285	3763	{
	3764	+ obj.pinned = false;
3286	3765	obj.CloseUI();
3287	3766	}
3288	3767	listUI.clear();
..	..	@@ -3292,7 +3771,7 @@
3292	3771	{
3293	3772	assert(copy == group);
3294	3773
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3775
3297	3776	for (Object3D obj : listUI)
3298	3777	{
..	..	@@ -3341,6 +3820,9 @@
3341	3820	}
3342	3821
3343	3822	copy = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
3344	3826	//Globals.theRenderer.object = group;
3345	3827	if(!useclient)
3346	3828	{
..	..	@@ -3367,6 +3849,13 @@
3367	3849	currentLayout = sevenButton;
3368	3850	*/
3369	3851	radio.layout.doClick();
	3852	+
	3853	+ ClearUnpinned();
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
	3858	+ EditSelection(false);
3370	3859	keepparent = group.parent;
3371	3860	// PARENT = NULL or not???
3372	3861	//group.parent = null; // ROOT
..	..	@@ -3380,7 +3869,7 @@
3380	3869	cameraView.ProtectCamera();
3381	3870	cameraView.repaint();
3382	3871	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3872	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3873	{
3385	3874	cameraView.RevertCamera();
3386	3875	cameraView.repaint();
..	..	@@ -3959,7 +4448,7 @@
3959	4448
3960	4449	try
3961	4450	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3963	4452	}
3964	4453	catch (Exception e)
3965	4454	{
..	..	@@ -4434,12 +4923,14 @@
4434	4923	// }
4435	4924	// }
4436	4925
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4926	void EditSelection(boolean newWindow)
4442	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
4443	4934	// aConstraints.gridy = 0;
4444	4935	for (int i=0; i<group.selection.size(); i++)
4445	4936	{
..	..	@@ -4450,12 +4941,7 @@
4450	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	4942	if(elem != group \|\| !newWindow)
4452	4943	{
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
	4944	+ EditElement(elem, newWindow); // ? new
4459	4945	}
4460	4946	}
4461	4947	}
..	..	@@ -4530,7 +5016,8 @@
4530	5016	//new Exception().printStackTrace();
4531	5017
4532	5018	freezemodel = true;
4533		-
	5019	+ ClearUnpinned();
	5020	+
4534	5021	/**/
4535	5022	//switch (event.id)
4536	5023	{
..	..	@@ -4563,7 +5050,7 @@
4563	5050	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	5051	// a camera
4565	5052	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5053	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	5054	{
4568	5055	CameraPane.camerachangeframe = 0; // don't refuse it
4569	5056	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +5059,13 @@
4572	5059	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	5060	}
4574	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4575	5069	refreshContents();
4576	5070	//return true;
4577	5071	}
..	..	@@ -4581,9 +5075,18 @@
4581	5075	freezemodel = false;
4582	5076	}
4583	5077
	5078	+ void SetPinStates(boolean enabled)
	5079	+ {
	5080	+ editButton.setEnabled(enabled);
	5081	+ uneditButton.setEnabled(enabled);
	5082	+ unselectButton.setEnabled(enabled);
	5083	+ flashSelectionButton.setEnabled(enabled);
	5084	+ }
	5085	+
4584	5086	void refreshContents(boolean cp)
4585	5087	{
4586		- if (!Globals.MOUSEDRAGGED)
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5089	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	5090	{
4588	5091	objEditor.ClearInfo(); // .GetMaterial());
4589	5092
..	..	@@ -4682,8 +5185,8 @@
4682	5185
4683	5186	if (cut)
4684	5187	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4687	5190	//int indices[] = jList.getSelectedIndices();
4688	5191	//for (int i = indices.length - 1; i >= 0; i--)
4689	5192	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5289,10 @@
4786	5289
4787	5290	void paste(boolean expand)
4788	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4789	5296	// if (GrafreeD.clipboard == null)
4790	5297	// return;
4791	5298	boolean first = true;
..	..	@@ -4845,6 +5352,7 @@
4845	5352	Grafreed.clipboard.get(0).parent = keepparent;
4846	5353	}
4847	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4848	5356	ResetModel();
4849	5357	refreshContents();
4850	5358	}
..	..	@@ -4980,6 +5488,10 @@
4980	5488
4981	5489	void group(Object3D csg, boolean grab)
4982	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4983	5495	if (//false) // why??
4984	5496	!group.selection.isEmpty())
4985	5497	{
..	..	@@ -5093,10 +5605,15 @@
5093	5605	//node.add(csg);
5094	5606	//makeSomething(node);
5095	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
5096	5609	}
5097	5610
5098	5611	void Ungroup(Object3D g)
5099	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
5100	5617	if (g instanceof HiddenObject)
5101	5618	{
5102	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5630,7 @@
5113	5630	objEditor.makeSomething(g.get(i), false);
5114	5631	}
5115	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
5116	5634	}
5117	5635
5118	5636	void ungroup()
..	..	@@ -5401,17 +5919,33 @@
5401	5919	cButton clearpanelButton;
5402	5920	cButton unselectButton;
5403	5921
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
	5922	+ cButton restoreCameraButton;
	5923	+
5409	5924	cButton saveButton;
5410	5925	cButton oneStepButton;
5411	5926
5412	5927	cButton groupButton;
5413	5928	cButton ungroupButton;
5414	5929	cButton compositeButton;
	5930	+ cButton switchButton;
	5931	+ cButton loopButton;
	5932	+ cButton textureButton;
	5933	+
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
5415	5949
5416	5950	cButton gridButton;
5417	5951	cButton boxButton;
..	..	@@ -5444,7 +5978,7 @@
5444	5978	//JTree jTree;
5445	5979	private MenuItem lookAtItem;
5446	5980	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
5448	5982	private MenuItem cutItem;
5449	5983	private MenuItem undoItem;
5450	5984	private MenuItem redoItem;
..	..	@@ -5476,7 +6010,7 @@
5476	6010	private MenuItem pasteLinkItem;
5477	6011	private MenuItem pasteCloneItem;
5478	6012	private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5480	6014	private MenuItem clearAllItem;
5481	6015	private MenuItem genUVItem;
5482	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5536,7 +6070,7 @@
5536	6070	private MenuItem frontItem;
5537	6071	private MenuItem cameraItem;
5538	6072	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
5540	6074	private MenuItem physicsItem;
5541	6075	private MenuItem frameselectorItem;
5542	6076	private MenuItem scriptNodeItem;
..	..	@@ -5560,6 +6094,8 @@
5560	6094	private MenuItem attachBumpItem;
5561	6095	private MenuItem detachBumpItem;
5562	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5563	6099
5564	6100	private MenuItem particleItem;
5565	6101	private MenuItem ragdollItem;
..	..	@@ -5610,5 +6146,5 @@
5610	6146
5611	6147	Menu cameraMenu;
5612	6148	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	6149	+ MenuItem restoreCameraItem;
5614	6150	}