~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("Duplicate current 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 version (undo latest change)");
	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 version (save latest change)");
	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 = threeButton; // sixButton;
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);
..	..	@@ -779,14 +1234,19 @@
779	1234	smoothCB.setToolTipText("Snapping delay");
780	1235	smoothCB.addItemListener(this);
781	1236
782		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
783		- slowCB.setToolTipText("Smooth interpolation");
784		- slowCB.addItemListener(this);
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
785	1243
786	1244	// constraints.gridy += 1;
787	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1246	// speakerMocapCB.addItemListener(this);
789	1247
	1248	+ panel.Return();
	1249	+
790	1250	if (false)
791	1251	{
792	1252	// handled in scripts
..	..	@@ -801,20 +1261,39 @@
801	1261	//constraints.gridy += 1;
802	1262	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1263	smoothfocusCB.addItemListener(this);
	1264	+ panel.Return();
804	1265	}
805	1266
806	1267	//constraints.gridx += 1;
807	1268	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1269	// debugCB.addItemListener(this);
809	1270
	1271	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1272	+ trackCB.setToolTipText("Enable tracking target");
	1273	+ trackCB.addItemListener(this);
	1274	+
810	1275	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	1276	+ oeilCB.setToolTipText("Move camera when tracking");
812	1277	oeilCB.addItemListener(this);
813	1278
814	1279	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815		- shadowCB.setToolTipText("Compute shadows when live");
	1280	+ shadowCB.setToolTipText("When live compute shadows");
816	1281	shadowCB.addItemListener(this);
817	1282
	1283	+ panel.Return();
	1284	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1285	+ toggleTextureCB.setToolTipText("Load textures");
	1286	+ toggleTextureCB.addItemListener(this);
	1287	+
	1288	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1289	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1290	+ toggleSwitchCB.addItemListener(this);
	1291	+
	1292	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1293	+ autokeepCB.setToolTipText("On structure change");
	1294	+ autokeepCB.addItemListener(this);
	1295	+
	1296	+ panel.Return();
818	1297	if (Globals.ADVANCED)
819	1298	{
820	1299	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -825,10 +1304,15 @@
825	1304	}
826	1305
827	1306	cGridBag fill = new cGridBag();
828		-
829	1307	fill.preferredHeight = 200;
	1308	+ cGridBag fill2 = new cGridBag();
	1309	+ fill2.preferredHeight = 200;
	1310	+ cGridBag fill3 = new cGridBag();
	1311	+ fill3.preferredHeight = 200;
830	1312
831	1313	panel.add(fill);
	1314	+ panel.add(fill2);
	1315	+ panel.add(fill3);
832	1316
833	1317	}
834	1318
..	..	@@ -836,7 +1320,7 @@
836	1320	{
837	1321	cRadio radioButton = new cRadio(obj.name);
838	1322
839		- // Patch to avoid bug with transparency.
	1323	+ // June 2019. Patch to avoid bug with transparency.
840	1324	radioButton.hadMaterial = obj.material != null;
841	1325	if (!radioButton.hadMaterial)
842	1326	{
..	..	@@ -844,7 +1328,7 @@
844	1328	}
845	1329
846	1330	radioButton.SetObject(obj);
847		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = threeButton; // sixButton;
848	1332	radioButton.SetCamera(cameraView.renderCamera, false);
849	1333	radioButton.addActionListener(this);
850	1334	radioPanel.add(radioButton);
..	..	@@ -864,25 +1348,30 @@
864	1348	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
865	1349	}
866	1350
867		- JCheckBox liveCB;
868		- JCheckBox supportCB;
869		- JCheckBox localCB;
870		- JCheckBox crowdCB;
871		- JCheckBox smoothCB;
872		- JCheckBox fastCB;
873		- JCheckBox slowCB;
874		- JCheckBox boxCB;
875		- JCheckBox zoomBoxCB;
876		- JCheckBox trackCB;
877		- JCheckBox smoothfocusCB;
878		-// JCheckBox speakerMocapCB;
879		- JCheckBox speakerCameraCB;
880		- JCheckBox speakerFocusCB;
881		- JCheckBox debugCB;
	1351	+ cToggleButton liveCB;
	1352	+ cCheckBox supportCB;
	1353	+ cCheckBox localCB;
	1354	+ cCheckBox crowdCB;
	1355	+ cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
882	1357
883		- JCheckBox oeilCB;
884		- JCheckBox shadowCB;
885		- JCheckBox lookAtCB;
	1358	+ cToggleButton fastCB;
	1359	+ cCheckBox slowCB;
	1360	+ cCheckBox boxCB;
	1361	+ cCheckBox zoomBoxCB;
	1362	+ cCheckBox freezeCB;
	1363	+ //cToggleButton trackCB;
	1364	+ cCheckBox trackCB;
	1365	+ cCheckBox smoothfocusCB;
	1366	+// JCheckBox speakerMocapCB;
	1367	+ cCheckBox speakerCameraCB;
	1368	+ cCheckBox speakerFocusCB;
	1369	+ cCheckBox debugCB;
	1370	+
	1371	+ cCheckBox oeilCB;
	1372	+ cCheckBox shadowCB;
	1373	+ cCheckBox autokeepCB;
	1374	+ cCheckBox lookAtCB;
886	1375
887	1376	// static int COLOR = 1;
888	1377	// static int MATERIAL = 2;
..	..	@@ -890,9 +1379,9 @@
890	1379
891	1380	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
892	1381
893		- JCheckBox colorCB;
894		- JCheckBox materialCB;
895		- JCheckBox textureCB;
	1382	+ cCheckBox colorCB;
	1383	+ cCheckBox materialCB;
	1384	+ cCheckBox textureCB;
896	1385
897	1386	public void itemStateChanged(ItemEvent e)
898	1387	{
..	..	@@ -936,6 +1425,12 @@
936	1425	{
937	1426	cameraView.ToggleInertia();
938	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
939	1434	}
940	1435	else if(e.getSource() == localCB)
941	1436	{
..	..	@@ -989,6 +1484,14 @@
989	1484	{
990	1485	Globals.COMPUTESHADOWWHENLIVE ^= true;
991	1486	}
	1487	+ else if(e.getSource() == freezeCB)
	1488	+ {
	1489	+ Globals.FREEZEONMOVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == autokeepCB)
	1492	+ {
	1493	+ Globals.REPLACEONMAKE ^= true;
	1494	+ }
992	1495	else if(e.getSource() == lookAtCB)
993	1496	{
994	1497	cameraView.ToggleLookAt();
..	..	@@ -1005,7 +1508,8 @@
1005	1508
1006	1509	/**/
1007	1510	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1008		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1511	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1512	+ TreePath path = objEditor.jTree.getSelectionPath();
1009	1513	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1010	1514	// We can't move the root node or an empty selection
1011	1515	return;
..	..	@@ -1068,8 +1572,6 @@
1068	1572	}
1069	1573	}
1070	1574
1071		- String string = (String) object;
1072		-
1073	1575	System.out.println("Transfer = " + object + "; drop : " + target);
1074	1576	// if( object instanceof java.io.File[])
1075	1577	// {
..	..	@@ -1077,6 +1579,8 @@
1077	1579	// objEditor.DropFile((java.io.File[]) object, true);
1078	1580	// return;
1079	1581	// }
	1582	+
	1583	+ String string = object.toString();
1080	1584
1081	1585	// File path for Mac and Windows
1082	1586	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1122,23 +1626,33 @@
1122	1626
1123	1627	assert target == objEditor.jTree;
1124	1628	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1629	+ Object3D destinationLeaf;
1125	1630	try {
1126		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1631	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1127	1632	} catch (Exception e) {
1128	1633	System.out.println("destinationPath : " + destinationPath);
1129	1634	return;
1130	1635	}
1131	1636
1132		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1637	+ for (int i=group.selection.size(); --i>=0;)
1133	1638	{
	1639	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1640	+
	1641	+ // Cannot move into itself
	1642	+ if (child == destinationLeaf)
	1643	+ return;
	1644	+ }
	1645	+
	1646	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1647	+// {
1134	1648	loadClipboard(true);
1135	1649	objEditor.jTree.setSelectionPath(destinationPath);
1136	1650	pasteInto(false, false);
1137		- } else {
1138		- loadClipboard(false);
1139		- objEditor.jTree.setSelectionPath(destinationPath);
1140		- pasteInto(false, false); // true); // ???
1141		- }
	1651	+// } else {
	1652	+// loadClipboard(false);
	1653	+// objEditor.jTree.setSelectionPath(destinationPath);
	1654	+// pasteInto(false, false); // true); // ???
	1655	+// }
1142	1656	}
1143	1657	public void dropActionChanged(DropTargetDragEvent dtde)
1144	1658	// Called if the user has modified the current drop gesture
..	..	@@ -1243,22 +1757,30 @@
1243	1757	{
1244	1758	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1245	1759	//heightFieldItem.addActionListener(this);
1246		- gridItem = menu.add(new MenuItem("Grid"));
1247		- gridItem.addActionListener(this);
1248		- rectoidItem = menu.add(new MenuItem("Box"));
1249		- rectoidItem.addActionListener(this);
1250		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1251		- ellipsoidItem.addActionListener(this);
1252		- coneItem = menu.add(new MenuItem("Cone"));
1253		- coneItem.addActionListener(this);
1254		- torusItem = menu.add(new MenuItem("Torus"));
1255		- torusItem.addActionListener(this);
1256		- superItem = menu.add(new MenuItem("Superellipsoid"));
1257		- superItem.addActionListener(this);
	1760	+// gridItem = menu.add(new MenuItem("Grid"));
	1761	+// gridItem.addActionListener(this);
	1762	+// rectoidItem = menu.add(new MenuItem("Box"));
	1763	+// rectoidItem.addActionListener(this);
	1764	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1765	+// ellipsoidItem.addActionListener(this);
	1766	+// coneItem = menu.add(new MenuItem("Cone"));
	1767	+// coneItem.addActionListener(this);
	1768	+// torusItem = menu.add(new MenuItem("Torus"));
	1769	+// torusItem.addActionListener(this);
	1770	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1771	+// superItem.addActionListener(this);
	1772	+
	1773	+ cameraItem = menu.add(new MenuItem("Camera"));
	1774	+ cameraItem.addActionListener(this);
	1775	+
	1776	+ if (!Globals.ADVANCED)
	1777	+ {
1258	1778	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1259	1779	kleinItem.addActionListener(this);
1260		- particleItem = menu.add(new MenuItem("Particle system"));
1261		- particleItem.addActionListener(this);
	1780	+ }
	1781	+
	1782	+// particleItem = menu.add(new MenuItem("Particle system"));
	1783	+// particleItem.addActionListener(this);
1262	1784	if (Globals.ADVANCED)
1263	1785	{
1264	1786	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1284,15 +1806,15 @@
1284	1806	}
1285	1807	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1286	1808	bezierItem.addActionListener(this);
1287		- overlayItem = menu.add(new MenuItem("Overlay"));
1288		- overlayItem.addActionListener(this);
1289		- lightItem = menu.add(new MenuItem("Light"));
1290		- lightItem.addActionListener(this);
	1809	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1810	+// overlayItem.addActionListener(this);
	1811	+// lightItem = menu.add(new MenuItem("Light"));
	1812	+// lightItem.addActionListener(this);
1291	1813	menu.add("-");
1292	1814	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1293	1815	//superLoopItem.addActionListener(this);
1294		- loopItem = menu.add(new MenuItem("Loop"));
1295		- loopItem.addActionListener(this);
	1816	+// loopItem = menu.add(new MenuItem("Loop"));
	1817	+// loopItem.addActionListener(this);
1296	1818	doubleItem = menu.add(new MenuItem("Fork"));
1297	1819	doubleItem.addActionListener(this);
1298	1820	if (Globals.ADVANCED)
..	..	@@ -1308,6 +1830,9 @@
1308	1830	animationItem.addItemListener(this);
1309	1831	animationItem.setState(Globals.ANIMATION);
1310	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1311	1836	menu.add("-");
1312	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1313	1838	parseverticesItem.addActionListener(this);
..	..	@@ -1320,6 +1845,8 @@
1320	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1321	1846	reduce34MorphItem.addActionListener(this);
1322	1847	menu.add("-");
	1848	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1849	+ memoryItem.addActionListener(this);
1323	1850	menu.add(computeAOItem = new MenuItem("Compute AO"));
1324	1851	computeAOItem.addActionListener(this);
1325	1852
..	..	@@ -1328,8 +1855,6 @@
1328	1855	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1329	1856	mirrorItem.addActionListener(this);
1330	1857	menu.add("-");
1331		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1332		- memoryItem.addActionListener(this);
1333	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1334	1859	analyzeItem.addActionListener(this);
1335	1860	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1477,6 +2002,30 @@
1477	2002
1478	2003	makeSomething(shadow);
1479	2004	}
	2005	+
	2006	+ private void ClearUnpinned()
	2007	+ {
	2008	+ //for (Object3D obj : listUI)
	2009	+ for (int i=listUI.size(); --i>=0;)
	2010	+ {
	2011	+ Object3D obj = listUI.elementAt(i);
	2012	+ if (!obj.pinned)
	2013	+ {
	2014	+ obj.CloseUI();
	2015	+ listUI.remove(i);
	2016	+ }
	2017	+ }
	2018	+ }
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
	2028	+ }
1480	2029
1481	2030	/**
1482	2031	* applyExample
..	..	@@ -1721,7 +2270,7 @@
1721	2270	{
1722	2271	ScreenFit();
1723	2272	} else
1724		- if (source == switchItem)
	2273	+ if (source == switchViewItem)
1725	2274	{
1726	2275	cVector v1 = new cVector();
1727	2276	cVector v2 = new cVector();
..	..	@@ -1730,11 +2279,11 @@
1730	2279	objEditor.cameraView.renderCamera.setAim(v2, v1);
1731	2280	objEditor.cameraView.repaint();
1732	2281	} else
1733		- if (source == rectoidItem)
	2282	+ if (source == rectoidItem \|\| source == boxButton)
1734	2283	{
1735	2284	makeSomething(new Box());
1736	2285	} else
1737		- if (source == particleItem)
	2286	+ if (source == particleItem \|\| source == particlesButton)
1738	2287	{
1739	2288	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1740	2289	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1813,27 +2362,27 @@
1813	2362
1814	2363	makeSomething(obj);
1815	2364	} else
1816		- if (source == gridItem)
	2365	+ if (source == gridItem \|\| source == gridButton)
1817	2366	{
1818	2367	makeSomething(new Grid());
1819	2368	} else
1820		- if (source == ellipsoidItem)
	2369	+ if (source == ellipsoidItem \|\| source == sphereButton)
1821	2370	{
1822	2371	makeSomething(new Sphere());
1823	2372	} else
1824		- if (source == coneItem)
	2373	+ if (source == coneItem \|\| source == coneButton)
1825	2374	{
1826	2375	makeSomething(new Cone());
1827	2376	} else
1828		- if (source == torusItem)
	2377	+ if (source == torusItem \|\| source == torusButton)
1829	2378	{
1830	2379	makeSomething(new Torus());
1831	2380	} else
1832		- if (source == superItem)
	2381	+ if (source == superItem \|\| source == superButton)
1833	2382	{
1834	2383	makeSomething(new Superellipsoid());
1835	2384	} else
1836		- if (source == kleinItem)
	2385	+ if (source == kleinItem \|\| source == kleinButton)
1837	2386	{
1838	2387	makeSomething(new Klein());
1839	2388	} else
..	..	@@ -1853,7 +2402,7 @@
1853	2402	{
1854	2403	makeSomething(new BezierSurface());
1855	2404	} else
1856		- if (source == overlayItem)
	2405	+ if (source == overlayItem \|\| source == overlayButton)
1857	2406	{
1858	2407	/*
1859	2408	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1901,10 +2450,27 @@
1901	2450	s.setup();
1902	2451	makeSomething(s);
1903	2452	} else
1904		- if (source == lightItem)
	2453	+ if (source == lightItem \|\| source == lightButton)
1905	2454	{
1906	2455	makeSomething(new Light());
1907	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
1908	2474	if (source == csgItem)
1909	2475	{
1910	2476	group(new CSG());
..	..	@@ -1951,30 +2517,30 @@
1951	2517
1952	2518	group(g);
1953	2519	} else
1954		- if (source == loopItem)
	2520	+ if (source == loopItem \|\| source == loopButton)
1955	2521	{
1956	2522	Composite csg = new GroupLeaf();
1957	2523	csg.count = 5;
1958	2524	group(csg);
1959		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
1960	2526	csg.addChild(child);
1961	2527	child.addChild(csg);
1962	2528	} else
1963	2529	if (source == doubleItem)
1964	2530	{
1965		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
1966	2532	csg.count = 5;
1967	2533	group(csg);
1968		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
1969	2535	csg.addChild(child);
1970	2536	child.addChild(csg);
1971		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
1972	2538	csg.addChild(child);
1973	2539	child.addChild(csg);
1974	2540	} else
1975	2541	if (source == tripleItem)
1976	2542	{
1977		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
1978	2544	csg.count = 4;
1979	2545	group(csg);
1980	2546	Composite child = new cGroup();
..	..	@@ -1990,7 +2556,7 @@
1990	2556	if (source == computeAOItem)
1991	2557	{
1992	2558	Globals.drawMode = CameraPane.OCCLUSION;
1993		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
1994	2560	} else
1995	2561	if (source == recompileItem)
1996	2562	{
..	..	@@ -2038,15 +2604,31 @@
2038	2604	} else
2039	2605	if (source == undoButton)
2040	2606	{
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2041	2610	Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ } else
	2617	+ if (source == replaceButton)
	2618	+ {
	2619	+ // Overwrite current version
	2620	+ Replace();
2042	2621	} else
2043	2622	if (source == redoButton)
2044	2623	{
	2624	+ // Go to next version
2045	2625	Redo();
2046	2626	} else
2047	2627	if (source == saveButton)
2048	2628	{
2049		- Save();
	2629	+ // Save a new version
	2630	+ if (!Save(true))
	2631	+ java.awt.Toolkit.getDefaultToolkit().beep();
2050	2632	} else
2051	2633	if (source == oneStepButton)
2052	2634	{
..	..	@@ -2055,17 +2637,14 @@
2055	2637	} else
2056	2638	if (source == screenfitButton)
2057	2639	{
2058		- //Reload(lastConverter, lastFilename, true);
2059	2640	ScreenFit();
2060	2641	} else
2061	2642	if (source == screenfitpointButton)
2062	2643	{
2063		- //Reload(lastConverter, lastFilename, true);
2064	2644	ScreenFitPoint();
2065	2645	} else
2066	2646	if (source == snapobjectButton)
2067	2647	{
2068		- //Reload(lastConverter, lastFilename, true);
2069	2648	SnapObject();
2070	2649	} else
2071	2650	// if (event.getSource() == recompileButton)
..	..	@@ -2429,7 +3008,7 @@
2429	3008	{
2430	3009	StepAll();
2431	3010	} else
2432		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2433	3012	{
2434	3013	//int indices[] = jList.getSelectedIndices();
2435	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2441,9 +3020,9 @@
2441	3020	{
2442	3021	ClearSelection(true);
2443	3022	} else
2444		- if (source == grabItem)
	3023	+ if (source == grabItem \|\| source == groupButton)
2445	3024	{
2446		- group(new cGroup(), true);
	3025	+ group(new cGroup(), false); // true);
2447	3026	} else
2448	3027	if (source == hideItem)
2449	3028	{
..	..	@@ -2461,11 +3040,11 @@
2461	3040	{
2462	3041	makeSomething(new Camera());
2463	3042	} else
2464		- if (source == compositeItem)
	3043	+ if (source == compositeItem \|\| source == compositeButton)
2465	3044	{
2466	3045	group(new Composite());
2467	3046	} else
2468		- if (source == randomItem)
	3047	+ if (source == switchItem \|\| source == switchButton)
2469	3048	{
2470	3049	RandomNode random = new RandomNode();
2471	3050	group(random);
..	..	@@ -2567,7 +3146,7 @@
2567	3146	{
2568	3147	group(new cLinker());
2569	3148	} else
2570		- if (source == textureItem)
	3149	+ if (source == textureItem \|\| source == textureButton)
2571	3150	{
2572	3151	group(new TextureNode());
2573	3152	} else
..	..	@@ -2587,17 +3166,30 @@
2587	3166	{
2588	3167	CastShadow(2);
2589	3168	} else
2590		- if (source == ungroupItem)
	3169	+ if (source == ungroupItem \|\| source == ungroupButton)
2591	3170	{
2592		- //ungroup();
	3171	+ boolean hasRoot = false;
	3172	+
2593	3173	for (int i=0; i<group.selection.size(); i++)
2594	3174	{
2595		- Ungroup(group.selection.get(i));
	3175	+ if (group.selection.get(i) == group)
	3176	+ {
	3177	+ hasRoot = true;
	3178	+ break;
	3179	+ }
2596	3180	}
2597	3181
2598		- ClearSelection(false);
2599		-
2600		- refreshContents();
	3182	+ if (!hasRoot)
	3183	+ {
	3184	+ for (int i=0; i<group.selection.size(); i++)
	3185	+ {
	3186	+ Ungroup(group.selection.get(i));
	3187	+ }
	3188	+
	3189	+ ClearSelection(false);
	3190	+
	3191	+ refreshContents();
	3192	+ }
2601	3193	} else
2602	3194	if (source == genUVItem)
2603	3195	{
..	..	@@ -2898,7 +3490,7 @@
2898	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2899	3491	{
2900	3492	obj = (Object3D)e.nextElement();
2901		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
2902	3494	}
2903	3495
2904	3496	refreshContents();
..	..	@@ -2914,6 +3506,31 @@
2914	3506
2915	3507	refreshContents();
2916	3508	} else
	3509	+ if (source == embedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(true);
	3516	+ }
	3517	+
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == deEmbedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(false);
	3527	+ }
	3528	+
	3529	+ CameraPane.texturepigment.clear();
	3530	+ CameraPane.texturebump.clear();
	3531	+
	3532	+ refreshContents();
	3533	+ } else
2917	3534	if (source == flashSelectionButton)
2918	3535	{
2919	3536	CameraPane.flash = true;
..	..	@@ -2925,6 +3542,10 @@
2925	3542	if (source == twoButton)
2926	3543	{
2927	3544	radio.layout = twoButton;
	3545	+
	3546	+ if (CameraPane.FULLSCREEN)
	3547	+ fullscreenLayout = radio.layout;
	3548	+
2928	3549	// bug
2929	3550	//gridPanel.setDividerLocation(1.0);
2930	3551	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2980,6 +3601,9 @@
2980	3601	{
2981	3602	radio.layout = threeButton;
2982	3603
	3604	+ if (CameraPane.FULLSCREEN)
	3605	+ fullscreenLayout = radio.layout;
	3606	+
2983	3607	// bigThree.remove(scenePanel);
2984	3608	// bigThree.remove(centralPanel);
2985	3609	// bigThree.remove(XYZPanel);
..	..	@@ -3008,8 +3632,8 @@
3008	3632	// centralPanel.setVisible(true);
3009	3633	// XYZPanel.setVisible(true);
3010	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
3011	3636	bigThree.add(centralPanel);
3012		- bigThree.add(XYZPanel);
3013	3637	bigThree.FlushUI();
3014	3638
3015	3639	cameraView.requestFocusInWindow();
..	..	@@ -3017,6 +3641,9 @@
3017	3641	if (source == fourButton)
3018	3642	{
3019	3643	radio.layout = fourButton;
	3644	+
	3645	+ if (CameraPane.FULLSCREEN)
	3646	+ fullscreenLayout = radio.layout;
3020	3647
3021	3648	// bigThree.remove(scenePanel);
3022	3649	// bigThree.remove(centralPanel);
..	..	@@ -3055,6 +3682,9 @@
3055	3682	{
3056	3683	radio.layout = sixButton;
3057	3684
	3685	+ if (CameraPane.FULLSCREEN)
	3686	+ fullscreenLayout = radio.layout;
	3687	+
3058	3688	// bigThree.remove(scenePanel);
3059	3689	// bigThree.remove(centralPanel);
3060	3690	// bigThree.remove(XYZPanel);
..	..	@@ -3083,8 +3713,8 @@
3083	3713	// centralPanel.setVisible(true);
3084	3714	// XYZPanel.setVisible(false);
3085	3715	bigThree.ClearUI();
3086		- bigThree.add(scenePanel);
3087	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
3088	3718	bigThree.FlushUI();
3089	3719
3090	3720	cameraView.requestFocusInWindow();
..	..	@@ -3092,6 +3722,9 @@
3092	3722	if (source == sevenButton)
3093	3723	{
3094	3724	radio.layout = sevenButton;
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
3095	3728
3096	3729	// bigThree.remove(scenePanel);
3097	3730	// bigThree.remove(centralPanel);
..	..	@@ -3159,7 +3792,8 @@
3159	3792	buttonGroup.remove(ab);
3160	3793	radioPanel.remove(ab);
3161	3794
3162		- ab.GetObject().editWindow = null;
	3795	+ //ab.GetObject().editWindow = null;
	3796	+ ab.GetObject().manipWindow = null;
3163	3797	// ab.GetObject().objectUI = null; // ?????????
3164	3798
3165	3799	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3172,6 +3806,12 @@
3172	3806	} else
3173	3807	if (source == editItem \|\| source == editButton)
3174	3808	{
	3809	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3810	+ {
	3811	+ Object3D child = (Object3D)e.nextElement();
	3812	+ child.pinned = true;
	3813	+ }
	3814	+
3175	3815	EditSelection(false);
3176	3816	} else
3177	3817	if (source == uneditButton)
..	..	@@ -3181,6 +3821,7 @@
3181	3821	Object3D child = (Object3D)e.nextElement();
3182	3822	if(child.editWindow != null)
3183	3823	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3824	+ child.pinned = false;
3184	3825	child.CloseUI();
3185	3826	listUI.remove(child);
3186	3827
..	..	@@ -3197,6 +3838,7 @@
3197	3838	//copy.ClearUI();
3198	3839	for (Object3D obj : listUI)
3199	3840	{
	3841	+ obj.pinned = false;
3200	3842	obj.CloseUI();
3201	3843	}
3202	3844	listUI.clear();
..	..	@@ -3206,7 +3848,7 @@
3206	3848	{
3207	3849	assert(copy == group);
3208	3850
3209		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3851	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3210	3852
3211	3853	for (Object3D obj : listUI)
3212	3854	{
..	..	@@ -3255,6 +3897,9 @@
3255	3897	}
3256	3898
3257	3899	copy = group;
	3900	+
	3901	+ SetUndoStates();
	3902	+
3258	3903	//Globals.theRenderer.object = group;
3259	3904	if(!useclient)
3260	3905	{
..	..	@@ -3273,6 +3918,7 @@
3273	3918
3274	3919	// fix "+" issue
3275	3920	//group.editWindow = this;
	3921	+ group.manipWindow = this;
3276	3922
3277	3923	/*
3278	3924	currentLayout = radio.layout;
..	..	@@ -3280,6 +3926,13 @@
3280	3926	currentLayout = sevenButton;
3281	3927	*/
3282	3928	radio.layout.doClick();
	3929	+
	3930	+ ClearUnpinned();
	3931	+ //Grafreed.Assert(group != null);
	3932	+ //Grafreed.Assert(group.selection != null);
	3933	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3934	+ if (group.selection == null \|\| group.selection.size() == 1)
	3935	+ EditSelection(false);
3283	3936	keepparent = group.parent;
3284	3937	// PARENT = NULL or not???
3285	3938	//group.parent = null; // ROOT
..	..	@@ -3291,11 +3944,13 @@
3291	3944	} else if (event.getSource() == editCameraItem)
3292	3945	{
3293	3946	cameraView.ProtectCamera();
	3947	+ cameraView.requestFocusInWindow();
3294	3948	cameraView.repaint();
3295	3949	return;
3296		- } else if (event.getSource() == revertCameraItem)
	3950	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3297	3951	{
3298	3952	cameraView.RevertCamera();
	3953	+ cameraView.requestFocusInWindow();
3299	3954	cameraView.repaint();
3300	3955	return;
3301	3956	// } else if (event.getSource() == textureButton)
..	..	@@ -3872,7 +4527,7 @@
3872	4527
3873	4528	try
3874	4529	{
3875		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4530	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3876	4531	}
3877	4532	catch (Exception e)
3878	4533	{
..	..	@@ -4347,28 +5002,25 @@
4347	5002	// }
4348	5003	// }
4349	5004
4350		- static boolean allparams = true;
4351		-
4352		- static Vector<Object3D> listUI = new Vector<Object3D>();
4353		-
4354	5005	void EditSelection(boolean newWindow)
4355	5006	{
	5007	+ if (group.selection == null)
	5008	+ {
	5009	+ EditElement(group, newWindow); // ? new
	5010	+ return;
	5011	+ }
	5012	+
4356	5013	// aConstraints.gridy = 0;
4357	5014	for (int i=0; i<group.selection.size(); i++)
4358	5015	{
4359	5016	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4360	5017	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4361		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5018	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4362	5019
4363	5020	Object3D elem = (Object3D)group.selection.elementAt(i);
4364	5021	if(elem != group \|\| !newWindow)
4365	5022	{
4366		- // if (!(elem instanceof Composite))
4367		- // newWindow = false;
4368		- listUI.add(elem);
4369		- elem.openEditWindow(this, newWindow); //, false);
4370		- System.out.println("edit : " + elem);
4371		- elem.editWindow.refreshContents(true); // ? new
	5023	+ EditElement(elem, newWindow); // ? new
4372	5024	}
4373	5025	}
4374	5026	}
..	..	@@ -4443,7 +5095,8 @@
4443	5095	//new Exception().printStackTrace();
4444	5096
4445	5097	freezemodel = true;
4446		-
	5098	+ ClearUnpinned();
	5099	+
4447	5100	/**/
4448	5101	//switch (event.id)
4449	5102	{
..	..	@@ -4476,7 +5129,7 @@
4476	5129	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4477	5130	// a camera
4478	5131	{
4479		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5132	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4480	5133	{
4481	5134	CameraPane.camerachangeframe = 0; // don't refuse it
4482	5135	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4485,6 +5138,13 @@
4485	5138	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4486	5139	}
4487	5140
	5141	+ if (tps != null && tps.length == 1)
	5142	+ {
	5143	+ EditSelection(false);
	5144	+ }
	5145	+
	5146	+ SetPinStates(tps != null && tps.length > 0);
	5147	+
4488	5148	refreshContents();
4489	5149	//return true;
4490	5150	}
..	..	@@ -4494,9 +5154,18 @@
4494	5154	freezemodel = false;
4495	5155	}
4496	5156
	5157	+ void SetPinStates(boolean enabled)
	5158	+ {
	5159	+ editButton.setEnabled(enabled);
	5160	+ uneditButton.setEnabled(enabled);
	5161	+ unselectButton.setEnabled(enabled);
	5162	+ flashSelectionButton.setEnabled(enabled);
	5163	+ }
	5164	+
4497	5165	void refreshContents(boolean cp)
4498	5166	{
4499		- if (!Globals.MOUSEDRAGGED)
	5167	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5168	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4500	5169	{
4501	5170	objEditor.ClearInfo(); // .GetMaterial());
4502	5171
..	..	@@ -4595,7 +5264,8 @@
4595	5264
4596	5265	if (cut)
4597	5266	{
4598		- Save();
	5267	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5268	+// Save();
4599	5269	//int indices[] = jList.getSelectedIndices();
4600	5270	//for (int i = indices.length - 1; i >= 0; i--)
4601	5271	//jList.remove(indices[i]);
..	..	@@ -4698,6 +5368,10 @@
4698	5368
4699	5369	void paste(boolean expand)
4700	5370	{
	5371	+ if (Globals.REPLACEONMAKE)
	5372	+ Save();
	5373	+ boolean keep = Globals.REPLACEONMAKE;
	5374	+ Globals.REPLACEONMAKE = false;
4701	5375	// if (GrafreeD.clipboard == null)
4702	5376	// return;
4703	5377	boolean first = true;
..	..	@@ -4757,6 +5431,7 @@
4757	5431	Grafreed.clipboard.get(0).parent = keepparent;
4758	5432	}
4759	5433
	5434	+ Globals.REPLACEONMAKE = keep;
4760	5435	ResetModel();
4761	5436	refreshContents();
4762	5437	}
..	..	@@ -4892,6 +5567,10 @@
4892	5567
4893	5568	void group(Object3D csg, boolean grab)
4894	5569	{
	5570	+ if (Globals.REPLACEONMAKE)
	5571	+ Save();
	5572	+ boolean keep = Globals.REPLACEONMAKE;
	5573	+ Globals.REPLACEONMAKE = false;
4895	5574	if (//false) // why??
4896	5575	!group.selection.isEmpty())
4897	5576	{
..	..	@@ -5005,10 +5684,15 @@
5005	5684	//node.add(csg);
5006	5685	//makeSomething(node);
5007	5686	makeSomething(csg);
	5687	+ Globals.REPLACEONMAKE = keep;
5008	5688	}
5009	5689
5010	5690	void Ungroup(Object3D g)
5011	5691	{
	5692	+ if (Globals.REPLACEONMAKE)
	5693	+ Save();
	5694	+ boolean keep = Globals.REPLACEONMAKE;
	5695	+ Globals.REPLACEONMAKE = false;
5012	5696	if (g instanceof HiddenObject)
5013	5697	{
5014	5698	HiddenObject h = (HiddenObject) g;
..	..	@@ -5025,6 +5709,7 @@
5025	5709	objEditor.makeSomething(g.get(i), false);
5026	5710	}
5027	5711	}
	5712	+ Globals.REPLACEONMAKE = keep;
5028	5713	}
5029	5714
5030	5715	void ungroup()
..	..	@@ -5313,13 +5998,44 @@
5313	5998	cButton clearpanelButton;
5314	5999	cButton unselectButton;
5315	6000
5316		- cButton minButton;
5317		- cButton maxButton;
5318		- cButton fullButton;
5319		- cButton undoButton;
5320		- cButton redoButton;
	6001	+ cButton restoreCameraButton;
	6002	+
5321	6003	cButton saveButton;
5322	6004	cButton oneStepButton;
	6005	+
	6006	+ cButton groupButton;
	6007	+ cButton ungroupButton;
	6008	+ cButton compositeButton;
	6009	+ cButton switchButton;
	6010	+ cButton loopButton;
	6011	+ cButton textureButton;
	6012	+
	6013	+ cButton skybox1Button;
	6014	+ cButton skybox2Button;
	6015	+ cButton skybox3Button;
	6016	+ cButton skybox4Button;
	6017	+ cButton skybox5Button;
	6018	+ cButton skybox6Button;
	6019	+ cButton skybox7Button;
	6020	+
	6021	+ cButton skybox11Button;
	6022	+ cButton skybox12Button;
	6023	+ cButton skybox13Button;
	6024	+ cButton skybox14Button;
	6025	+ cButton skybox15Button;
	6026	+ cButton skybox16Button;
	6027	+ cButton skybox17Button;
	6028	+
	6029	+ cButton gridButton;
	6030	+ cButton boxButton;
	6031	+ cButton sphereButton;
	6032	+ cButton coneButton;
	6033	+ cButton torusButton;
	6034	+ cButton superButton;
	6035	+ cButton kleinButton;
	6036	+ cButton particlesButton;
	6037	+ cButton overlayButton;
	6038	+ cButton lightButton;
5323	6039
5324	6040	cButton screenfitButton;
5325	6041	cButton screenfitpointButton;
..	..	@@ -5341,11 +6057,11 @@
5341	6057	//JTree jTree;
5342	6058	private MenuItem lookAtItem;
5343	6059	private MenuItem lookFromItem;
5344		- private MenuItem switchItem;
	6060	+ private MenuItem switchViewItem;
5345	6061	private MenuItem cutItem;
5346	6062	private MenuItem undoItem;
5347	6063	private MenuItem redoItem;
5348		- private MenuItem duplicateItem;
	6064	+ private JMenuItem duplicateItem;
5349	6065	private MenuItem cloneItem;
5350	6066	private MenuItem cloneSupportItem;
5351	6067	private MenuItem overwriteGeoItem;
..	..	@@ -5373,7 +6089,7 @@
5373	6089	private MenuItem pasteLinkItem;
5374	6090	private MenuItem pasteCloneItem;
5375	6091	private MenuItem pasteExpandItem;
5376		- private MenuItem clearItem;
	6092	+ private MenuItem deleteItem;
5377	6093	private MenuItem clearAllItem;
5378	6094	private MenuItem genUVItem;
5379	6095	private MenuItem genNormalsMESHItem;
..	..	@@ -5433,7 +6149,7 @@
5433	6149	private MenuItem frontItem;
5434	6150	private MenuItem cameraItem;
5435	6151	private MenuItem compositeItem;
5436		- private MenuItem randomItem;
	6152	+ private MenuItem switchItem;
5437	6153	private MenuItem physicsItem;
5438	6154	private MenuItem frameselectorItem;
5439	6155	private MenuItem scriptNodeItem;
..	..	@@ -5457,6 +6173,8 @@
5457	6173	private MenuItem attachBumpItem;
5458	6174	private MenuItem detachBumpItem;
5459	6175	private MenuItem pigmentBumpItem;
	6176	+ private MenuItem embedTexturesItem;
	6177	+ private MenuItem deEmbedTexturesItem;
5460	6178
5461	6179	private MenuItem particleItem;
5462	6180	private MenuItem ragdollItem;
..	..	@@ -5507,5 +6225,5 @@
5507	6225
5508	6226	Menu cameraMenu;
5509	6227	MenuItem editCameraItem;
5510		- MenuItem revertCameraItem;
	6228	+ MenuItem restoreCameraItem;
5511	6229	}