~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,335 @@
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, final String t, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(f + "s");
	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	+ cameraView.repaint();
	354	+ }
	355	+
26	356	//ObjEditor objEditor;
27	357	public void closeUI2()
28	358	{
..	..	@@ -60,6 +390,12 @@
60	390	this.copy = this.group = group;
61	391	//selectees = this.group.selectees;
62	392
	393	+ if (copy.versionlist == null)
	394	+ {
	395	+ copy.versionlist = new Object3D[100];
	396	+ copy.versionindex = -1;
	397	+ }
	398	+
63	399	if(ui)
64	400	SetupUI(objEditor);
65	401	}
..	..	@@ -80,10 +416,22 @@
80	416	SetupViews(objEditor);
81	417
82	418	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ Save(true);
	426	+ }
83	427	}
84	428
85	429	void CloneSelection(boolean supports)
86	430	{
	431	+ if (Globals.REPLACEONMAKE)
	432	+ Save();
	433	+ boolean keep = Globals.REPLACEONMAKE;
	434	+ Globals.REPLACEONMAKE = false;
87	435	// Object3D keep = GrafreeD.clipboard;
88	436	//Object3D obj;
89	437	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +442,7 @@
94	442
95	443	makeSomething(clone, i==group.selection.size()-1);
96	444	}
	445	+ Globals.REPLACEONMAKE = keep;
97	446	}
98	447
99	448	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +499,8 @@
150	499
151	500	void SetupMenu2(GroupEditor oe)
152	501	{
	502	+ oe.jTree = new cTree();
	503	+
153	504	Menu menu;
154	505	oe.menuBar.add(menu = new Menu("Edit"));
155	506	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +511,7 @@
160	511	// redoItem = menu.add(new MenuItem("Redo"));
161	512	// redoItem.addActionListener(this);
162	513	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	514	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	515	duplicateItem.addActionListener(this);
165	516	cloneItem = menu.add(new MenuItem("Clone"));
166	517	cloneItem.addActionListener(this);
..	..	@@ -187,8 +538,8 @@
187	538	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	539	// pasteExpandItem.addActionListener(this);
189	540	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	541	+ deleteItem = menu.add(new MenuItem("Delete"));
	542	+ deleteItem.addActionListener(this);
192	543
193	544	if (Globals.ADVANCED)
194	545	{
..	..	@@ -202,23 +553,23 @@
202	553	//zBufferItem.addActionListener(this);
203	554	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	555	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	556	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	557	+ restoreCameraItem.addActionListener(this);
207	558
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	559	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	560	+// toggleFullScreenItem.addItemListener(this);
	561	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	562	+// cameraMenu.add("-");
	563	+//
	564	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	565	+// toggleTextureItem.addItemListener(this);
	566	+// toggleTextureItem.setState(CameraPane.textureon);
	567	+//
	568	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	569	+// toggleSwitchItem.addItemListener(this);
	570	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	571
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"));
	572	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	573	toggleHandleItem.addItemListener(this);
223	574	toggleHandleItem.setState(CameraPane.HANDLES);
224	575
..	..	@@ -273,7 +624,7 @@
273	624	{
274	625	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	626	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	627	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	628	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	629	oe.cameraMenu.add("-");
279	630	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +632,7 @@
281	632	editLeafItem.addActionListener(this);
282	633	lookAtItem.addActionListener(this);
283	634	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	635	+ //switchViewItem.addActionListener(this);
285	636	}
286	637
287	638	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +677,29 @@
326	677	}
327	678
328	679	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	680	+// grabItem = menu.add(new MenuItem("Grab"));
	681	+// grabItem.addActionListener(this);
331	682	backItem = menu.add(new MenuItem("Back"));
332	683	backItem.addActionListener(this);
333	684	frontItem = menu.add(new MenuItem("Front"));
334	685	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	686	+// compositeItem = menu.add(new MenuItem("Composite"));
	687	+// compositeItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
337	691	hideItem = menu.add(new MenuItem("Hidden Group"));
338	692	hideItem.addActionListener(this);
	693	+ }
339	694	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	695	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	696	+
	697	+// menu.add("-");
	698	+//
	699	+// switchItem = menu.add(new MenuItem("Switch node"));
	700	+// switchItem.addActionListener(this);
	701	+ if (Globals.ADVANCED)
	702	+ {
344	703	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	704	switchGeoItem.addActionListener(this);
346	705	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +707,6 @@
348	707	morphItem = menu.add(new MenuItem("Morph Group"));
349	708	morphItem.addActionListener(this);
350	709
351		- if (Globals.ADVANCED)
352		- {
353	710	menu.add("-");
354	711	physicsItem = menu.add(new MenuItem("Physics"));
355	712	physicsItem.addActionListener(this);
..	..	@@ -357,13 +714,11 @@
357	714	frameselectorItem.addActionListener(this);
358	715	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	716	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	717	}
363	718
364	719	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	720	+// textureItem = menu.add(new MenuItem("Texture"));
	721	+// textureItem.addActionListener(this);
367	722	billboardItem = menu.add(new MenuItem("Billboard"));
368	723	billboardItem.addActionListener(this);
369	724	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +729,14 @@
374	729	shadowYItem.addActionListener(this);
375	730	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	731	shadowZItem.addActionListener(this);
	732	+ attributeItem = menu.add(new MenuItem("Attribute"));
	733	+ attributeItem.addActionListener(this);
	734	+
377	735	if (Globals.ADVANCED)
378	736	{
379	737	menu.add("-");
380	738	linkerItem = menu.add(new MenuItem("Linker"));
381	739	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	740	templateItem = menu.add(new MenuItem("Template"));
385	741	templateItem.addActionListener(this);
386	742	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +765,7 @@
409	765	genNormalsMESHItem.addActionListener(this);
410	766	if (Globals.ADVANCED)
411	767	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	768	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	769	genNormalsMINEItem.addActionListener(this);
414	770	}
415	771	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -502,10 +858,15 @@
502	858	attachBumpItem.addActionListener(this);
503	859	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	860	pigmentBumpItem.addActionListener(this);
	861	+ //embedTexturesItem
505	862	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	863	detachPigmentItem.addActionListener(this);
507	864	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	865	detachBumpItem.addActionListener(this);
	866	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	867	+ embedTexturesItem.addActionListener(this);
	868	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	869	+ deEmbedTexturesItem.addActionListener(this);
509	870	menu.add("-");
510	871	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	872	sortbysizeItem.addActionListener(this);
..	..	@@ -532,6 +893,68 @@
532	893	buildToolsMenu(menu);
533	894	}
534	895
	896	+ JTabbedPane resourcecontainer;
	897	+ cGridBag currenttab;
	898	+ boolean added; // patch for jar
	899	+
	900	+ int tabcount = 0;
	901	+ int colcount = 0;
	902	+ int rowcount = 0;
	903	+
	904	+ int columns = 5;
	905	+ int rows = 7;
	906	+
	907	+ public void ResourceCallBack(String[] path)
	908	+ {
	909	+ for (int i = 0; i < path.length; i++)
	910	+ System.out.print(path[i] + "/");
	911	+ System.out.println();
	912	+ if (rowcount == 0)
	913	+ {
	914	+ currenttab = new cGridBag();
	915	+ added = false;
	916	+ String tabname = String.valueOf((char)('A'+tabcount));
	917	+ currenttab.setName(tabname);
	918	+ rowcount = 1;
	919	+ }
	920	+
	921	+ if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	922	+ {
	923	+ if (!added)
	924	+ {
	925	+ added = true;
	926	+ resourcecontainer.add(currenttab);
	927	+ String tabname = String.valueOf((char)('A'+tabcount));
	928	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	929	+ }
	930	+
	931	+ AddTextureButton(path[0], path[1], currenttab);
	932	+ if (++colcount >= columns)
	933	+ {
	934	+ colcount = 0;
	935	+ currenttab.Return();
	936	+
	937	+ if (rowcount++ >= rows)
	938	+ {
	939	+ rowcount = 0;
	940	+ }
	941	+ }
	942	+ }
	943	+ else
	944	+ {
	945	+// if (!path[path.length-1].equals("icons"))
	946	+// resourcecontainer.Return();
	947	+ }
	948	+ }
	949	+
	950	+ void CreateTexturePanel(cGridBag container)
	951	+ {
	952	+ resourcecontainer = new JTabbedPane();
	953	+ container.add(resourcecontainer);
	954	+
	955	+ Grafreed.ParseResources("textures", this);
	956	+ }
	957	+
535	958	void SetupUI2(ObjEditor oe)
536	959	{
537	960	// June 2019
..	..	@@ -574,51 +997,83 @@
574	997	oe.radioPanel.add(dummyButton);
575	998	oe.buttonGroup.add(dummyButton);
576	999	*/
	1000	+ cGridBag copyOptionsPanel = new cGridBag();
	1001	+
	1002	+ copyOptionsPanel.preferredHeight = 2;
	1003	+
577	1004	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	1005
579	1006	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1007	//minButton.setToolTipText("Minimize window");
581	1008	//minButton.addActionListener(this);
582	1009
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	1010	+ if (Globals.ADVANCED)
	1011	+ {
	1012	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ maxButton.setToolTipText("Maximize window");
	1014	+ maxButton.addActionListener(this);
	1015	+ }
586	1016
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1017	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	1018	fullButton.setToolTipText("Full-screen window");
589	1019	fullButton.addActionListener(this);
590	1020
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
	1021	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ screenfitButton.setToolTipText("Screen fit");
	1023	+ screenfitButton.addActionListener(this);
	1024	+
	1025	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1027	+ restoreCameraButton.addActionListener(this);
594	1028
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
	1029	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ saveVersionButton.setToolTipText("Duplicate current version");
	1031	+ saveVersionButton.addActionListener(this);
	1032	+
	1033	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ deleteVersionButton.setToolTipText("Delete current version");
	1035	+ deleteVersionButton.addActionListener(this);
	1036	+
	1037	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ previousVersionButton.setToolTipText("Previous version");
	1039	+ previousVersionButton.addActionListener(this);
	1040	+ previousVersionButton.setEnabled(false);
598	1041
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
601		- saveButton.addActionListener(this);
	1042	+ cGridBag updown = new cGridBag().setVertical(true);
	1043	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ restoreButton.setToolTipText("Undo (restore current version)");
	1045	+ restoreButton.addActionListener(this);
	1046	+ //restoreButton.setEnabled(false);
602	1047
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	1048	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ replaceButton.setToolTipText("Save (replace current version)");
	1050	+ replaceButton.addActionListener(this);
	1051	+ //replaceButton.setEnabled(false);
	1052	+
	1053	+ copyOptionsPanel.add(updown);
	1054	+
	1055	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ nextVersionButton.setToolTipText("Next version");
	1057	+ nextVersionButton.addActionListener(this);
	1058	+ nextVersionButton.setEnabled(false);
	1059	+
	1060	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	1061	liveCB.setToolTipText("Enable animation");
605	1062	liveCB.addItemListener(this);
606	1063
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	1065	oneStepButton.setToolTipText("Animate one step forward");
609	1066	oneStepButton.addActionListener(this);
610	1067
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1068	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	1069	fastCB.setToolTipText("Fast mode");
613	1070	fastCB.addItemListener(this);
614	1071
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	1072	+ //oe.toolboxPanel.Return();
	1073	+
	1074	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1075	+// trackCB.setToolTipText("Enable tracking");
	1076	+// trackCB.addItemListener(this);
622	1077
623	1078	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	1079	// screenfitpointButton.addActionListener(this);
..	..	@@ -628,63 +1083,150 @@
628	1083	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	1084	snapobjectButton.addActionListener(this);
630	1085	snapobjectButton.setToolTipText("Snap Object");
	1086	+
	1087	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ fourButton.addActionListener(this);
	1089	+ fourButton.setToolTipText("Show control panel only");
631	1090	}
632	1091
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	1092	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	1093
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");
	1094	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ twoButton.setToolTipText("Show 3D view only");
641	1096	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");
	1097	+ this.fullscreenLayout = twoButton;
	1098	+
	1099	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ threeButton.setToolTipText("Show controls and 3D view");
650	1101	threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+// sevenButton.setToolTipText("3-column layout");
	1107	+// sevenButton.addActionListener(this);
654	1108	//
655	1109
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	1110	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ rootButton.setToolTipText("Open selection in new tab");
658	1112	rootButton.addActionListener(this);
659	1113
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	1115	closeButton.setToolTipText("Close tab");
662	1116	closeButton.addActionListener(this);
663	1117	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	1118	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	1119	+
	1120	+ cGridBag row1 = new cGridBag();
	1121	+
	1122	+ // INSERT
	1123	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ gridButton.setToolTipText("Create grid");
	1125	+ gridButton.addActionListener(this);
	1126	+
	1127	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ boxButton.setToolTipText("Create box");
	1129	+ boxButton.addActionListener(this);
	1130	+
	1131	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ sphereButton.setToolTipText("Create sphere");
	1133	+ sphereButton.addActionListener(this);
	1134	+
	1135	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ coneButton.setToolTipText("Create cone");
	1137	+ coneButton.addActionListener(this);
	1138	+
	1139	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ torusButton.setToolTipText("Create torus");
	1141	+ torusButton.addActionListener(this);
	1142	+
	1143	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ superButton.setToolTipText("Create superellipsoid");
	1145	+ superButton.addActionListener(this);
	1146	+
	1147	+ if (Globals.ADVANCED)
	1148	+ {
	1149	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ kleinButton.setToolTipText("Create Klein bottle");
	1151	+ kleinButton.addActionListener(this);
	1152	+ }
	1153	+
	1154	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ particlesButton.setToolTipText("Create particle system");
	1156	+ particlesButton.addActionListener(this);
	1157	+
	1158	+ oe.toolboxPanel.add(row1);
	1159	+
	1160	+ cGridBag row2 = new cGridBag();
	1161	+
	1162	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1163	+ groupButton.setToolTipText("Create group");
	1164	+ groupButton.addActionListener(this);
	1165	+
	1166	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ compositeButton.setToolTipText("Create composite");
	1168	+ compositeButton.addActionListener(this);
	1169	+
	1170	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ switchButton.setToolTipText("Create item switcher");
	1172	+ switchButton.addActionListener(this);
	1173	+
	1174	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ loopButton.setToolTipText("Create loop");
	1176	+ loopButton.addActionListener(this);
	1177	+
	1178	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ textureButton.setToolTipText("Create texture");
	1180	+ textureButton.addActionListener(this);
	1181	+
	1182	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ overlayButton.setToolTipText("Create overlay");
	1184	+ overlayButton.addActionListener(this);
	1185	+
	1186	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ lightButton.setToolTipText("Create light");
	1188	+ lightButton.addActionListener(this);
	1189	+
	1190	+ oe.toolboxPanel.add(row2);
	1191	+
	1192	+ cGridBag textures = new cGridBag();
	1193	+
	1194	+ CreateTexturePanel(textures);
	1195	+
	1196	+ oe.toolboxPanel.add(textures);
	1197	+
	1198	+ textures.preferredHeight = 100;
	1199	+
	1200	+ CreateSkyboxPanel(oe.skyboxPanel);
	1201	+
	1202	+ // EDIT panel
	1203	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ editButton.setToolTipText("Pin selection controls");
668	1205	editButton.addActionListener(this);
669	1206
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1207	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ uneditButton.setToolTipText("Unpin and remove selection controls");
672	1209	uneditButton.addActionListener(this);
673	1210
674	1211	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1212	+ allParamsButton.setToolTipText("Show all controls");
676	1213	allParamsButton.addActionListener(this);
677	1214
678		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- clearPanelButton.setToolTipText("Clear edit panel");
	1215	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ clearPanelButton.setToolTipText("Clear all controls");
680	1217	clearPanelButton.addActionListener(this);
681	1218
682		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
683		- unselectButton.setToolTipText("Unselect");
684		- unselectButton.addActionListener(this);
	1219	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ //unselectButton.setToolTipText("Unselect");
	1221	+ //unselectButton.addActionListener(this);
685	1222
	1223	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ flashSelectionButton.setToolTipText("Highlight selection");
	1225	+ flashSelectionButton.addActionListener(this);
	1226	+
686	1227	editCommandsPanel.preferredHeight = 1;
687	1228
	1229	+ SetPinStates(false);
688	1230	// oe.treePanel.add(commandsPanel);
689	1231	// oe.treePanel.Return();
690	1232
..	..	@@ -703,32 +1245,20 @@
703	1245
704	1246	JScrollPane jSP;
705	1247	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1248	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1249	ResetModel();
708	1250
709	1251	oe.treePanel.add(jSPPanel);
710	1252	oe.treePanel.Return();
711	1253
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	1254	oe.treePanel.add(copyOptionsPanel);
728	1255	oe.treePanel.Return();
	1256	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1257	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1258	+ sliderPane.preferredHeight = 1;
729	1259
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1260	+// mainPanel.setDividerLocation(0.1); //1.0);
	1261	+ mainPanel.setResizeWeight(0.4);
732	1262
733	1263	//jList.addListSelectionListener(this);
734	1264	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1266,7 @@
736	1266	//jTree.setEditable(true);
737	1267	oe.jTree.setDragEnabled(true);
738	1268	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1269	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1270
741	1271	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1272
..	..	@@ -748,29 +1278,49 @@
748	1278	dgr.addDragGestureListener(this);
749	1279	}catch(Exception e) {}
750	1280	*/
751		- radio.layout = sevenButton;
	1281	+ radio.layout = threeButton; // sixButton;
752	1282	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1283	}
754	1284
755	1285	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1286	{
	1287	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1288	+ colorCB.setToolTipText("Copy color when dropped");
	1289	+ colorCB.addItemListener(this);
	1290	+
	1291	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1292	+ materialCB.setToolTipText("Copy material when dropped");
	1293	+ materialCB.addItemListener(this);
	1294	+
	1295	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1296	+ textureCB.setToolTipText("Copy texture when dropped");
	1297	+ textureCB.addItemListener(this);
	1298	+
	1299	+ panel.Return();
	1300	+
757	1301	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1302	boxCB.setToolTipText("Display bounding boxes");
759	1303	boxCB.addItemListener(this);
760	1304
761	1305	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1306	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1307	zoomBoxCB.addItemListener(this);
764	1308
765	1309	if (true) // Globals.ADVANCED)
766	1310	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1311	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1312	+// supportCB.setToolTipText("Enable rigging");
	1313	+// supportCB.addItemListener(this);
	1314	+
	1315	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1316	+ freezeCB.setToolTipText("Fast moving camera");
	1317	+ freezeCB.addItemListener(this);
770	1318
771	1319	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1320	// localCB.addItemListener(this);
773	1321
	1322	+ panel.Return();
	1323	+
774	1324	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1325	crowdCB.setToolTipText("Used for crowds");
776	1326	crowdCB.addItemListener(this);
..	..	@@ -779,14 +1329,19 @@
779	1329	smoothCB.setToolTipText("Snapping delay");
780	1330	smoothCB.addItemListener(this);
781	1331
782		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783		- slowCB.setToolTipText("Smooth interpolation");
784		- slowCB.addItemListener(this);
	1332	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1333	+// slowCB.setToolTipText("Smooth interpolation");
	1334	+// slowCB.addItemListener(this);
	1335	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1336	+ minshaderCB.setToolTipText("Minimal fast shader");
	1337	+ minshaderCB.addItemListener(this);
785	1338
786	1339	// constraints.gridy += 1;
787	1340	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1341	// speakerMocapCB.addItemListener(this);
789	1342
	1343	+ panel.Return();
	1344	+
790	1345	if (false)
791	1346	{
792	1347	// handled in scripts
..	..	@@ -801,34 +1356,74 @@
801	1356	//constraints.gridy += 1;
802	1357	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1358	smoothfocusCB.addItemListener(this);
	1359	+ panel.Return();
804	1360	}
805	1361
806	1362	//constraints.gridx += 1;
807	1363	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1364	// debugCB.addItemListener(this);
809	1365
	1366	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1367	+ trackCB.setToolTipText("Enable tracking target");
	1368	+ trackCB.addItemListener(this);
	1369	+
810	1370	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1371	+ oeilCB.setToolTipText("Move camera when tracking");
811	1372	oeilCB.addItemListener(this);
812	1373
	1374	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1375	+ shadowCB.setToolTipText("When live compute shadows");
	1376	+ shadowCB.addItemListener(this);
	1377	+
	1378	+ panel.Return();
	1379	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1380	+ toggleTextureCB.setToolTipText("Load textures");
	1381	+ toggleTextureCB.addItemListener(this);
	1382	+
	1383	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1384	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1385	+ toggleSwitchCB.addItemListener(this);
	1386	+
	1387	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1388	+ autokeepCB.setToolTipText("On structure change");
	1389	+ autokeepCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+ if (Globals.ADVANCED)
	1393	+ {
813	1394	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	1395	lookAtCB.setToolTipText("Look-at target");
815	1396	lookAtCB.addItemListener(this);
	1397	+ }
816	1398
817	1399	}
818	1400
819	1401	cGridBag fill = new cGridBag();
820		-
821	1402	fill.preferredHeight = 200;
	1403	+ cGridBag fill2 = new cGridBag();
	1404	+ fill2.preferredHeight = 200;
	1405	+ cGridBag fill3 = new cGridBag();
	1406	+ fill3.preferredHeight = 200;
822	1407
823	1408	panel.add(fill);
	1409	+ panel.add(fill2);
	1410	+ panel.add(fill3);
824	1411
825	1412	}
826	1413
827	1414	void EditObject(Object3D obj)
828	1415	{
829	1416	cRadio radioButton = new cRadio(obj.name);
	1417	+
	1418	+ // June 2019. Patch to avoid bug with transparency.
	1419	+ radioButton.hadMaterial = obj.material != null;
	1420	+ if (!radioButton.hadMaterial)
	1421	+ {
	1422	+ obj.material = new cMaterial();
	1423	+ }
	1424	+
830	1425	radioButton.SetObject(obj);
831		- radioButton.layout = sevenButton;
	1426	+ radioButton.layout = threeButton; // sixButton;
832	1427	radioButton.SetCamera(cameraView.renderCamera, false);
833	1428	radioButton.addActionListener(this);
834	1429	radioPanel.add(radioButton);
..	..	@@ -848,23 +1443,30 @@
848	1443	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1444	}
850	1445
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	1446	+ cToggleButton liveCB;
	1447	+ cCheckBox supportCB;
	1448	+ cCheckBox localCB;
	1449	+ cCheckBox crowdCB;
	1450	+ cCheckBox smoothCB;
	1451	+ cCheckBox minshaderCB;
	1452	+
	1453	+ cToggleButton fastCB;
	1454	+ cCheckBox slowCB;
	1455	+ cCheckBox boxCB;
	1456	+ cCheckBox zoomBoxCB;
	1457	+ cCheckBox freezeCB;
	1458	+ //cToggleButton trackCB;
	1459	+ cCheckBox trackCB;
	1460	+ cCheckBox smoothfocusCB;
862	1461	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1462	+ cCheckBox speakerCameraCB;
	1463	+ cCheckBox speakerFocusCB;
	1464	+ cCheckBox debugCB;
	1465	+
	1466	+ cCheckBox oeilCB;
	1467	+ cCheckBox shadowCB;
	1468	+ cCheckBox autokeepCB;
	1469	+ cCheckBox lookAtCB;
868	1470
869	1471	// static int COLOR = 1;
870	1472	// static int MATERIAL = 2;
..	..	@@ -872,9 +1474,9 @@
872	1474
873	1475	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1476
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1477	+ cCheckBox colorCB;
	1478	+ cCheckBox materialCB;
	1479	+ cCheckBox textureCB;
878	1480
879	1481	public void itemStateChanged(ItemEvent e)
880	1482	{
..	..	@@ -918,6 +1520,12 @@
918	1520	{
919	1521	cameraView.ToggleInertia();
920	1522	cameraView.repaint();
	1523	+ }
	1524	+ else if(e.getSource() == minshaderCB)
	1525	+ {
	1526	+ Globals.MINSHADER ^= true;
	1527	+ cameraView.programInitialized = false;
	1528	+ cameraView.repaint();
921	1529	}
922	1530	else if(e.getSource() == localCB)
923	1531	{
..	..	@@ -967,6 +1575,18 @@
967	1575	{
968	1576	cameraView.ToggleOeil();
969	1577	}
	1578	+ else if(e.getSource() == shadowCB)
	1579	+ {
	1580	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1581	+ }
	1582	+ else if(e.getSource() == freezeCB)
	1583	+ {
	1584	+ Globals.FREEZEONMOVE ^= true;
	1585	+ }
	1586	+ else if(e.getSource() == autokeepCB)
	1587	+ {
	1588	+ Globals.REPLACEONMAKE ^= true;
	1589	+ }
970	1590	else if(e.getSource() == lookAtCB)
971	1591	{
972	1592	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1603,8 @@
983	1603
984	1604	/**/
985	1605	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1606	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1607	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1608	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1609	// We can't move the root node or an empty selection
989	1610	return;
..	..	@@ -1046,8 +1667,6 @@
1046	1667	}
1047	1668	}
1048	1669
1049		- String string = (String) object;
1050		-
1051	1670	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1671	// if( object instanceof java.io.File[])
1053	1672	// {
..	..	@@ -1055,6 +1674,8 @@
1055	1674	// objEditor.DropFile((java.io.File[]) object, true);
1056	1675	// return;
1057	1676	// }
	1677	+
	1678	+ String string = object.toString();
1058	1679
1059	1680	// File path for Mac and Windows
1060	1681	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1721,33 @@
1100	1721
1101	1722	assert target == objEditor.jTree;
1102	1723	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1724	+ Object3D destinationLeaf;
1103	1725	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1726	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1727	} catch (Exception e) {
1106	1728	System.out.println("destinationPath : " + destinationPath);
1107	1729	return;
1108	1730	}
1109	1731
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1732	+ for (int i=group.selection.size(); --i>=0;)
1111	1733	{
	1734	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1735	+
	1736	+ // Cannot move into itself
	1737	+ if (child == destinationLeaf)
	1738	+ return;
	1739	+ }
	1740	+
	1741	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1742	+// {
1112	1743	loadClipboard(true);
1113	1744	objEditor.jTree.setSelectionPath(destinationPath);
1114	1745	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1746	+// } else {
	1747	+// loadClipboard(false);
	1748	+// objEditor.jTree.setSelectionPath(destinationPath);
	1749	+// pasteInto(false, false); // true); // ???
	1750	+// }
1120	1751	}
1121	1752	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1753	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1852,30 @@
1221	1852	{
1222	1853	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1854	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	1855	+// gridItem = menu.add(new MenuItem("Grid"));
	1856	+// gridItem.addActionListener(this);
	1857	+// rectoidItem = menu.add(new MenuItem("Box"));
	1858	+// rectoidItem.addActionListener(this);
	1859	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1860	+// ellipsoidItem.addActionListener(this);
	1861	+// coneItem = menu.add(new MenuItem("Cone"));
	1862	+// coneItem.addActionListener(this);
	1863	+// torusItem = menu.add(new MenuItem("Torus"));
	1864	+// torusItem.addActionListener(this);
	1865	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1866	+// superItem.addActionListener(this);
	1867	+
	1868	+ cameraItem = menu.add(new MenuItem("Camera"));
	1869	+ cameraItem.addActionListener(this);
	1870	+
	1871	+ if (!Globals.ADVANCED)
	1872	+ {
1236	1873	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1874	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1875	+ }
	1876	+
	1877	+// particleItem = menu.add(new MenuItem("Particle system"));
	1878	+// particleItem.addActionListener(this);
1240	1879	if (Globals.ADVANCED)
1241	1880	{
1242	1881	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1901,15 @@
1262	1901	}
1263	1902	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1903	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1904	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1905	+// overlayItem.addActionListener(this);
	1906	+// lightItem = menu.add(new MenuItem("Light"));
	1907	+// lightItem.addActionListener(this);
1269	1908	menu.add("-");
1270	1909	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1910	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1911	+// loopItem = menu.add(new MenuItem("Loop"));
	1912	+// loopItem.addActionListener(this);
1274	1913	doubleItem = menu.add(new MenuItem("Fork"));
1275	1914	doubleItem.addActionListener(this);
1276	1915	if (Globals.ADVANCED)
..	..	@@ -1286,6 +1925,9 @@
1286	1925	animationItem.addItemListener(this);
1287	1926	animationItem.setState(Globals.ANIMATION);
1288	1927
	1928	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1929	+ archiveItem.addActionListener(this);
	1930	+
1289	1931	menu.add("-");
1290	1932	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1291	1933	parseverticesItem.addActionListener(this);
..	..	@@ -1298,6 +1940,8 @@
1298	1940	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1299	1941	reduce34MorphItem.addActionListener(this);
1300	1942	menu.add("-");
	1943	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1944	+ memoryItem.addActionListener(this);
1301	1945	menu.add(computeAOItem = new MenuItem("Compute AO"));
1302	1946	computeAOItem.addActionListener(this);
1303	1947
..	..	@@ -1306,8 +1950,6 @@
1306	1950	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1307	1951	mirrorItem.addActionListener(this);
1308	1952	menu.add("-");
1309		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310		- memoryItem.addActionListener(this);
1311	1953	menu.add(analyzeItem = new MenuItem("Analyze"));
1312	1954	analyzeItem.addActionListener(this);
1313	1955	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1455,6 +2097,30 @@
1455	2097
1456	2098	makeSomething(shadow);
1457	2099	}
	2100	+
	2101	+ private void ClearUnpinned()
	2102	+ {
	2103	+ //for (Object3D obj : listUI)
	2104	+ for (int i=listUI.size(); --i>=0;)
	2105	+ {
	2106	+ Object3D obj = listUI.elementAt(i);
	2107	+ if (!obj.pinned)
	2108	+ {
	2109	+ obj.CloseUI();
	2110	+ listUI.remove(i);
	2111	+ }
	2112	+ }
	2113	+ }
	2114	+
	2115	+ private void EditElement(Object3D elem, boolean newWindow)
	2116	+ {
	2117	+ // if (!(elem instanceof Composite))
	2118	+ // newWindow = false;
	2119	+ listUI.add(elem);
	2120	+ elem.openEditWindow(this, newWindow); //, false);
	2121	+ System.out.println("edit : " + elem);
	2122	+ elem.editWindow.refreshContents(true); // ? new
	2123	+ }
1458	2124
1459	2125	/**
1460	2126	* applyExample
..	..	@@ -1699,7 +2365,7 @@
1699	2365	{
1700	2366	ScreenFit();
1701	2367	} else
1702		- if (source == switchItem)
	2368	+ if (source == switchViewItem)
1703	2369	{
1704	2370	cVector v1 = new cVector();
1705	2371	cVector v2 = new cVector();
..	..	@@ -1708,11 +2374,11 @@
1708	2374	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	2375	objEditor.cameraView.repaint();
1710	2376	} else
1711		- if (source == rectoidItem)
	2377	+ if (source == rectoidItem \|\| source == boxButton)
1712	2378	{
1713	2379	makeSomething(new Box());
1714	2380	} else
1715		- if (source == particleItem)
	2381	+ if (source == particleItem \|\| source == particlesButton)
1716	2382	{
1717	2383	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	2384	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +2457,27 @@
1791	2457
1792	2458	makeSomething(obj);
1793	2459	} else
1794		- if (source == gridItem)
	2460	+ if (source == gridItem \|\| source == gridButton)
1795	2461	{
1796	2462	makeSomething(new Grid());
1797	2463	} else
1798		- if (source == ellipsoidItem)
	2464	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2465	{
1800	2466	makeSomething(new Sphere());
1801	2467	} else
1802		- if (source == coneItem)
	2468	+ if (source == coneItem \|\| source == coneButton)
1803	2469	{
1804	2470	makeSomething(new Cone());
1805	2471	} else
1806		- if (source == torusItem)
	2472	+ if (source == torusItem \|\| source == torusButton)
1807	2473	{
1808	2474	makeSomething(new Torus());
1809	2475	} else
1810		- if (source == superItem)
	2476	+ if (source == superItem \|\| source == superButton)
1811	2477	{
1812	2478	makeSomething(new Superellipsoid());
1813	2479	} else
1814		- if (source == kleinItem)
	2480	+ if (source == kleinItem \|\| source == kleinButton)
1815	2481	{
1816	2482	makeSomething(new Klein());
1817	2483	} else
..	..	@@ -1831,7 +2497,7 @@
1831	2497	{
1832	2498	makeSomething(new BezierSurface());
1833	2499	} else
1834		- if (source == overlayItem)
	2500	+ if (source == overlayItem \|\| source == overlayButton)
1835	2501	{
1836	2502	/*
1837	2503	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,10 +2545,27 @@
1879	2545	s.setup();
1880	2546	makeSomething(s);
1881	2547	} else
1882		- if (source == lightItem)
	2548	+ if (source == lightItem \|\| source == lightButton)
1883	2549	{
1884	2550	makeSomething(new Light());
1885	2551	} else
	2552	+// if (source == skybox1Button \|\|
	2553	+// source == skybox2Button \|\|
	2554	+// source == skybox3Button \|\|
	2555	+// source == skybox4Button \|\|
	2556	+// source == skybox5Button \|\|
	2557	+// source == skybox6Button \|\|
	2558	+// source == skybox7Button \|\|
	2559	+// source == skybox11Button \|\|
	2560	+// source == skybox12Button \|\|
	2561	+// source == skybox13Button \|\|
	2562	+// source == skybox14Button \|\|
	2563	+// source == skybox15Button \|\|
	2564	+// source == skybox16Button \|\|
	2565	+// source == skybox17Button)
	2566	+// {
	2567	+// ChangeSkybox(source);
	2568	+// } else
1886	2569	if (source == csgItem)
1887	2570	{
1888	2571	group(new CSG());
..	..	@@ -1929,30 +2612,30 @@
1929	2612
1930	2613	group(g);
1931	2614	} else
1932		- if (source == loopItem)
	2615	+ if (source == loopItem \|\| source == loopButton)
1933	2616	{
1934	2617	Composite csg = new GroupLeaf();
1935	2618	csg.count = 5;
1936	2619	group(csg);
1937		- Composite child = new cGroup();
	2620	+ Composite child = new cGroup("Branch");
1938	2621	csg.addChild(child);
1939	2622	child.addChild(csg);
1940	2623	} else
1941	2624	if (source == doubleItem)
1942	2625	{
1943		- Composite csg = new GroupLeaf();
	2626	+ Composite csg = new GroupLeaf("Fork");
1944	2627	csg.count = 5;
1945	2628	group(csg);
1946		- Composite child = new cGroup();
	2629	+ Composite child = new cGroup("Branch A");
1947	2630	csg.addChild(child);
1948	2631	child.addChild(csg);
1949		- child = new cGroup();
	2632	+ child = new cGroup("Branch B");
1950	2633	csg.addChild(child);
1951	2634	child.addChild(csg);
1952	2635	} else
1953	2636	if (source == tripleItem)
1954	2637	{
1955		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Trident");
1956	2639	csg.count = 4;
1957	2640	group(csg);
1958	2641	Composite child = new cGroup();
..	..	@@ -1968,7 +2651,7 @@
1968	2651	if (source == computeAOItem)
1969	2652	{
1970	2653	Globals.drawMode = CameraPane.OCCLUSION;
1971		- Globals.theRenderer.repaint();
	2654	+ cameraView.repaint();
1972	2655	} else
1973	2656	if (source == recompileItem)
1974	2657	{
..	..	@@ -1983,7 +2666,7 @@
1983	2666	if (source == invariantsItem)
1984	2667	{
1985	2668	System.out.println("Invariants:");
1986		- Grafreed.grafreeD.universe.invariants();
	2669	+ Grafreed.grafreed.universe.invariants();
1987	2670	} else
1988	2671	if (source == memoryItem)
1989	2672	{
..	..	@@ -2014,17 +2697,40 @@
2014	2697	{
2015	2698	ToggleFullScreen();
2016	2699	} else
2017		- if (source == undoButton)
	2700	+ if (source == previousVersionButton)
2018	2701	{
2019		- Undo();
	2702	+ // Go to previous version
	2703	+ //if (!Undo())
	2704	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2705	+ PreviousVersion();
2020	2706	} else
2021		- if (source == redoButton)
	2707	+ if (source == restoreButton)
2022	2708	{
2023		- Redo();
	2709	+ // Restore current version
	2710	+ Restore();
	2711	+ //restoreButton.setEnabled(false);
2024	2712	} else
2025		- if (source == saveButton)
	2713	+ if (source == replaceButton)
2026	2714	{
2027		- Save();
	2715	+ // Overwrite current version
	2716	+ Replace();
	2717	+ //replaceButton.setEnabled(false);
	2718	+ } else
	2719	+ if (source == nextVersionButton)
	2720	+ {
	2721	+ // Go to next version
	2722	+ NextVersion();
	2723	+ } else
	2724	+ if (source == saveVersionButton)
	2725	+ {
	2726	+ // Save a new version
	2727	+ if (!Save(true))
	2728	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2729	+ } else
	2730	+ if (source == deleteVersionButton)
	2731	+ {
	2732	+ // Delete a new version
	2733	+ DeleteVersion();
2028	2734	} else
2029	2735	if (source == oneStepButton)
2030	2736	{
..	..	@@ -2033,17 +2739,14 @@
2033	2739	} else
2034	2740	if (source == screenfitButton)
2035	2741	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2742	ScreenFit();
2038	2743	} else
2039	2744	if (source == screenfitpointButton)
2040	2745	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2746	ScreenFitPoint();
2043	2747	} else
2044	2748	if (source == snapobjectButton)
2045	2749	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2750	SnapObject();
2048	2751	} else
2049	2752	// if (event.getSource() == recompileButton)
..	..	@@ -2082,11 +2785,11 @@
2082	2785	} else
2083	2786	if (source == undoItem)
2084	2787	{
2085		- Undo();
	2788	+ PreviousVersion();
2086	2789	} else
2087	2790	if (source == redoItem)
2088	2791	{
2089		- Redo();
	2792	+ NextVersion();
2090	2793	} else
2091	2794	if (source == duplicateItem)
2092	2795	{
..	..	@@ -2407,7 +3110,7 @@
2407	3110	{
2408	3111	StepAll();
2409	3112	} else
2410		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3113	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2411	3114	{
2412	3115	//int indices[] = jList.getSelectedIndices();
2413	3116	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2419,9 +3122,9 @@
2419	3122	{
2420	3123	ClearSelection(true);
2421	3124	} else
2422		- if (source == grabItem)
	3125	+ if (source == grabItem \|\| source == groupButton)
2423	3126	{
2424		- group(new cGroup(), true);
	3127	+ group(new cGroup(), false); // true);
2425	3128	} else
2426	3129	if (source == hideItem)
2427	3130	{
..	..	@@ -2439,11 +3142,11 @@
2439	3142	{
2440	3143	makeSomething(new Camera());
2441	3144	} else
2442		- if (source == compositeItem)
	3145	+ if (source == compositeItem \|\| source == compositeButton)
2443	3146	{
2444	3147	group(new Composite());
2445	3148	} else
2446		- if (source == randomItem)
	3149	+ if (source == switchItem \|\| source == switchButton)
2447	3150	{
2448	3151	RandomNode random = new RandomNode();
2449	3152	group(random);
..	..	@@ -2545,7 +3248,7 @@
2545	3248	{
2546	3249	group(new cLinker());
2547	3250	} else
2548		- if (source == textureItem)
	3251	+ if (source == textureItem \|\| source == textureButton)
2549	3252	{
2550	3253	group(new TextureNode());
2551	3254	} else
..	..	@@ -2565,17 +3268,30 @@
2565	3268	{
2566	3269	CastShadow(2);
2567	3270	} else
2568		- if (source == ungroupItem)
	3271	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	3272	{
2570		- //ungroup();
	3273	+ boolean hasRoot = false;
	3274	+
2571	3275	for (int i=0; i<group.selection.size(); i++)
2572	3276	{
2573		- Ungroup(group.selection.get(i));
	3277	+ if (group.selection.get(i) == group)
	3278	+ {
	3279	+ hasRoot = true;
	3280	+ break;
	3281	+ }
2574	3282	}
2575	3283
2576		- ClearSelection(false);
2577		-
2578		- refreshContents();
	3284	+ if (!hasRoot)
	3285	+ {
	3286	+ for (int i=0; i<group.selection.size(); i++)
	3287	+ {
	3288	+ Ungroup(group.selection.get(i));
	3289	+ }
	3290	+
	3291	+ ClearSelection(false);
	3292	+
	3293	+ refreshContents();
	3294	+ }
2579	3295	} else
2580	3296	if (source == genUVItem)
2581	3297	{
..	..	@@ -2876,7 +3592,7 @@
2876	3592	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2877	3593	{
2878	3594	obj = (Object3D)e.nextElement();
2879		- obj.SetBumpTexture(null);
	3595	+ obj.ResetBumpTexture();
2880	3596	}
2881	3597
2882	3598	refreshContents();
..	..	@@ -2892,6 +3608,31 @@
2892	3608
2893	3609	refreshContents();
2894	3610	} else
	3611	+ if (source == embedTexturesItem)
	3612	+ {
	3613	+ Object3D obj;
	3614	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3615	+ {
	3616	+ obj = (Object3D)e.nextElement();
	3617	+ obj.EmbedTextures(true);
	3618	+ }
	3619	+
	3620	+ refreshContents();
	3621	+ } else
	3622	+ if (source == deEmbedTexturesItem)
	3623	+ {
	3624	+ Object3D obj;
	3625	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3626	+ {
	3627	+ obj = (Object3D)e.nextElement();
	3628	+ obj.EmbedTextures(false);
	3629	+ }
	3630	+
	3631	+ CameraPane.texturepigment.clear();
	3632	+ CameraPane.texturebump.clear();
	3633	+
	3634	+ refreshContents();
	3635	+ } else
2895	3636	if (source == flashSelectionButton)
2896	3637	{
2897	3638	CameraPane.flash = true;
..	..	@@ -2903,6 +3644,10 @@
2903	3644	if (source == twoButton)
2904	3645	{
2905	3646	radio.layout = twoButton;
	3647	+
	3648	+ if (CameraPane.FULLSCREEN)
	3649	+ fullscreenLayout = radio.layout;
	3650	+
2906	3651	// bug
2907	3652	//gridPanel.setDividerLocation(1.0);
2908	3653	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3703,9 @@
2958	3703	{
2959	3704	radio.layout = threeButton;
2960	3705
	3706	+ if (CameraPane.FULLSCREEN)
	3707	+ fullscreenLayout = radio.layout;
	3708	+
2961	3709	// bigThree.remove(scenePanel);
2962	3710	// bigThree.remove(centralPanel);
2963	3711	// bigThree.remove(XYZPanel);
..	..	@@ -2986,8 +3734,8 @@
2986	3734	// centralPanel.setVisible(true);
2987	3735	// XYZPanel.setVisible(true);
2988	3736	bigThree.ClearUI();
	3737	+ bigThree.add(scenePanel);
2989	3738	bigThree.add(centralPanel);
2990		- bigThree.add(XYZPanel);
2991	3739	bigThree.FlushUI();
2992	3740
2993	3741	cameraView.requestFocusInWindow();
..	..	@@ -2995,6 +3743,9 @@
2995	3743	if (source == fourButton)
2996	3744	{
2997	3745	radio.layout = fourButton;
	3746	+
	3747	+ if (CameraPane.FULLSCREEN)
	3748	+ fullscreenLayout = radio.layout;
2998	3749
2999	3750	// bigThree.remove(scenePanel);
3000	3751	// bigThree.remove(centralPanel);
..	..	@@ -3033,6 +3784,9 @@
3033	3784	{
3034	3785	radio.layout = sixButton;
3035	3786
	3787	+ if (CameraPane.FULLSCREEN)
	3788	+ fullscreenLayout = radio.layout;
	3789	+
3036	3790	// bigThree.remove(scenePanel);
3037	3791	// bigThree.remove(centralPanel);
3038	3792	// bigThree.remove(XYZPanel);
..	..	@@ -3061,8 +3815,8 @@
3061	3815	// centralPanel.setVisible(true);
3062	3816	// XYZPanel.setVisible(false);
3063	3817	bigThree.ClearUI();
3064		- bigThree.add(scenePanel);
3065	3818	bigThree.add(centralPanel);
	3819	+ bigThree.add(scenePanel);
3066	3820	bigThree.FlushUI();
3067	3821
3068	3822	cameraView.requestFocusInWindow();
..	..	@@ -3070,6 +3824,9 @@
3070	3824	if (source == sevenButton)
3071	3825	{
3072	3826	radio.layout = sevenButton;
	3827	+
	3828	+ if (CameraPane.FULLSCREEN)
	3829	+ fullscreenLayout = radio.layout;
3073	3830
3074	3831	// bigThree.remove(scenePanel);
3075	3832	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3883,19 @@
3126	3883	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3884	{
3128	3885	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3886	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3887	{
	3888	+ // Patch to avoid bug with transparency.
	3889	+ if (!ab.hadMaterial)
	3890	+ {
	3891	+ ab.object.material = null;
	3892	+ }
	3893	+
3131	3894	buttonGroup.remove(ab);
3132	3895	radioPanel.remove(ab);
3133	3896
3134		- ab.GetObject().editWindow = null;
	3897	+ //ab.GetObject().editWindow = null;
	3898	+ ab.GetObject().manipWindow = null;
3135	3899	// ab.GetObject().objectUI = null; // ?????????
3136	3900
3137	3901	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3908,12 @@
3144	3908	} else
3145	3909	if (source == editItem \|\| source == editButton)
3146	3910	{
	3911	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3912	+ {
	3913	+ Object3D child = (Object3D)e.nextElement();
	3914	+ child.pinned = true;
	3915	+ }
	3916	+
3147	3917	EditSelection(false);
3148	3918	} else
3149	3919	if (source == uneditButton)
..	..	@@ -3152,9 +3922,10 @@
3152	3922	{
3153	3923	Object3D child = (Object3D)e.nextElement();
3154	3924	if(child.editWindow != null)
3155		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3925	+ child.pinned = false;
3156	3926	child.CloseUI();
3157	3927	listUI.remove(child);
	3928	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3158	3929
3159	3930	//child.editWindow = null; // ???????????
3160	3931	}
..	..	@@ -3169,16 +3940,18 @@
3169	3940	//copy.ClearUI();
3170	3941	for (Object3D obj : listUI)
3171	3942	{
	3943	+ obj.pinned = false;
3172	3944	obj.CloseUI();
3173	3945	}
3174	3946	listUI.clear();
	3947	+ SetPinStates(group.selection.size() > 0);
3175	3948	refreshContents(true);
3176	3949	} else
3177	3950	if (source == allParamsButton)
3178	3951	{
3179	3952	assert(copy == group);
3180	3953
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3954	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3955
3183	3956	for (Object3D obj : listUI)
3184	3957	{
..	..	@@ -3227,6 +4000,9 @@
3227	4000	}
3228	4001
3229	4002	copy = group;
	4003	+
	4004	+ SetUndoStates();
	4005	+
3230	4006	//Globals.theRenderer.object = group;
3231	4007	if(!useclient)
3232	4008	{
..	..	@@ -3245,6 +4021,7 @@
3245	4021
3246	4022	// fix "+" issue
3247	4023	//group.editWindow = this;
	4024	+ group.manipWindow = this;
3248	4025
3249	4026	/*
3250	4027	currentLayout = radio.layout;
..	..	@@ -3252,6 +4029,14 @@
3252	4029	currentLayout = sevenButton;
3253	4030	*/
3254	4031	radio.layout.doClick();
	4032	+
	4033	+ ClearUnpinned();
	4034	+
	4035	+ //Grafreed.Assert(group != null);
	4036	+ //Grafreed.Assert(group.selection != null);
	4037	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4038	+ if (group.selection == null \|\| group.selection.size() == 1)
	4039	+ EditSelection(false);
3255	4040	keepparent = group.parent;
3256	4041	// PARENT = NULL or not???
3257	4042	//group.parent = null; // ROOT
..	..	@@ -3263,11 +4048,13 @@
3263	4048	} else if (event.getSource() == editCameraItem)
3264	4049	{
3265	4050	cameraView.ProtectCamera();
	4051	+ cameraView.requestFocusInWindow();
3266	4052	cameraView.repaint();
3267	4053	return;
3268		- } else if (event.getSource() == revertCameraItem)
	4054	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	4055	{
3270	4056	cameraView.RevertCamera();
	4057	+ cameraView.requestFocusInWindow();
3271	4058	cameraView.repaint();
3272	4059	return;
3273	4060	// } else if (event.getSource() == textureButton)
..	..	@@ -3844,7 +4631,7 @@
3844	4631
3845	4632	try
3846	4633	{
3847		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4634	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3848	4635	}
3849	4636	catch (Exception e)
3850	4637	{
..	..	@@ -4319,28 +5106,25 @@
4319	5106	// }
4320	5107	// }
4321	5108
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	5109	void EditSelection(boolean newWindow)
4327	5110	{
	5111	+ if (group.selection == null)
	5112	+ {
	5113	+ EditElement(group, newWindow); // ? new
	5114	+ return;
	5115	+ }
	5116	+
4328	5117	// aConstraints.gridy = 0;
4329	5118	for (int i=0; i<group.selection.size(); i++)
4330	5119	{
4331	5120	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	5121	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5122	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	5123
4335	5124	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	5125	if(elem != group \|\| !newWindow)
4337	5126	{
4338		- // if (!(elem instanceof Composite))
4339		- // newWindow = false;
4340		- listUI.add(elem);
4341		- elem.openEditWindow(this, newWindow); //, false);
4342		- System.out.println("edit : " + elem);
4343		- elem.editWindow.refreshContents(true); // ? new
	5127	+ EditElement(elem, newWindow); // ? new
4344	5128	}
4345	5129	}
4346	5130	}
..	..	@@ -4403,9 +5187,7 @@
4403	5187
4404	5188	freezemodel = false;
4405	5189	}
4406		-
4407		- boolean flashIt = true;
4408		-
	5190	+
4409	5191	public void valueChanged(TreeSelectionEvent e)
4410	5192	//public boolean handleEvent(Event event)
4411	5193	{
..	..	@@ -4415,7 +5197,8 @@
4415	5197	//new Exception().printStackTrace();
4416	5198
4417	5199	freezemodel = true;
4418		-
	5200	+ ClearUnpinned();
	5201	+
4419	5202	/**/
4420	5203	//switch (event.id)
4421	5204	{
..	..	@@ -4448,7 +5231,7 @@
4448	5231	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	5232	// a camera
4450	5233	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5234	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	5235	{
4453	5236	CameraPane.camerachangeframe = 0; // don't refuse it
4454	5237	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +5240,13 @@
4457	5240	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	5241	}
4459	5242
	5243	+ if (tps != null && tps.length == 1)
	5244	+ {
	5245	+ EditSelection(false);
	5246	+ }
	5247	+
	5248	+ SetPinStates(tps != null && tps.length > 0);
	5249	+
4460	5250	refreshContents();
4461	5251	//return true;
4462	5252	}
..	..	@@ -4466,9 +5256,20 @@
4466	5256	freezemodel = false;
4467	5257	}
4468	5258
	5259	+ void SetPinStates(boolean enabled)
	5260	+ {
	5261	+ editButton.setEnabled(enabled);
	5262	+ uneditButton.setEnabled(enabled);
	5263	+ //unselectButton.setEnabled(enabled);
	5264	+ flashSelectionButton.setEnabled(enabled);
	5265	+
	5266	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5267	+ }
	5268	+
4469	5269	void refreshContents(boolean cp)
4470	5270	{
4471		- if (!Globals.MOUSEDRAGGED)
	5271	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5272	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	5273	{
4473	5274	objEditor.ClearInfo(); // .GetMaterial());
4474	5275
..	..	@@ -4567,7 +5368,8 @@
4567	5368
4568	5369	if (cut)
4569	5370	{
4570		- Save();
	5371	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5372	+// Save();
4571	5373	//int indices[] = jList.getSelectedIndices();
4572	5374	//for (int i = indices.length - 1; i >= 0; i--)
4573	5375	//jList.remove(indices[i]);
..	..	@@ -4670,6 +5472,10 @@
4670	5472
4671	5473	void paste(boolean expand)
4672	5474	{
	5475	+ if (Globals.REPLACEONMAKE)
	5476	+ Save();
	5477	+ boolean keep = Globals.REPLACEONMAKE;
	5478	+ Globals.REPLACEONMAKE = false;
4673	5479	// if (GrafreeD.clipboard == null)
4674	5480	// return;
4675	5481	boolean first = true;
..	..	@@ -4729,6 +5535,7 @@
4729	5535	Grafreed.clipboard.get(0).parent = keepparent;
4730	5536	}
4731	5537
	5538	+ Globals.REPLACEONMAKE = keep;
4732	5539	ResetModel();
4733	5540	refreshContents();
4734	5541	}
..	..	@@ -4864,6 +5671,10 @@
4864	5671
4865	5672	void group(Object3D csg, boolean grab)
4866	5673	{
	5674	+ if (Globals.REPLACEONMAKE)
	5675	+ Save();
	5676	+ boolean keep = Globals.REPLACEONMAKE;
	5677	+ Globals.REPLACEONMAKE = false;
4867	5678	if (//false) // why??
4868	5679	!group.selection.isEmpty())
4869	5680	{
..	..	@@ -4977,10 +5788,15 @@
4977	5788	//node.add(csg);
4978	5789	//makeSomething(node);
4979	5790	makeSomething(csg);
	5791	+ Globals.REPLACEONMAKE = keep;
4980	5792	}
4981	5793
4982	5794	void Ungroup(Object3D g)
4983	5795	{
	5796	+ if (Globals.REPLACEONMAKE)
	5797	+ Save();
	5798	+ boolean keep = Globals.REPLACEONMAKE;
	5799	+ Globals.REPLACEONMAKE = false;
4984	5800	if (g instanceof HiddenObject)
4985	5801	{
4986	5802	HiddenObject h = (HiddenObject) g;
..	..	@@ -4997,6 +5813,7 @@
4997	5813	objEditor.makeSomething(g.get(i), false);
4998	5814	}
4999	5815	}
	5816	+ Globals.REPLACEONMAKE = keep;
5000	5817	}
5001	5818
5002	5819	void ungroup()
..	..	@@ -5285,13 +6102,43 @@
5285	6102	cButton clearpanelButton;
5286	6103	cButton unselectButton;
5287	6104
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
5293		- cButton saveButton;
	6105	+ cButton restoreCameraButton;
	6106	+
5294	6107	cButton oneStepButton;
	6108	+
	6109	+ cButton groupButton;
	6110	+ cButton ungroupButton;
	6111	+ cButton compositeButton;
	6112	+ cButton switchButton;
	6113	+ cButton loopButton;
	6114	+ cButton textureButton;
	6115	+
	6116	+ cButton skybox1Button;
	6117	+ cButton skybox2Button;
	6118	+ cButton skybox3Button;
	6119	+ cButton skybox4Button;
	6120	+ cButton skybox5Button;
	6121	+ cButton skybox6Button;
	6122	+ cButton skybox7Button;
	6123	+
	6124	+ cButton skybox11Button;
	6125	+ cButton skybox12Button;
	6126	+ cButton skybox13Button;
	6127	+ cButton skybox14Button;
	6128	+ cButton skybox15Button;
	6129	+ cButton skybox16Button;
	6130	+ cButton skybox17Button;
	6131	+
	6132	+ cButton gridButton;
	6133	+ cButton boxButton;
	6134	+ cButton sphereButton;
	6135	+ cButton coneButton;
	6136	+ cButton torusButton;
	6137	+ cButton superButton;
	6138	+ cButton kleinButton;
	6139	+ cButton particlesButton;
	6140	+ cButton overlayButton;
	6141	+ cButton lightButton;
5295	6142
5296	6143	cButton screenfitButton;
5297	6144	cButton screenfitpointButton;
..	..	@@ -5313,11 +6160,11 @@
5313	6160	//JTree jTree;
5314	6161	private MenuItem lookAtItem;
5315	6162	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	6163	+ private MenuItem switchViewItem;
5317	6164	private MenuItem cutItem;
5318	6165	private MenuItem undoItem;
5319	6166	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	6167	+ private JMenuItem duplicateItem;
5321	6168	private MenuItem cloneItem;
5322	6169	private MenuItem cloneSupportItem;
5323	6170	private MenuItem overwriteGeoItem;
..	..	@@ -5345,7 +6192,7 @@
5345	6192	private MenuItem pasteLinkItem;
5346	6193	private MenuItem pasteCloneItem;
5347	6194	private MenuItem pasteExpandItem;
5348		- private MenuItem clearItem;
	6195	+ private MenuItem deleteItem;
5349	6196	private MenuItem clearAllItem;
5350	6197	private MenuItem genUVItem;
5351	6198	private MenuItem genNormalsMESHItem;
..	..	@@ -5405,7 +6252,7 @@
5405	6252	private MenuItem frontItem;
5406	6253	private MenuItem cameraItem;
5407	6254	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	6255	+ private MenuItem switchItem;
5409	6256	private MenuItem physicsItem;
5410	6257	private MenuItem frameselectorItem;
5411	6258	private MenuItem scriptNodeItem;
..	..	@@ -5429,6 +6276,8 @@
5429	6276	private MenuItem attachBumpItem;
5430	6277	private MenuItem detachBumpItem;
5431	6278	private MenuItem pigmentBumpItem;
	6279	+ private MenuItem embedTexturesItem;
	6280	+ private MenuItem deEmbedTexturesItem;
5432	6281
5433	6282	private MenuItem particleItem;
5434	6283	private MenuItem ragdollItem;
..	..	@@ -5479,5 +6328,5 @@
5479	6328
5480	6329	Menu cameraMenu;
5481	6330	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	6331	+ MenuItem restoreCameraItem;
5483	6332	}