~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,351 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void 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", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,6 +406,14 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+
	414	+ Save(true);
	415	+ }
	416	+
63	417	if(ui)
64	418	SetupUI(objEditor);
65	419	}
..	..	@@ -80,10 +434,22 @@
80	434	SetupViews(objEditor);
81	435
82	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
83	445	}
84	446
85	447	void CloneSelection(boolean supports)
86	448	{
	449	+ if (Globals.REPLACEONMAKE)
	450	+ Save();
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
87	453	// Object3D keep = GrafreeD.clipboard;
88	454	//Object3D obj;
89	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +460,7 @@
94	460
95	461	makeSomething(clone, i==group.selection.size()-1);
96	462	}
	463	+ Globals.REPLACEONMAKE = keep;
97	464	}
98	465
99	466	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +517,8 @@
150	517
151	518	void SetupMenu2(GroupEditor oe)
152	519	{
	520	+ oe.jTree = new cTree();
	521	+
153	522	Menu menu;
154	523	oe.menuBar.add(menu = new Menu("Edit"));
155	524	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +529,7 @@
160	529	// redoItem = menu.add(new MenuItem("Redo"));
161	530	// redoItem.addActionListener(this);
162	531	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	532	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	533	duplicateItem.addActionListener(this);
165	534	cloneItem = menu.add(new MenuItem("Clone"));
166	535	cloneItem.addActionListener(this);
..	..	@@ -187,8 +556,8 @@
187	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	557	// pasteExpandItem.addActionListener(this);
189	558	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
192	561
193	562	if (Globals.ADVANCED)
194	563	{
..	..	@@ -202,23 +571,23 @@
202	571	//zBufferItem.addActionListener(this);
203	572	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	573	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	574	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	575	+ restoreCameraItem.addActionListener(this);
207	576
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	577	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	578	+// toggleFullScreenItem.addItemListener(this);
	579	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	580	+// cameraMenu.add("-");
	581	+//
	582	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	583	+// toggleTextureItem.addItemListener(this);
	584	+// toggleTextureItem.setState(CameraPane.textureon);
	585	+//
	586	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	587	+// toggleSwitchItem.addItemListener(this);
	588	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	589
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	590	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	591	toggleHandleItem.addItemListener(this);
223	592	toggleHandleItem.setState(CameraPane.HANDLES);
224	593
..	..	@@ -273,15 +642,13 @@
273	642	{
274	643	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	644	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	645	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	646	oe.cameraMenu.add("-");
279	647	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
280	648	openWindowItem.addActionListener(this);
281		- editLeafItem.addActionListener(this);
282	649	lookAtItem.addActionListener(this);
283	650	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	651	+ //switchViewItem.addActionListener(this);
285	652	}
286	653
287	654	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +693,29 @@
326	693	}
327	694
328	695	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
331	698	backItem = menu.add(new MenuItem("Back"));
332	699	backItem.addActionListener(this);
333	700	frontItem = menu.add(new MenuItem("Front"));
334	701	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
337	707	hideItem = menu.add(new MenuItem("Hidden Group"));
338	708	hideItem.addActionListener(this);
	709	+ }
339	710	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	711	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
344	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	720	switchGeoItem.addActionListener(this);
346	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +723,6 @@
348	723	morphItem = menu.add(new MenuItem("Morph Group"));
349	724	morphItem.addActionListener(this);
350	725
351		- if (Globals.ADVANCED)
352		- {
353	726	menu.add("-");
354	727	physicsItem = menu.add(new MenuItem("Physics"));
355	728	physicsItem.addActionListener(this);
..	..	@@ -357,13 +730,11 @@
357	730	frameselectorItem.addActionListener(this);
358	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	732	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	733	}
363	734
364	735	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
367	738	billboardItem = menu.add(new MenuItem("Billboard"));
368	739	billboardItem.addActionListener(this);
369	740	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +745,14 @@
374	745	shadowYItem.addActionListener(this);
375	746	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
377	751	if (Globals.ADVANCED)
378	752	{
379	753	menu.add("-");
380	754	linkerItem = menu.add(new MenuItem("Linker"));
381	755	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	756	templateItem = menu.add(new MenuItem("Template"));
385	757	templateItem.addActionListener(this);
386	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +781,7 @@
409	781	genNormalsMESHItem.addActionListener(this);
410	782	if (Globals.ADVANCED)
411	783	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	785	genNormalsMINEItem.addActionListener(this);
414	786	}
415	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -502,10 +874,15 @@
502	874	attachBumpItem.addActionListener(this);
503	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
505	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	879	detachPigmentItem.addActionListener(this);
507	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
509	886	menu.add("-");
510	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	888	sortbysizeItem.addActionListener(this);
..	..	@@ -516,6 +893,9 @@
516	893	shareGeometriesItem.addActionListener(this);
517	894	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518	895	mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
519	899	if (Globals.ADVANCED)
520	900	{
521	901	// Pretty much the same as duplicate and clone.
..	..	@@ -532,6 +912,74 @@
532	912	buildToolsMenu(menu);
533	913	}
534	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
535	983	void SetupUI2(ObjEditor oe)
536	984	{
537	985	// June 2019
..	..	@@ -549,11 +997,6 @@
549	997	//new Exception().printStackTrace();
550	998
551	999	oe.radioPanel = new JPanel(new GridBagLayout());
552		- oe.aConstraints.weightx = 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
555		- oe.aConstraints.gridwidth = 100;
556		- oe.aConstraints.gridheight = 1;
557	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
558	1001
559	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -574,51 +1017,122 @@
574	1017	oe.radioPanel.add(dummyButton);
575	1018	oe.buttonGroup.add(dummyButton);
576	1019	*/
	1020	+ cGridBag copyOptionsPanel = new cGridBag();
	1021	+
	1022	+ copyOptionsPanel.preferredHeight = 2;
	1023	+
577	1024	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	1025
579	1026	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1027	//minButton.setToolTipText("Minimize window");
581	1028	//minButton.addActionListener(this);
582	1029
583		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	1030	+ if (Globals.ADVANCED)
	1031	+ {
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
	1035	+ }
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
586	1075
587	1076	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	1077	fullButton.setToolTipText("Full-screen window");
589	1078	fullButton.addActionListener(this);
590	1079
591		- oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
594		-
595		- oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
601		- saveButton.addActionListener(this);
602		-
603		- oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604		- liveCB.setToolTipText("Enable animation");
605		- liveCB.addItemListener(this);
	1080	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ screenfitButton.setToolTipText("Screen fit");
	1082	+ screenfitButton.addActionListener(this);
606	1083
607		- oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
608		- fastCB.setToolTipText("Fast mode");
609		- fastCB.addItemListener(this);
610		-
	1084	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1086	+ restoreCameraButton.addActionListener(this);
	1087	+
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
	1100	+
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
	1106	+
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
	1111	+
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
611	1119	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	1120	oneStepButton.setToolTipText("Animate one step forward");
613	1121	oneStepButton.addActionListener(this);
614	1122
615		- oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
	1125	+ liveCB.addItemListener(this);
618	1126
619		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1128	+ fastCB.setToolTipText("Fast mode");
	1129	+ fastCB.addItemListener(this);
	1130	+
	1131	+ //oe.toolboxPanel.Return();
	1132	+
	1133	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1134	+// trackCB.setToolTipText("Enable tracking");
	1135	+// trackCB.addItemListener(this);
622	1136
623	1137	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	1138	// screenfitpointButton.addActionListener(this);
..	..	@@ -628,63 +1142,135 @@
628	1142	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	1143	snapobjectButton.addActionListener(this);
630	1144	snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ fourButton.addActionListener(this);
	1148	+ fourButton.setToolTipText("Show control panel only");
631	1149	}
632	1150
633		- oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Highlight selection");
635		- flashSelectionButton.addActionListener(this);
	1151	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	1152
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638		-
639		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640		- twoButton.setToolTipText("Show center view only");
641		- twoButton.addActionListener(this);
642		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- fourButton.addActionListener(this);
644		- fourButton.setToolTipText("Show left panel only");
645		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- sixButton.setToolTipText("2-column layout left");
647		- sixButton.addActionListener(this);
648		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- threeButton.setToolTipText("2-column layout right");
650		- threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
654		- //
655	1153
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
658	1156	rootButton.addActionListener(this);
659	1157
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	1159	closeButton.setToolTipText("Close tab");
662	1160	closeButton.addActionListener(this);
663	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	1162	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	1163	+
	1164	+ cGridBag row1 = new cGridBag();
	1165	+
	1166	+ // INSERT
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
	1169	+ gridButton.addActionListener(this);
	1170	+
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ boxButton.setToolTipText("Create box");
	1173	+ boxButton.addActionListener(this);
	1174	+
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ sphereButton.setToolTipText("Create sphere");
	1177	+ sphereButton.addActionListener(this);
	1178	+
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ coneButton.setToolTipText("Create cone");
	1181	+ coneButton.addActionListener(this);
	1182	+
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ torusButton.setToolTipText("Create torus");
	1185	+ torusButton.addActionListener(this);
	1186	+
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ superButton.setToolTipText("Create superellipsoid");
	1189	+ superButton.addActionListener(this);
	1190	+
	1191	+ if (Globals.ADVANCED)
	1192	+ {
	1193	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ kleinButton.setToolTipText("Create Klein bottle");
	1195	+ kleinButton.addActionListener(this);
	1196	+ }
	1197	+
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ particlesButton.setToolTipText("Create particle system");
	1200	+ particlesButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row1);
	1203	+
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ groupButton.setToolTipText("Create group");
	1208	+ groupButton.addActionListener(this);
	1209	+
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ compositeButton.setToolTipText("Create composite");
	1212	+ compositeButton.addActionListener(this);
	1213	+
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ switchButton.setToolTipText("Create item switcher");
	1216	+ switchButton.addActionListener(this);
	1217	+
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ loopButton.setToolTipText("Create loop");
	1220	+ loopButton.addActionListener(this);
	1221	+
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ textureButton.setToolTipText("Create texture");
	1224	+ textureButton.addActionListener(this);
	1225	+
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ overlayButton.setToolTipText("Create overlay");
	1228	+ overlayButton.addActionListener(this);
	1229	+
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ lightButton.setToolTipText("Create light");
	1232	+ lightButton.addActionListener(this);
	1233	+
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
	1245	+
	1246	+ // EDIT panel
	1247	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ editButton.setToolTipText("Pin selection controls");
668	1249	editButton.addActionListener(this);
669	1250
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1251	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
672	1253	uneditButton.addActionListener(this);
673	1254
674	1255	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1256	+ allParamsButton.setToolTipText("Show all controls");
676	1257	allParamsButton.addActionListener(this);
677	1258
678		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
680	1261	clearPanelButton.addActionListener(this);
681	1262
682		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683		- unselectButton.setToolTipText("Unselect");
684		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
685	1266
	1267	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1268	+ flashSelectionButton.setToolTipText("Highlight selection");
	1269	+ flashSelectionButton.addActionListener(this);
	1270	+
686	1271	editCommandsPanel.preferredHeight = 1;
687	1272
	1273	+ SetPinStates(false);
688	1274	// oe.treePanel.add(commandsPanel);
689	1275	// oe.treePanel.Return();
690	1276
..	..	@@ -703,32 +1289,20 @@
703	1289
704	1290	JScrollPane jSP;
705	1291	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1292	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1293	ResetModel();
708	1294
709	1295	oe.treePanel.add(jSPPanel);
710	1296	oe.treePanel.Return();
711	1297
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727	1298	oe.treePanel.add(copyOptionsPanel);
728	1299	oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
729	1303
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
732	1306
733	1307	//jList.addListSelectionListener(this);
734	1308	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1310,7 @@
736	1310	//jTree.setEditable(true);
737	1311	oe.jTree.setDragEnabled(true);
738	1312	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1314
741	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1316
..	..	@@ -748,29 +1322,49 @@
748	1322	dgr.addDragGestureListener(this);
749	1323	}catch(Exception e) {}
750	1324	*/
751		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
752	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1327	}
754	1328
755	1329	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1330	{
	1331	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1332	+ colorCB.setToolTipText("Copy color when dropped");
	1333	+ colorCB.addItemListener(this);
	1334	+
	1335	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1336	+ materialCB.setToolTipText("Copy material when dropped");
	1337	+ materialCB.addItemListener(this);
	1338	+
	1339	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1340	+ textureCB.setToolTipText("Copy texture when dropped");
	1341	+ textureCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
757	1345	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1346	boxCB.setToolTipText("Display bounding boxes");
759	1347	boxCB.addItemListener(this);
760	1348
761	1349	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1350	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1351	zoomBoxCB.addItemListener(this);
764	1352
765	1353	if (true) // Globals.ADVANCED)
766	1354	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1355	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1356	+// supportCB.setToolTipText("Enable rigging");
	1357	+// supportCB.addItemListener(this);
	1358	+
	1359	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1360	+ freezeCB.setToolTipText("Fast moving camera");
	1361	+ freezeCB.addItemListener(this);
770	1362
771	1363	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1364	// localCB.addItemListener(this);
773	1365
	1366	+ panel.Return();
	1367	+
774	1368	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1369	crowdCB.setToolTipText("Used for crowds");
776	1370	crowdCB.addItemListener(this);
..	..	@@ -779,14 +1373,19 @@
779	1373	smoothCB.setToolTipText("Snapping delay");
780	1374	smoothCB.addItemListener(this);
781	1375
782		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783		- slowCB.setToolTipText("Smooth interpolation");
784		- slowCB.addItemListener(this);
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
785	1382
786	1383	// constraints.gridy += 1;
787	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1385	// speakerMocapCB.addItemListener(this);
789	1386
	1387	+ panel.Return();
	1388	+
790	1389	if (false)
791	1390	{
792	1391	// handled in scripts
..	..	@@ -801,24 +1400,39 @@
801	1400	//constraints.gridy += 1;
802	1401	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1402	smoothfocusCB.addItemListener(this);
	1403	+ panel.Return();
804	1404	}
805	1405
806	1406	//constraints.gridx += 1;
807	1407	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1408	// debugCB.addItemListener(this);
809	1409
	1410	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1411	+ trackCB.setToolTipText("Enable tracking target");
	1412	+ trackCB.addItemListener(this);
	1413	+
810	1414	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	1415	+ oeilCB.setToolTipText("Move camera when tracking");
812	1416	oeilCB.addItemListener(this);
813	1417
814	1418	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815		- shadowCB.setToolTipText("Compute shadows when live");
	1419	+ shadowCB.setToolTipText("When live compute shadows");
816	1420	shadowCB.addItemListener(this);
817	1421
818		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
819		- autosaveCB.setToolTipText("Auto-save on structure change");
820		- autosaveCB.addItemListener(this);
	1422	+ panel.Return();
	1423	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1424	+ toggleTextureCB.setToolTipText("Load textures");
	1425	+ toggleTextureCB.addItemListener(this);
	1426	+
	1427	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1428	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1429	+ toggleSwitchCB.addItemListener(this);
	1430	+
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
821	1434
	1435	+ panel.Return();
822	1436	if (Globals.ADVANCED)
823	1437	{
824	1438	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -829,18 +1443,31 @@
829	1443	}
830	1444
831	1445	cGridBag fill = new cGridBag();
832		-
833	1446	fill.preferredHeight = 200;
	1447	+ cGridBag fill2 = new cGridBag();
	1448	+ fill2.preferredHeight = 200;
	1449	+ cGridBag fill3 = new cGridBag();
	1450	+ fill3.preferredHeight = 200;
834	1451
835	1452	panel.add(fill);
	1453	+ panel.add(fill2);
	1454	+ panel.add(fill3);
836	1455
837	1456	}
838	1457
839	1458	void EditObject(Object3D obj)
840	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
841	1468	cRadio radioButton = new cRadio(obj.name);
842	1469
843		- // Patch to avoid bug with transparency.
	1470	+ // June 2019. Patch to avoid bug with transparency.
844	1471	radioButton.hadMaterial = obj.material != null;
845	1472	if (!radioButton.hadMaterial)
846	1473	{
..	..	@@ -848,7 +1475,7 @@
848	1475	}
849	1476
850	1477	radioButton.SetObject(obj);
851		- radioButton.layout = sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
852	1479	radioButton.SetCamera(cameraView.renderCamera, false);
853	1480	radioButton.addActionListener(this);
854	1481	radioPanel.add(radioButton);
..	..	@@ -868,15 +1495,19 @@
868	1495	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
869	1496	}
870	1497
871		- cCheckBox liveCB;
	1498	+ cToggleButton liveCB;
872	1499	cCheckBox supportCB;
873	1500	cCheckBox localCB;
874	1501	cCheckBox crowdCB;
875	1502	cCheckBox smoothCB;
876		- cCheckBox fastCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
	1505	+ cToggleButton fastCB;
877	1506	cCheckBox slowCB;
878	1507	cCheckBox boxCB;
879	1508	cCheckBox zoomBoxCB;
	1509	+ cCheckBox freezeCB;
	1510	+ //cToggleButton trackCB;
880	1511	cCheckBox trackCB;
881	1512	cCheckBox smoothfocusCB;
882	1513	// JCheckBox speakerMocapCB;
..	..	@@ -886,7 +1517,7 @@
886	1517
887	1518	cCheckBox oeilCB;
888	1519	cCheckBox shadowCB;
889		- cCheckBox autosaveCB;
	1520	+ cCheckBox autokeepCB;
890	1521	cCheckBox lookAtCB;
891	1522
892	1523	// static int COLOR = 1;
..	..	@@ -942,6 +1573,12 @@
942	1573	cameraView.ToggleInertia();
943	1574	cameraView.repaint();
944	1575	}
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
	1581	+ }
945	1582	else if(e.getSource() == localCB)
946	1583	{
947	1584	cameraView.ToggleLocal();
..	..	@@ -994,9 +1631,13 @@
994	1631	{
995	1632	Globals.COMPUTESHADOWWHENLIVE ^= true;
996	1633	}
997		- else if(e.getSource() == autosaveCB)
	1634	+ else if(e.getSource() == freezeCB)
998	1635	{
999		- Globals.SAVEONMAKE ^= true;
	1636	+ Globals.FREEZEONMOVE ^= true;
	1637	+ }
	1638	+ else if(e.getSource() == autokeepCB)
	1639	+ {
	1640	+ Globals.REPLACEONMAKE ^= true;
1000	1641	}
1001	1642	else if(e.getSource() == lookAtCB)
1002	1643	{
..	..	@@ -1014,7 +1655,8 @@
1014	1655
1015	1656	/**/
1016	1657	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1017		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1658	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1659	+ TreePath path = objEditor.jTree.getSelectionPath();
1018	1660	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1019	1661	// We can't move the root node or an empty selection
1020	1662	return;
..	..	@@ -1077,8 +1719,6 @@
1077	1719	}
1078	1720	}
1079	1721
1080		- String string = (String) object;
1081		-
1082	1722	System.out.println("Transfer = " + object + "; drop : " + target);
1083	1723	// if( object instanceof java.io.File[])
1084	1724	// {
..	..	@@ -1086,6 +1726,8 @@
1086	1726	// objEditor.DropFile((java.io.File[]) object, true);
1087	1727	// return;
1088	1728	// }
	1729	+
	1730	+ String string = object.toString();
1089	1731
1090	1732	// File path for Mac and Windows
1091	1733	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1131,23 +1773,33 @@
1131	1773
1132	1774	assert target == objEditor.jTree;
1133	1775	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1776	+ Object3D destinationLeaf;
1134	1777	try {
1135		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1778	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1136	1779	} catch (Exception e) {
1137	1780	System.out.println("destinationPath : " + destinationPath);
1138	1781	return;
1139	1782	}
1140	1783
1141		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1784	+ for (int i=group.selection.size(); --i>=0;)
1142	1785	{
	1786	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1787	+
	1788	+ // Cannot move into itself
	1789	+ if (child == destinationLeaf)
	1790	+ return;
	1791	+ }
	1792	+
	1793	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1794	+// {
1143	1795	loadClipboard(true);
1144	1796	objEditor.jTree.setSelectionPath(destinationPath);
1145	1797	pasteInto(false, false);
1146		- } else {
1147		- loadClipboard(false);
1148		- objEditor.jTree.setSelectionPath(destinationPath);
1149		- pasteInto(false, false); // true); // ???
1150		- }
	1798	+// } else {
	1799	+// loadClipboard(false);
	1800	+// objEditor.jTree.setSelectionPath(destinationPath);
	1801	+// pasteInto(false, false); // true); // ???
	1802	+// }
1151	1803	}
1152	1804	public void dropActionChanged(DropTargetDragEvent dtde)
1153	1805	// Called if the user has modified the current drop gesture
..	..	@@ -1203,7 +1855,12 @@
1203	1855	TreePath path;
1204	1856
1205	1857	public TransferableTreePath(TreePath tp) {
1206		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
1207	1864	}
1208	1865
1209	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1252,22 +1909,30 @@
1252	1909	{
1253	1910	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1254	1911	//heightFieldItem.addActionListener(this);
1255		- gridItem = menu.add(new MenuItem("Grid"));
1256		- gridItem.addActionListener(this);
1257		- rectoidItem = menu.add(new MenuItem("Box"));
1258		- rectoidItem.addActionListener(this);
1259		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1260		- ellipsoidItem.addActionListener(this);
1261		- coneItem = menu.add(new MenuItem("Cone"));
1262		- coneItem.addActionListener(this);
1263		- torusItem = menu.add(new MenuItem("Torus"));
1264		- torusItem.addActionListener(this);
1265		- superItem = menu.add(new MenuItem("Superellipsoid"));
1266		- superItem.addActionListener(this);
	1912	+// gridItem = menu.add(new MenuItem("Grid"));
	1913	+// gridItem.addActionListener(this);
	1914	+// rectoidItem = menu.add(new MenuItem("Box"));
	1915	+// rectoidItem.addActionListener(this);
	1916	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1917	+// ellipsoidItem.addActionListener(this);
	1918	+// coneItem = menu.add(new MenuItem("Cone"));
	1919	+// coneItem.addActionListener(this);
	1920	+// torusItem = menu.add(new MenuItem("Torus"));
	1921	+// torusItem.addActionListener(this);
	1922	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1923	+// superItem.addActionListener(this);
	1924	+
	1925	+ cameraItem = menu.add(new MenuItem("Camera"));
	1926	+ cameraItem.addActionListener(this);
	1927	+
	1928	+ if (!Globals.ADVANCED)
	1929	+ {
1267	1930	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1268	1931	kleinItem.addActionListener(this);
1269		- particleItem = menu.add(new MenuItem("Particle system"));
1270		- particleItem.addActionListener(this);
	1932	+ }
	1933	+
	1934	+// particleItem = menu.add(new MenuItem("Particle system"));
	1935	+// particleItem.addActionListener(this);
1271	1936	if (Globals.ADVANCED)
1272	1937	{
1273	1938	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1293,15 +1958,15 @@
1293	1958	}
1294	1959	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1295	1960	bezierItem.addActionListener(this);
1296		- overlayItem = menu.add(new MenuItem("Overlay"));
1297		- overlayItem.addActionListener(this);
1298		- lightItem = menu.add(new MenuItem("Light"));
1299		- lightItem.addActionListener(this);
	1961	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1962	+// overlayItem.addActionListener(this);
	1963	+// lightItem = menu.add(new MenuItem("Light"));
	1964	+// lightItem.addActionListener(this);
1300	1965	menu.add("-");
1301	1966	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1302	1967	//superLoopItem.addActionListener(this);
1303		- loopItem = menu.add(new MenuItem("Loop"));
1304		- loopItem.addActionListener(this);
	1968	+// loopItem = menu.add(new MenuItem("Loop"));
	1969	+// loopItem.addActionListener(this);
1305	1970	doubleItem = menu.add(new MenuItem("Fork"));
1306	1971	doubleItem.addActionListener(this);
1307	1972	if (Globals.ADVANCED)
..	..	@@ -1317,6 +1982,9 @@
1317	1982	animationItem.addItemListener(this);
1318	1983	animationItem.setState(Globals.ANIMATION);
1319	1984
	1985	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1986	+ archiveItem.addActionListener(this);
	1987	+
1320	1988	menu.add("-");
1321	1989	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1322	1990	parseverticesItem.addActionListener(this);
..	..	@@ -1329,6 +1997,8 @@
1329	1997	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1330	1998	reduce34MorphItem.addActionListener(this);
1331	1999	menu.add("-");
	2000	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2001	+ memoryItem.addActionListener(this);
1332	2002	menu.add(computeAOItem = new MenuItem("Compute AO"));
1333	2003	computeAOItem.addActionListener(this);
1334	2004
..	..	@@ -1337,8 +2007,6 @@
1337	2007	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1338	2008	mirrorItem.addActionListener(this);
1339	2009	menu.add("-");
1340		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1341		- memoryItem.addActionListener(this);
1342	2010	menu.add(analyzeItem = new MenuItem("Analyze"));
1343	2011	analyzeItem.addActionListener(this);
1344	2012	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1486,6 +2154,30 @@
1486	2154
1487	2155	makeSomething(shadow);
1488	2156	}
	2157	+
	2158	+ private void ClearUnpinned()
	2159	+ {
	2160	+ //for (Object3D obj : listUI)
	2161	+ for (int i=listUI.size(); --i>=0;)
	2162	+ {
	2163	+ Object3D obj = listUI.elementAt(i);
	2164	+ if (!obj.pinned)
	2165	+ {
	2166	+ obj.CloseUI();
	2167	+ listUI.remove(i);
	2168	+ }
	2169	+ }
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
	2180	+ }
1489	2181
1490	2182	/**
1491	2183	* applyExample
..	..	@@ -1730,7 +2422,7 @@
1730	2422	{
1731	2423	ScreenFit();
1732	2424	} else
1733		- if (source == switchItem)
	2425	+ if (source == switchViewItem)
1734	2426	{
1735	2427	cVector v1 = new cVector();
1736	2428	cVector v2 = new cVector();
..	..	@@ -1739,11 +2431,11 @@
1739	2431	objEditor.cameraView.renderCamera.setAim(v2, v1);
1740	2432	objEditor.cameraView.repaint();
1741	2433	} else
1742		- if (source == rectoidItem)
	2434	+ if (source == rectoidItem \|\| source == boxButton)
1743	2435	{
1744	2436	makeSomething(new Box());
1745	2437	} else
1746		- if (source == particleItem)
	2438	+ if (source == particleItem \|\| source == particlesButton)
1747	2439	{
1748	2440	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1749	2441	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1822,27 +2514,27 @@
1822	2514
1823	2515	makeSomething(obj);
1824	2516	} else
1825		- if (source == gridItem)
	2517	+ if (source == gridItem \|\| source == gridButton)
1826	2518	{
1827	2519	makeSomething(new Grid());
1828	2520	} else
1829		- if (source == ellipsoidItem)
	2521	+ if (source == ellipsoidItem \|\| source == sphereButton)
1830	2522	{
1831	2523	makeSomething(new Sphere());
1832	2524	} else
1833		- if (source == coneItem)
	2525	+ if (source == coneItem \|\| source == coneButton)
1834	2526	{
1835	2527	makeSomething(new Cone());
1836	2528	} else
1837		- if (source == torusItem)
	2529	+ if (source == torusItem \|\| source == torusButton)
1838	2530	{
1839	2531	makeSomething(new Torus());
1840	2532	} else
1841		- if (source == superItem)
	2533	+ if (source == superItem \|\| source == superButton)
1842	2534	{
1843	2535	makeSomething(new Superellipsoid());
1844	2536	} else
1845		- if (source == kleinItem)
	2537	+ if (source == kleinItem \|\| source == kleinButton)
1846	2538	{
1847	2539	makeSomething(new Klein());
1848	2540	} else
..	..	@@ -1862,7 +2554,7 @@
1862	2554	{
1863	2555	makeSomething(new BezierSurface());
1864	2556	} else
1865		- if (source == overlayItem)
	2557	+ if (source == overlayItem \|\| source == overlayButton)
1866	2558	{
1867	2559	/*
1868	2560	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1910,10 +2602,27 @@
1910	2602	s.setup();
1911	2603	makeSomething(s);
1912	2604	} else
1913		- if (source == lightItem)
	2605	+ if (source == lightItem \|\| source == lightButton)
1914	2606	{
1915	2607	makeSomething(new Light());
1916	2608	} else
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
1917	2626	if (source == csgItem)
1918	2627	{
1919	2628	group(new CSG());
..	..	@@ -1960,30 +2669,30 @@
1960	2669
1961	2670	group(g);
1962	2671	} else
1963		- if (source == loopItem)
	2672	+ if (source == loopItem \|\| source == loopButton)
1964	2673	{
1965	2674	Composite csg = new GroupLeaf();
1966	2675	csg.count = 5;
1967	2676	group(csg);
1968		- Composite child = new cGroup();
	2677	+ Composite child = new cGroup("Branch");
1969	2678	csg.addChild(child);
1970	2679	child.addChild(csg);
1971	2680	} else
1972	2681	if (source == doubleItem)
1973	2682	{
1974		- Composite csg = new GroupLeaf();
	2683	+ Composite csg = new GroupLeaf("Fork");
1975	2684	csg.count = 5;
1976	2685	group(csg);
1977		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch A");
1978	2687	csg.addChild(child);
1979	2688	child.addChild(csg);
1980		- child = new cGroup();
	2689	+ child = new cGroup("Branch B");
1981	2690	csg.addChild(child);
1982	2691	child.addChild(csg);
1983	2692	} else
1984	2693	if (source == tripleItem)
1985	2694	{
1986		- Composite csg = new GroupLeaf();
	2695	+ Composite csg = new GroupLeaf("Trident");
1987	2696	csg.count = 4;
1988	2697	group(csg);
1989	2698	Composite child = new cGroup();
..	..	@@ -1999,7 +2708,7 @@
1999	2708	if (source == computeAOItem)
2000	2709	{
2001	2710	Globals.drawMode = CameraPane.OCCLUSION;
2002		- Globals.theRenderer.repaint();
	2711	+ cameraView.repaint();
2003	2712	} else
2004	2713	if (source == recompileItem)
2005	2714	{
..	..	@@ -2014,7 +2723,7 @@
2014	2723	if (source == invariantsItem)
2015	2724	{
2016	2725	System.out.println("Invariants:");
2017		- Grafreed.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
2018	2727	} else
2019	2728	if (source == memoryItem)
2020	2729	{
..	..	@@ -2045,17 +2754,52 @@
2045	2754	{
2046	2755	ToggleFullScreen();
2047	2756	} else
2048		- if (source == undoButton)
	2757	+ if (source == collapseButton)
2049	2758	{
2050		- Undo();
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
2051	2761	} else
2052		- if (source == redoButton)
	2762	+ if (source == maximize3DButton)
2053	2763	{
2054		- Redo();
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
2055	2768	} else
2056		- if (source == saveButton)
	2769	+ if (source == previousVersionButton)
2057	2770	{
2058		- Save();
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
	2796	+ if (!Save(true))
	2797	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
2059	2803	} else
2060	2804	if (source == oneStepButton)
2061	2805	{
..	..	@@ -2064,17 +2808,14 @@
2064	2808	} else
2065	2809	if (source == screenfitButton)
2066	2810	{
2067		- //Reload(lastConverter, lastFilename, true);
2068	2811	ScreenFit();
2069	2812	} else
2070	2813	if (source == screenfitpointButton)
2071	2814	{
2072		- //Reload(lastConverter, lastFilename, true);
2073	2815	ScreenFitPoint();
2074	2816	} else
2075	2817	if (source == snapobjectButton)
2076	2818	{
2077		- //Reload(lastConverter, lastFilename, true);
2078	2819	SnapObject();
2079	2820	} else
2080	2821	// if (event.getSource() == recompileButton)
..	..	@@ -2113,11 +2854,11 @@
2113	2854	} else
2114	2855	if (source == undoItem)
2115	2856	{
2116		- Undo();
	2857	+ PreviousVersion();
2117	2858	} else
2118	2859	if (source == redoItem)
2119	2860	{
2120		- Redo();
	2861	+ NextVersion();
2121	2862	} else
2122	2863	if (source == duplicateItem)
2123	2864	{
..	..	@@ -2438,7 +3179,7 @@
2438	3179	{
2439	3180	StepAll();
2440	3181	} else
2441		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2442	3183	{
2443	3184	//int indices[] = jList.getSelectedIndices();
2444	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2450,9 +3191,9 @@
2450	3191	{
2451	3192	ClearSelection(true);
2452	3193	} else
2453		- if (source == grabItem)
	3194	+ if (source == grabItem \|\| source == groupButton)
2454	3195	{
2455		- group(new cGroup(), true);
	3196	+ group(new cGroup(), false); // true);
2456	3197	} else
2457	3198	if (source == hideItem)
2458	3199	{
..	..	@@ -2470,11 +3211,11 @@
2470	3211	{
2471	3212	makeSomething(new Camera());
2472	3213	} else
2473		- if (source == compositeItem)
	3214	+ if (source == compositeItem \|\| source == compositeButton)
2474	3215	{
2475	3216	group(new Composite());
2476	3217	} else
2477		- if (source == randomItem)
	3218	+ if (source == switchItem \|\| source == switchButton)
2478	3219	{
2479	3220	RandomNode random = new RandomNode();
2480	3221	group(random);
..	..	@@ -2576,7 +3317,7 @@
2576	3317	{
2577	3318	group(new cLinker());
2578	3319	} else
2579		- if (source == textureItem)
	3320	+ if (source == textureItem \|\| source == textureButton)
2580	3321	{
2581	3322	group(new TextureNode());
2582	3323	} else
..	..	@@ -2596,17 +3337,30 @@
2596	3337	{
2597	3338	CastShadow(2);
2598	3339	} else
2599		- if (source == ungroupItem)
	3340	+ if (source == ungroupItem \|\| source == ungroupButton)
2600	3341	{
2601		- //ungroup();
	3342	+ boolean hasRoot = false;
	3343	+
2602	3344	for (int i=0; i<group.selection.size(); i++)
2603	3345	{
2604		- Ungroup(group.selection.get(i));
	3346	+ if (group.selection.get(i) == group)
	3347	+ {
	3348	+ hasRoot = true;
	3349	+ break;
	3350	+ }
2605	3351	}
2606	3352
2607		- ClearSelection(false);
2608		-
2609		- refreshContents();
	3353	+ if (!hasRoot)
	3354	+ {
	3355	+ for (int i=0; i<group.selection.size(); i++)
	3356	+ {
	3357	+ Ungroup(group.selection.get(i));
	3358	+ }
	3359	+
	3360	+ ClearSelection(false);
	3361	+
	3362	+ refreshContents();
	3363	+ }
2610	3364	} else
2611	3365	if (source == genUVItem)
2612	3366	{
..	..	@@ -2907,7 +3661,7 @@
2907	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2908	3662	{
2909	3663	obj = (Object3D)e.nextElement();
2910		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
2911	3665	}
2912	3666
2913	3667	refreshContents();
..	..	@@ -2923,6 +3677,31 @@
2923	3677
2924	3678	refreshContents();
2925	3679	} else
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
	3703	+ refreshContents();
	3704	+ } else
2926	3705	if (source == flashSelectionButton)
2927	3706	{
2928	3707	CameraPane.flash = true;
..	..	@@ -2934,38 +3713,11 @@
2934	3713	if (source == twoButton)
2935	3714	{
2936	3715	radio.layout = twoButton;
2937		- // bug
2938		- //gridPanel.setDividerLocation(1.0);
2939		- //bigPanel.setDividerLocation(0.0);
2940		-// bigThree.remove(scenePanel);
2941		-// bigThree.remove(centralPanel);
2942		-// bigThree.remove(XYZPanel);
2943		-// aWindowConstraints.gridx = 0;
2944		-// aWindowConstraints.gridy = 0;
2945		-// aWindowConstraints.gridwidth = 1;
2946		-// // aConstraints.gridheight = 3;
2947		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2948		-// aWindowConstraints.weightx = 0;
2949		-// aWindowConstraints.weighty = 1;
2950		-// //bigThree.add(jtp, aWindowConstraints);
2951		-// aWindowConstraints.weightx = 1;
2952		-// aWindowConstraints.gridwidth = 3;
2953		-// // aConstraints.gridheight = 3;
2954		-// aWindowConstraints.gridx = 1;
2955		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2956		-// bigThree.add(centralPanel, aWindowConstraints);
2957		-// aWindowConstraints.weightx = 0;
2958		-// aWindowConstraints.gridx = 4;
2959		-// aWindowConstraints.gridwidth = 1;
2960		-// // aConstraints.gridheight = 3;
2961		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2962		-// //bigThree.add(XYZPanel, aWindowConstraints);
2963		-// scenePanel.setVisible(false);
2964		-// centralPanel.setVisible(true);
2965		-// XYZPanel.setVisible(false);
2966		- bigThree.ClearUI();
2967		- bigThree.add(centralPanel);
2968		- bigThree.FlushUI();
	3716	+
	3717	+ if (CameraPane.FULLSCREEN)
	3718	+ fullscreenLayout = radio.layout;
	3719	+
	3720	+ Show3DView();
2969	3721
2970	3722	cameraView.requestFocusInWindow();
2971	3723
..	..	@@ -2988,6 +3740,9 @@
2988	3740	if (source == threeButton)
2989	3741	{
2990	3742	radio.layout = threeButton;
	3743	+
	3744	+ if (CameraPane.FULLSCREEN)
	3745	+ fullscreenLayout = radio.layout;
2991	3746
2992	3747	// bigThree.remove(scenePanel);
2993	3748	// bigThree.remove(centralPanel);
..	..	@@ -3017,8 +3772,8 @@
3017	3772	// centralPanel.setVisible(true);
3018	3773	// XYZPanel.setVisible(true);
3019	3774	bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
3020	3776	bigThree.add(centralPanel);
3021		- bigThree.add(XYZPanel);
3022	3777	bigThree.FlushUI();
3023	3778
3024	3779	cameraView.requestFocusInWindow();
..	..	@@ -3026,6 +3781,9 @@
3026	3781	if (source == fourButton)
3027	3782	{
3028	3783	radio.layout = fourButton;
	3784	+
	3785	+ if (CameraPane.FULLSCREEN)
	3786	+ fullscreenLayout = radio.layout;
3029	3787
3030	3788	// bigThree.remove(scenePanel);
3031	3789	// bigThree.remove(centralPanel);
..	..	@@ -3064,6 +3822,9 @@
3064	3822	{
3065	3823	radio.layout = sixButton;
3066	3824
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
	3827	+
3067	3828	// bigThree.remove(scenePanel);
3068	3829	// bigThree.remove(centralPanel);
3069	3830	// bigThree.remove(XYZPanel);
..	..	@@ -3092,8 +3853,8 @@
3092	3853	// centralPanel.setVisible(true);
3093	3854	// XYZPanel.setVisible(false);
3094	3855	bigThree.ClearUI();
3095		- bigThree.add(scenePanel);
3096	3856	bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
3097	3858	bigThree.FlushUI();
3098	3859
3099	3860	cameraView.requestFocusInWindow();
..	..	@@ -3101,6 +3862,9 @@
3101	3862	if (source == sevenButton)
3102	3863	{
3103	3864	radio.layout = sevenButton;
	3865	+
	3866	+ if (CameraPane.FULLSCREEN)
	3867	+ fullscreenLayout = radio.layout;
3104	3868
3105	3869	// bigThree.remove(scenePanel);
3106	3870	// bigThree.remove(centralPanel);
..	..	@@ -3139,6 +3903,7 @@
3139	3903	} else
3140	3904	if (source == rootButton)
3141	3905	{
	3906	+ Replace();
3142	3907	Object3D obj;
3143	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3144	3909	{
..	..	@@ -3182,6 +3947,12 @@
3182	3947	} else
3183	3948	if (source == editItem \|\| source == editButton)
3184	3949	{
	3950	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3951	+ {
	3952	+ Object3D child = (Object3D)e.nextElement();
	3953	+ child.pinned = true;
	3954	+ }
	3955	+
3185	3956	EditSelection(false);
3186	3957	} else
3187	3958	if (source == uneditButton)
..	..	@@ -3190,9 +3961,10 @@
3190	3961	{
3191	3962	Object3D child = (Object3D)e.nextElement();
3192	3963	if(child.editWindow != null)
3193		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3964	+ child.pinned = false;
3194	3965	child.CloseUI();
3195	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3196	3968
3197	3969	//child.editWindow = null; // ???????????
3198	3970	}
..	..	@@ -3207,16 +3979,18 @@
3207	3979	//copy.ClearUI();
3208	3980	for (Object3D obj : listUI)
3209	3981	{
	3982	+ obj.pinned = false;
3210	3983	obj.CloseUI();
3211	3984	}
3212	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
3213	3987	refreshContents(true);
3214	3988	} else
3215	3989	if (source == allParamsButton)
3216	3990	{
3217	3991	assert(copy == group);
3218	3992
3219		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3993	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3220	3994
3221	3995	for (Object3D obj : listUI)
3222	3996	{
..	..	@@ -3265,6 +4039,7 @@
3265	4039	}
3266	4040
3267	4041	copy = group;
	4042	+
3268	4043	//Globals.theRenderer.object = group;
3269	4044	if(!useclient)
3270	4045	{
..	..	@@ -3291,6 +4066,16 @@
3291	4066	currentLayout = sevenButton;
3292	4067	*/
3293	4068	radio.layout.doClick();
	4069	+
	4070	+ SetUndoStates();
	4071	+
	4072	+ ClearUnpinned();
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
	4078	+ EditSelection(false);
3294	4079	keepparent = group.parent;
3295	4080	// PARENT = NULL or not???
3296	4081	//group.parent = null; // ROOT
..	..	@@ -3302,11 +4087,13 @@
3302	4087	} else if (event.getSource() == editCameraItem)
3303	4088	{
3304	4089	cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
3305	4091	cameraView.repaint();
3306	4092	return;
3307		- } else if (event.getSource() == revertCameraItem)
	4093	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3308	4094	{
3309	4095	cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
3310	4097	cameraView.repaint();
3311	4098	return;
3312	4099	// } else if (event.getSource() == textureButton)
..	..	@@ -3883,7 +4670,7 @@
3883	4670
3884	4671	try
3885	4672	{
3886		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3887	4674	}
3888	4675	catch (Exception e)
3889	4676	{
..	..	@@ -4358,28 +5145,25 @@
4358	5145	// }
4359	5146	// }
4360	5147
4361		- static boolean allparams = true;
4362		-
4363		- static Vector<Object3D> listUI = new Vector<Object3D>();
4364		-
4365	5148	void EditSelection(boolean newWindow)
4366	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
4367	5156	// aConstraints.gridy = 0;
4368	5157	for (int i=0; i<group.selection.size(); i++)
4369	5158	{
4370	5159	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4371	5160	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4372		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5161	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4373	5162
4374	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
4375	5164	if(elem != group \|\| !newWindow)
4376	5165	{
4377		- // if (!(elem instanceof Composite))
4378		- // newWindow = false;
4379		- listUI.add(elem);
4380		- elem.openEditWindow(this, newWindow); //, false);
4381		- System.out.println("edit : " + elem);
4382		- elem.editWindow.refreshContents(true); // ? new
	5166	+ EditElement(elem, newWindow); // ? new
4383	5167	}
4384	5168	}
4385	5169	}
..	..	@@ -4442,9 +5226,7 @@
4442	5226
4443	5227	freezemodel = false;
4444	5228	}
4445		-
4446		- boolean flashIt = true;
4447		-
	5229	+
4448	5230	public void valueChanged(TreeSelectionEvent e)
4449	5231	//public boolean handleEvent(Event event)
4450	5232	{
..	..	@@ -4454,7 +5236,8 @@
4454	5236	//new Exception().printStackTrace();
4455	5237
4456	5238	freezemodel = true;
4457		-
	5239	+ ClearUnpinned();
	5240	+
4458	5241	/**/
4459	5242	//switch (event.id)
4460	5243	{
..	..	@@ -4487,7 +5270,7 @@
4487	5270	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4488	5271	// a camera
4489	5272	{
4490		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5273	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4491	5274	{
4492	5275	CameraPane.camerachangeframe = 0; // don't refuse it
4493	5276	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4496,6 +5279,13 @@
4496	5279	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4497	5280	}
4498	5281
	5282	+ if (tps != null && tps.length == 1)
	5283	+ {
	5284	+ EditSelection(false);
	5285	+ }
	5286	+
	5287	+ SetPinStates(tps != null && tps.length > 0);
	5288	+
4499	5289	refreshContents();
4500	5290	//return true;
4501	5291	}
..	..	@@ -4505,9 +5295,33 @@
4505	5295	freezemodel = false;
4506	5296	}
4507	5297
	5298	+ void SetPinStates(boolean enabled)
	5299	+ {
	5300	+ editButton.setEnabled(enabled);
	5301	+ uneditButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
	5303	+ flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
	5319	+ }
	5320	+
4508	5321	void refreshContents(boolean cp)
4509	5322	{
4510		- if (!Globals.MOUSEDRAGGED)
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5324	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4511	5325	{
4512	5326	objEditor.ClearInfo(); // .GetMaterial());
4513	5327
..	..	@@ -4516,7 +5330,7 @@
4516	5330	Object3D child = (Object3D) group.selection.get(i);
4517	5331
4518	5332	objEditor.AddInfo(child, this, true);
4519		- System.err.println("info : " + child.GetPath());
	5333	+// System.err.println("info : " + child.GetPath());
4520	5334	}
4521	5335
4522	5336	objEditor.SetText(); // jan 2014
..	..	@@ -4606,8 +5420,8 @@
4606	5420
4607	5421	if (cut)
4608	5422	{
4609		- if (Globals.SAVEONMAKE)
4610		- Save();
	5423	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5424	+// Save();
4611	5425	//int indices[] = jList.getSelectedIndices();
4612	5426	//for (int i = indices.length - 1; i >= 0; i--)
4613	5427	//jList.remove(indices[i]);
..	..	@@ -4710,6 +5524,10 @@
4710	5524
4711	5525	void paste(boolean expand)
4712	5526	{
	5527	+ if (Globals.REPLACEONMAKE)
	5528	+ Save();
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
4713	5531	// if (GrafreeD.clipboard == null)
4714	5532	// return;
4715	5533	boolean first = true;
..	..	@@ -4769,6 +5587,7 @@
4769	5587	Grafreed.clipboard.get(0).parent = keepparent;
4770	5588	}
4771	5589
	5590	+ Globals.REPLACEONMAKE = keep;
4772	5591	ResetModel();
4773	5592	refreshContents();
4774	5593	}
..	..	@@ -4904,6 +5723,10 @@
4904	5723
4905	5724	void group(Object3D csg, boolean grab)
4906	5725	{
	5726	+ if (Globals.REPLACEONMAKE)
	5727	+ Save();
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
4907	5730	if (//false) // why??
4908	5731	!group.selection.isEmpty())
4909	5732	{
..	..	@@ -5017,10 +5840,15 @@
5017	5840	//node.add(csg);
5018	5841	//makeSomething(node);
5019	5842	makeSomething(csg);
	5843	+ Globals.REPLACEONMAKE = keep;
5020	5844	}
5021	5845
5022	5846	void Ungroup(Object3D g)
5023	5847	{
	5848	+ if (Globals.REPLACEONMAKE)
	5849	+ Save();
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
5024	5852	if (g instanceof HiddenObject)
5025	5853	{
5026	5854	HiddenObject h = (HiddenObject) g;
..	..	@@ -5037,6 +5865,7 @@
5037	5865	objEditor.makeSomething(g.get(i), false);
5038	5866	}
5039	5867	}
	5868	+ Globals.REPLACEONMAKE = keep;
5040	5869	}
5041	5870
5042	5871	void ungroup()
..	..	@@ -5325,13 +6154,43 @@
5325	6154	cButton clearpanelButton;
5326	6155	cButton unselectButton;
5327	6156
5328		- cButton minButton;
5329		- cButton maxButton;
5330		- cButton fullButton;
5331		- cButton undoButton;
5332		- cButton redoButton;
5333		- cButton saveButton;
	6157	+ cButton restoreCameraButton;
	6158	+
5334	6159	cButton oneStepButton;
	6160	+
	6161	+ cButton groupButton;
	6162	+ cButton ungroupButton;
	6163	+ cButton compositeButton;
	6164	+ cButton switchButton;
	6165	+ cButton loopButton;
	6166	+ cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
	6183	+
	6184	+ cButton gridButton;
	6185	+ cButton boxButton;
	6186	+ cButton sphereButton;
	6187	+ cButton coneButton;
	6188	+ cButton torusButton;
	6189	+ cButton superButton;
	6190	+ cButton kleinButton;
	6191	+ cButton particlesButton;
	6192	+ cButton overlayButton;
	6193	+ cButton lightButton;
5335	6194
5336	6195	cButton screenfitButton;
5337	6196	cButton screenfitpointButton;
..	..	@@ -5353,11 +6212,11 @@
5353	6212	//JTree jTree;
5354	6213	private MenuItem lookAtItem;
5355	6214	private MenuItem lookFromItem;
5356		- private MenuItem switchItem;
	6215	+ private MenuItem switchViewItem;
5357	6216	private MenuItem cutItem;
5358	6217	private MenuItem undoItem;
5359	6218	private MenuItem redoItem;
5360		- private MenuItem duplicateItem;
	6219	+ private JMenuItem duplicateItem;
5361	6220	private MenuItem cloneItem;
5362	6221	private MenuItem cloneSupportItem;
5363	6222	private MenuItem overwriteGeoItem;
..	..	@@ -5385,7 +6244,7 @@
5385	6244	private MenuItem pasteLinkItem;
5386	6245	private MenuItem pasteCloneItem;
5387	6246	private MenuItem pasteExpandItem;
5388		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
5389	6248	private MenuItem clearAllItem;
5390	6249	private MenuItem genUVItem;
5391	6250	private MenuItem genNormalsMESHItem;
..	..	@@ -5445,7 +6304,7 @@
5445	6304	private MenuItem frontItem;
5446	6305	private MenuItem cameraItem;
5447	6306	private MenuItem compositeItem;
5448		- private MenuItem randomItem;
	6307	+ private MenuItem switchItem;
5449	6308	private MenuItem physicsItem;
5450	6309	private MenuItem frameselectorItem;
5451	6310	private MenuItem scriptNodeItem;
..	..	@@ -5469,6 +6328,8 @@
5469	6328	private MenuItem attachBumpItem;
5470	6329	private MenuItem detachBumpItem;
5471	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5472	6333
5473	6334	private MenuItem particleItem;
5474	6335	private MenuItem ragdollItem;
..	..	@@ -5519,5 +6380,5 @@
5519	6380
5520	6381	Menu cameraMenu;
5521	6382	MenuItem editCameraItem;
5522		- MenuItem revertCameraItem;
	6383	+ MenuItem restoreCameraItem;
5523	6384	}