~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,314 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,6 +369,12 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
63	378	if(ui)
64	379	SetupUI(objEditor);
65	380	}
..	..	@@ -80,10 +395,22 @@
80	395	SetupViews(objEditor);
81	396
82	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
83	406	}
84	407
85	408	void CloneSelection(boolean supports)
86	409	{
	410	+ if (Globals.REPLACEONMAKE)
	411	+ Save();
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
87	414	// Object3D keep = GrafreeD.clipboard;
88	415	//Object3D obj;
89	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +421,7 @@
94	421
95	422	makeSomething(clone, i==group.selection.size()-1);
96	423	}
	424	+ Globals.REPLACEONMAKE = keep;
97	425	}
98	426
99	427	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +478,8 @@
150	478
151	479	void SetupMenu2(GroupEditor oe)
152	480	{
	481	+ oe.jTree = new cTree();
	482	+
153	483	Menu menu;
154	484	oe.menuBar.add(menu = new Menu("Edit"));
155	485	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +490,7 @@
160	490	// redoItem = menu.add(new MenuItem("Redo"));
161	491	// redoItem.addActionListener(this);
162	492	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	493	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	494	duplicateItem.addActionListener(this);
165	495	cloneItem = menu.add(new MenuItem("Clone"));
166	496	cloneItem.addActionListener(this);
..	..	@@ -176,7 +506,6 @@
176	506	copyItem.addActionListener(this);
177	507	pasteItem = menu.add(new MenuItem("Paste"));
178	508	pasteItem.addActionListener(this);
179		- menu.add("-");
180	509
181	510	menu.add("-");
182	511	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +517,8 @@
188	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	518	// pasteExpandItem.addActionListener(this);
190	519	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
193	522
194	523	if (Globals.ADVANCED)
195	524	{
..	..	@@ -203,23 +532,23 @@
203	532	//zBufferItem.addActionListener(this);
204	533	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	534	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	535	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	536	+ restoreCameraItem.addActionListener(this);
208	537
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	538	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	539	+// toggleFullScreenItem.addItemListener(this);
	540	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	541	+// cameraMenu.add("-");
	542	+//
	543	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	544	+// toggleTextureItem.addItemListener(this);
	545	+// toggleTextureItem.setState(CameraPane.textureon);
	546	+//
	547	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	548	+// toggleSwitchItem.addItemListener(this);
	549	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	550
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	551	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	552	toggleHandleItem.addItemListener(this);
224	553	toggleHandleItem.setState(CameraPane.HANDLES);
225	554
..	..	@@ -274,7 +603,7 @@
274	603	{
275	604	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	605	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	606	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	607	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	608	oe.cameraMenu.add("-");
280	609	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +611,7 @@
282	611	editLeafItem.addActionListener(this);
283	612	lookAtItem.addActionListener(this);
284	613	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	614	+ //switchViewItem.addActionListener(this);
286	615	}
287	616
288	617	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +656,29 @@
327	656	}
328	657
329	658	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	659	+// grabItem = menu.add(new MenuItem("Grab"));
	660	+// grabItem.addActionListener(this);
332	661	backItem = menu.add(new MenuItem("Back"));
333	662	backItem.addActionListener(this);
334	663	frontItem = menu.add(new MenuItem("Front"));
335	664	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	665	+// compositeItem = menu.add(new MenuItem("Composite"));
	666	+// compositeItem.addActionListener(this);
	667	+
	668	+ if (Globals.ADVANCED)
	669	+ {
338	670	hideItem = menu.add(new MenuItem("Hidden Group"));
339	671	hideItem.addActionListener(this);
	672	+ }
340	673	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	674	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	675	+
	676	+// menu.add("-");
	677	+//
	678	+// switchItem = menu.add(new MenuItem("Switch node"));
	679	+// switchItem.addActionListener(this);
	680	+ if (Globals.ADVANCED)
	681	+ {
345	682	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	683	switchGeoItem.addActionListener(this);
347	684	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +686,6 @@
349	686	morphItem = menu.add(new MenuItem("Morph Group"));
350	687	morphItem.addActionListener(this);
351	688
352		- if (Globals.ADVANCED)
353		- {
354	689	menu.add("-");
355	690	physicsItem = menu.add(new MenuItem("Physics"));
356	691	physicsItem.addActionListener(this);
..	..	@@ -358,30 +693,29 @@
358	693	frameselectorItem.addActionListener(this);
359	694	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	695	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	696	}
364	697
365	698	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	699	+// textureItem = menu.add(new MenuItem("Texture"));
	700	+// textureItem.addActionListener(this);
368	701	billboardItem = menu.add(new MenuItem("Billboard"));
369	702	billboardItem.addActionListener(this);
370	703	csgItem = menu.add(new MenuItem("CSG"));
371	704	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	705	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	706	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	707	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	708	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	709	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	710	shadowZItem.addActionListener(this);
	711	+ attributeItem = menu.add(new MenuItem("Attribute"));
	712	+ attributeItem.addActionListener(this);
	713	+
378	714	if (Globals.ADVANCED)
379	715	{
380	716	menu.add("-");
381	717	linkerItem = menu.add(new MenuItem("Linker"));
382	718	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	719	templateItem = menu.add(new MenuItem("Template"));
386	720	templateItem.addActionListener(this);
387	721	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +744,7 @@
410	744	genNormalsMESHItem.addActionListener(this);
411	745	if (Globals.ADVANCED)
412	746	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	748	genNormalsMINEItem.addActionListener(this);
415	749	}
416	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +837,15 @@
503	837	attachBumpItem.addActionListener(this);
504	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
506	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	842	detachPigmentItem.addActionListener(this);
508	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
510	849	menu.add("-");
511	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	851	sortbysizeItem.addActionListener(this);
..	..	@@ -533,6 +872,7 @@
533	872	buildToolsMenu(menu);
534	873	}
535	874
	875	+
536	876	void SetupUI2(ObjEditor oe)
537	877	{
538	878	// June 2019
..	..	@@ -575,51 +915,83 @@
575	915	oe.radioPanel.add(dummyButton);
576	916	oe.buttonGroup.add(dummyButton);
577	917	*/
	918	+ cGridBag copyOptionsPanel = new cGridBag();
	919	+
	920	+ copyOptionsPanel.preferredHeight = 2;
	921	+
578	922	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	923
580	924	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	925	//minButton.setToolTipText("Minimize window");
582	926	//minButton.addActionListener(this);
583	927
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ maxButton.setToolTipText("Maximize window");
	932	+ maxButton.addActionListener(this);
	933	+ }
587	934
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	936	fullButton.setToolTipText("Full-screen window");
590	937	fullButton.addActionListener(this);
591	938
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
	939	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	940	+ screenfitButton.setToolTipText("Screen fit");
	941	+ screenfitButton.addActionListener(this);
	942	+
	943	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	944	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	945	+ restoreCameraButton.addActionListener(this);
595	946
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
599	959
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
602		- saveButton.addActionListener(this);
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
603	965
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
	970	+
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
605	979	liveCB.setToolTipText("Enable animation");
606	980	liveCB.addItemListener(this);
607	981
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	983	oneStepButton.setToolTipText("Animate one step forward");
610	984	oneStepButton.addActionListener(this);
611	985
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	987	fastCB.setToolTipText("Fast mode");
614	988	fastCB.addItemListener(this);
615	989
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- screenfitButton.setToolTipText("Screen fit");
622		- screenfitButton.addActionListener(this);
	990	+ //oe.toolboxPanel.Return();
	991	+
	992	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	993	+// trackCB.setToolTipText("Enable tracking");
	994	+// trackCB.addItemListener(this);
623	995
624	996	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	997	// screenfitpointButton.addActionListener(this);
..	..	@@ -629,67 +1001,156 @@
629	1001	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1002	snapobjectButton.addActionListener(this);
631	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
632	1008	}
633	1009
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	1010	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	1011
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- twoButton.setToolTipText("Show center view only");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
642	1014	twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- fourButton.addActionListener(this);
645		- fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- sixButton.setToolTipText("2-column layout left");
648		- sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- threeButton.setToolTipText("2-column layout right");
	1015	+ this.fullscreenLayout = twoButton;
	1016	+
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
651	1019	threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
655	1026	//
656	1027
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
659	1030	rootButton.addActionListener(this);
660	1031
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	1033	closeButton.setToolTipText("Close tab");
663	1034	closeButton.addActionListener(this);
664	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	1036	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	1037	+
	1038	+ cGridBag row1 = new cGridBag();
668	1039
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	1040	+ // INSERT
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ gridButton.setToolTipText("Create grid");
	1043	+ gridButton.addActionListener(this);
	1044	+
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ boxButton.setToolTipText("Create box");
	1047	+ boxButton.addActionListener(this);
	1048	+
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ sphereButton.setToolTipText("Create sphere");
	1051	+ sphereButton.addActionListener(this);
	1052	+
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ coneButton.setToolTipText("Create cone");
	1055	+ coneButton.addActionListener(this);
	1056	+
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ torusButton.setToolTipText("Create torus");
	1059	+ torusButton.addActionListener(this);
	1060	+
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ superButton.setToolTipText("Create superellipsoid");
	1063	+ superButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ kleinButton.setToolTipText("Create Klein bottle");
	1069	+ kleinButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ particlesButton.setToolTipText("Create particle system");
	1074	+ particlesButton.addActionListener(this);
	1075	+
	1076	+ oe.toolboxPanel.add(row1);
	1077	+
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ groupButton.setToolTipText("Create group");
	1082	+ groupButton.addActionListener(this);
	1083	+
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ compositeButton.setToolTipText("Create composite");
	1086	+ compositeButton.addActionListener(this);
	1087	+
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ switchButton.setToolTipText("Create item switcher");
	1090	+ switchButton.addActionListener(this);
	1091	+
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ loopButton.setToolTipText("Create loop");
	1094	+ loopButton.addActionListener(this);
	1095	+
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ textureButton.setToolTipText("Create texture");
	1098	+ textureButton.addActionListener(this);
	1099	+
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ overlayButton.setToolTipText("Create overlay");
	1102	+ overlayButton.addActionListener(this);
	1103	+
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ lightButton.setToolTipText("Create light");
	1106	+ lightButton.addActionListener(this);
	1107	+
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.toolboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
	1123	+
	1124	+ // EDIT panel
	1125	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ editButton.setToolTipText("Pin selection controls");
671	1127	editButton.addActionListener(this);
672	1128
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1129	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
675	1131	uneditButton.addActionListener(this);
676	1132
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1133	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1134	+ allParamsButton.setToolTipText("Show all controle");
679	1135	allParamsButton.addActionListener(this);
680	1136
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	1138	clearPanelButton.setToolTipText("Clear edit panel");
683	1139	clearPanelButton.addActionListener(this);
684	1140
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	1142	unselectButton.setToolTipText("Unselect");
687	1143	unselectButton.addActionListener(this);
688	1144
689		- commandsPanel.preferredHeight = 1;
	1145	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ flashSelectionButton.setToolTipText("Highlight selection");
	1147	+ flashSelectionButton.addActionListener(this);
690	1148
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1149	+ editCommandsPanel.preferredHeight = 1;
	1150	+
	1151	+ SetPinStates(false);
	1152	+// oe.treePanel.add(commandsPanel);
	1153	+// oe.treePanel.Return();
693	1154
694	1155	// oe.aConstraints.gridx += 1;
695	1156	// oe.aConstraints.weighty = 0;
..	..	@@ -706,32 +1167,20 @@
706	1167
707	1168	JScrollPane jSP;
708	1169	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1170	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1171	ResetModel();
711	1172
712	1173	oe.treePanel.add(jSPPanel);
713	1174	oe.treePanel.Return();
714	1175
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730	1176	oe.treePanel.add(copyOptionsPanel);
731	1177	oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
732	1181
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
735	1184
736	1185	//jList.addListSelectionListener(this);
737	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1188,7 @@
739	1188	//jTree.setEditable(true);
740	1189	oe.jTree.setDragEnabled(true);
741	1190	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1192
744	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1194
..	..	@@ -751,29 +1200,49 @@
751	1200	dgr.addDragGestureListener(this);
752	1201	}catch(Exception e) {}
753	1202	*/
754		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
755	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1205	}
757	1206
758	1207	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1208	{
	1209	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1210	+ colorCB.setToolTipText("Copy color when dropped");
	1211	+ colorCB.addItemListener(this);
	1212	+
	1213	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1214	+ materialCB.setToolTipText("Copy material when dropped");
	1215	+ materialCB.addItemListener(this);
	1216	+
	1217	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1218	+ textureCB.setToolTipText("Copy texture when dropped");
	1219	+ textureCB.addItemListener(this);
	1220	+
	1221	+ panel.Return();
	1222	+
760	1223	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1224	boxCB.setToolTipText("Display bounding boxes");
762	1225	boxCB.addItemListener(this);
763	1226
764	1227	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1228	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1229	zoomBoxCB.addItemListener(this);
767	1230
768	1231	if (true) // Globals.ADVANCED)
769	1232	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1233	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1234	+// supportCB.setToolTipText("Enable rigging");
	1235	+// supportCB.addItemListener(this);
	1236	+
	1237	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1238	+ freezeCB.setToolTipText("Fast moving camera");
	1239	+ freezeCB.addItemListener(this);
773	1240
774	1241	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1242	// localCB.addItemListener(this);
776	1243
	1244	+ panel.Return();
	1245	+
777	1246	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1247	crowdCB.setToolTipText("Used for crowds");
779	1248	crowdCB.addItemListener(this);
..	..	@@ -782,14 +1251,19 @@
782	1251	smoothCB.setToolTipText("Snapping delay");
783	1252	smoothCB.addItemListener(this);
784	1253
785		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
786		- slowCB.setToolTipText("Smooth interpolation");
787		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
788	1260
789	1261	// constraints.gridy += 1;
790	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1263	// speakerMocapCB.addItemListener(this);
792	1264
	1265	+ panel.Return();
	1266	+
793	1267	if (false)
794	1268	{
795	1269	// handled in scripts
..	..	@@ -804,34 +1278,74 @@
804	1278	//constraints.gridy += 1;
805	1279	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1280	smoothfocusCB.addItemListener(this);
	1281	+ panel.Return();
807	1282	}
808	1283
809	1284	//constraints.gridx += 1;
810	1285	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1286	// debugCB.addItemListener(this);
812	1287
	1288	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1289	+ trackCB.setToolTipText("Enable tracking target");
	1290	+ trackCB.addItemListener(this);
	1291	+
813	1292	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1293	+ oeilCB.setToolTipText("Move camera when tracking");
814	1294	oeilCB.addItemListener(this);
815	1295
	1296	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1297	+ shadowCB.setToolTipText("When live compute shadows");
	1298	+ shadowCB.addItemListener(this);
	1299	+
	1300	+ panel.Return();
	1301	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1302	+ toggleTextureCB.setToolTipText("Load textures");
	1303	+ toggleTextureCB.addItemListener(this);
	1304	+
	1305	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1306	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1307	+ toggleSwitchCB.addItemListener(this);
	1308	+
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
	1312	+
	1313	+ panel.Return();
	1314	+ if (Globals.ADVANCED)
	1315	+ {
816	1316	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1317	lookAtCB.setToolTipText("Look-at target");
818	1318	lookAtCB.addItemListener(this);
	1319	+ }
819	1320
820	1321	}
821	1322
822	1323	cGridBag fill = new cGridBag();
823		-
824	1324	fill.preferredHeight = 200;
	1325	+ cGridBag fill2 = new cGridBag();
	1326	+ fill2.preferredHeight = 200;
	1327	+ cGridBag fill3 = new cGridBag();
	1328	+ fill3.preferredHeight = 200;
825	1329
826	1330	panel.add(fill);
	1331	+ panel.add(fill2);
	1332	+ panel.add(fill3);
827	1333
828	1334	}
829	1335
830	1336	void EditObject(Object3D obj)
831	1337	{
832	1338	cRadio radioButton = new cRadio(obj.name);
	1339	+
	1340	+ // June 2019. Patch to avoid bug with transparency.
	1341	+ radioButton.hadMaterial = obj.material != null;
	1342	+ if (!radioButton.hadMaterial)
	1343	+ {
	1344	+ obj.material = new cMaterial();
	1345	+ }
	1346	+
833	1347	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
835	1349	radioButton.SetCamera(cameraView.renderCamera, false);
836	1350	radioButton.addActionListener(this);
837	1351	radioPanel.add(radioButton);
..	..	@@ -851,23 +1365,30 @@
851	1365	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1366	}
853	1367
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- JCheckBox smoothfocusCB;
	1368	+ cToggleButton liveCB;
	1369	+ cCheckBox supportCB;
	1370	+ cCheckBox localCB;
	1371	+ cCheckBox crowdCB;
	1372	+ cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
	1375	+ cToggleButton fastCB;
	1376	+ cCheckBox slowCB;
	1377	+ cCheckBox boxCB;
	1378	+ cCheckBox zoomBoxCB;
	1379	+ cCheckBox freezeCB;
	1380	+ //cToggleButton trackCB;
	1381	+ cCheckBox trackCB;
	1382	+ cCheckBox smoothfocusCB;
865	1383	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1384	+ cCheckBox speakerCameraCB;
	1385	+ cCheckBox speakerFocusCB;
	1386	+ cCheckBox debugCB;
	1387	+
	1388	+ cCheckBox oeilCB;
	1389	+ cCheckBox shadowCB;
	1390	+ cCheckBox autokeepCB;
	1391	+ cCheckBox lookAtCB;
871	1392
872	1393	// static int COLOR = 1;
873	1394	// static int MATERIAL = 2;
..	..	@@ -875,9 +1396,9 @@
875	1396
876	1397	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1398
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1399	+ cCheckBox colorCB;
	1400	+ cCheckBox materialCB;
	1401	+ cCheckBox textureCB;
881	1402
882	1403	public void itemStateChanged(ItemEvent e)
883	1404	{
..	..	@@ -921,6 +1442,12 @@
921	1442	{
922	1443	cameraView.ToggleInertia();
923	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
924	1451	}
925	1452	else if(e.getSource() == localCB)
926	1453	{
..	..	@@ -970,6 +1497,18 @@
970	1497	{
971	1498	cameraView.ToggleOeil();
972	1499	}
	1500	+ else if(e.getSource() == shadowCB)
	1501	+ {
	1502	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1503	+ }
	1504	+ else if(e.getSource() == freezeCB)
	1505	+ {
	1506	+ Globals.FREEZEONMOVE ^= true;
	1507	+ }
	1508	+ else if(e.getSource() == autokeepCB)
	1509	+ {
	1510	+ Globals.REPLACEONMAKE ^= true;
	1511	+ }
973	1512	else if(e.getSource() == lookAtCB)
974	1513	{
975	1514	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1525,8 @@
986	1525
987	1526	/**/
988	1527	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1528	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1529	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1530	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1531	// We can't move the root node or an empty selection
992	1532	return;
..	..	@@ -1049,8 +1589,6 @@
1049	1589	}
1050	1590	}
1051	1591
1052		- String string = (String) object;
1053		-
1054	1592	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1593	// if( object instanceof java.io.File[])
1056	1594	// {
..	..	@@ -1058,6 +1596,8 @@
1058	1596	// objEditor.DropFile((java.io.File[]) object, true);
1059	1597	// return;
1060	1598	// }
	1599	+
	1600	+ String string = object.toString();
1061	1601
1062	1602	// File path for Mac and Windows
1063	1603	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1643,33 @@
1103	1643
1104	1644	assert target == objEditor.jTree;
1105	1645	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1646	+ Object3D destinationLeaf;
1106	1647	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1648	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1649	} catch (Exception e) {
1109	1650	System.out.println("destinationPath : " + destinationPath);
1110	1651	return;
1111	1652	}
1112	1653
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1654	+ for (int i=group.selection.size(); --i>=0;)
1114	1655	{
	1656	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1657	+
	1658	+ // Cannot move into itself
	1659	+ if (child == destinationLeaf)
	1660	+ return;
	1661	+ }
	1662	+
	1663	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1664	+// {
1115	1665	loadClipboard(true);
1116	1666	objEditor.jTree.setSelectionPath(destinationPath);
1117	1667	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1668	+// } else {
	1669	+// loadClipboard(false);
	1670	+// objEditor.jTree.setSelectionPath(destinationPath);
	1671	+// pasteInto(false, false); // true); // ???
	1672	+// }
1123	1673	}
1124	1674	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1675	// Called if the user has modified the current drop gesture
..	..	@@ -1224,22 +1774,30 @@
1224	1774	{
1225	1775	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1776	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- superItem.addActionListener(this);
	1777	+// gridItem = menu.add(new MenuItem("Grid"));
	1778	+// gridItem.addActionListener(this);
	1779	+// rectoidItem = menu.add(new MenuItem("Box"));
	1780	+// rectoidItem.addActionListener(this);
	1781	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1782	+// ellipsoidItem.addActionListener(this);
	1783	+// coneItem = menu.add(new MenuItem("Cone"));
	1784	+// coneItem.addActionListener(this);
	1785	+// torusItem = menu.add(new MenuItem("Torus"));
	1786	+// torusItem.addActionListener(this);
	1787	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1788	+// superItem.addActionListener(this);
	1789	+
	1790	+ cameraItem = menu.add(new MenuItem("Camera"));
	1791	+ cameraItem.addActionListener(this);
	1792	+
	1793	+ if (!Globals.ADVANCED)
	1794	+ {
1239	1795	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1796	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1797	+ }
	1798	+
	1799	+// particleItem = menu.add(new MenuItem("Particle system"));
	1800	+// particleItem.addActionListener(this);
1243	1801	if (Globals.ADVANCED)
1244	1802	{
1245	1803	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1823,15 @@
1265	1823	}
1266	1824	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1825	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- lightItem.addActionListener(this);
	1826	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1827	+// overlayItem.addActionListener(this);
	1828	+// lightItem = menu.add(new MenuItem("Light"));
	1829	+// lightItem.addActionListener(this);
1272	1830	menu.add("-");
1273	1831	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1832	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1833	+// loopItem = menu.add(new MenuItem("Loop"));
	1834	+// loopItem.addActionListener(this);
1277	1835	doubleItem = menu.add(new MenuItem("Fork"));
1278	1836	doubleItem.addActionListener(this);
1279	1837	if (Globals.ADVANCED)
..	..	@@ -1289,6 +1847,9 @@
1289	1847	animationItem.addItemListener(this);
1290	1848	animationItem.setState(Globals.ANIMATION);
1291	1849
	1850	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1851	+ archiveItem.addActionListener(this);
	1852	+
1292	1853	menu.add("-");
1293	1854	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	1855	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +1862,8 @@
1301	1862	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	1863	reduce34MorphItem.addActionListener(this);
1303	1864	menu.add("-");
	1865	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1866	+ memoryItem.addActionListener(this);
1304	1867	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	1868	computeAOItem.addActionListener(this);
1306	1869
..	..	@@ -1309,8 +1872,6 @@
1309	1872	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	1873	mirrorItem.addActionListener(this);
1311	1874	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	1875	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	1876	analyzeItem.addActionListener(this);
1316	1877	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +2015,34 @@
1454	2015	shadow.material = new cMaterial(obj.material);
1455	2016	shadow.material.diffuse = 0.0001f;
1456	2017	shadow.material.specular = 0.0001f;
	2018	+ //shadow.projectedVertices[1].x = 300;
1457	2019
1458	2020	makeSomething(shadow);
1459	2021	}
	2022	+
	2023	+ private void ClearUnpinned()
	2024	+ {
	2025	+ //for (Object3D obj : listUI)
	2026	+ for (int i=listUI.size(); --i>=0;)
	2027	+ {
	2028	+ Object3D obj = listUI.elementAt(i);
	2029	+ if (!obj.pinned)
	2030	+ {
	2031	+ obj.CloseUI();
	2032	+ listUI.remove(i);
	2033	+ }
	2034	+ }
	2035	+ }
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1460	2046
1461	2047	/**
1462	2048	* applyExample
..	..	@@ -1701,7 +2287,7 @@
1701	2287	{
1702	2288	ScreenFit();
1703	2289	} else
1704		- if (source == switchItem)
	2290	+ if (source == switchViewItem)
1705	2291	{
1706	2292	cVector v1 = new cVector();
1707	2293	cVector v2 = new cVector();
..	..	@@ -1710,11 +2296,11 @@
1710	2296	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2297	objEditor.cameraView.repaint();
1712	2298	} else
1713		- if (source == rectoidItem)
	2299	+ if (source == rectoidItem \|\| source == boxButton)
1714	2300	{
1715	2301	makeSomething(new Box());
1716	2302	} else
1717		- if (source == particleItem)
	2303	+ if (source == particleItem \|\| source == particlesButton)
1718	2304	{
1719	2305	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2306	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2379,27 @@
1793	2379
1794	2380	makeSomething(obj);
1795	2381	} else
1796		- if (source == gridItem)
	2382	+ if (source == gridItem \|\| source == gridButton)
1797	2383	{
1798	2384	makeSomething(new Grid());
1799	2385	} else
1800		- if (source == ellipsoidItem)
	2386	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2387	{
1802	2388	makeSomething(new Sphere());
1803	2389	} else
1804		- if (source == coneItem)
	2390	+ if (source == coneItem \|\| source == coneButton)
1805	2391	{
1806	2392	makeSomething(new Cone());
1807	2393	} else
1808		- if (source == torusItem)
	2394	+ if (source == torusItem \|\| source == torusButton)
1809	2395	{
1810	2396	makeSomething(new Torus());
1811	2397	} else
1812		- if (source == superItem)
	2398	+ if (source == superItem \|\| source == superButton)
1813	2399	{
1814	2400	makeSomething(new Superellipsoid());
1815	2401	} else
1816		- if (source == kleinItem)
	2402	+ if (source == kleinItem \|\| source == kleinButton)
1817	2403	{
1818	2404	makeSomething(new Klein());
1819	2405	} else
..	..	@@ -1833,7 +2419,7 @@
1833	2419	{
1834	2420	makeSomething(new BezierSurface());
1835	2421	} else
1836		- if (source == overlayItem)
	2422	+ if (source == overlayItem \|\| source == overlayButton)
1837	2423	{
1838	2424	/*
1839	2425	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2467,27 @@
1881	2467	s.setup();
1882	2468	makeSomething(s);
1883	2469	} else
1884		- if (source == lightItem)
	2470	+ if (source == lightItem \|\| source == lightButton)
1885	2471	{
1886	2472	makeSomething(new Light());
1887	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
1888	2491	if (source == csgItem)
1889	2492	{
1890	2493	group(new CSG());
..	..	@@ -1931,30 +2534,30 @@
1931	2534
1932	2535	group(g);
1933	2536	} else
1934		- if (source == loopItem)
	2537	+ if (source == loopItem \|\| source == loopButton)
1935	2538	{
1936	2539	Composite csg = new GroupLeaf();
1937	2540	csg.count = 5;
1938	2541	group(csg);
1939		- Composite child = new cGroup();
	2542	+ Composite child = new cGroup("Branch");
1940	2543	csg.addChild(child);
1941	2544	child.addChild(csg);
1942	2545	} else
1943	2546	if (source == doubleItem)
1944	2547	{
1945		- Composite csg = new GroupLeaf();
	2548	+ Composite csg = new GroupLeaf("Fork");
1946	2549	csg.count = 5;
1947	2550	group(csg);
1948		- Composite child = new cGroup();
	2551	+ Composite child = new cGroup("Branch A");
1949	2552	csg.addChild(child);
1950	2553	child.addChild(csg);
1951		- child = new cGroup();
	2554	+ child = new cGroup("Branch B");
1952	2555	csg.addChild(child);
1953	2556	child.addChild(csg);
1954	2557	} else
1955	2558	if (source == tripleItem)
1956	2559	{
1957		- Composite csg = new GroupLeaf();
	2560	+ Composite csg = new GroupLeaf("Trident");
1958	2561	csg.count = 4;
1959	2562	group(csg);
1960	2563	Composite child = new cGroup();
..	..	@@ -1970,7 +2573,7 @@
1970	2573	if (source == computeAOItem)
1971	2574	{
1972	2575	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
1974	2577	} else
1975	2578	if (source == recompileItem)
1976	2579	{
..	..	@@ -1985,7 +2588,7 @@
1985	2588	if (source == invariantsItem)
1986	2589	{
1987	2590	System.out.println("Invariants:");
1988		- Grafreed.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
1989	2592	} else
1990	2593	if (source == memoryItem)
1991	2594	{
..	..	@@ -2016,17 +2619,40 @@
2016	2619	{
2017	2620	ToggleFullScreen();
2018	2621	} else
2019		- if (source == undoButton)
	2622	+ if (source == previousVersionButton)
2020	2623	{
2021		- Undo();
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
2022	2628	} else
2023		- if (source == redoButton)
	2629	+ if (source == restoreButton)
2024	2630	{
2025		- Redo();
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
2026	2634	} else
2027		- if (source == saveButton)
	2635	+ if (source == replaceButton)
2028	2636	{
2029		- Save();
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
	2649	+ if (!Save(true))
	2650	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
2030	2656	} else
2031	2657	if (source == oneStepButton)
2032	2658	{
..	..	@@ -2035,17 +2661,14 @@
2035	2661	} else
2036	2662	if (source == screenfitButton)
2037	2663	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2664	ScreenFit();
2040	2665	} else
2041	2666	if (source == screenfitpointButton)
2042	2667	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2668	ScreenFitPoint();
2045	2669	} else
2046	2670	if (source == snapobjectButton)
2047	2671	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2672	SnapObject();
2050	2673	} else
2051	2674	// if (event.getSource() == recompileButton)
..	..	@@ -2084,11 +2707,11 @@
2084	2707	} else
2085	2708	if (source == undoItem)
2086	2709	{
2087		- Undo();
	2710	+ PreviousVersion();
2088	2711	} else
2089	2712	if (source == redoItem)
2090	2713	{
2091		- Redo();
	2714	+ NextVersion();
2092	2715	} else
2093	2716	if (source == duplicateItem)
2094	2717	{
..	..	@@ -2409,7 +3032,7 @@
2409	3032	{
2410	3033	StepAll();
2411	3034	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	3036	{
2414	3037	//int indices[] = jList.getSelectedIndices();
2415	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +3044,9 @@
2421	3044	{
2422	3045	ClearSelection(true);
2423	3046	} else
2424		- if (source == grabItem)
	3047	+ if (source == grabItem \|\| source == groupButton)
2425	3048	{
2426		- group(new cGroup(), true);
	3049	+ group(new cGroup(), false); // true);
2427	3050	} else
2428	3051	if (source == hideItem)
2429	3052	{
..	..	@@ -2441,11 +3064,11 @@
2441	3064	{
2442	3065	makeSomething(new Camera());
2443	3066	} else
2444		- if (source == compositeItem)
	3067	+ if (source == compositeItem \|\| source == compositeButton)
2445	3068	{
2446	3069	group(new Composite());
2447	3070	} else
2448		- if (source == randomItem)
	3071	+ if (source == switchItem \|\| source == switchButton)
2449	3072	{
2450	3073	RandomNode random = new RandomNode();
2451	3074	group(random);
..	..	@@ -2547,7 +3170,7 @@
2547	3170	{
2548	3171	group(new cLinker());
2549	3172	} else
2550		- if (source == textureItem)
	3173	+ if (source == textureItem \|\| source == textureButton)
2551	3174	{
2552	3175	group(new TextureNode());
2553	3176	} else
..	..	@@ -2567,17 +3190,30 @@
2567	3190	{
2568	3191	CastShadow(2);
2569	3192	} else
2570		- if (source == ungroupItem)
	3193	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3194	{
2572		- //ungroup();
	3195	+ boolean hasRoot = false;
	3196	+
2573	3197	for (int i=0; i<group.selection.size(); i++)
2574	3198	{
2575		- Ungroup(group.selection.get(i));
	3199	+ if (group.selection.get(i) == group)
	3200	+ {
	3201	+ hasRoot = true;
	3202	+ break;
	3203	+ }
2576	3204	}
2577	3205
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3206	+ if (!hasRoot)
	3207	+ {
	3208	+ for (int i=0; i<group.selection.size(); i++)
	3209	+ {
	3210	+ Ungroup(group.selection.get(i));
	3211	+ }
	3212	+
	3213	+ ClearSelection(false);
	3214	+
	3215	+ refreshContents();
	3216	+ }
2581	3217	} else
2582	3218	if (source == genUVItem)
2583	3219	{
..	..	@@ -2878,7 +3514,7 @@
2878	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3515	{
2880	3516	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
2882	3518	}
2883	3519
2884	3520	refreshContents();
..	..	@@ -2894,6 +3530,31 @@
2894	3530
2895	3531	refreshContents();
2896	3532	} else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
	3556	+ refreshContents();
	3557	+ } else
2897	3558	if (source == flashSelectionButton)
2898	3559	{
2899	3560	CameraPane.flash = true;
..	..	@@ -2905,6 +3566,10 @@
2905	3566	if (source == twoButton)
2906	3567	{
2907	3568	radio.layout = twoButton;
	3569	+
	3570	+ if (CameraPane.FULLSCREEN)
	3571	+ fullscreenLayout = radio.layout;
	3572	+
2908	3573	// bug
2909	3574	//gridPanel.setDividerLocation(1.0);
2910	3575	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2960,6 +3625,9 @@
2960	3625	{
2961	3626	radio.layout = threeButton;
2962	3627
	3628	+ if (CameraPane.FULLSCREEN)
	3629	+ fullscreenLayout = radio.layout;
	3630	+
2963	3631	// bigThree.remove(scenePanel);
2964	3632	// bigThree.remove(centralPanel);
2965	3633	// bigThree.remove(XYZPanel);
..	..	@@ -2988,8 +3656,8 @@
2988	3656	// centralPanel.setVisible(true);
2989	3657	// XYZPanel.setVisible(true);
2990	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
2991	3660	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3661	bigThree.FlushUI();
2994	3662
2995	3663	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3665,9 @@
2997	3665	if (source == fourButton)
2998	3666	{
2999	3667	radio.layout = fourButton;
	3668	+
	3669	+ if (CameraPane.FULLSCREEN)
	3670	+ fullscreenLayout = radio.layout;
3000	3671
3001	3672	// bigThree.remove(scenePanel);
3002	3673	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3706,9 @@
3035	3706	{
3036	3707	radio.layout = sixButton;
3037	3708
	3709	+ if (CameraPane.FULLSCREEN)
	3710	+ fullscreenLayout = radio.layout;
	3711	+
3038	3712	// bigThree.remove(scenePanel);
3039	3713	// bigThree.remove(centralPanel);
3040	3714	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3737,8 @@
3063	3737	// centralPanel.setVisible(true);
3064	3738	// XYZPanel.setVisible(false);
3065	3739	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
3068	3742	bigThree.FlushUI();
3069	3743
3070	3744	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3746,9 @@
3072	3746	if (source == sevenButton)
3073	3747	{
3074	3748	radio.layout = sevenButton;
	3749	+
	3750	+ if (CameraPane.FULLSCREEN)
	3751	+ fullscreenLayout = radio.layout;
3075	3752
3076	3753	// bigThree.remove(scenePanel);
3077	3754	// bigThree.remove(centralPanel);
..	..	@@ -3128,12 +3805,19 @@
3128	3805	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3806	{
3130	3807	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3808	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3809	{
	3810	+ // Patch to avoid bug with transparency.
	3811	+ if (!ab.hadMaterial)
	3812	+ {
	3813	+ ab.object.material = null;
	3814	+ }
	3815	+
3133	3816	buttonGroup.remove(ab);
3134	3817	radioPanel.remove(ab);
3135	3818
3136		- ab.GetObject().editWindow = null;
	3819	+ //ab.GetObject().editWindow = null;
	3820	+ ab.GetObject().manipWindow = null;
3137	3821	// ab.GetObject().objectUI = null; // ?????????
3138	3822
3139	3823	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3830,12 @@
3146	3830	} else
3147	3831	if (source == editItem \|\| source == editButton)
3148	3832	{
	3833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3834	+ {
	3835	+ Object3D child = (Object3D)e.nextElement();
	3836	+ child.pinned = true;
	3837	+ }
	3838	+
3149	3839	EditSelection(false);
3150	3840	} else
3151	3841	if (source == uneditButton)
..	..	@@ -3154,9 +3844,10 @@
3154	3844	{
3155	3845	Object3D child = (Object3D)e.nextElement();
3156	3846	if(child.editWindow != null)
3157		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3847	+ child.pinned = false;
3158	3848	child.CloseUI();
3159	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3160	3851
3161	3852	//child.editWindow = null; // ???????????
3162	3853	}
..	..	@@ -3171,16 +3862,18 @@
3171	3862	//copy.ClearUI();
3172	3863	for (Object3D obj : listUI)
3173	3864	{
	3865	+ obj.pinned = false;
3174	3866	obj.CloseUI();
3175	3867	}
3176	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
3177	3870	refreshContents(true);
3178	3871	} else
3179	3872	if (source == allParamsButton)
3180	3873	{
3181	3874	assert(copy == group);
3182	3875
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3876	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	3877
3185	3878	for (Object3D obj : listUI)
3186	3879	{
..	..	@@ -3229,6 +3922,9 @@
3229	3922	}
3230	3923
3231	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
3232	3928	//Globals.theRenderer.object = group;
3233	3929	if(!useclient)
3234	3930	{
..	..	@@ -3247,6 +3943,7 @@
3247	3943
3248	3944	// fix "+" issue
3249	3945	//group.editWindow = this;
	3946	+ group.manipWindow = this;
3250	3947
3251	3948	/*
3252	3949	currentLayout = radio.layout;
..	..	@@ -3254,6 +3951,14 @@
3254	3951	currentLayout = sevenButton;
3255	3952	*/
3256	3953	radio.layout.doClick();
	3954	+
	3955	+ ClearUnpinned();
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
	3961	+ EditSelection(false);
3257	3962	keepparent = group.parent;
3258	3963	// PARENT = NULL or not???
3259	3964	//group.parent = null; // ROOT
..	..	@@ -3265,11 +3970,13 @@
3265	3970	} else if (event.getSource() == editCameraItem)
3266	3971	{
3267	3972	cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
3268	3974	cameraView.repaint();
3269	3975	return;
3270		- } else if (event.getSource() == revertCameraItem)
	3976	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	3977	{
3272	3978	cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
3273	3980	cameraView.repaint();
3274	3981	return;
3275	3982	// } else if (event.getSource() == textureButton)
..	..	@@ -3846,7 +4553,7 @@
3846	4553
3847	4554	try
3848	4555	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4557	}
3851	4558	catch (Exception e)
3852	4559	{
..	..	@@ -4321,28 +5028,25 @@
4321	5028	// }
4322	5029	// }
4323	5030
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	5031	void EditSelection(boolean newWindow)
4329	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4330	5039	// aConstraints.gridy = 0;
4331	5040	for (int i=0; i<group.selection.size(); i++)
4332	5041	{
4333	5042	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	5043	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5044	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	5045
4337	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	5047	if(elem != group \|\| !newWindow)
4339	5048	{
4340		- // if (!(elem instanceof Composite))
4341		- // newWindow = false;
4342		- listUI.add(elem);
4343		- elem.openEditWindow(this, newWindow); //, false);
4344		- System.out.println("edit : " + elem);
4345		- elem.editWindow.refreshContents(true); // ? new
	5049	+ EditElement(elem, newWindow); // ? new
4346	5050	}
4347	5051	}
4348	5052	}
..	..	@@ -4405,9 +5109,7 @@
4405	5109
4406	5110	freezemodel = false;
4407	5111	}
4408		-
4409		- boolean flashIt = true;
4410		-
	5112	+
4411	5113	public void valueChanged(TreeSelectionEvent e)
4412	5114	//public boolean handleEvent(Event event)
4413	5115	{
..	..	@@ -4417,7 +5119,8 @@
4417	5119	//new Exception().printStackTrace();
4418	5120
4419	5121	freezemodel = true;
4420		-
	5122	+ ClearUnpinned();
	5123	+
4421	5124	/**/
4422	5125	//switch (event.id)
4423	5126	{
..	..	@@ -4450,7 +5153,7 @@
4450	5153	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5154	// a camera
4452	5155	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5156	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	5157	{
4455	5158	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5159	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5162,13 @@
4459	5162	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5163	}
4461	5164
	5165	+ if (tps != null && tps.length == 1)
	5166	+ {
	5167	+ EditSelection(false);
	5168	+ }
	5169	+
	5170	+ SetPinStates(tps != null && tps.length > 0);
	5171	+
4462	5172	refreshContents();
4463	5173	//return true;
4464	5174	}
..	..	@@ -4468,9 +5178,20 @@
4468	5178	freezemodel = false;
4469	5179	}
4470	5180
	5181	+ void SetPinStates(boolean enabled)
	5182	+ {
	5183	+ editButton.setEnabled(enabled);
	5184	+ uneditButton.setEnabled(enabled);
	5185	+ unselectButton.setEnabled(enabled);
	5186	+ flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5189	+ }
	5190	+
4471	5191	void refreshContents(boolean cp)
4472	5192	{
4473		- if (!Globals.MOUSEDRAGGED)
	5193	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5194	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5195	{
4475	5196	objEditor.ClearInfo(); // .GetMaterial());
4476	5197
..	..	@@ -4569,7 +5290,8 @@
4569	5290
4570	5291	if (cut)
4571	5292	{
4572		- Save();
	5293	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5294	+// Save();
4573	5295	//int indices[] = jList.getSelectedIndices();
4574	5296	//for (int i = indices.length - 1; i >= 0; i--)
4575	5297	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5394,10 @@
4672	5394
4673	5395	void paste(boolean expand)
4674	5396	{
	5397	+ if (Globals.REPLACEONMAKE)
	5398	+ Save();
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4675	5401	// if (GrafreeD.clipboard == null)
4676	5402	// return;
4677	5403	boolean first = true;
..	..	@@ -4731,6 +5457,7 @@
4731	5457	Grafreed.clipboard.get(0).parent = keepparent;
4732	5458	}
4733	5459
	5460	+ Globals.REPLACEONMAKE = keep;
4734	5461	ResetModel();
4735	5462	refreshContents();
4736	5463	}
..	..	@@ -4866,6 +5593,10 @@
4866	5593
4867	5594	void group(Object3D csg, boolean grab)
4868	5595	{
	5596	+ if (Globals.REPLACEONMAKE)
	5597	+ Save();
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
4869	5600	if (//false) // why??
4870	5601	!group.selection.isEmpty())
4871	5602	{
..	..	@@ -4979,10 +5710,15 @@
4979	5710	//node.add(csg);
4980	5711	//makeSomething(node);
4981	5712	makeSomething(csg);
	5713	+ Globals.REPLACEONMAKE = keep;
4982	5714	}
4983	5715
4984	5716	void Ungroup(Object3D g)
4985	5717	{
	5718	+ if (Globals.REPLACEONMAKE)
	5719	+ Save();
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
4986	5722	if (g instanceof HiddenObject)
4987	5723	{
4988	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5735,7 @@
4999	5735	objEditor.makeSomething(g.get(i), false);
5000	5736	}
5001	5737	}
	5738	+ Globals.REPLACEONMAKE = keep;
5002	5739	}
5003	5740
5004	5741	void ungroup()
..	..	@@ -5287,13 +6024,43 @@
5287	6024	cButton clearpanelButton;
5288	6025	cButton unselectButton;
5289	6026
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
5295		- cButton saveButton;
	6027	+ cButton restoreCameraButton;
	6028	+
5296	6029	cButton oneStepButton;
	6030	+
	6031	+ cButton groupButton;
	6032	+ cButton ungroupButton;
	6033	+ cButton compositeButton;
	6034	+ cButton switchButton;
	6035	+ cButton loopButton;
	6036	+ cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
	6053	+
	6054	+ cButton gridButton;
	6055	+ cButton boxButton;
	6056	+ cButton sphereButton;
	6057	+ cButton coneButton;
	6058	+ cButton torusButton;
	6059	+ cButton superButton;
	6060	+ cButton kleinButton;
	6061	+ cButton particlesButton;
	6062	+ cButton overlayButton;
	6063	+ cButton lightButton;
5297	6064
5298	6065	cButton screenfitButton;
5299	6066	cButton screenfitpointButton;
..	..	@@ -5315,11 +6082,11 @@
5315	6082	//JTree jTree;
5316	6083	private MenuItem lookAtItem;
5317	6084	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
	6085	+ private MenuItem switchViewItem;
5319	6086	private MenuItem cutItem;
5320	6087	private MenuItem undoItem;
5321	6088	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
	6089	+ private JMenuItem duplicateItem;
5323	6090	private MenuItem cloneItem;
5324	6091	private MenuItem cloneSupportItem;
5325	6092	private MenuItem overwriteGeoItem;
..	..	@@ -5347,7 +6114,7 @@
5347	6114	private MenuItem pasteLinkItem;
5348	6115	private MenuItem pasteCloneItem;
5349	6116	private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5351	6118	private MenuItem clearAllItem;
5352	6119	private MenuItem genUVItem;
5353	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5407,7 +6174,7 @@
5407	6174	private MenuItem frontItem;
5408	6175	private MenuItem cameraItem;
5409	6176	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6177	+ private MenuItem switchItem;
5411	6178	private MenuItem physicsItem;
5412	6179	private MenuItem frameselectorItem;
5413	6180	private MenuItem scriptNodeItem;
..	..	@@ -5431,6 +6198,8 @@
5431	6198	private MenuItem attachBumpItem;
5432	6199	private MenuItem detachBumpItem;
5433	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5434	6203
5435	6204	private MenuItem particleItem;
5436	6205	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6250,5 @@
5481	6250
5482	6251	Menu cameraMenu;
5483	6252	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6253	+ MenuItem restoreCameraItem;
5485	6254	}