~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versions == null)
	360	+ {
	361	+ copy.versions = new byte[100][];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -80,10 +382,22 @@
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versions == null)
	387	+ {
	388	+ copy.versions = new byte[100][];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +408,7 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +465,8 @@
150	465
151	466	void SetupMenu2(GroupEditor oe)
152	467	{
	468	+ oe.jTree = new cTree();
	469	+
153	470	Menu menu;
154	471	oe.menuBar.add(menu = new Menu("Edit"));
155	472	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +477,7 @@
160	477	// redoItem = menu.add(new MenuItem("Redo"));
161	478	// redoItem.addActionListener(this);
162	479	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	481	duplicateItem.addActionListener(this);
165	482	cloneItem = menu.add(new MenuItem("Clone"));
166	483	cloneItem.addActionListener(this);
..	..	@@ -187,8 +504,8 @@
187	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	505	// pasteExpandItem.addActionListener(this);
189	506	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
192	509
193	510	if (Globals.ADVANCED)
194	511	{
..	..	@@ -202,23 +519,23 @@
202	519	//zBufferItem.addActionListener(this);
203	520	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	521	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
207	524
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	537
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"));
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	539	toggleHandleItem.addItemListener(this);
223	540	toggleHandleItem.setState(CameraPane.HANDLES);
224	541
..	..	@@ -273,7 +590,7 @@
273	590	{
274	591	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	592	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	594	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	595	oe.cameraMenu.add("-");
279	596	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +598,7 @@
281	598	editLeafItem.addActionListener(this);
282	599	lookAtItem.addActionListener(this);
283	600	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	601	+ //switchViewItem.addActionListener(this);
285	602	}
286	603
287	604	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +643,29 @@
326	643	}
327	644
328	645	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
331	648	backItem = menu.add(new MenuItem("Back"));
332	649	backItem.addActionListener(this);
333	650	frontItem = menu.add(new MenuItem("Front"));
334	651	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
337	657	hideItem = menu.add(new MenuItem("Hidden Group"));
338	658	hideItem.addActionListener(this);
	659	+ }
339	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	661	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
344	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	670	switchGeoItem.addActionListener(this);
346	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +673,6 @@
348	673	morphItem = menu.add(new MenuItem("Morph Group"));
349	674	morphItem.addActionListener(this);
350	675
351		- if (Globals.ADVANCED)
352		- {
353	676	menu.add("-");
354	677	physicsItem = menu.add(new MenuItem("Physics"));
355	678	physicsItem.addActionListener(this);
..	..	@@ -357,13 +680,11 @@
357	680	frameselectorItem.addActionListener(this);
358	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	682	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	683	}
363	684
364	685	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
367	688	billboardItem = menu.add(new MenuItem("Billboard"));
368	689	billboardItem.addActionListener(this);
369	690	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +695,14 @@
374	695	shadowYItem.addActionListener(this);
375	696	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
377	701	if (Globals.ADVANCED)
378	702	{
379	703	menu.add("-");
380	704	linkerItem = menu.add(new MenuItem("Linker"));
381	705	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	706	templateItem = menu.add(new MenuItem("Template"));
385	707	templateItem.addActionListener(this);
386	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +731,7 @@
409	731	genNormalsMESHItem.addActionListener(this);
410	732	if (Globals.ADVANCED)
411	733	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	735	genNormalsMINEItem.addActionListener(this);
414	736	}
415	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -502,10 +824,15 @@
502	824	attachBumpItem.addActionListener(this);
503	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
505	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	829	detachPigmentItem.addActionListener(this);
507	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
509	836	menu.add("-");
510	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	838	sortbysizeItem.addActionListener(this);
..	..	@@ -532,6 +859,7 @@
532	859	buildToolsMenu(menu);
533	860	}
534	861
	862	+
535	863	void SetupUI2(ObjEditor oe)
536	864	{
537	865	// June 2019
..	..	@@ -574,51 +902,79 @@
574	902	oe.radioPanel.add(dummyButton);
575	903	oe.buttonGroup.add(dummyButton);
576	904	*/
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
	908	+
577	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	910
579	911	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	912	//minButton.setToolTipText("Minimize window");
581	913	//minButton.addActionListener(this);
582	914
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
586	921
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	923	fullButton.setToolTipText("Full-screen window");
589	924	fullButton.addActionListener(this);
590	925
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
594	933
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("New version");
601	936	saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
602	942
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Replace current");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
	956	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	957	+ redoButton.setToolTipText("Next version");
	958	+ redoButton.addActionListener(this);
	959	+ redoButton.setEnabled(false);
	960	+
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	962	liveCB.setToolTipText("Enable animation");
605	963	liveCB.addItemListener(this);
606	964
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	966	oneStepButton.setToolTipText("Animate one step forward");
609	967	oneStepButton.addActionListener(this);
610	968
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	970	fastCB.setToolTipText("Fast mode");
613	971	fastCB.addItemListener(this);
614	972
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);
	973	+ //oe.toolboxPanel.Return();
	974	+
	975	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	976	+// trackCB.setToolTipText("Enable tracking");
	977	+// trackCB.addItemListener(this);
622	978
623	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	980	// screenfitpointButton.addActionListener(this);
..	..	@@ -628,51 +984,137 @@
628	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	985	snapobjectButton.addActionListener(this);
630	986	snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ fourButton.addActionListener(this);
	990	+ fourButton.setToolTipText("Show control panel only");
631	991	}
632	992
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	994
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");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
641	997	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");
	998	+ this.fullscreenLayout = twoButton;
	999	+
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
650	1002	threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
654	1009	//
655	1010
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
658	1013	rootButton.addActionListener(this);
659	1014
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	1016	closeButton.setToolTipText("Close tab");
662	1017	closeButton.addActionListener(this);
663	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	1019	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	1020	+
	1021	+ cGridBag row1 = new cGridBag();
	1022	+
	1023	+ // INSERT
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ gridButton.setToolTipText("Create grid");
	1026	+ gridButton.addActionListener(this);
	1027	+
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ boxButton.setToolTipText("Create box");
	1030	+ boxButton.addActionListener(this);
	1031	+
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ sphereButton.setToolTipText("Create sphere");
	1034	+ sphereButton.addActionListener(this);
	1035	+
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ coneButton.setToolTipText("Create cone");
	1038	+ coneButton.addActionListener(this);
	1039	+
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ torusButton.setToolTipText("Create torus");
	1042	+ torusButton.addActionListener(this);
	1043	+
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ superButton.setToolTipText("Create superellipsoid");
	1046	+ superButton.addActionListener(this);
	1047	+
	1048	+ if (Globals.ADVANCED)
	1049	+ {
	1050	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ kleinButton.setToolTipText("Create Klein bottle");
	1052	+ kleinButton.addActionListener(this);
	1053	+ }
	1054	+
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ particlesButton.setToolTipText("Create particle system");
	1057	+ particlesButton.addActionListener(this);
	1058	+
	1059	+ oe.toolboxPanel.add(row1);
	1060	+
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ groupButton.setToolTipText("Create group");
	1065	+ groupButton.addActionListener(this);
	1066	+
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ compositeButton.setToolTipText("Create composite");
	1069	+ compositeButton.addActionListener(this);
	1070	+
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
	1073	+ switchButton.addActionListener(this);
	1074	+
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ loopButton.setToolTipText("Create loop");
	1077	+ loopButton.addActionListener(this);
	1078	+
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ textureButton.setToolTipText("Create texture");
	1081	+ textureButton.addActionListener(this);
	1082	+
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ overlayButton.setToolTipText("Create overlay");
	1085	+ overlayButton.addActionListener(this);
	1086	+
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ lightButton.setToolTipText("Create light");
	1089	+ lightButton.addActionListener(this);
	1090	+
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
	1106	+
	1107	+ // EDIT panel
	1108	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ editButton.setToolTipText("Pin selection controls");
668	1110	editButton.addActionListener(this);
669	1111
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
672	1114	uneditButton.addActionListener(this);
673	1115
674	1116	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	1117	+ allParamsButton.setToolTipText("Show all controle");
676	1118	allParamsButton.addActionListener(this);
677	1119
678	1120	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +1125,13 @@
683	1125	unselectButton.setToolTipText("Unselect");
684	1126	unselectButton.addActionListener(this);
685	1127
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
	1131	+
686	1132	editCommandsPanel.preferredHeight = 1;
687	1133
	1134	+ SetPinStates(false);
688	1135	// oe.treePanel.add(commandsPanel);
689	1136	// oe.treePanel.Return();
690	1137
..	..	@@ -703,32 +1150,20 @@
703	1150
704	1151	JScrollPane jSP;
705	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	1154	ResetModel();
708	1155
709	1156	oe.treePanel.add(jSPPanel);
710	1157	oe.treePanel.Return();
711	1158
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	1159	oe.treePanel.add(copyOptionsPanel);
728	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
729	1164
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
732	1167
733	1168	//jList.addListSelectionListener(this);
734	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +1171,7 @@
736	1171	//jTree.setEditable(true);
737	1172	oe.jTree.setDragEnabled(true);
738	1173	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
740	1175
741	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	1177
..	..	@@ -748,29 +1183,49 @@
748	1183	dgr.addDragGestureListener(this);
749	1184	}catch(Exception e) {}
750	1185	*/
751		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
752	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1188	}
754	1189
755	1190	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1191	{
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
	1195	+
	1196	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1197	+ materialCB.setToolTipText("Copy material when dropped");
	1198	+ materialCB.addItemListener(this);
	1199	+
	1200	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1201	+ textureCB.setToolTipText("Copy texture when dropped");
	1202	+ textureCB.addItemListener(this);
	1203	+
	1204	+ panel.Return();
	1205	+
757	1206	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1207	boxCB.setToolTipText("Display bounding boxes");
759	1208	boxCB.addItemListener(this);
760	1209
761	1210	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1212	zoomBoxCB.addItemListener(this);
764	1213
765	1214	if (true) // Globals.ADVANCED)
766	1215	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
770	1223
771	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1225	// localCB.addItemListener(this);
773	1226
	1227	+ panel.Return();
	1228	+
774	1229	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1230	crowdCB.setToolTipText("Used for crowds");
776	1231	crowdCB.addItemListener(this);
..	..	@@ -787,6 +1242,8 @@
787	1242	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1243	// speakerMocapCB.addItemListener(this);
789	1244
	1245	+ panel.Return();
	1246	+
790	1247	if (false)
791	1248	{
792	1249	// handled in scripts
..	..	@@ -801,34 +1258,74 @@
801	1258	//constraints.gridy += 1;
802	1259	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1260	smoothfocusCB.addItemListener(this);
	1261	+ panel.Return();
804	1262	}
805	1263
806	1264	//constraints.gridx += 1;
807	1265	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1266	// debugCB.addItemListener(this);
809	1267
	1268	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1269	+ trackCB.setToolTipText("Enable tracking target");
	1270	+ trackCB.addItemListener(this);
	1271	+
810	1272	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1273	+ oeilCB.setToolTipText("Move camera when tracking");
811	1274	oeilCB.addItemListener(this);
812	1275
	1276	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1277	+ shadowCB.setToolTipText("When live compute shadows");
	1278	+ shadowCB.addItemListener(this);
	1279	+
	1280	+ panel.Return();
	1281	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1282	+ toggleTextureCB.setToolTipText("Load textures");
	1283	+ toggleTextureCB.addItemListener(this);
	1284	+
	1285	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1286	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1287	+ toggleSwitchCB.addItemListener(this);
	1288	+
	1289	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1290	+ autokeepCB.setToolTipText("On structure change");
	1291	+ autokeepCB.addItemListener(this);
	1292	+
	1293	+ panel.Return();
	1294	+ if (Globals.ADVANCED)
	1295	+ {
813	1296	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	1297	lookAtCB.setToolTipText("Look-at target");
815	1298	lookAtCB.addItemListener(this);
	1299	+ }
816	1300
817	1301	}
818	1302
819	1303	cGridBag fill = new cGridBag();
820		-
821	1304	fill.preferredHeight = 200;
	1305	+ cGridBag fill2 = new cGridBag();
	1306	+ fill2.preferredHeight = 200;
	1307	+ cGridBag fill3 = new cGridBag();
	1308	+ fill3.preferredHeight = 200;
822	1309
823	1310	panel.add(fill);
	1311	+ panel.add(fill2);
	1312	+ panel.add(fill3);
824	1313
825	1314	}
826	1315
827	1316	void EditObject(Object3D obj)
828	1317	{
829	1318	cRadio radioButton = new cRadio(obj.name);
	1319	+
	1320	+ // June 2019. Patch to avoid bug with transparency.
	1321	+ radioButton.hadMaterial = obj.material != null;
	1322	+ if (!radioButton.hadMaterial)
	1323	+ {
	1324	+ obj.material = new cMaterial();
	1325	+ }
	1326	+
830	1327	radioButton.SetObject(obj);
831		- radioButton.layout = sevenButton;
	1328	+ radioButton.layout = sixButton; // sevenButton;
832	1329	radioButton.SetCamera(cameraView.renderCamera, false);
833	1330	radioButton.addActionListener(this);
834	1331	radioPanel.add(radioButton);
..	..	@@ -848,23 +1345,28 @@
848	1345	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1346	}
850	1347
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;
	1348	+ cToggleButton liveCB;
	1349	+ cCheckBox supportCB;
	1350	+ cCheckBox localCB;
	1351	+ cCheckBox crowdCB;
	1352	+ cCheckBox smoothCB;
	1353	+ cToggleButton fastCB;
	1354	+ cCheckBox slowCB;
	1355	+ cCheckBox boxCB;
	1356	+ cCheckBox zoomBoxCB;
	1357	+ cCheckBox freezeCB;
	1358	+ //cToggleButton trackCB;
	1359	+ cCheckBox trackCB;
	1360	+ cCheckBox smoothfocusCB;
862	1361	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1362	+ cCheckBox speakerCameraCB;
	1363	+ cCheckBox speakerFocusCB;
	1364	+ cCheckBox debugCB;
	1365	+
	1366	+ cCheckBox oeilCB;
	1367	+ cCheckBox shadowCB;
	1368	+ cCheckBox autokeepCB;
	1369	+ cCheckBox lookAtCB;
868	1370
869	1371	// static int COLOR = 1;
870	1372	// static int MATERIAL = 2;
..	..	@@ -872,9 +1374,9 @@
872	1374
873	1375	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1376
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1377	+ cCheckBox colorCB;
	1378	+ cCheckBox materialCB;
	1379	+ cCheckBox textureCB;
878	1380
879	1381	public void itemStateChanged(ItemEvent e)
880	1382	{
..	..	@@ -967,6 +1469,18 @@
967	1469	{
968	1470	cameraView.ToggleOeil();
969	1471	}
	1472	+ else if(e.getSource() == shadowCB)
	1473	+ {
	1474	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1475	+ }
	1476	+ else if(e.getSource() == freezeCB)
	1477	+ {
	1478	+ Globals.FREEZEONMOVE ^= true;
	1479	+ }
	1480	+ else if(e.getSource() == autokeepCB)
	1481	+ {
	1482	+ Globals.REPLACEONMAKE ^= true;
	1483	+ }
970	1484	else if(e.getSource() == lookAtCB)
971	1485	{
972	1486	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1497,8 @@
983	1497
984	1498	/**/
985	1499	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1500	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1501	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1502	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1503	// We can't move the root node or an empty selection
989	1504	return;
..	..	@@ -1046,8 +1561,6 @@
1046	1561	}
1047	1562	}
1048	1563
1049		- String string = (String) object;
1050		-
1051	1564	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1565	// if( object instanceof java.io.File[])
1053	1566	// {
..	..	@@ -1055,6 +1568,8 @@
1055	1568	// objEditor.DropFile((java.io.File[]) object, true);
1056	1569	// return;
1057	1570	// }
	1571	+
	1572	+ String string = object.toString();
1058	1573
1059	1574	// File path for Mac and Windows
1060	1575	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1615,33 @@
1100	1615
1101	1616	assert target == objEditor.jTree;
1102	1617	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1618	+ Object3D destinationLeaf;
1103	1619	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1620	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1621	} catch (Exception e) {
1106	1622	System.out.println("destinationPath : " + destinationPath);
1107	1623	return;
1108	1624	}
1109	1625
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1626	+ for (int i=group.selection.size(); --i>=0;)
1111	1627	{
	1628	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1629	+
	1630	+ // Cannot move into itself
	1631	+ if (child == destinationLeaf)
	1632	+ return;
	1633	+ }
	1634	+
	1635	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1636	+// {
1112	1637	loadClipboard(true);
1113	1638	objEditor.jTree.setSelectionPath(destinationPath);
1114	1639	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1640	+// } else {
	1641	+// loadClipboard(false);
	1642	+// objEditor.jTree.setSelectionPath(destinationPath);
	1643	+// pasteInto(false, false); // true); // ???
	1644	+// }
1120	1645	}
1121	1646	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1647	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1746,30 @@
1221	1746	{
1222	1747	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1748	//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);
	1749	+// gridItem = menu.add(new MenuItem("Grid"));
	1750	+// gridItem.addActionListener(this);
	1751	+// rectoidItem = menu.add(new MenuItem("Box"));
	1752	+// rectoidItem.addActionListener(this);
	1753	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1754	+// ellipsoidItem.addActionListener(this);
	1755	+// coneItem = menu.add(new MenuItem("Cone"));
	1756	+// coneItem.addActionListener(this);
	1757	+// torusItem = menu.add(new MenuItem("Torus"));
	1758	+// torusItem.addActionListener(this);
	1759	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1760	+// superItem.addActionListener(this);
	1761	+
	1762	+ cameraItem = menu.add(new MenuItem("Camera"));
	1763	+ cameraItem.addActionListener(this);
	1764	+
	1765	+ if (!Globals.ADVANCED)
	1766	+ {
1236	1767	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1768	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1769	+ }
	1770	+
	1771	+// particleItem = menu.add(new MenuItem("Particle system"));
	1772	+// particleItem.addActionListener(this);
1240	1773	if (Globals.ADVANCED)
1241	1774	{
1242	1775	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1795,15 @@
1262	1795	}
1263	1796	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1797	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);
	1798	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1799	+// overlayItem.addActionListener(this);
	1800	+// lightItem = menu.add(new MenuItem("Light"));
	1801	+// lightItem.addActionListener(this);
1269	1802	menu.add("-");
1270	1803	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1804	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1805	+// loopItem = menu.add(new MenuItem("Loop"));
	1806	+// loopItem.addActionListener(this);
1274	1807	doubleItem = menu.add(new MenuItem("Fork"));
1275	1808	doubleItem.addActionListener(this);
1276	1809	if (Globals.ADVANCED)
..	..	@@ -1286,6 +1819,9 @@
1286	1819	animationItem.addItemListener(this);
1287	1820	animationItem.setState(Globals.ANIMATION);
1288	1821
	1822	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1823	+ archiveItem.addActionListener(this);
	1824	+
1289	1825	menu.add("-");
1290	1826	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1291	1827	parseverticesItem.addActionListener(this);
..	..	@@ -1298,6 +1834,8 @@
1298	1834	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1299	1835	reduce34MorphItem.addActionListener(this);
1300	1836	menu.add("-");
	1837	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1838	+ memoryItem.addActionListener(this);
1301	1839	menu.add(computeAOItem = new MenuItem("Compute AO"));
1302	1840	computeAOItem.addActionListener(this);
1303	1841
..	..	@@ -1306,8 +1844,6 @@
1306	1844	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1307	1845	mirrorItem.addActionListener(this);
1308	1846	menu.add("-");
1309		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310		- memoryItem.addActionListener(this);
1311	1847	menu.add(analyzeItem = new MenuItem("Analyze"));
1312	1848	analyzeItem.addActionListener(this);
1313	1849	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1455,6 +1991,30 @@
1455	1991
1456	1992	makeSomething(shadow);
1457	1993	}
	1994	+
	1995	+ private void ClearUnpinned()
	1996	+ {
	1997	+ //for (Object3D obj : listUI)
	1998	+ for (int i=listUI.size(); --i>=0;)
	1999	+ {
	2000	+ Object3D obj = listUI.elementAt(i);
	2001	+ if (!obj.pinned)
	2002	+ {
	2003	+ obj.CloseUI();
	2004	+ listUI.remove(i);
	2005	+ }
	2006	+ }
	2007	+ }
	2008	+
	2009	+ private void EditElement(Object3D elem, boolean newWindow)
	2010	+ {
	2011	+ // if (!(elem instanceof Composite))
	2012	+ // newWindow = false;
	2013	+ listUI.add(elem);
	2014	+ elem.openEditWindow(this, newWindow); //, false);
	2015	+ System.out.println("edit : " + elem);
	2016	+ elem.editWindow.refreshContents(true); // ? new
	2017	+ }
1458	2018
1459	2019	/**
1460	2020	* applyExample
..	..	@@ -1699,7 +2259,7 @@
1699	2259	{
1700	2260	ScreenFit();
1701	2261	} else
1702		- if (source == switchItem)
	2262	+ if (source == switchViewItem)
1703	2263	{
1704	2264	cVector v1 = new cVector();
1705	2265	cVector v2 = new cVector();
..	..	@@ -1708,11 +2268,11 @@
1708	2268	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	2269	objEditor.cameraView.repaint();
1710	2270	} else
1711		- if (source == rectoidItem)
	2271	+ if (source == rectoidItem \|\| source == boxButton)
1712	2272	{
1713	2273	makeSomething(new Box());
1714	2274	} else
1715		- if (source == particleItem)
	2275	+ if (source == particleItem \|\| source == particlesButton)
1716	2276	{
1717	2277	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	2278	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +2351,27 @@
1791	2351
1792	2352	makeSomething(obj);
1793	2353	} else
1794		- if (source == gridItem)
	2354	+ if (source == gridItem \|\| source == gridButton)
1795	2355	{
1796	2356	makeSomething(new Grid());
1797	2357	} else
1798		- if (source == ellipsoidItem)
	2358	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2359	{
1800	2360	makeSomething(new Sphere());
1801	2361	} else
1802		- if (source == coneItem)
	2362	+ if (source == coneItem \|\| source == coneButton)
1803	2363	{
1804	2364	makeSomething(new Cone());
1805	2365	} else
1806		- if (source == torusItem)
	2366	+ if (source == torusItem \|\| source == torusButton)
1807	2367	{
1808	2368	makeSomething(new Torus());
1809	2369	} else
1810		- if (source == superItem)
	2370	+ if (source == superItem \|\| source == superButton)
1811	2371	{
1812	2372	makeSomething(new Superellipsoid());
1813	2373	} else
1814		- if (source == kleinItem)
	2374	+ if (source == kleinItem \|\| source == kleinButton)
1815	2375	{
1816	2376	makeSomething(new Klein());
1817	2377	} else
..	..	@@ -1831,7 +2391,7 @@
1831	2391	{
1832	2392	makeSomething(new BezierSurface());
1833	2393	} else
1834		- if (source == overlayItem)
	2394	+ if (source == overlayItem \|\| source == overlayButton)
1835	2395	{
1836	2396	/*
1837	2397	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,10 +2439,27 @@
1879	2439	s.setup();
1880	2440	makeSomething(s);
1881	2441	} else
1882		- if (source == lightItem)
	2442	+ if (source == lightItem \|\| source == lightButton)
1883	2443	{
1884	2444	makeSomething(new Light());
1885	2445	} else
	2446	+// if (source == skybox1Button \|\|
	2447	+// source == skybox2Button \|\|
	2448	+// source == skybox3Button \|\|
	2449	+// source == skybox4Button \|\|
	2450	+// source == skybox5Button \|\|
	2451	+// source == skybox6Button \|\|
	2452	+// source == skybox7Button \|\|
	2453	+// source == skybox11Button \|\|
	2454	+// source == skybox12Button \|\|
	2455	+// source == skybox13Button \|\|
	2456	+// source == skybox14Button \|\|
	2457	+// source == skybox15Button \|\|
	2458	+// source == skybox16Button \|\|
	2459	+// source == skybox17Button)
	2460	+// {
	2461	+// ChangeSkybox(source);
	2462	+// } else
1886	2463	if (source == csgItem)
1887	2464	{
1888	2465	group(new CSG());
..	..	@@ -1929,30 +2506,30 @@
1929	2506
1930	2507	group(g);
1931	2508	} else
1932		- if (source == loopItem)
	2509	+ if (source == loopItem \|\| source == loopButton)
1933	2510	{
1934	2511	Composite csg = new GroupLeaf();
1935	2512	csg.count = 5;
1936	2513	group(csg);
1937		- Composite child = new cGroup();
	2514	+ Composite child = new cGroup("Branch");
1938	2515	csg.addChild(child);
1939	2516	child.addChild(csg);
1940	2517	} else
1941	2518	if (source == doubleItem)
1942	2519	{
1943		- Composite csg = new GroupLeaf();
	2520	+ Composite csg = new GroupLeaf("Fork");
1944	2521	csg.count = 5;
1945	2522	group(csg);
1946		- Composite child = new cGroup();
	2523	+ Composite child = new cGroup("Branch A");
1947	2524	csg.addChild(child);
1948	2525	child.addChild(csg);
1949		- child = new cGroup();
	2526	+ child = new cGroup("Branch B");
1950	2527	csg.addChild(child);
1951	2528	child.addChild(csg);
1952	2529	} else
1953	2530	if (source == tripleItem)
1954	2531	{
1955		- Composite csg = new GroupLeaf();
	2532	+ Composite csg = new GroupLeaf("Trident");
1956	2533	csg.count = 4;
1957	2534	group(csg);
1958	2535	Composite child = new cGroup();
..	..	@@ -1968,7 +2545,7 @@
1968	2545	if (source == computeAOItem)
1969	2546	{
1970	2547	Globals.drawMode = CameraPane.OCCLUSION;
1971		- Globals.theRenderer.repaint();
	2548	+ cameraView.repaint();
1972	2549	} else
1973	2550	if (source == recompileItem)
1974	2551	{
..	..	@@ -2016,15 +2593,31 @@
2016	2593	} else
2017	2594	if (source == undoButton)
2018	2595	{
	2596	+ // Go to previous version
	2597	+ //if (!Undo())
	2598	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2019	2599	Undo();
	2600	+ } else
	2601	+ if (source == restoreButton)
	2602	+ {
	2603	+ // Restore current version
	2604	+ Restore();
	2605	+ } else
	2606	+ if (source == replaceButton)
	2607	+ {
	2608	+ // Overwrite current version
	2609	+ Replace();
2020	2610	} else
2021	2611	if (source == redoButton)
2022	2612	{
	2613	+ // Go to next version
2023	2614	Redo();
2024	2615	} else
2025	2616	if (source == saveButton)
2026	2617	{
2027		- Save();
	2618	+ // Save a new version
	2619	+ if (!Save(true))
	2620	+ java.awt.Toolkit.getDefaultToolkit().beep();
2028	2621	} else
2029	2622	if (source == oneStepButton)
2030	2623	{
..	..	@@ -2033,17 +2626,14 @@
2033	2626	} else
2034	2627	if (source == screenfitButton)
2035	2628	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2629	ScreenFit();
2038	2630	} else
2039	2631	if (source == screenfitpointButton)
2040	2632	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2633	ScreenFitPoint();
2043	2634	} else
2044	2635	if (source == snapobjectButton)
2045	2636	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2637	SnapObject();
2048	2638	} else
2049	2639	// if (event.getSource() == recompileButton)
..	..	@@ -2407,7 +2997,7 @@
2407	2997	{
2408	2998	StepAll();
2409	2999	} else
2410		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3000	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2411	3001	{
2412	3002	//int indices[] = jList.getSelectedIndices();
2413	3003	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2419,9 +3009,9 @@
2419	3009	{
2420	3010	ClearSelection(true);
2421	3011	} else
2422		- if (source == grabItem)
	3012	+ if (source == grabItem \|\| source == groupButton)
2423	3013	{
2424		- group(new cGroup(), true);
	3014	+ group(new cGroup(), false); // true);
2425	3015	} else
2426	3016	if (source == hideItem)
2427	3017	{
..	..	@@ -2439,11 +3029,11 @@
2439	3029	{
2440	3030	makeSomething(new Camera());
2441	3031	} else
2442		- if (source == compositeItem)
	3032	+ if (source == compositeItem \|\| source == compositeButton)
2443	3033	{
2444	3034	group(new Composite());
2445	3035	} else
2446		- if (source == randomItem)
	3036	+ if (source == switchItem \|\| source == switchButton)
2447	3037	{
2448	3038	RandomNode random = new RandomNode();
2449	3039	group(random);
..	..	@@ -2545,7 +3135,7 @@
2545	3135	{
2546	3136	group(new cLinker());
2547	3137	} else
2548		- if (source == textureItem)
	3138	+ if (source == textureItem \|\| source == textureButton)
2549	3139	{
2550	3140	group(new TextureNode());
2551	3141	} else
..	..	@@ -2565,17 +3155,30 @@
2565	3155	{
2566	3156	CastShadow(2);
2567	3157	} else
2568		- if (source == ungroupItem)
	3158	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	3159	{
2570		- //ungroup();
	3160	+ boolean hasRoot = false;
	3161	+
2571	3162	for (int i=0; i<group.selection.size(); i++)
2572	3163	{
2573		- Ungroup(group.selection.get(i));
	3164	+ if (group.selection.get(i) == group)
	3165	+ {
	3166	+ hasRoot = true;
	3167	+ break;
	3168	+ }
2574	3169	}
2575	3170
2576		- ClearSelection(false);
2577		-
2578		- refreshContents();
	3171	+ if (!hasRoot)
	3172	+ {
	3173	+ for (int i=0; i<group.selection.size(); i++)
	3174	+ {
	3175	+ Ungroup(group.selection.get(i));
	3176	+ }
	3177	+
	3178	+ ClearSelection(false);
	3179	+
	3180	+ refreshContents();
	3181	+ }
2579	3182	} else
2580	3183	if (source == genUVItem)
2581	3184	{
..	..	@@ -2876,7 +3479,7 @@
2876	3479	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2877	3480	{
2878	3481	obj = (Object3D)e.nextElement();
2879		- obj.SetBumpTexture(null);
	3482	+ obj.ResetBumpTexture();
2880	3483	}
2881	3484
2882	3485	refreshContents();
..	..	@@ -2892,6 +3495,31 @@
2892	3495
2893	3496	refreshContents();
2894	3497	} else
	3498	+ if (source == embedTexturesItem)
	3499	+ {
	3500	+ Object3D obj;
	3501	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3502	+ {
	3503	+ obj = (Object3D)e.nextElement();
	3504	+ obj.EmbedTextures(true);
	3505	+ }
	3506	+
	3507	+ refreshContents();
	3508	+ } else
	3509	+ if (source == deEmbedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(false);
	3516	+ }
	3517	+
	3518	+ CameraPane.texturepigment.clear();
	3519	+ CameraPane.texturebump.clear();
	3520	+
	3521	+ refreshContents();
	3522	+ } else
2895	3523	if (source == flashSelectionButton)
2896	3524	{
2897	3525	CameraPane.flash = true;
..	..	@@ -2903,6 +3531,10 @@
2903	3531	if (source == twoButton)
2904	3532	{
2905	3533	radio.layout = twoButton;
	3534	+
	3535	+ if (CameraPane.FULLSCREEN)
	3536	+ fullscreenLayout = radio.layout;
	3537	+
2906	3538	// bug
2907	3539	//gridPanel.setDividerLocation(1.0);
2908	3540	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3590,9 @@
2958	3590	{
2959	3591	radio.layout = threeButton;
2960	3592
	3593	+ if (CameraPane.FULLSCREEN)
	3594	+ fullscreenLayout = radio.layout;
	3595	+
2961	3596	// bigThree.remove(scenePanel);
2962	3597	// bigThree.remove(centralPanel);
2963	3598	// bigThree.remove(XYZPanel);
..	..	@@ -2986,8 +3621,8 @@
2986	3621	// centralPanel.setVisible(true);
2987	3622	// XYZPanel.setVisible(true);
2988	3623	bigThree.ClearUI();
	3624	+ bigThree.add(scenePanel);
2989	3625	bigThree.add(centralPanel);
2990		- bigThree.add(XYZPanel);
2991	3626	bigThree.FlushUI();
2992	3627
2993	3628	cameraView.requestFocusInWindow();
..	..	@@ -2995,6 +3630,9 @@
2995	3630	if (source == fourButton)
2996	3631	{
2997	3632	radio.layout = fourButton;
	3633	+
	3634	+ if (CameraPane.FULLSCREEN)
	3635	+ fullscreenLayout = radio.layout;
2998	3636
2999	3637	// bigThree.remove(scenePanel);
3000	3638	// bigThree.remove(centralPanel);
..	..	@@ -3033,6 +3671,9 @@
3033	3671	{
3034	3672	radio.layout = sixButton;
3035	3673
	3674	+ if (CameraPane.FULLSCREEN)
	3675	+ fullscreenLayout = radio.layout;
	3676	+
3036	3677	// bigThree.remove(scenePanel);
3037	3678	// bigThree.remove(centralPanel);
3038	3679	// bigThree.remove(XYZPanel);
..	..	@@ -3061,8 +3702,8 @@
3061	3702	// centralPanel.setVisible(true);
3062	3703	// XYZPanel.setVisible(false);
3063	3704	bigThree.ClearUI();
3064		- bigThree.add(scenePanel);
3065	3705	bigThree.add(centralPanel);
	3706	+ bigThree.add(scenePanel);
3066	3707	bigThree.FlushUI();
3067	3708
3068	3709	cameraView.requestFocusInWindow();
..	..	@@ -3070,6 +3711,9 @@
3070	3711	if (source == sevenButton)
3071	3712	{
3072	3713	radio.layout = sevenButton;
	3714	+
	3715	+ if (CameraPane.FULLSCREEN)
	3716	+ fullscreenLayout = radio.layout;
3073	3717
3074	3718	// bigThree.remove(scenePanel);
3075	3719	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3770,19 @@
3126	3770	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3771	{
3128	3772	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3773	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3774	{
	3775	+ // Patch to avoid bug with transparency.
	3776	+ if (!ab.hadMaterial)
	3777	+ {
	3778	+ ab.object.material = null;
	3779	+ }
	3780	+
3131	3781	buttonGroup.remove(ab);
3132	3782	radioPanel.remove(ab);
3133	3783
3134		- ab.GetObject().editWindow = null;
	3784	+ //ab.GetObject().editWindow = null;
	3785	+ ab.GetObject().manipWindow = null;
3135	3786	// ab.GetObject().objectUI = null; // ?????????
3136	3787
3137	3788	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3795,12 @@
3144	3795	} else
3145	3796	if (source == editItem \|\| source == editButton)
3146	3797	{
	3798	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3799	+ {
	3800	+ Object3D child = (Object3D)e.nextElement();
	3801	+ child.pinned = true;
	3802	+ }
	3803	+
3147	3804	EditSelection(false);
3148	3805	} else
3149	3806	if (source == uneditButton)
..	..	@@ -3153,6 +3810,7 @@
3153	3810	Object3D child = (Object3D)e.nextElement();
3154	3811	if(child.editWindow != null)
3155	3812	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3813	+ child.pinned = false;
3156	3814	child.CloseUI();
3157	3815	listUI.remove(child);
3158	3816
..	..	@@ -3169,6 +3827,7 @@
3169	3827	//copy.ClearUI();
3170	3828	for (Object3D obj : listUI)
3171	3829	{
	3830	+ obj.pinned = false;
3172	3831	obj.CloseUI();
3173	3832	}
3174	3833	listUI.clear();
..	..	@@ -3178,7 +3837,7 @@
3178	3837	{
3179	3838	assert(copy == group);
3180	3839
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3840	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3841
3183	3842	for (Object3D obj : listUI)
3184	3843	{
..	..	@@ -3227,6 +3886,9 @@
3227	3886	}
3228	3887
3229	3888	copy = group;
	3889	+
	3890	+ SetUndoStates();
	3891	+
3230	3892	//Globals.theRenderer.object = group;
3231	3893	if(!useclient)
3232	3894	{
..	..	@@ -3245,6 +3907,7 @@
3245	3907
3246	3908	// fix "+" issue
3247	3909	//group.editWindow = this;
	3910	+ group.manipWindow = this;
3248	3911
3249	3912	/*
3250	3913	currentLayout = radio.layout;
..	..	@@ -3252,6 +3915,13 @@
3252	3915	currentLayout = sevenButton;
3253	3916	*/
3254	3917	radio.layout.doClick();
	3918	+
	3919	+ ClearUnpinned();
	3920	+ //Grafreed.Assert(group != null);
	3921	+ //Grafreed.Assert(group.selection != null);
	3922	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3923	+ if (group.selection == null \|\| group.selection.size() == 1)
	3924	+ EditSelection(false);
3255	3925	keepparent = group.parent;
3256	3926	// PARENT = NULL or not???
3257	3927	//group.parent = null; // ROOT
..	..	@@ -3265,7 +3935,7 @@
3265	3935	cameraView.ProtectCamera();
3266	3936	cameraView.repaint();
3267	3937	return;
3268		- } else if (event.getSource() == revertCameraItem)
	3938	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	3939	{
3270	3940	cameraView.RevertCamera();
3271	3941	cameraView.repaint();
..	..	@@ -3844,7 +4514,7 @@
3844	4514
3845	4515	try
3846	4516	{
3847		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4517	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3848	4518	}
3849	4519	catch (Exception e)
3850	4520	{
..	..	@@ -4319,28 +4989,25 @@
4319	4989	// }
4320	4990	// }
4321	4991
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	4992	void EditSelection(boolean newWindow)
4327	4993	{
	4994	+ if (group.selection == null)
	4995	+ {
	4996	+ EditElement(group, newWindow); // ? new
	4997	+ return;
	4998	+ }
	4999	+
4328	5000	// aConstraints.gridy = 0;
4329	5001	for (int i=0; i<group.selection.size(); i++)
4330	5002	{
4331	5003	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	5004	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5005	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	5006
4335	5007	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	5008	if(elem != group \|\| !newWindow)
4337	5009	{
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
	5010	+ EditElement(elem, newWindow); // ? new
4344	5011	}
4345	5012	}
4346	5013	}
..	..	@@ -4415,7 +5082,8 @@
4415	5082	//new Exception().printStackTrace();
4416	5083
4417	5084	freezemodel = true;
4418		-
	5085	+ ClearUnpinned();
	5086	+
4419	5087	/**/
4420	5088	//switch (event.id)
4421	5089	{
..	..	@@ -4448,7 +5116,7 @@
4448	5116	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	5117	// a camera
4450	5118	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5119	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	5120	{
4453	5121	CameraPane.camerachangeframe = 0; // don't refuse it
4454	5122	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +5125,13 @@
4457	5125	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	5126	}
4459	5127
	5128	+ if (tps != null && tps.length == 1)
	5129	+ {
	5130	+ EditSelection(false);
	5131	+ }
	5132	+
	5133	+ SetPinStates(tps != null && tps.length > 0);
	5134	+
4460	5135	refreshContents();
4461	5136	//return true;
4462	5137	}
..	..	@@ -4466,9 +5141,18 @@
4466	5141	freezemodel = false;
4467	5142	}
4468	5143
	5144	+ void SetPinStates(boolean enabled)
	5145	+ {
	5146	+ editButton.setEnabled(enabled);
	5147	+ uneditButton.setEnabled(enabled);
	5148	+ unselectButton.setEnabled(enabled);
	5149	+ flashSelectionButton.setEnabled(enabled);
	5150	+ }
	5151	+
4469	5152	void refreshContents(boolean cp)
4470	5153	{
4471		- if (!Globals.MOUSEDRAGGED)
	5154	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5155	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	5156	{
4473	5157	objEditor.ClearInfo(); // .GetMaterial());
4474	5158
..	..	@@ -4567,7 +5251,8 @@
4567	5251
4568	5252	if (cut)
4569	5253	{
4570		- Save();
	5254	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5255	+// Save();
4571	5256	//int indices[] = jList.getSelectedIndices();
4572	5257	//for (int i = indices.length - 1; i >= 0; i--)
4573	5258	//jList.remove(indices[i]);
..	..	@@ -4670,6 +5355,10 @@
4670	5355
4671	5356	void paste(boolean expand)
4672	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4673	5362	// if (GrafreeD.clipboard == null)
4674	5363	// return;
4675	5364	boolean first = true;
..	..	@@ -4729,6 +5418,7 @@
4729	5418	Grafreed.clipboard.get(0).parent = keepparent;
4730	5419	}
4731	5420
	5421	+ Globals.REPLACEONMAKE = keep;
4732	5422	ResetModel();
4733	5423	refreshContents();
4734	5424	}
..	..	@@ -4864,6 +5554,10 @@
4864	5554
4865	5555	void group(Object3D csg, boolean grab)
4866	5556	{
	5557	+ if (Globals.REPLACEONMAKE)
	5558	+ Save();
	5559	+ boolean keep = Globals.REPLACEONMAKE;
	5560	+ Globals.REPLACEONMAKE = false;
4867	5561	if (//false) // why??
4868	5562	!group.selection.isEmpty())
4869	5563	{
..	..	@@ -4977,10 +5671,15 @@
4977	5671	//node.add(csg);
4978	5672	//makeSomething(node);
4979	5673	makeSomething(csg);
	5674	+ Globals.REPLACEONMAKE = keep;
4980	5675	}
4981	5676
4982	5677	void Ungroup(Object3D g)
4983	5678	{
	5679	+ if (Globals.REPLACEONMAKE)
	5680	+ Save();
	5681	+ boolean keep = Globals.REPLACEONMAKE;
	5682	+ Globals.REPLACEONMAKE = false;
4984	5683	if (g instanceof HiddenObject)
4985	5684	{
4986	5685	HiddenObject h = (HiddenObject) g;
..	..	@@ -4997,6 +5696,7 @@
4997	5696	objEditor.makeSomething(g.get(i), false);
4998	5697	}
4999	5698	}
	5699	+ Globals.REPLACEONMAKE = keep;
5000	5700	}
5001	5701
5002	5702	void ungroup()
..	..	@@ -5285,13 +5985,44 @@
5285	5985	cButton clearpanelButton;
5286	5986	cButton unselectButton;
5287	5987
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
	5988	+ cButton restoreCameraButton;
	5989	+
5293	5990	cButton saveButton;
5294	5991	cButton oneStepButton;
	5992	+
	5993	+ cButton groupButton;
	5994	+ cButton ungroupButton;
	5995	+ cButton compositeButton;
	5996	+ cButton switchButton;
	5997	+ cButton loopButton;
	5998	+ cButton textureButton;
	5999	+
	6000	+ cButton skybox1Button;
	6001	+ cButton skybox2Button;
	6002	+ cButton skybox3Button;
	6003	+ cButton skybox4Button;
	6004	+ cButton skybox5Button;
	6005	+ cButton skybox6Button;
	6006	+ cButton skybox7Button;
	6007	+
	6008	+ cButton skybox11Button;
	6009	+ cButton skybox12Button;
	6010	+ cButton skybox13Button;
	6011	+ cButton skybox14Button;
	6012	+ cButton skybox15Button;
	6013	+ cButton skybox16Button;
	6014	+ cButton skybox17Button;
	6015	+
	6016	+ cButton gridButton;
	6017	+ cButton boxButton;
	6018	+ cButton sphereButton;
	6019	+ cButton coneButton;
	6020	+ cButton torusButton;
	6021	+ cButton superButton;
	6022	+ cButton kleinButton;
	6023	+ cButton particlesButton;
	6024	+ cButton overlayButton;
	6025	+ cButton lightButton;
5295	6026
5296	6027	cButton screenfitButton;
5297	6028	cButton screenfitpointButton;
..	..	@@ -5313,11 +6044,11 @@
5313	6044	//JTree jTree;
5314	6045	private MenuItem lookAtItem;
5315	6046	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	6047	+ private MenuItem switchViewItem;
5317	6048	private MenuItem cutItem;
5318	6049	private MenuItem undoItem;
5319	6050	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	6051	+ private JMenuItem duplicateItem;
5321	6052	private MenuItem cloneItem;
5322	6053	private MenuItem cloneSupportItem;
5323	6054	private MenuItem overwriteGeoItem;
..	..	@@ -5345,7 +6076,7 @@
5345	6076	private MenuItem pasteLinkItem;
5346	6077	private MenuItem pasteCloneItem;
5347	6078	private MenuItem pasteExpandItem;
5348		- private MenuItem clearItem;
	6079	+ private MenuItem deleteItem;
5349	6080	private MenuItem clearAllItem;
5350	6081	private MenuItem genUVItem;
5351	6082	private MenuItem genNormalsMESHItem;
..	..	@@ -5405,7 +6136,7 @@
5405	6136	private MenuItem frontItem;
5406	6137	private MenuItem cameraItem;
5407	6138	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	6139	+ private MenuItem switchItem;
5409	6140	private MenuItem physicsItem;
5410	6141	private MenuItem frameselectorItem;
5411	6142	private MenuItem scriptNodeItem;
..	..	@@ -5429,6 +6160,8 @@
5429	6160	private MenuItem attachBumpItem;
5430	6161	private MenuItem detachBumpItem;
5431	6162	private MenuItem pigmentBumpItem;
	6163	+ private MenuItem embedTexturesItem;
	6164	+ private MenuItem deEmbedTexturesItem;
5432	6165
5433	6166	private MenuItem particleItem;
5434	6167	private MenuItem ragdollItem;
..	..	@@ -5479,5 +6212,5 @@
5479	6212
5480	6213	Menu cameraMenu;
5481	6214	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	6215	+ MenuItem restoreCameraItem;
5483	6216	}