~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,10 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +565,8 @@
189	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	566	// pasteExpandItem.addActionListener(this);
191	567	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
194	570
195	571	if (Globals.ADVANCED)
196	572	{
..	..	@@ -204,23 +580,23 @@
204	580	//zBufferItem.addActionListener(this);
205	581	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	582	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	583	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	584	+ restoreCameraItem.addActionListener(this);
209	585
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- cameraMenu.add("-");
	586	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	587	+// toggleFullScreenItem.addItemListener(this);
	588	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	589	+// cameraMenu.add("-");
	590	+//
	591	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	592	+// toggleTextureItem.addItemListener(this);
	593	+// toggleTextureItem.setState(CameraPane.textureon);
	594	+//
	595	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	596	+// toggleSwitchItem.addItemListener(this);
	597	+// toggleSwitchItem.setState(CameraPane.SWITCH);
214	598
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"));
	599	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	600	toggleHandleItem.addItemListener(this);
225	601	toggleHandleItem.setState(CameraPane.HANDLES);
226	602
..	..	@@ -275,15 +651,13 @@
275	651	{
276	652	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	653	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	654	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
280	655	oe.cameraMenu.add("-");
281	656	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	657	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	658	lookAtItem.addActionListener(this);
285	659	//lookFromItem.addActinoListener(this);
286		- //switchItem.addActionListener(this);
	660	+ //switchViewItem.addActionListener(this);
287	661	}
288	662
289	663	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -328,14 +702,14 @@
328	702	}
329	703
330	704	oe.menuBar.add(menu = new Menu("Group"));
331		- grabItem = menu.add(new MenuItem("Grab"));
332		- grabItem.addActionListener(this);
	705	+// grabItem = menu.add(new MenuItem("Grab"));
	706	+// grabItem.addActionListener(this);
333	707	backItem = menu.add(new MenuItem("Back"));
334	708	backItem.addActionListener(this);
335	709	frontItem = menu.add(new MenuItem("Front"));
336	710	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
339	713
340	714	if (Globals.ADVANCED)
341	715	{
..	..	@@ -345,10 +719,10 @@
345	719	ungroupItem = menu.add(new MenuItem("Ungroup"));
346	720	ungroupItem.addActionListener(this);
347	721
348		- menu.add("-");
349		-
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	722	+// menu.add("-");
	723	+//
	724	+// switchItem = menu.add(new MenuItem("Switch node"));
	725	+// switchItem.addActionListener(this);
352	726	if (Globals.ADVANCED)
353	727	{
354	728	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +739,11 @@
365	739	frameselectorItem.addActionListener(this);
366	740	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	741	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	742	}
371	743
372	744	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	745	+// textureItem = menu.add(new MenuItem("Texture"));
	746	+// textureItem.addActionListener(this);
375	747	billboardItem = menu.add(new MenuItem("Billboard"));
376	748	billboardItem.addActionListener(this);
377	749	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -382,13 +754,14 @@
382	754	shadowYItem.addActionListener(this);
383	755	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	756	shadowZItem.addActionListener(this);
	757	+ attributeItem = menu.add(new MenuItem("Attribute"));
	758	+ attributeItem.addActionListener(this);
	759	+
385	760	if (Globals.ADVANCED)
386	761	{
387	762	menu.add("-");
388	763	linkerItem = menu.add(new MenuItem("Linker"));
389	764	linkerItem.addActionListener(this);
390		- attributeItem = menu.add(new MenuItem("Attribute"));
391		- attributeItem.addActionListener(this);
392	765	templateItem = menu.add(new MenuItem("Template"));
393	766	templateItem.addActionListener(this);
394	767	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -417,7 +790,7 @@
417	790	genNormalsMESHItem.addActionListener(this);
418	791	if (Globals.ADVANCED)
419	792	{
420		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
421	794	genNormalsMINEItem.addActionListener(this);
422	795	}
423	796	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -510,10 +883,15 @@
510	883	attachBumpItem.addActionListener(this);
511	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
512	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
513	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
514	888	detachPigmentItem.addActionListener(this);
515	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
516	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
517	895	menu.add("-");
518	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
519	897	sortbysizeItem.addActionListener(this);
..	..	@@ -524,6 +902,9 @@
524	902	shareGeometriesItem.addActionListener(this);
525	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
526	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
527	908	if (Globals.ADVANCED)
528	909	{
529	910	// Pretty much the same as duplicate and clone.
..	..	@@ -540,6 +921,74 @@
540	921	buildToolsMenu(menu);
541	922	}
542	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
543	992	void SetupUI2(ObjEditor oe)
544	993	{
545	994	// June 2019
..	..	@@ -557,11 +1006,6 @@
557	1006	//new Exception().printStackTrace();
558	1007
559	1008	oe.radioPanel = new JPanel(new GridBagLayout());
560		- oe.aConstraints.weightx = 1;
561		- oe.aConstraints.weighty = 0;
562		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
563		- oe.aConstraints.gridwidth = 100;
564		- oe.aConstraints.gridheight = 1;
565	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
566	1010
567	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -582,53 +1026,122 @@
582	1026	oe.radioPanel.add(dummyButton);
583	1027	oe.buttonGroup.add(dummyButton);
584	1028	*/
	1029	+ cGridBag copyOptionsPanel = new cGridBag();
	1030	+
	1031	+ copyOptionsPanel.preferredHeight = 2;
	1032	+
585	1033	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	1034
587	1035	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	1036	//minButton.setToolTipText("Minimize window");
589	1037	//minButton.addActionListener(this);
590	1038
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	1039	+ if (Globals.ADVANCED)
	1040	+ {
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
	1044	+ }
	1045	+
	1046	+ cButton gcButton;
	1047	+
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
594	1084
595	1085	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	1086	fullButton.setToolTipText("Full-screen window");
597	1087	fullButton.addActionListener(this);
598	1088
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
602		-
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");
609		- saveButton.addActionListener(this);
610		-
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612		- liveCB.setToolTipText("Enable animation");
613		- liveCB.addItemListener(this);
	1089	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ screenfitButton.setToolTipText("Screen fit");
	1091	+ screenfitButton.addActionListener(this);
614	1092
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1095	+ restoreCameraButton.addActionListener(this);
	1096	+
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
	1109	+
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
	1115	+
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
	1120	+
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	1129	oneStepButton.setToolTipText("Animate one step forward");
617	1130	oneStepButton.addActionListener(this);
618	1131
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	1137	fastCB.setToolTipText("Fast mode");
621	1138	fastCB.addItemListener(this);
622	1139
623		- oe.toolboxPanel.Return();
	1140	+ //oe.toolboxPanel.Return();
624	1141
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);
	1142	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1143	+// trackCB.setToolTipText("Enable tracking");
	1144	+// trackCB.addItemListener(this);
632	1145
633	1146	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	1147	// screenfitpointButton.addActionListener(this);
..	..	@@ -638,35 +1151,17 @@
638	1151	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639	1152	snapobjectButton.addActionListener(this);
640	1153	snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ fourButton.addActionListener(this);
	1157	+ fourButton.setToolTipText("Show control panel only");
641	1158	}
642	1159
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	1160	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	1161
649		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- twoButton.setToolTipText("Show center view only");
651		- twoButton.addActionListener(this);
652		- this.fullscreenLayout = twoButton;
653		-
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");
662		- threeButton.addActionListener(this);
663		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- sevenButton.setToolTipText("3-column layout");
665		- sevenButton.addActionListener(this);
666		- //
667	1162
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
670	1165	rootButton.addActionListener(this);
671	1166
672	1167	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -675,30 +1170,30 @@
675	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
676	1171	//clearButton.addActionListener(this);
677	1172
	1173	+ cGridBag row1 = new cGridBag();
	1174	+
678	1175	// INSERT
679		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680		- gridButton.setToolTipText("Create grid");
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
681	1178	gridButton.addActionListener(this);
682	1179
683		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1181	boxButton.setToolTipText("Create box");
685	1182	boxButton.addActionListener(this);
686	1183
687		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1185	sphereButton.setToolTipText("Create sphere");
689	1186	sphereButton.addActionListener(this);
690	1187
691		- oe.toolboxPanel.Return();
692		-
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	1189	coneButton.setToolTipText("Create cone");
695	1190	coneButton.addActionListener(this);
696	1191
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	1193	torusButton.setToolTipText("Create torus");
699	1194	torusButton.addActionListener(this);
700	1195
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	1197	superButton.setToolTipText("Create superellipsoid");
703	1198	superButton.addActionListener(this);
704	1199
..	..	@@ -709,41 +1204,82 @@
709	1204	kleinButton.addActionListener(this);
710	1205	}
711	1206
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1208	particlesButton.setToolTipText("Create particle system");
714	1209	particlesButton.addActionListener(this);
715	1210
716		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ oe.toolboxPanel.add(row1);
	1212	+
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ groupButton.setToolTipText("Create group");
	1217	+ groupButton.addActionListener(this);
	1218	+
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ compositeButton.setToolTipText("Create composite");
	1221	+ compositeButton.addActionListener(this);
	1222	+
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
	1225	+ switchButton.addActionListener(this);
	1226	+
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ loopButton.setToolTipText("Create loop");
	1229	+ loopButton.addActionListener(this);
	1230	+
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ textureButton.setToolTipText("Create texture");
	1233	+ textureButton.addActionListener(this);
	1234	+
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	1236	overlayButton.setToolTipText("Create overlay");
718	1237	overlayButton.addActionListener(this);
719	1238
720		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1240	lightButton.setToolTipText("Create light");
722	1241	lightButton.addActionListener(this);
723	1242
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
	1254	+
724	1255	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	1256	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ editButton.setToolTipText("Pin selection controls");
727	1258	editButton.addActionListener(this);
728	1259
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	1260	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
731	1262	uneditButton.addActionListener(this);
732	1263
733	1264	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	1265	+ allParamsButton.setToolTipText("Show all controls");
735	1266	allParamsButton.addActionListener(this);
736	1267
737		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
739	1270	clearPanelButton.addActionListener(this);
740	1271
741		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742		- unselectButton.setToolTipText("Unselect");
743		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
744	1275
	1276	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1277	+ flashSelectionButton.setToolTipText("Highlight selection");
	1278	+ flashSelectionButton.addActionListener(this);
	1279	+
745	1280	editCommandsPanel.preferredHeight = 1;
746	1281
	1282	+ SetPinStates(false);
747	1283	// oe.treePanel.add(commandsPanel);
748	1284	// oe.treePanel.Return();
749	1285
..	..	@@ -768,26 +1304,14 @@
768	1304	oe.treePanel.add(jSPPanel);
769	1305	oe.treePanel.Return();
770	1306
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	1307	oe.treePanel.add(copyOptionsPanel);
787	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
788	1312
789		-// mainPanel.setDividerLocation(0.5); //1.0);
790		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
791	1315
792	1316	//jList.addListSelectionListener(this);
793	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -795,7 +1319,7 @@
795	1319	//jTree.setEditable(true);
796	1320	oe.jTree.setDragEnabled(true);
797	1321	//jTree.setPreferredSize(new Dimension(10,10));
798		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
799	1323
800	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
801	1325
..	..	@@ -807,29 +1331,49 @@
807	1331	dgr.addDragGestureListener(this);
808	1332	}catch(Exception e) {}
809	1333	*/
810		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
811	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	1336	}
813	1337
814	1338	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	1339	{
	1340	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1341	+ colorCB.setToolTipText("Copy color when dropped");
	1342	+ colorCB.addItemListener(this);
	1343	+
	1344	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1345	+ materialCB.setToolTipText("Copy material when dropped");
	1346	+ materialCB.addItemListener(this);
	1347	+
	1348	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1349	+ textureCB.setToolTipText("Copy texture when dropped");
	1350	+ textureCB.addItemListener(this);
	1351	+
	1352	+ panel.Return();
	1353	+
816	1354	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	1355	boxCB.setToolTipText("Display bounding boxes");
818	1356	boxCB.addItemListener(this);
819	1357
820	1358	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1359	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	1360	zoomBoxCB.addItemListener(this);
823	1361
824	1362	if (true) // Globals.ADVANCED)
825	1363	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	1364	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1365	+// supportCB.setToolTipText("Enable rigging");
	1366	+// supportCB.addItemListener(this);
	1367	+
	1368	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1369	+ freezeCB.setToolTipText("Fast moving camera");
	1370	+ freezeCB.addItemListener(this);
829	1371
830	1372	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	1373	// localCB.addItemListener(this);
832	1374
	1375	+ panel.Return();
	1376	+
833	1377	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	1378	crowdCB.setToolTipText("Used for crowds");
835	1379	crowdCB.addItemListener(this);
..	..	@@ -838,14 +1382,19 @@
838	1382	smoothCB.setToolTipText("Snapping delay");
839	1383	smoothCB.addItemListener(this);
840	1384
841		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
842		- slowCB.setToolTipText("Smooth interpolation");
843		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
844	1391
845	1392	// constraints.gridy += 1;
846	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	1394	// speakerMocapCB.addItemListener(this);
848	1395
	1396	+ panel.Return();
	1397	+
849	1398	if (false)
850	1399	{
851	1400	// handled in scripts
..	..	@@ -860,24 +1409,39 @@
860	1409	//constraints.gridy += 1;
861	1410	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	1411	smoothfocusCB.addItemListener(this);
	1412	+ panel.Return();
863	1413	}
864	1414
865	1415	//constraints.gridx += 1;
866	1416	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	1417	// debugCB.addItemListener(this);
868	1418
	1419	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1420	+ trackCB.setToolTipText("Enable tracking target");
	1421	+ trackCB.addItemListener(this);
	1422	+
869	1423	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	1424	+ oeilCB.setToolTipText("Move camera when tracking");
871	1425	oeilCB.addItemListener(this);
872	1426
873	1427	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	1428	+ shadowCB.setToolTipText("When live compute shadows");
875	1429	shadowCB.addItemListener(this);
876	1430
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	1431	+ panel.Return();
	1432	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1433	+ toggleTextureCB.setToolTipText("Load textures");
	1434	+ toggleTextureCB.addItemListener(this);
	1435	+
	1436	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1438	+ toggleSwitchCB.addItemListener(this);
	1439	+
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
880	1443
	1444	+ panel.Return();
881	1445	if (Globals.ADVANCED)
882	1446	{
883	1447	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,18 +1452,31 @@
888	1452	}
889	1453
890	1454	cGridBag fill = new cGridBag();
891		-
892	1455	fill.preferredHeight = 200;
	1456	+ cGridBag fill2 = new cGridBag();
	1457	+ fill2.preferredHeight = 200;
	1458	+ cGridBag fill3 = new cGridBag();
	1459	+ fill3.preferredHeight = 200;
893	1460
894	1461	panel.add(fill);
	1462	+ panel.add(fill2);
	1463	+ panel.add(fill3);
895	1464
896	1465	}
897	1466
898	1467	void EditObject(Object3D obj)
899	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
900	1477	cRadio radioButton = new cRadio(obj.name);
901	1478
902		- // Patch to avoid bug with transparency.
	1479	+ // June 2019. Patch to avoid bug with transparency.
903	1480	radioButton.hadMaterial = obj.material != null;
904	1481	if (!radioButton.hadMaterial)
905	1482	{
..	..	@@ -907,7 +1484,7 @@
907	1484	}
908	1485
909	1486	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
911	1488	radioButton.SetCamera(cameraView.renderCamera, false);
912	1489	radioButton.addActionListener(this);
913	1490	radioPanel.add(radioButton);
..	..	@@ -932,11 +1509,15 @@
932	1509	cCheckBox localCB;
933	1510	cCheckBox crowdCB;
934	1511	cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
935	1514	cToggleButton fastCB;
936	1515	cCheckBox slowCB;
937	1516	cCheckBox boxCB;
938	1517	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1518	+ cCheckBox freezeCB;
	1519	+ //cToggleButton trackCB;
	1520	+ cCheckBox trackCB;
940	1521	cCheckBox smoothfocusCB;
941	1522	// JCheckBox speakerMocapCB;
942	1523	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1526,7 @@
945	1526
946	1527	cCheckBox oeilCB;
947	1528	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1529	+ cCheckBox autokeepCB;
949	1530	cCheckBox lookAtCB;
950	1531
951	1532	// static int COLOR = 1;
..	..	@@ -1001,6 +1582,12 @@
1001	1582	cameraView.ToggleInertia();
1002	1583	cameraView.repaint();
1003	1584	}
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
	1590	+ }
1004	1591	else if(e.getSource() == localCB)
1005	1592	{
1006	1593	cameraView.ToggleLocal();
..	..	@@ -1053,9 +1640,13 @@
1053	1640	{
1054	1641	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1642	}
1056		- else if(e.getSource() == autosaveCB)
	1643	+ else if(e.getSource() == freezeCB)
1057	1644	{
1058		- Globals.SAVEONMAKE ^= true;
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
1059	1650	}
1060	1651	else if(e.getSource() == lookAtCB)
1061	1652	{
..	..	@@ -1137,8 +1728,6 @@
1137	1728	}
1138	1729	}
1139	1730
1140		- String string = (String) object;
1141		-
1142	1731	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1732	// if( object instanceof java.io.File[])
1144	1733	// {
..	..	@@ -1146,6 +1735,8 @@
1146	1735	// objEditor.DropFile((java.io.File[]) object, true);
1147	1736	// return;
1148	1737	// }
	1738	+
	1739	+ String string = object.toString();
1149	1740
1150	1741	// File path for Mac and Windows
1151	1742	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1782,23 @@
1191	1782
1192	1783	assert target == objEditor.jTree;
1193	1784	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1785	+ Object3D destinationLeaf;
1194	1786	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1787	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1788	} catch (Exception e) {
1197	1789	System.out.println("destinationPath : " + destinationPath);
1198	1790	return;
1199	1791	}
1200	1792
	1793	+ for (int i=group.selection.size(); --i>=0;)
	1794	+ {
	1795	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1796	+
	1797	+ // Cannot move into itself
	1798	+ if (child == destinationLeaf)
	1799	+ return;
	1800	+ }
	1801	+
1201	1802	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1803	// {
1203	1804	loadClipboard(true);
..	..	@@ -1263,7 +1864,12 @@
1263	1864	TreePath path;
1264	1865
1265	1866	public TransferableTreePath(TreePath tp) {
1266		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1267	1873	}
1268	1874
1269	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1312,22 +1918,30 @@
1312	1918	{
1313	1919	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1920	//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);
	1921	+// gridItem = menu.add(new MenuItem("Grid"));
	1922	+// gridItem.addActionListener(this);
	1923	+// rectoidItem = menu.add(new MenuItem("Box"));
	1924	+// rectoidItem.addActionListener(this);
	1925	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1926	+// ellipsoidItem.addActionListener(this);
	1927	+// coneItem = menu.add(new MenuItem("Cone"));
	1928	+// coneItem.addActionListener(this);
	1929	+// torusItem = menu.add(new MenuItem("Torus"));
	1930	+// torusItem.addActionListener(this);
	1931	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1932	+// superItem.addActionListener(this);
	1933	+
	1934	+ cameraItem = menu.add(new MenuItem("Camera"));
	1935	+ cameraItem.addActionListener(this);
	1936	+
	1937	+ if (!Globals.ADVANCED)
	1938	+ {
1327	1939	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1940	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1941	+ }
	1942	+
	1943	+// particleItem = menu.add(new MenuItem("Particle system"));
	1944	+// particleItem.addActionListener(this);
1331	1945	if (Globals.ADVANCED)
1332	1946	{
1333	1947	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1967,15 @@
1353	1967	}
1354	1968	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1969	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);
	1970	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1971	+// overlayItem.addActionListener(this);
	1972	+// lightItem = menu.add(new MenuItem("Light"));
	1973	+// lightItem.addActionListener(this);
1360	1974	menu.add("-");
1361	1975	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1976	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1977	+// loopItem = menu.add(new MenuItem("Loop"));
	1978	+// loopItem.addActionListener(this);
1365	1979	doubleItem = menu.add(new MenuItem("Fork"));
1366	1980	doubleItem.addActionListener(this);
1367	1981	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1991,9 @@
1377	1991	animationItem.addItemListener(this);
1378	1992	animationItem.setState(Globals.ANIMATION);
1379	1993
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
	1996	+
1380	1997	menu.add("-");
1381	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1999	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +2006,8 @@
1389	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	2007	reduce34MorphItem.addActionListener(this);
1391	2008	menu.add("-");
	2009	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2010	+ memoryItem.addActionListener(this);
1392	2011	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	2012	computeAOItem.addActionListener(this);
1394	2013
..	..	@@ -1397,8 +2016,6 @@
1397	2016	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	2017	mirrorItem.addActionListener(this);
1399	2018	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	2020	analyzeItem.addActionListener(this);
1404	2021	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +2163,30 @@
1546	2163
1547	2164	makeSomething(shadow);
1548	2165	}
	2166	+
	2167	+ private void ClearUnpinned()
	2168	+ {
	2169	+ //for (Object3D obj : listUI)
	2170	+ for (int i=listUI.size(); --i>=0;)
	2171	+ {
	2172	+ Object3D obj = listUI.elementAt(i);
	2173	+ if (!obj.pinned)
	2174	+ {
	2175	+ obj.CloseUI();
	2176	+ listUI.remove(i);
	2177	+ }
	2178	+ }
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
	2189	+ }
1549	2190
1550	2191	/**
1551	2192	* applyExample
..	..	@@ -1790,7 +2431,7 @@
1790	2431	{
1791	2432	ScreenFit();
1792	2433	} else
1793		- if (source == switchItem)
	2434	+ if (source == switchViewItem)
1794	2435	{
1795	2436	cVector v1 = new cVector();
1796	2437	cVector v2 = new cVector();
..	..	@@ -1974,6 +2615,23 @@
1974	2615	{
1975	2616	makeSomething(new Light());
1976	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
1977	2635	if (source == csgItem)
1978	2636	{
1979	2637	group(new CSG());
..	..	@@ -2020,30 +2678,30 @@
2020	2678
2021	2679	group(g);
2022	2680	} else
2023		- if (source == loopItem)
	2681	+ if (source == loopItem \|\| source == loopButton)
2024	2682	{
2025	2683	Composite csg = new GroupLeaf();
2026	2684	csg.count = 5;
2027	2685	group(csg);
2028		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
2029	2687	csg.addChild(child);
2030	2688	child.addChild(csg);
2031	2689	} else
2032	2690	if (source == doubleItem)
2033	2691	{
2034		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
2035	2693	csg.count = 5;
2036	2694	group(csg);
2037		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
2038	2696	csg.addChild(child);
2039	2697	child.addChild(csg);
2040		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
2041	2699	csg.addChild(child);
2042	2700	child.addChild(csg);
2043	2701	} else
2044	2702	if (source == tripleItem)
2045	2703	{
2046		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
2047	2705	csg.count = 4;
2048	2706	group(csg);
2049	2707	Composite child = new cGroup();
..	..	@@ -2059,7 +2717,7 @@
2059	2717	if (source == computeAOItem)
2060	2718	{
2061	2719	Globals.drawMode = CameraPane.OCCLUSION;
2062		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
2063	2721	} else
2064	2722	if (source == recompileItem)
2065	2723	{
..	..	@@ -2074,7 +2732,7 @@
2074	2732	if (source == invariantsItem)
2075	2733	{
2076	2734	System.out.println("Invariants:");
2077		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
2078	2736	} else
2079	2737	if (source == memoryItem)
2080	2738	{
..	..	@@ -2105,17 +2763,52 @@
2105	2763	{
2106	2764	ToggleFullScreen();
2107	2765	} else
2108		- if (source == undoButton)
	2766	+ if (source == collapseButton)
2109	2767	{
2110		- Undo();
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
2111	2770	} else
2112		- if (source == redoButton)
	2771	+ if (source == maximize3DButton)
2113	2772	{
2114		- Redo();
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
2115	2777	} else
2116		- if (source == saveButton)
	2778	+ if (source == previousVersionButton)
2117	2779	{
2118		- Save();
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
	2805	+ if (!Save(true))
	2806	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
2119	2812	} else
2120	2813	if (source == oneStepButton)
2121	2814	{
..	..	@@ -2124,17 +2817,14 @@
2124	2817	} else
2125	2818	if (source == screenfitButton)
2126	2819	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2820	ScreenFit();
2129	2821	} else
2130	2822	if (source == screenfitpointButton)
2131	2823	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2824	ScreenFitPoint();
2134	2825	} else
2135	2826	if (source == snapobjectButton)
2136	2827	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2828	SnapObject();
2139	2829	} else
2140	2830	// if (event.getSource() == recompileButton)
..	..	@@ -2173,11 +2863,11 @@
2173	2863	} else
2174	2864	if (source == undoItem)
2175	2865	{
2176		- Undo();
	2866	+ PreviousVersion();
2177	2867	} else
2178	2868	if (source == redoItem)
2179	2869	{
2180		- Redo();
	2870	+ NextVersion();
2181	2871	} else
2182	2872	if (source == duplicateItem)
2183	2873	{
..	..	@@ -2498,7 +3188,7 @@
2498	3188	{
2499	3189	StepAll();
2500	3190	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	3192	{
2503	3193	//int indices[] = jList.getSelectedIndices();
2504	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +3200,9 @@
2510	3200	{
2511	3201	ClearSelection(true);
2512	3202	} else
2513		- if (source == grabItem)
	3203	+ if (source == grabItem \|\| source == groupButton)
2514	3204	{
2515		- group(new cGroup(), true);
	3205	+ group(new cGroup(), false); // true);
2516	3206	} else
2517	3207	if (source == hideItem)
2518	3208	{
..	..	@@ -2530,11 +3220,11 @@
2530	3220	{
2531	3221	makeSomething(new Camera());
2532	3222	} else
2533		- if (source == compositeItem)
	3223	+ if (source == compositeItem \|\| source == compositeButton)
2534	3224	{
2535	3225	group(new Composite());
2536	3226	} else
2537		- if (source == randomItem)
	3227	+ if (source == switchItem \|\| source == switchButton)
2538	3228	{
2539	3229	RandomNode random = new RandomNode();
2540	3230	group(random);
..	..	@@ -2636,7 +3326,7 @@
2636	3326	{
2637	3327	group(new cLinker());
2638	3328	} else
2639		- if (source == textureItem)
	3329	+ if (source == textureItem \|\| source == textureButton)
2640	3330	{
2641	3331	group(new TextureNode());
2642	3332	} else
..	..	@@ -2658,15 +3348,28 @@
2658	3348	} else
2659	3349	if (source == ungroupItem \|\| source == ungroupButton)
2660	3350	{
2661		- //ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
2662	3353	for (int i=0; i<group.selection.size(); i++)
2663	3354	{
2664		- Ungroup(group.selection.get(i));
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
2665	3360	}
2666	3361
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	3362	+ if (!hasRoot)
	3363	+ {
	3364	+ for (int i=0; i<group.selection.size(); i++)
	3365	+ {
	3366	+ Ungroup(group.selection.get(i));
	3367	+ }
	3368	+
	3369	+ ClearSelection(false);
	3370	+
	3371	+ refreshContents();
	3372	+ }
2670	3373	} else
2671	3374	if (source == genUVItem)
2672	3375	{
..	..	@@ -2967,7 +3670,7 @@
2967	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3671	{
2969	3672	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
2971	3674	}
2972	3675
2973	3676	refreshContents();
..	..	@@ -2981,6 +3684,31 @@
2981	3684	obj.SetBumpTexture(obj.GetPigmentTexture());
2982	3685	}
2983	3686
	3687	+ refreshContents();
	3688	+ } else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
2984	3712	refreshContents();
2985	3713	} else
2986	3714	if (source == flashSelectionButton)
..	..	@@ -2998,38 +3726,7 @@
2998	3726	if (CameraPane.FULLSCREEN)
2999	3727	fullscreenLayout = radio.layout;
3000	3728
3001		- // bug
3002		- //gridPanel.setDividerLocation(1.0);
3003		- //bigPanel.setDividerLocation(0.0);
3004		-// bigThree.remove(scenePanel);
3005		-// bigThree.remove(centralPanel);
3006		-// bigThree.remove(XYZPanel);
3007		-// aWindowConstraints.gridx = 0;
3008		-// aWindowConstraints.gridy = 0;
3009		-// aWindowConstraints.gridwidth = 1;
3010		-// // aConstraints.gridheight = 3;
3011		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3012		-// aWindowConstraints.weightx = 0;
3013		-// aWindowConstraints.weighty = 1;
3014		-// //bigThree.add(jtp, aWindowConstraints);
3015		-// aWindowConstraints.weightx = 1;
3016		-// aWindowConstraints.gridwidth = 3;
3017		-// // aConstraints.gridheight = 3;
3018		-// aWindowConstraints.gridx = 1;
3019		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3020		-// bigThree.add(centralPanel, aWindowConstraints);
3021		-// aWindowConstraints.weightx = 0;
3022		-// aWindowConstraints.gridx = 4;
3023		-// aWindowConstraints.gridwidth = 1;
3024		-// // aConstraints.gridheight = 3;
3025		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3026		-// //bigThree.add(XYZPanel, aWindowConstraints);
3027		-// scenePanel.setVisible(false);
3028		-// centralPanel.setVisible(true);
3029		-// XYZPanel.setVisible(false);
3030		- bigThree.ClearUI();
3031		- bigThree.add(centralPanel);
3032		- bigThree.FlushUI();
	3729	+ Show3DView();
3033	3730
3034	3731	cameraView.requestFocusInWindow();
3035	3732
..	..	@@ -3084,8 +3781,8 @@
3084	3781	// centralPanel.setVisible(true);
3085	3782	// XYZPanel.setVisible(true);
3086	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
3087	3785	bigThree.add(centralPanel);
3088		- bigThree.add(XYZPanel);
3089	3786	bigThree.FlushUI();
3090	3787
3091	3788	cameraView.requestFocusInWindow();
..	..	@@ -3165,8 +3862,8 @@
3165	3862	// centralPanel.setVisible(true);
3166	3863	// XYZPanel.setVisible(false);
3167	3864	bigThree.ClearUI();
3168		- bigThree.add(scenePanel);
3169	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
3170	3867	bigThree.FlushUI();
3171	3868
3172	3869	cameraView.requestFocusInWindow();
..	..	@@ -3215,6 +3912,7 @@
3215	3912	} else
3216	3913	if (source == rootButton)
3217	3914	{
	3915	+ Replace();
3218	3916	Object3D obj;
3219	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3220	3918	{
..	..	@@ -3258,6 +3956,12 @@
3258	3956	} else
3259	3957	if (source == editItem \|\| source == editButton)
3260	3958	{
	3959	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3960	+ {
	3961	+ Object3D child = (Object3D)e.nextElement();
	3962	+ child.pinned = true;
	3963	+ }
	3964	+
3261	3965	EditSelection(false);
3262	3966	} else
3263	3967	if (source == uneditButton)
..	..	@@ -3266,9 +3970,10 @@
3266	3970	{
3267	3971	Object3D child = (Object3D)e.nextElement();
3268	3972	if(child.editWindow != null)
3269		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3973	+ child.pinned = false;
3270	3974	child.CloseUI();
3271	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3272	3977
3273	3978	//child.editWindow = null; // ???????????
3274	3979	}
..	..	@@ -3283,16 +3988,18 @@
3283	3988	//copy.ClearUI();
3284	3989	for (Object3D obj : listUI)
3285	3990	{
	3991	+ obj.pinned = false;
3286	3992	obj.CloseUI();
3287	3993	}
3288	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3289	3996	refreshContents(true);
3290	3997	} else
3291	3998	if (source == allParamsButton)
3292	3999	{
3293	4000	assert(copy == group);
3294	4001
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4002	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	4003
3297	4004	for (Object3D obj : listUI)
3298	4005	{
..	..	@@ -3341,6 +4048,7 @@
3341	4048	}
3342	4049
3343	4050	copy = group;
	4051	+
3344	4052	//Globals.theRenderer.object = group;
3345	4053	if(!useclient)
3346	4054	{
..	..	@@ -3367,6 +4075,26 @@
3367	4075	currentLayout = sevenButton;
3368	4076	*/
3369	4077	radio.layout.doClick();
	4078	+
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
	4091	+ ClearUnpinned();
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
	4097	+ EditSelection(false);
3370	4098	keepparent = group.parent;
3371	4099	// PARENT = NULL or not???
3372	4100	//group.parent = null; // ROOT
..	..	@@ -3378,11 +4106,13 @@
3378	4106	} else if (event.getSource() == editCameraItem)
3379	4107	{
3380	4108	cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
3381	4110	cameraView.repaint();
3382	4111	return;
3383		- } else if (event.getSource() == revertCameraItem)
	4112	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	4113	{
3385	4114	cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
3386	4116	cameraView.repaint();
3387	4117	return;
3388	4118	// } else if (event.getSource() == textureButton)
..	..	@@ -3959,7 +4689,7 @@
3959	4689
3960	4690	try
3961	4691	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3963	4693	}
3964	4694	catch (Exception e)
3965	4695	{
..	..	@@ -4434,12 +5164,14 @@
4434	5164	// }
4435	5165	// }
4436	5166
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	5167	void EditSelection(boolean newWindow)
4442	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4443	5175	// aConstraints.gridy = 0;
4444	5176	for (int i=0; i<group.selection.size(); i++)
4445	5177	{
..	..	@@ -4450,12 +5182,7 @@
4450	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	5183	if(elem != group \|\| !newWindow)
4452	5184	{
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
	5185	+ EditElement(elem, newWindow); // ? new
4459	5186	}
4460	5187	}
4461	5188	}
..	..	@@ -4518,9 +5245,7 @@
4518	5245
4519	5246	freezemodel = false;
4520	5247	}
4521		-
4522		- boolean flashIt = true;
4523		-
	5248	+
4524	5249	public void valueChanged(TreeSelectionEvent e)
4525	5250	//public boolean handleEvent(Event event)
4526	5251	{
..	..	@@ -4530,7 +5255,8 @@
4530	5255	//new Exception().printStackTrace();
4531	5256
4532	5257	freezemodel = true;
4533		-
	5258	+ ClearUnpinned();
	5259	+
4534	5260	/**/
4535	5261	//switch (event.id)
4536	5262	{
..	..	@@ -4563,7 +5289,7 @@
4563	5289	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	5290	// a camera
4565	5291	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5292	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	5293	{
4568	5294	CameraPane.camerachangeframe = 0; // don't refuse it
4569	5295	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +5298,13 @@
4572	5298	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	5299	}
4574	5300
	5301	+ if (tps != null && tps.length == 1)
	5302	+ {
	5303	+ EditSelection(false);
	5304	+ }
	5305	+
	5306	+ SetPinStates(tps != null && tps.length > 0);
	5307	+
4575	5308	refreshContents();
4576	5309	//return true;
4577	5310	}
..	..	@@ -4581,9 +5314,34 @@
4581	5314	freezemodel = false;
4582	5315	}
4583	5316
	5317	+ void SetPinStates(boolean enabled)
	5318	+ {
	5319	+ editButton.setEnabled(enabled);
	5320	+ uneditButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
	5322	+ flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ if (group.selection != null)
	5329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5330	+ {
	5331	+ if (!(e.nextElement() instanceof Composite))
	5332	+ {
	5333	+ allComposites = false;
	5334	+ break;
	5335	+ }
	5336	+ }
	5337	+
	5338	+ rootButton.setEnabled(allComposites);
	5339	+ }
	5340	+
4584	5341	void refreshContents(boolean cp)
4585	5342	{
4586		- if (!Globals.MOUSEDRAGGED)
	5343	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5344	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	5345	{
4588	5346	objEditor.ClearInfo(); // .GetMaterial());
4589	5347
..	..	@@ -4592,7 +5350,7 @@
4592	5350	Object3D child = (Object3D) group.selection.get(i);
4593	5351
4594	5352	objEditor.AddInfo(child, this, true);
4595		- System.err.println("info : " + child.GetPath());
	5353	+// System.err.println("info : " + child.GetPath());
4596	5354	}
4597	5355
4598	5356	objEditor.SetText(); // jan 2014
..	..	@@ -4682,8 +5440,8 @@
4682	5440
4683	5441	if (cut)
4684	5442	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	5443	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5444	+// Save();
4687	5445	//int indices[] = jList.getSelectedIndices();
4688	5446	//for (int i = indices.length - 1; i >= 0; i--)
4689	5447	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5544,10 @@
4786	5544
4787	5545	void paste(boolean expand)
4788	5546	{
	5547	+ if (Globals.REPLACEONMAKE)
	5548	+ Save();
	5549	+ boolean keep = Globals.REPLACEONMAKE;
	5550	+ Globals.REPLACEONMAKE = false;
4789	5551	// if (GrafreeD.clipboard == null)
4790	5552	// return;
4791	5553	boolean first = true;
..	..	@@ -4845,6 +5607,7 @@
4845	5607	Grafreed.clipboard.get(0).parent = keepparent;
4846	5608	}
4847	5609
	5610	+ Globals.REPLACEONMAKE = keep;
4848	5611	ResetModel();
4849	5612	refreshContents();
4850	5613	}
..	..	@@ -4980,6 +5743,10 @@
4980	5743
4981	5744	void group(Object3D csg, boolean grab)
4982	5745	{
	5746	+ if (Globals.REPLACEONMAKE)
	5747	+ Save();
	5748	+ boolean keep = Globals.REPLACEONMAKE;
	5749	+ Globals.REPLACEONMAKE = false;
4983	5750	if (//false) // why??
4984	5751	!group.selection.isEmpty())
4985	5752	{
..	..	@@ -5093,10 +5860,15 @@
5093	5860	//node.add(csg);
5094	5861	//makeSomething(node);
5095	5862	makeSomething(csg);
	5863	+ Globals.REPLACEONMAKE = keep;
5096	5864	}
5097	5865
5098	5866	void Ungroup(Object3D g)
5099	5867	{
	5868	+ if (Globals.REPLACEONMAKE)
	5869	+ Save();
	5870	+ boolean keep = Globals.REPLACEONMAKE;
	5871	+ Globals.REPLACEONMAKE = false;
5100	5872	if (g instanceof HiddenObject)
5101	5873	{
5102	5874	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5885,7 @@
5113	5885	objEditor.makeSomething(g.get(i), false);
5114	5886	}
5115	5887	}
	5888	+ Globals.REPLACEONMAKE = keep;
5116	5889	}
5117	5890
5118	5891	void ungroup()
..	..	@@ -5401,17 +6174,32 @@
5401	6174	cButton clearpanelButton;
5402	6175	cButton unselectButton;
5403	6176
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
5409		- cButton saveButton;
	6177	+ cButton restoreCameraButton;
	6178	+
5410	6179	cButton oneStepButton;
5411	6180
5412	6181	cButton groupButton;
5413	6182	cButton ungroupButton;
5414	6183	cButton compositeButton;
	6184	+ cButton switchButton;
	6185	+ cButton loopButton;
	6186	+ cButton textureButton;
	6187	+
	6188	+ cButton skybox1Button;
	6189	+ cButton skybox2Button;
	6190	+ cButton skybox3Button;
	6191	+ cButton skybox4Button;
	6192	+ cButton skybox5Button;
	6193	+ cButton skybox6Button;
	6194	+ cButton skybox7Button;
	6195	+
	6196	+ cButton skybox11Button;
	6197	+ cButton skybox12Button;
	6198	+ cButton skybox13Button;
	6199	+ cButton skybox14Button;
	6200	+ cButton skybox15Button;
	6201	+ cButton skybox16Button;
	6202	+ cButton skybox17Button;
5415	6203
5416	6204	cButton gridButton;
5417	6205	cButton boxButton;
..	..	@@ -5444,7 +6232,7 @@
5444	6232	//JTree jTree;
5445	6233	private MenuItem lookAtItem;
5446	6234	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	6235	+ private MenuItem switchViewItem;
5448	6236	private MenuItem cutItem;
5449	6237	private MenuItem undoItem;
5450	6238	private MenuItem redoItem;
..	..	@@ -5476,7 +6264,7 @@
5476	6264	private MenuItem pasteLinkItem;
5477	6265	private MenuItem pasteCloneItem;
5478	6266	private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	6267	+ private MenuItem deleteItem;
5480	6268	private MenuItem clearAllItem;
5481	6269	private MenuItem genUVItem;
5482	6270	private MenuItem genNormalsMESHItem;
..	..	@@ -5536,7 +6324,7 @@
5536	6324	private MenuItem frontItem;
5537	6325	private MenuItem cameraItem;
5538	6326	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	6327	+ private MenuItem switchItem;
5540	6328	private MenuItem physicsItem;
5541	6329	private MenuItem frameselectorItem;
5542	6330	private MenuItem scriptNodeItem;
..	..	@@ -5560,6 +6348,8 @@
5560	6348	private MenuItem attachBumpItem;
5561	6349	private MenuItem detachBumpItem;
5562	6350	private MenuItem pigmentBumpItem;
	6351	+ private MenuItem embedTexturesItem;
	6352	+ private MenuItem deEmbedTexturesItem;
5563	6353
5564	6354	private MenuItem particleItem;
5565	6355	private MenuItem ragdollItem;
..	..	@@ -5610,5 +6400,5 @@
5610	6400
5611	6401	Menu cameraMenu;
5612	6402	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	6403	+ MenuItem restoreCameraItem;
5614	6404	}