~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,240 @@
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("default", "skycube", 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("park", "Stairs", 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", "Ryfjallet", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("penguins", "wrath", row5);
	152	+ AddSkyboxButton("penguins", "yonder", row5);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "Greenlands", row6);
	160	+ AddSkyboxButton("daz", "MountainTrail", row6);
	161	+ AddSkyboxButton("daz", "Oasis", row6);
	162	+ /*
	163	+Autumn
	164	+Greenlands
	165	+MountainTrail
	166	+Oasis
	167	+TheRock
	168	+TopOfTheWorld
	169	+Winter
	170	+ */
	171	+
	172	+ tab0.add(row0);
	173	+ tab0.add(row1);
	174	+ tab0.add(row2);
	175	+ tab0.add(row3);
	176	+ tab0.add(row4);
	177	+ tab0.add(row5);
	178	+ tab0.add(row6);
	179	+
	180	+ for (int i=5; --i>=0;)
	181	+ {
	182	+ //oe.toolboxPanel.Return();
	183	+ //tab0.add(new cGridBag());
	184	+ }
	185	+ }
	186	+
	187	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	188	+ {
	189	+ cGridBag tab0 = new cGridBag().setVertical(true);
	190	+
	191	+ tab0.setName("Night");
	192	+ skyboxpanel.add(tab0);
	193	+
	194	+ cGridBag row0 = new cGridBag();
	195	+ cGridBag row1 = new cGridBag();
	196	+ cGridBag row2 = new cGridBag();
	197	+ cGridBag row3 = new cGridBag();
	198	+ cGridBag row4 = new cGridBag();
	199	+ cGridBag row5 = new cGridBag();
	200	+ cGridBag row6 = new cGridBag();
	201	+
	202	+ AddSkyboxButton("night", "NightPath", row0);
	203	+ AddSkyboxButton("night", "PondNight", row0);
	204	+ AddSkyboxButton("night", "Powerlines", row0);
	205	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	206	+
	207	+ AddSkyboxButton("urban", "CNTower", row1);
	208	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	209	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	210	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	211	+
	212	+ AddSkyboxButton("penguins", "kenon_star", row2);
	213	+ AddSkyboxButton("indoors", "DallasW", row2);
	214	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	215	+ AddSkyboxButton("indoors", "Vasa", row2);
	216	+
	217	+ AddSkyboxButton("winter", "Backyard", row3);
	218	+ AddSkyboxButton("winter", "Creek", row3);
	219	+ AddSkyboxButton("winter", "FootballField3", row3);
	220	+ AddSkyboxButton("winter", "Forest", row3);
	221	+
	222	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	223	+ AddSkyboxButton("winter", "House", row4);
	224	+ AddSkyboxButton("winter", "IceLake", row4);
	225	+ AddSkyboxButton("winter", "IceRiver", row4);
	226	+
	227	+ AddSkyboxButton("winter", "Park3", row5);
	228	+ AddSkyboxButton("winter", "PondWinter", row5);
	229	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	230	+ AddSkyboxButton("winter", "Vindelalven", row5);
	231	+
	232	+ AddSkyboxButton("daz", "TheRock", row6);
	233	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	234	+ AddSkyboxButton("daz", "Winter", row6);
	235	+ AddSkyboxButton("penguins", "desertdawn", row6);
	236	+
	237	+ tab0.add(row0);
	238	+ tab0.add(row1);
	239	+ tab0.add(row2);
	240	+ tab0.add(row3);
	241	+ tab0.add(row4);
	242	+ tab0.add(row5);
	243	+ tab0.add(row6);
	244	+
	245	+ for (int i=5; --i>=0;)
	246	+ {
	247	+ //oe.toolboxPanel.Return();
	248	+ //tab0.add(new cGridBag());
	249	+ }
	250	+ }
	251	+
	252	+ public void ChangeSkybox(String name)
	253	+ {
	254	+ //cameraView.envyoff = false;
	255	+ group.skyboxname = name;
	256	+ group.skyboxext = "jpg";
	257	+ cameraView.repaint();
	258	+ }
	259	+
26	260	//ObjEditor objEditor;
27	261	public void closeUI2()
28	262	{
..	..	@@ -60,6 +294,12 @@
60	294	this.copy = this.group = group;
61	295	//selectees = this.group.selectees;
62	296
	297	+ if (copy.versions == null)
	298	+ {
	299	+ copy.versions = new byte[100][];
	300	+ copy.versionindex = -1;
	301	+ }
	302	+
63	303	if(ui)
64	304	SetupUI(objEditor);
65	305	}
..	..	@@ -80,10 +320,22 @@
80	320	SetupViews(objEditor);
81	321
82	322	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	323	+
	324	+ if (copy.versions == null)
	325	+ {
	326	+ copy.versions = new byte[100][];
	327	+ copy.versionindex = -1;
	328	+
	329	+ Save(true);
	330	+ }
83	331	}
84	332
85	333	void CloneSelection(boolean supports)
86	334	{
	335	+ if (Globals.REPLACEONMAKE)
	336	+ Save();
	337	+ boolean keep = Globals.REPLACEONMAKE;
	338	+ Globals.REPLACEONMAKE = false;
87	339	// Object3D keep = GrafreeD.clipboard;
88	340	//Object3D obj;
89	341	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +346,7 @@
94	346
95	347	makeSomething(clone, i==group.selection.size()-1);
96	348	}
	349	+ Globals.REPLACEONMAKE = keep;
97	350	}
98	351
99	352	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +403,8 @@
150	403
151	404	void SetupMenu2(GroupEditor oe)
152	405	{
	406	+ oe.jTree = new cTree();
	407	+
153	408	Menu menu;
154	409	oe.menuBar.add(menu = new Menu("Edit"));
155	410	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +415,7 @@
160	415	// redoItem = menu.add(new MenuItem("Redo"));
161	416	// redoItem.addActionListener(this);
162	417	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	418	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	419	duplicateItem.addActionListener(this);
165	420	cloneItem = menu.add(new MenuItem("Clone"));
166	421	cloneItem.addActionListener(this);
..	..	@@ -176,7 +431,6 @@
176	431	copyItem.addActionListener(this);
177	432	pasteItem = menu.add(new MenuItem("Paste"));
178	433	pasteItem.addActionListener(this);
179		- menu.add("-");
180	434
181	435	menu.add("-");
182	436	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +442,8 @@
188	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	443	// pasteExpandItem.addActionListener(this);
190	444	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
193	447
194	448	if (Globals.ADVANCED)
195	449	{
..	..	@@ -203,23 +457,23 @@
203	457	//zBufferItem.addActionListener(this);
204	458	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	459	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	460	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	461	+ restoreCameraItem.addActionListener(this);
208	462
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	463	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	464	+// toggleFullScreenItem.addItemListener(this);
	465	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	466	+// cameraMenu.add("-");
	467	+//
	468	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	469	+// toggleTextureItem.addItemListener(this);
	470	+// toggleTextureItem.setState(CameraPane.textureon);
	471	+//
	472	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	473	+// toggleSwitchItem.addItemListener(this);
	474	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	475
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"));
	476	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	477	toggleHandleItem.addItemListener(this);
224	478	toggleHandleItem.setState(CameraPane.HANDLES);
225	479
..	..	@@ -246,7 +500,7 @@
246	500
247	501	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	502	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	503	+ toggleDebugItem.setState(Globals.DEBUG);
250	504
251	505	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	506	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +528,7 @@
274	528	{
275	529	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	530	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	531	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	532	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	533	oe.cameraMenu.add("-");
280	534	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +536,7 @@
282	536	editLeafItem.addActionListener(this);
283	537	lookAtItem.addActionListener(this);
284	538	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	539	+ //switchViewItem.addActionListener(this);
286	540	}
287	541
288	542	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +581,29 @@
327	581	}
328	582
329	583	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	584	+// grabItem = menu.add(new MenuItem("Grab"));
	585	+// grabItem.addActionListener(this);
332	586	backItem = menu.add(new MenuItem("Back"));
333	587	backItem.addActionListener(this);
334	588	frontItem = menu.add(new MenuItem("Front"));
335	589	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	590	+// compositeItem = menu.add(new MenuItem("Composite"));
	591	+// compositeItem.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
338	595	hideItem = menu.add(new MenuItem("Hidden Group"));
339	596	hideItem.addActionListener(this);
	597	+ }
340	598	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	599	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	600	+
	601	+// menu.add("-");
	602	+//
	603	+// switchItem = menu.add(new MenuItem("Switch node"));
	604	+// switchItem.addActionListener(this);
	605	+ if (Globals.ADVANCED)
	606	+ {
345	607	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	608	switchGeoItem.addActionListener(this);
347	609	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +611,6 @@
349	611	morphItem = menu.add(new MenuItem("Morph Group"));
350	612	morphItem.addActionListener(this);
351	613
352		- if (Globals.ADVANCED)
353		- {
354	614	menu.add("-");
355	615	physicsItem = menu.add(new MenuItem("Physics"));
356	616	physicsItem.addActionListener(this);
..	..	@@ -358,30 +618,29 @@
358	618	frameselectorItem.addActionListener(this);
359	619	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	620	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	621	}
364	622
365	623	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	624	+// textureItem = menu.add(new MenuItem("Texture"));
	625	+// textureItem.addActionListener(this);
368	626	billboardItem = menu.add(new MenuItem("Billboard"));
369	627	billboardItem.addActionListener(this);
370	628	csgItem = menu.add(new MenuItem("CSG"));
371	629	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	630	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	631	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	632	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	633	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	634	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	635	shadowZItem.addActionListener(this);
	636	+ attributeItem = menu.add(new MenuItem("Attribute"));
	637	+ attributeItem.addActionListener(this);
	638	+
378	639	if (Globals.ADVANCED)
379	640	{
380	641	menu.add("-");
381	642	linkerItem = menu.add(new MenuItem("Linker"));
382	643	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	644	templateItem = menu.add(new MenuItem("Template"));
386	645	templateItem.addActionListener(this);
387	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +669,7 @@
410	669	genNormalsMESHItem.addActionListener(this);
411	670	if (Globals.ADVANCED)
412	671	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	673	genNormalsMINEItem.addActionListener(this);
415	674	}
416	675	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -470,6 +729,14 @@
470	729	markleavesItem.addActionListener(this);
471	730	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	731	unmarkleavesItem.addActionListener(this);
	732	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	733	+ rewindleavesItem.addActionListener(this);
	734	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	735	+ unrewindleavesItem.addActionListener(this);
	736	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	737	+ randomleavesItem.addActionListener(this);
	738	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	739	+ unrandomleavesItem.addActionListener(this);
473	740	menu.add("-");
474	741	flipVItem = menu.add(new MenuItem("Flip V"));
475	742	flipVItem.addActionListener(this);
..	..	@@ -495,10 +762,15 @@
495	762	attachBumpItem.addActionListener(this);
496	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
498	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	767	detachPigmentItem.addActionListener(this);
500	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	769	detachBumpItem.addActionListener(this);
	770	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	771	+ embedTexturesItem.addActionListener(this);
	772	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	773	+ deEmbedTexturesItem.addActionListener(this);
502	774	menu.add("-");
503	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	776	sortbysizeItem.addActionListener(this);
..	..	@@ -525,8 +797,21 @@
525	797	buildToolsMenu(menu);
526	798	}
527	799
	800	+
528	801	void SetupUI2(ObjEditor oe)
529	802	{
	803	+ // June 2019
	804	+ if (oe == null)
	805	+ {
	806	+ //super.SetupUI2(this);
	807	+ //return;
	808	+ }
	809	+
	810	+ if (copy != group)
	811	+ {
	812	+ //super.SetupUI2(this);
	813	+ }
	814	+
530	815	//new Exception().printStackTrace();
531	816
532	817	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -555,39 +840,79 @@
555	840	oe.radioPanel.add(dummyButton);
556	841	oe.buttonGroup.add(dummyButton);
557	842	*/
	843	+ cGridBag copyOptionsPanel = new cGridBag();
	844	+
	845	+ copyOptionsPanel.preferredHeight = 2;
	846	+
558	847	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	848
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	849	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	850	+ //minButton.setToolTipText("Minimize window");
	851	+ //minButton.addActionListener(this);
563	852
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	853	+ if (Globals.ADVANCED)
	854	+ {
	855	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	856	+ maxButton.setToolTipText("Maximize window");
	857	+ maxButton.addActionListener(this);
	858	+ }
567	859
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
	860	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	861	+ fullButton.setToolTipText("Full-screen window");
	862	+ fullButton.addActionListener(this);
	863	+
	864	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	865	+ screenfitButton.setToolTipText("Screen fit");
	866	+ screenfitButton.addActionListener(this);
	867	+
	868	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	869	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	870	+ restoreCameraButton.addActionListener(this);
	871	+
	872	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	873	+ saveButton.setToolTipText("New version");
570	874	saveButton.addActionListener(this);
	875	+
	876	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	877	+ undoButton.setToolTipText("Previous version");
	878	+ undoButton.addActionListener(this);
	879	+ undoButton.setEnabled(false);
571	880
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	881	+ cGridBag updown = new cGridBag().setVertical(true);
	882	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	883	+ restoreButton.setToolTipText("Restore current");
	884	+ restoreButton.addActionListener(this);
	885	+ restoreButton.setEnabled(false);
	886	+
	887	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	888	+ replaceButton.setToolTipText("Replace current");
	889	+ replaceButton.addActionListener(this);
	890	+ replaceButton.setEnabled(false);
	891	+
	892	+ copyOptionsPanel.add(updown);
	893	+
	894	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	895	+ redoButton.setToolTipText("Next version");
	896	+ redoButton.addActionListener(this);
	897	+ redoButton.setEnabled(false);
	898	+
	899	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	900	liveCB.setToolTipText("Enable animation");
574	901	liveCB.addItemListener(this);
575	902
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	904	oneStepButton.setToolTipText("Animate one step forward");
578	905	oneStepButton.addActionListener(this);
579	906
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	908	fastCB.setToolTipText("Fast mode");
582	909	fastCB.addItemListener(this);
583	910
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	911	+ //oe.toolboxPanel.Return();
	912	+
	913	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	914	+// trackCB.setToolTipText("Enable tracking");
	915	+// trackCB.addItemListener(this);
591	916
592	917	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	918	// screenfitpointButton.addActionListener(this);
..	..	@@ -597,67 +922,155 @@
597	922	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	923	snapobjectButton.addActionListener(this);
599	924	snapobjectButton.setToolTipText("Snap Object");
	925	+
	926	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ fourButton.addActionListener(this);
	928	+ fourButton.setToolTipText("Show control panel only");
600	929	}
601	930
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	931	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	932
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- twoButton.setToolTipText("Show center view only");
	933	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	934	+ twoButton.setToolTipText("Show 3D view only");
610	935	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612		- fourButton.addActionListener(this);
613		- fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
616		- sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
	936	+ this.fullscreenLayout = twoButton;
	937	+
	938	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ threeButton.setToolTipText("Show controls and 3D view");
619	940	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
	941	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+ sixButton.setToolTipText("Show 3D view and controls");
	943	+ sixButton.addActionListener(this);
	944	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+// sevenButton.setToolTipText("3-column layout");
	946	+// sevenButton.addActionListener(this);
623	947	//
624	948
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	949	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ rootButton.setToolTipText("Open selection in new tab");
627	951	rootButton.addActionListener(this);
628	952
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	953	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	954	closeButton.setToolTipText("Close tab");
631	955	closeButton.addActionListener(this);
632	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	957	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	958	+
	959	+ cGridBag row1 = new cGridBag();
636	960
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	961	+ // INSERT
	962	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	963	+ gridButton.setToolTipText("Create grid");
	964	+ gridButton.addActionListener(this);
	965	+
	966	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ boxButton.setToolTipText("Create box");
	968	+ boxButton.addActionListener(this);
	969	+
	970	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	971	+ sphereButton.setToolTipText("Create sphere");
	972	+ sphereButton.addActionListener(this);
	973	+
	974	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	975	+ coneButton.setToolTipText("Create cone");
	976	+ coneButton.addActionListener(this);
	977	+
	978	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	979	+ torusButton.setToolTipText("Create torus");
	980	+ torusButton.addActionListener(this);
	981	+
	982	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	983	+ superButton.setToolTipText("Create superellipsoid");
	984	+ superButton.addActionListener(this);
	985	+
	986	+ if (Globals.ADVANCED)
	987	+ {
	988	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ kleinButton.setToolTipText("Create Klein bottle");
	990	+ kleinButton.addActionListener(this);
	991	+ }
	992	+
	993	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	994	+ particlesButton.setToolTipText("Create particle system");
	995	+ particlesButton.addActionListener(this);
	996	+
	997	+ oe.toolboxPanel.add(row1);
	998	+
	999	+ cGridBag row2 = new cGridBag();
	1000	+
	1001	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1002	+ groupButton.setToolTipText("Create group");
	1003	+ groupButton.addActionListener(this);
	1004	+
	1005	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ compositeButton.setToolTipText("Create composite");
	1007	+ compositeButton.addActionListener(this);
	1008	+
	1009	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1010	+ switchButton.setToolTipText("Create item switcher");
	1011	+ switchButton.addActionListener(this);
	1012	+
	1013	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1014	+ loopButton.setToolTipText("Create loop");
	1015	+ loopButton.addActionListener(this);
	1016	+
	1017	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ textureButton.setToolTipText("Create texture");
	1019	+ textureButton.addActionListener(this);
	1020	+
	1021	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ overlayButton.setToolTipText("Create overlay");
	1023	+ overlayButton.addActionListener(this);
	1024	+
	1025	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ lightButton.setToolTipText("Create light");
	1027	+ lightButton.addActionListener(this);
	1028	+
	1029	+ oe.toolboxPanel.add(row2);
	1030	+
	1031	+ // ENVYMAPS
	1032	+ cGridBag skyboxpane = new cGridBag();
	1033	+ skyboxpane.preferredHeight = 100;
	1034	+
	1035	+ oe.toolboxPanel.add(skyboxpane);
	1036	+
	1037	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1038	+ skyboxpane.add(skyboxpanel);
	1039	+
	1040	+ AddSkyboxTab0(skyboxpanel);
	1041	+ AddSkyboxTab1(skyboxpanel);
	1042	+ AddSkyboxTab2(skyboxpanel);
	1043	+
	1044	+ // EDIT panel
	1045	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ editButton.setToolTipText("Pin selection controls");
639	1047	editButton.addActionListener(this);
640	1048
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1049	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ uneditButton.setToolTipText("Remove selection controls");
643	1051	uneditButton.addActionListener(this);
644	1052
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1053	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1054	+ allParamsButton.setToolTipText("Show all controle");
647	1055	allParamsButton.addActionListener(this);
648	1056
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1057	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	1058	clearPanelButton.setToolTipText("Clear edit panel");
651	1059	clearPanelButton.addActionListener(this);
652	1060
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	1062	unselectButton.setToolTipText("Unselect");
655	1063	unselectButton.addActionListener(this);
656	1064
657		- commandsPanel.preferredHeight = 1;
	1065	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+ flashSelectionButton.setToolTipText("Highlight selection");
	1067	+ flashSelectionButton.addActionListener(this);
658	1068
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1069	+ editCommandsPanel.preferredHeight = 1;
	1070	+
	1071	+ SetPinStates(false);
	1072	+// oe.treePanel.add(commandsPanel);
	1073	+// oe.treePanel.Return();
661	1074
662	1075	// oe.aConstraints.gridx += 1;
663	1076	// oe.aConstraints.weighty = 0;
..	..	@@ -674,32 +1087,20 @@
674	1087
675	1088	JScrollPane jSP;
676	1089	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1090	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1091	ResetModel();
679	1092
680	1093	oe.treePanel.add(jSPPanel);
681	1094	oe.treePanel.Return();
682	1095
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	1096	oe.treePanel.add(copyOptionsPanel);
699	1097	oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
700	1101
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
703	1104
704	1105	//jList.addListSelectionListener(this);
705	1106	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1108,7 @@
707	1108	//jTree.setEditable(true);
708	1109	oe.jTree.setDragEnabled(true);
709	1110	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1112
712	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1114
..	..	@@ -719,29 +1120,49 @@
719	1120	dgr.addDragGestureListener(this);
720	1121	}catch(Exception e) {}
721	1122	*/
722		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
723	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1125	}
725	1126
726	1127	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1128	{
	1129	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1130	+ colorCB.setToolTipText("Copy color when dropped");
	1131	+ colorCB.addItemListener(this);
	1132	+
	1133	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1134	+ materialCB.setToolTipText("Copy material when dropped");
	1135	+ materialCB.addItemListener(this);
	1136	+
	1137	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1138	+ textureCB.setToolTipText("Copy texture when dropped");
	1139	+ textureCB.addItemListener(this);
	1140	+
	1141	+ panel.Return();
	1142	+
728	1143	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1144	boxCB.setToolTipText("Display bounding boxes");
730	1145	boxCB.addItemListener(this);
731	1146
732	1147	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1148	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1149	zoomBoxCB.addItemListener(this);
735	1150
736	1151	if (true) // Globals.ADVANCED)
737	1152	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1153	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1154	+// supportCB.setToolTipText("Enable rigging");
	1155	+// supportCB.addItemListener(this);
	1156	+
	1157	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1158	+ freezeCB.setToolTipText("Fast moving camera");
	1159	+ freezeCB.addItemListener(this);
741	1160
742	1161	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1162	// localCB.addItemListener(this);
744	1163
	1164	+ panel.Return();
	1165	+
745	1166	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1167	crowdCB.setToolTipText("Used for crowds");
747	1168	crowdCB.addItemListener(this);
..	..	@@ -758,6 +1179,8 @@
758	1179	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1180	// speakerMocapCB.addItemListener(this);
760	1181
	1182	+ panel.Return();
	1183	+
761	1184	if (false)
762	1185	{
763	1186	// handled in scripts
..	..	@@ -772,34 +1195,74 @@
772	1195	//constraints.gridy += 1;
773	1196	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	1197	smoothfocusCB.addItemListener(this);
	1198	+ panel.Return();
775	1199	}
776	1200
777	1201	//constraints.gridx += 1;
778	1202	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1203	// debugCB.addItemListener(this);
780	1204
	1205	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1206	+ trackCB.setToolTipText("Enable tracking target");
	1207	+ trackCB.addItemListener(this);
	1208	+
781	1209	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1210	+ oeilCB.setToolTipText("Move camera when tracking");
782	1211	oeilCB.addItemListener(this);
783	1212
	1213	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1214	+ shadowCB.setToolTipText("When live compute shadows");
	1215	+ shadowCB.addItemListener(this);
	1216	+
	1217	+ panel.Return();
	1218	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1219	+ toggleTextureCB.setToolTipText("Load textures");
	1220	+ toggleTextureCB.addItemListener(this);
	1221	+
	1222	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1223	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1224	+ toggleSwitchCB.addItemListener(this);
	1225	+
	1226	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1227	+ autokeepCB.setToolTipText("On structure change");
	1228	+ autokeepCB.addItemListener(this);
	1229	+
	1230	+ panel.Return();
	1231	+ if (Globals.ADVANCED)
	1232	+ {
784	1233	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1234	lookAtCB.setToolTipText("Look-at target");
786	1235	lookAtCB.addItemListener(this);
	1236	+ }
787	1237
788	1238	}
789	1239
790	1240	cGridBag fill = new cGridBag();
791		-
792	1241	fill.preferredHeight = 200;
	1242	+ cGridBag fill2 = new cGridBag();
	1243	+ fill2.preferredHeight = 200;
	1244	+ cGridBag fill3 = new cGridBag();
	1245	+ fill3.preferredHeight = 200;
793	1246
794	1247	panel.add(fill);
	1248	+ panel.add(fill2);
	1249	+ panel.add(fill3);
795	1250
796	1251	}
797	1252
798	1253	void EditObject(Object3D obj)
799	1254	{
800	1255	cRadio radioButton = new cRadio(obj.name);
	1256	+
	1257	+ // June 2019. Patch to avoid bug with transparency.
	1258	+ radioButton.hadMaterial = obj.material != null;
	1259	+ if (!radioButton.hadMaterial)
	1260	+ {
	1261	+ obj.material = new cMaterial();
	1262	+ }
	1263	+
801	1264	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1265	+ radioButton.layout = sixButton; // sevenButton;
803	1266	radioButton.SetCamera(cameraView.renderCamera, false);
804	1267	radioButton.addActionListener(this);
805	1268	radioPanel.add(radioButton);
..	..	@@ -809,6 +1272,8 @@
809	1272
810	1273	void SetupViews(ObjEditor oe)
811	1274	{
	1275	+ theFrame = this;
	1276	+
812	1277	oe.SetupViews();
813	1278
814	1279	System.out.println("SetupViews");
..	..	@@ -817,23 +1282,28 @@
817	1282	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1283	}
819	1284
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1285	+ cToggleButton liveCB;
	1286	+ cCheckBox supportCB;
	1287	+ cCheckBox localCB;
	1288	+ cCheckBox crowdCB;
	1289	+ cCheckBox smoothCB;
	1290	+ cToggleButton fastCB;
	1291	+ cCheckBox slowCB;
	1292	+ cCheckBox boxCB;
	1293	+ cCheckBox zoomBoxCB;
	1294	+ cCheckBox freezeCB;
	1295	+ //cToggleButton trackCB;
	1296	+ cCheckBox trackCB;
	1297	+ cCheckBox smoothfocusCB;
831	1298	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1299	+ cCheckBox speakerCameraCB;
	1300	+ cCheckBox speakerFocusCB;
	1301	+ cCheckBox debugCB;
	1302	+
	1303	+ cCheckBox oeilCB;
	1304	+ cCheckBox shadowCB;
	1305	+ cCheckBox autokeepCB;
	1306	+ cCheckBox lookAtCB;
837	1307
838	1308	// static int COLOR = 1;
839	1309	// static int MATERIAL = 2;
..	..	@@ -841,9 +1311,9 @@
841	1311
842	1312	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1313
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1314	+ cCheckBox colorCB;
	1315	+ cCheckBox materialCB;
	1316	+ cCheckBox textureCB;
847	1317
848	1318	public void itemStateChanged(ItemEvent e)
849	1319	{
..	..	@@ -871,6 +1341,7 @@
871	1341	} else if(e.getSource() == liveCB)
872	1342	{
873	1343	cameraView.ToggleLive();
	1344	+ refreshContents(false);
874	1345	}
875	1346	else if(e.getSource() == supportCB)
876	1347	{
..	..	@@ -935,6 +1406,18 @@
935	1406	{
936	1407	cameraView.ToggleOeil();
937	1408	}
	1409	+ else if(e.getSource() == shadowCB)
	1410	+ {
	1411	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1412	+ }
	1413	+ else if(e.getSource() == freezeCB)
	1414	+ {
	1415	+ Globals.FREEZEONMOVE ^= true;
	1416	+ }
	1417	+ else if(e.getSource() == autokeepCB)
	1418	+ {
	1419	+ Globals.REPLACEONMAKE ^= true;
	1420	+ }
938	1421	else if(e.getSource() == lookAtCB)
939	1422	{
940	1423	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1434,8 @@
951	1434
952	1435	/**/
953	1436	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1437	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1438	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1439	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1440	// We can't move the root node or an empty selection
957	1441	return;
..	..	@@ -1014,8 +1498,6 @@
1014	1498	}
1015	1499	}
1016	1500
1017		- String string = (String) object;
1018		-
1019	1501	System.out.println("Transfer = " + object + "; drop : " + target);
1020	1502	// if( object instanceof java.io.File[])
1021	1503	// {
..	..	@@ -1023,6 +1505,8 @@
1023	1505	// objEditor.DropFile((java.io.File[]) object, true);
1024	1506	// return;
1025	1507	// }
	1508	+
	1509	+ String string = object.toString();
1026	1510
1027	1511	// File path for Mac and Windows
1028	1512	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1068,23 +1552,33 @@
1068	1552
1069	1553	assert target == objEditor.jTree;
1070	1554	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1555	+ Object3D destinationLeaf;
1071	1556	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1557	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1558	} catch (Exception e) {
1074	1559	System.out.println("destinationPath : " + destinationPath);
1075	1560	return;
1076	1561	}
1077	1562
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1563	+ for (int i=group.selection.size(); --i>=0;)
1079	1564	{
	1565	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1566	+
	1567	+ // Cannot move into itself
	1568	+ if (child == destinationLeaf)
	1569	+ return;
	1570	+ }
	1571	+
	1572	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1573	+// {
1080	1574	loadClipboard(true);
1081	1575	objEditor.jTree.setSelectionPath(destinationPath);
1082	1576	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1577	+// } else {
	1578	+// loadClipboard(false);
	1579	+// objEditor.jTree.setSelectionPath(destinationPath);
	1580	+// pasteInto(false, false); // true); // ???
	1581	+// }
1088	1582	}
1089	1583	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1584	// Called if the user has modified the current drop gesture
..	..	@@ -1189,22 +1683,30 @@
1189	1683	{
1190	1684	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1685	//heightFieldItem.addActionListener(this);
1192		- gridItem = menu.add(new MenuItem("Grid"));
1193		- gridItem.addActionListener(this);
1194		- rectoidItem = menu.add(new MenuItem("Box"));
1195		- rectoidItem.addActionListener(this);
1196		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197		- ellipsoidItem.addActionListener(this);
1198		- coneItem = menu.add(new MenuItem("Cone"));
1199		- coneItem.addActionListener(this);
1200		- torusItem = menu.add(new MenuItem("Torus"));
1201		- torusItem.addActionListener(this);
1202		- superItem = menu.add(new MenuItem("Superellipsoid"));
1203		- superItem.addActionListener(this);
	1686	+// gridItem = menu.add(new MenuItem("Grid"));
	1687	+// gridItem.addActionListener(this);
	1688	+// rectoidItem = menu.add(new MenuItem("Box"));
	1689	+// rectoidItem.addActionListener(this);
	1690	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1691	+// ellipsoidItem.addActionListener(this);
	1692	+// coneItem = menu.add(new MenuItem("Cone"));
	1693	+// coneItem.addActionListener(this);
	1694	+// torusItem = menu.add(new MenuItem("Torus"));
	1695	+// torusItem.addActionListener(this);
	1696	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1697	+// superItem.addActionListener(this);
	1698	+
	1699	+ cameraItem = menu.add(new MenuItem("Camera"));
	1700	+ cameraItem.addActionListener(this);
	1701	+
	1702	+ if (!Globals.ADVANCED)
	1703	+ {
1204	1704	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1705	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1706	+ }
	1707	+
	1708	+// particleItem = menu.add(new MenuItem("Particle system"));
	1709	+// particleItem.addActionListener(this);
1208	1710	if (Globals.ADVANCED)
1209	1711	{
1210	1712	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1732,15 @@
1230	1732	}
1231	1733	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1734	bezierItem.addActionListener(this);
1233		- overlayItem = menu.add(new MenuItem("Overlay"));
1234		- overlayItem.addActionListener(this);
1235		- lightItem = menu.add(new MenuItem("Light"));
1236		- lightItem.addActionListener(this);
	1735	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1736	+// overlayItem.addActionListener(this);
	1737	+// lightItem = menu.add(new MenuItem("Light"));
	1738	+// lightItem.addActionListener(this);
1237	1739	menu.add("-");
1238	1740	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	1741	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	1742	+// loopItem = menu.add(new MenuItem("Loop"));
	1743	+// loopItem.addActionListener(this);
1242	1744	doubleItem = menu.add(new MenuItem("Fork"));
1243	1745	doubleItem.addActionListener(this);
1244	1746	if (Globals.ADVANCED)
..	..	@@ -1254,6 +1756,9 @@
1254	1756	animationItem.addItemListener(this);
1255	1757	animationItem.setState(Globals.ANIMATION);
1256	1758
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
	1761	+
1257	1762	menu.add("-");
1258	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1259	1764	parseverticesItem.addActionListener(this);
..	..	@@ -1266,6 +1771,8 @@
1266	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1267	1772	reduce34MorphItem.addActionListener(this);
1268	1773	menu.add("-");
	1774	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1775	+ memoryItem.addActionListener(this);
1269	1776	menu.add(computeAOItem = new MenuItem("Compute AO"));
1270	1777	computeAOItem.addActionListener(this);
1271	1778
..	..	@@ -1274,11 +1781,9 @@
1274	1781	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1275	1782	mirrorItem.addActionListener(this);
1276	1783	menu.add("-");
1277		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1278		- memoryItem.addActionListener(this);
1279	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	1785	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	1786	+ menu.add(dumpItem = new MenuItem("Print"));
1282	1787	dumpItem.addActionListener(this);
1283	1788	// menu.add(pathItem = new MenuItem("From-to path"));
1284	1789	// pathItem.addActionListener(this);
..	..	@@ -1419,9 +1924,34 @@
1419	1924	shadow.material = new cMaterial(obj.material);
1420	1925	shadow.material.diffuse = 0.0001f;
1421	1926	shadow.material.specular = 0.0001f;
	1927	+ //shadow.projectedVertices[1].x = 300;
1422	1928
1423	1929	makeSomething(shadow);
1424	1930	}
	1931	+
	1932	+ private void ClearUnpinned()
	1933	+ {
	1934	+ //for (Object3D obj : listUI)
	1935	+ for (int i=listUI.size(); --i>=0;)
	1936	+ {
	1937	+ Object3D obj = listUI.elementAt(i);
	1938	+ if (!obj.pinned)
	1939	+ {
	1940	+ obj.CloseUI();
	1941	+ listUI.remove(i);
	1942	+ }
	1943	+ }
	1944	+ }
	1945	+
	1946	+ private void EditElement(Object3D elem, boolean newWindow)
	1947	+ {
	1948	+ // if (!(elem instanceof Composite))
	1949	+ // newWindow = false;
	1950	+ listUI.add(elem);
	1951	+ elem.openEditWindow(this, newWindow); //, false);
	1952	+ System.out.println("edit : " + elem);
	1953	+ elem.editWindow.refreshContents(true); // ? new
	1954	+ }
1425	1955
1426	1956	/**
1427	1957	* applyExample
..	..	@@ -1666,7 +2196,7 @@
1666	2196	{
1667	2197	ScreenFit();
1668	2198	} else
1669		- if (source == switchItem)
	2199	+ if (source == switchViewItem)
1670	2200	{
1671	2201	cVector v1 = new cVector();
1672	2202	cVector v2 = new cVector();
..	..	@@ -1675,11 +2205,11 @@
1675	2205	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	2206	objEditor.cameraView.repaint();
1677	2207	} else
1678		- if (source == rectoidItem)
	2208	+ if (source == rectoidItem \|\| source == boxButton)
1679	2209	{
1680	2210	makeSomething(new Box());
1681	2211	} else
1682		- if (source == particleItem)
	2212	+ if (source == particleItem \|\| source == particlesButton)
1683	2213	{
1684	2214	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	2215	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +2288,27 @@
1758	2288
1759	2289	makeSomething(obj);
1760	2290	} else
1761		- if (source == gridItem)
	2291	+ if (source == gridItem \|\| source == gridButton)
1762	2292	{
1763	2293	makeSomething(new Grid());
1764	2294	} else
1765		- if (source == ellipsoidItem)
	2295	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	2296	{
1767	2297	makeSomething(new Sphere());
1768	2298	} else
1769		- if (source == coneItem)
	2299	+ if (source == coneItem \|\| source == coneButton)
1770	2300	{
1771	2301	makeSomething(new Cone());
1772	2302	} else
1773		- if (source == torusItem)
	2303	+ if (source == torusItem \|\| source == torusButton)
1774	2304	{
1775	2305	makeSomething(new Torus());
1776	2306	} else
1777		- if (source == superItem)
	2307	+ if (source == superItem \|\| source == superButton)
1778	2308	{
1779	2309	makeSomething(new Superellipsoid());
1780	2310	} else
1781		- if (source == kleinItem)
	2311	+ if (source == kleinItem \|\| source == kleinButton)
1782	2312	{
1783	2313	makeSomething(new Klein());
1784	2314	} else
..	..	@@ -1798,7 +2328,7 @@
1798	2328	{
1799	2329	makeSomething(new BezierSurface());
1800	2330	} else
1801		- if (source == overlayItem)
	2331	+ if (source == overlayItem \|\| source == overlayButton)
1802	2332	{
1803	2333	/*
1804	2334	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,10 +2376,27 @@
1846	2376	s.setup();
1847	2377	makeSomething(s);
1848	2378	} else
1849		- if (source == lightItem)
	2379	+ if (source == lightItem \|\| source == lightButton)
1850	2380	{
1851	2381	makeSomething(new Light());
1852	2382	} else
	2383	+// if (source == skybox1Button \|\|
	2384	+// source == skybox2Button \|\|
	2385	+// source == skybox3Button \|\|
	2386	+// source == skybox4Button \|\|
	2387	+// source == skybox5Button \|\|
	2388	+// source == skybox6Button \|\|
	2389	+// source == skybox7Button \|\|
	2390	+// source == skybox11Button \|\|
	2391	+// source == skybox12Button \|\|
	2392	+// source == skybox13Button \|\|
	2393	+// source == skybox14Button \|\|
	2394	+// source == skybox15Button \|\|
	2395	+// source == skybox16Button \|\|
	2396	+// source == skybox17Button)
	2397	+// {
	2398	+// ChangeSkybox(source);
	2399	+// } else
1853	2400	if (source == csgItem)
1854	2401	{
1855	2402	group(new CSG());
..	..	@@ -1896,30 +2443,30 @@
1896	2443
1897	2444	group(g);
1898	2445	} else
1899		- if (source == loopItem)
	2446	+ if (source == loopItem \|\| source == loopButton)
1900	2447	{
1901	2448	Composite csg = new GroupLeaf();
1902	2449	csg.count = 5;
1903	2450	group(csg);
1904		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
1905	2452	csg.addChild(child);
1906	2453	child.addChild(csg);
1907	2454	} else
1908	2455	if (source == doubleItem)
1909	2456	{
1910		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
1911	2458	csg.count = 5;
1912	2459	group(csg);
1913		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
1914	2461	csg.addChild(child);
1915	2462	child.addChild(csg);
1916		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
1917	2464	csg.addChild(child);
1918	2465	child.addChild(csg);
1919	2466	} else
1920	2467	if (source == tripleItem)
1921	2468	{
1922		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
1923	2470	csg.count = 4;
1924	2471	group(csg);
1925	2472	Composite child = new cGroup();
..	..	@@ -1935,7 +2482,7 @@
1935	2482	if (source == computeAOItem)
1936	2483	{
1937	2484	Globals.drawMode = CameraPane.OCCLUSION;
1938		- Globals.theRenderer.repaint();
	2485	+ cameraView.repaint();
1939	2486	} else
1940	2487	if (source == recompileItem)
1941	2488	{
..	..	@@ -1969,17 +2516,45 @@
1969	2516	{
1970	2517	DumpObject();
1971	2518	} else
	2519	+ if (source == minButton)
	2520	+ {
	2521	+ Minimize();
	2522	+ } else
	2523	+ if (source == maxButton)
	2524	+ {
	2525	+ Maximize();
	2526	+ } else
	2527	+ if (source == fullButton)
	2528	+ {
	2529	+ ToggleFullScreen();
	2530	+ } else
1972	2531	if (source == undoButton)
1973	2532	{
	2533	+ // Go to previous version
	2534	+ //if (!Undo())
	2535	+ //java.awt.Toolkit.getDefaultToolkit().beep();
1974	2536	Undo();
	2537	+ } else
	2538	+ if (source == restoreButton)
	2539	+ {
	2540	+ // Restore current version
	2541	+ Restore();
	2542	+ } else
	2543	+ if (source == replaceButton)
	2544	+ {
	2545	+ // Overwrite current version
	2546	+ Replace();
1975	2547	} else
1976	2548	if (source == redoButton)
1977	2549	{
	2550	+ // Go to next version
1978	2551	Redo();
1979	2552	} else
1980	2553	if (source == saveButton)
1981	2554	{
1982		- Save();
	2555	+ // Save a new version
	2556	+ if (!Save(true))
	2557	+ java.awt.Toolkit.getDefaultToolkit().beep();
1983	2558	} else
1984	2559	if (source == oneStepButton)
1985	2560	{
..	..	@@ -1988,17 +2563,14 @@
1988	2563	} else
1989	2564	if (source == screenfitButton)
1990	2565	{
1991		- //Reload(lastConverter, lastFilename, true);
1992	2566	ScreenFit();
1993	2567	} else
1994	2568	if (source == screenfitpointButton)
1995	2569	{
1996		- //Reload(lastConverter, lastFilename, true);
1997	2570	ScreenFitPoint();
1998	2571	} else
1999	2572	if (source == snapobjectButton)
2000	2573	{
2001		- //Reload(lastConverter, lastFilename, true);
2002	2574	SnapObject();
2003	2575	} else
2004	2576	// if (event.getSource() == recompileButton)
..	..	@@ -2362,7 +2934,7 @@
2362	2934	{
2363	2935	StepAll();
2364	2936	} else
2365		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2366	2938	{
2367	2939	//int indices[] = jList.getSelectedIndices();
2368	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2374,9 +2946,9 @@
2374	2946	{
2375	2947	ClearSelection(true);
2376	2948	} else
2377		- if (source == grabItem)
	2949	+ if (source == grabItem \|\| source == groupButton)
2378	2950	{
2379		- group(new cGroup(), true);
	2951	+ group(new cGroup(), false); // true);
2380	2952	} else
2381	2953	if (source == hideItem)
2382	2954	{
..	..	@@ -2394,11 +2966,11 @@
2394	2966	{
2395	2967	makeSomething(new Camera());
2396	2968	} else
2397		- if (source == compositeItem)
	2969	+ if (source == compositeItem \|\| source == compositeButton)
2398	2970	{
2399	2971	group(new Composite());
2400	2972	} else
2401		- if (source == randomItem)
	2973	+ if (source == switchItem \|\| source == switchButton)
2402	2974	{
2403	2975	RandomNode random = new RandomNode();
2404	2976	group(random);
..	..	@@ -2500,7 +3072,7 @@
2500	3072	{
2501	3073	group(new cLinker());
2502	3074	} else
2503		- if (source == textureItem)
	3075	+ if (source == textureItem \|\| source == textureButton)
2504	3076	{
2505	3077	group(new TextureNode());
2506	3078	} else
..	..	@@ -2520,17 +3092,30 @@
2520	3092	{
2521	3093	CastShadow(2);
2522	3094	} else
2523		- if (source == ungroupItem)
	3095	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	3096	{
2525		- //ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
2526	3099	for (int i=0; i<group.selection.size(); i++)
2527	3100	{
2528		- Ungroup(group.selection.get(i));
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
2529	3106	}
2530	3107
2531		- ClearSelection(false);
2532		-
2533		- refreshContents();
	3108	+ if (!hasRoot)
	3109	+ {
	3110	+ for (int i=0; i<group.selection.size(); i++)
	3111	+ {
	3112	+ Ungroup(group.selection.get(i));
	3113	+ }
	3114	+
	3115	+ ClearSelection(false);
	3116	+
	3117	+ refreshContents();
	3118	+ }
2534	3119	} else
2535	3120	if (source == genUVItem)
2536	3121	{
..	..	@@ -2607,6 +3192,22 @@
2607	3192	if (source == unmarkleavesItem)
2608	3193	{
2609	3194	MarkLeaves(false);
	3195	+ } else
	3196	+ if (source == rewindleavesItem)
	3197	+ {
	3198	+ RewindLeaves(true);
	3199	+ } else
	3200	+ if (source == unrewindleavesItem)
	3201	+ {
	3202	+ RewindLeaves(false);
	3203	+ } else
	3204	+ if (source == randomleavesItem)
	3205	+ {
	3206	+ RandomLeaves(true);
	3207	+ } else
	3208	+ if (source == unrandomleavesItem)
	3209	+ {
	3210	+ RandomLeaves(false);
2610	3211	} else
2611	3212	if (source == flipVItem)
2612	3213	{
..	..	@@ -2815,7 +3416,7 @@
2815	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2816	3417	{
2817	3418	obj = (Object3D)e.nextElement();
2818		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
2819	3420	}
2820	3421
2821	3422	refreshContents();
..	..	@@ -2831,6 +3432,31 @@
2831	3432
2832	3433	refreshContents();
2833	3434	} else
	3435	+ if (source == embedTexturesItem)
	3436	+ {
	3437	+ Object3D obj;
	3438	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3439	+ {
	3440	+ obj = (Object3D)e.nextElement();
	3441	+ obj.EmbedTextures(true);
	3442	+ }
	3443	+
	3444	+ refreshContents();
	3445	+ } else
	3446	+ if (source == deEmbedTexturesItem)
	3447	+ {
	3448	+ Object3D obj;
	3449	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3450	+ {
	3451	+ obj = (Object3D)e.nextElement();
	3452	+ obj.EmbedTextures(false);
	3453	+ }
	3454	+
	3455	+ CameraPane.texturepigment.clear();
	3456	+ CameraPane.texturebump.clear();
	3457	+
	3458	+ refreshContents();
	3459	+ } else
2834	3460	if (source == flashSelectionButton)
2835	3461	{
2836	3462	CameraPane.flash = true;
..	..	@@ -2842,6 +3468,10 @@
2842	3468	if (source == twoButton)
2843	3469	{
2844	3470	radio.layout = twoButton;
	3471	+
	3472	+ if (CameraPane.FULLSCREEN)
	3473	+ fullscreenLayout = radio.layout;
	3474	+
2845	3475	// bug
2846	3476	//gridPanel.setDividerLocation(1.0);
2847	3477	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2874,10 +3504,31 @@
2874	3504	bigThree.ClearUI();
2875	3505	bigThree.add(centralPanel);
2876	3506	bigThree.FlushUI();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
	3509	+
	3510	+// refreshContents(true);
	3511	+//
	3512	+// try
	3513	+// {
	3514	+// java.awt.Robot bot = new java.awt.Robot();
	3515	+// int mask = InputEvent.BUTTON1_MASK;
	3516	+// bot.mouseMove(100, 100);
	3517	+// bot.mousePress(mask);
	3518	+// bot.mouseRelease(mask);
	3519	+// }
	3520	+// catch (Exception e)
	3521	+// {
	3522	+//
	3523	+// }
	3524	+
2877	3525	} else
2878	3526	if (source == threeButton)
2879	3527	{
2880	3528	radio.layout = threeButton;
	3529	+
	3530	+ if (CameraPane.FULLSCREEN)
	3531	+ fullscreenLayout = radio.layout;
2881	3532
2882	3533	// bigThree.remove(scenePanel);
2883	3534	// bigThree.remove(centralPanel);
..	..	@@ -2907,13 +3558,18 @@
2907	3558	// centralPanel.setVisible(true);
2908	3559	// XYZPanel.setVisible(true);
2909	3560	bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
2910	3562	bigThree.add(centralPanel);
2911		- bigThree.add(XYZPanel);
2912	3563	bigThree.FlushUI();
	3564	+
	3565	+ cameraView.requestFocusInWindow();
2913	3566	} else
2914	3567	if (source == fourButton)
2915	3568	{
2916	3569	radio.layout = fourButton;
	3570	+
	3571	+ if (CameraPane.FULLSCREEN)
	3572	+ fullscreenLayout = radio.layout;
2917	3573
2918	3574	// bigThree.remove(scenePanel);
2919	3575	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3601,15 @@
2945	3601	bigThree.ClearUI();
2946	3602	bigThree.add(scenePanel);
2947	3603	bigThree.FlushUI();
	3604	+
	3605	+ cameraView.requestFocusInWindow();
2948	3606	} else
2949	3607	if (source == sixButton)
2950	3608	{
2951	3609	radio.layout = sixButton;
	3610	+
	3611	+ if (CameraPane.FULLSCREEN)
	3612	+ fullscreenLayout = radio.layout;
2952	3613
2953	3614	// bigThree.remove(scenePanel);
2954	3615	// bigThree.remove(centralPanel);
..	..	@@ -2978,13 +3639,18 @@
2978	3639	// centralPanel.setVisible(true);
2979	3640	// XYZPanel.setVisible(false);
2980	3641	bigThree.ClearUI();
2981		- bigThree.add(scenePanel);
2982	3642	bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
2983	3644	bigThree.FlushUI();
	3645	+
	3646	+ cameraView.requestFocusInWindow();
2984	3647	} else
2985	3648	if (source == sevenButton)
2986	3649	{
2987	3650	radio.layout = sevenButton;
	3651	+
	3652	+ if (CameraPane.FULLSCREEN)
	3653	+ fullscreenLayout = radio.layout;
2988	3654
2989	3655	// bigThree.remove(scenePanel);
2990	3656	// bigThree.remove(centralPanel);
..	..	@@ -3018,6 +3684,8 @@
3018	3684	bigThree.add(centralPanel);
3019	3685	bigThree.add(XYZPanel);
3020	3686	bigThree.FlushUI();
	3687	+
	3688	+ cameraView.requestFocusInWindow();
3021	3689	} else
3022	3690	if (source == rootButton)
3023	3691	{
..	..	@@ -3029,6 +3697,7 @@
3029	3697	EditObject(obj);
3030	3698	}
3031	3699
	3700	+ cameraView.requestFocusInWindow();
3032	3701	refreshContents(true);
3033	3702	} else
3034	3703	if (source == closeButton)
..	..	@@ -3038,22 +3707,37 @@
3038	3707	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	3708	{
3040	3709	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3710	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	3711	{
	3712	+ // Patch to avoid bug with transparency.
	3713	+ if (!ab.hadMaterial)
	3714	+ {
	3715	+ ab.object.material = null;
	3716	+ }
	3717	+
3043	3718	buttonGroup.remove(ab);
3044	3719	radioPanel.remove(ab);
3045	3720
3046		- ab.GetObject().editWindow = null;
	3721	+ //ab.GetObject().editWindow = null;
	3722	+ ab.GetObject().manipWindow = null;
3047	3723	// ab.GetObject().objectUI = null; // ?????????
3048	3724
3049	3725	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	3726	break;
3051	3727	}
3052	3728	}
	3729	+
	3730	+ cameraView.requestFocusInWindow();
3053	3731	refreshContents(true);
3054	3732	} else
3055	3733	if (source == editItem \|\| source == editButton)
3056	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
3057	3741	EditSelection(false);
3058	3742	} else
3059	3743	if (source == uneditButton)
..	..	@@ -3063,6 +3747,7 @@
3063	3747	Object3D child = (Object3D)e.nextElement();
3064	3748	if(child.editWindow != null)
3065	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
3066	3751	child.CloseUI();
3067	3752	listUI.remove(child);
3068	3753
..	..	@@ -3079,6 +3764,7 @@
3079	3764	//copy.ClearUI();
3080	3765	for (Object3D obj : listUI)
3081	3766	{
	3767	+ obj.pinned = false;
3082	3768	obj.CloseUI();
3083	3769	}
3084	3770	listUI.clear();
..	..	@@ -3088,7 +3774,7 @@
3088	3774	{
3089	3775	assert(copy == group);
3090	3776
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	3778
3093	3779	for (Object3D obj : listUI)
3094	3780	{
..	..	@@ -3137,6 +3823,9 @@
3137	3823	}
3138	3824
3139	3825	copy = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
3140	3829	//Globals.theRenderer.object = group;
3141	3830	if(!useclient)
3142	3831	{
..	..	@@ -3154,7 +3843,8 @@
3154	3843	}
3155	3844
3156	3845	// fix "+" issue
3157		- group.editWindow = this;
	3846	+ //group.editWindow = this;
	3847	+ group.manipWindow = this;
3158	3848
3159	3849	/*
3160	3850	currentLayout = radio.layout;
..	..	@@ -3162,18 +3852,27 @@
3162	3852	currentLayout = sevenButton;
3163	3853	*/
3164	3854	radio.layout.doClick();
	3855	+
	3856	+ ClearUnpinned();
	3857	+ //Grafreed.Assert(group != null);
	3858	+ //Grafreed.Assert(group.selection != null);
	3859	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3860	+ if (group.selection == null \|\| group.selection.size() == 1)
	3861	+ EditSelection(false);
3165	3862	keepparent = group.parent;
3166	3863	// PARENT = NULL or not???
3167	3864	//group.parent = null; // ROOT
3168	3865	//group.attributes = -1;
3169	3866	ResetModel();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
3170	3869	refreshContents(true);
3171	3870	} else if (event.getSource() == editCameraItem)
3172	3871	{
3173	3872	cameraView.ProtectCamera();
3174	3873	cameraView.repaint();
3175	3874	return;
3176		- } else if (event.getSource() == revertCameraItem)
	3875	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	3876	{
3178	3877	cameraView.RevertCamera();
3179	3878	cameraView.repaint();
..	..	@@ -3190,7 +3889,6 @@
3190	3889	}
3191	3890
3192	3891	boolean useclient = false;
3193		- cRadio radio;
3194	3892
3195	3893	void ToggleRoot()
3196	3894	{
..	..	@@ -3753,7 +4451,7 @@
3753	4451
3754	4452	try
3755	4453	{
3756		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4454	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3757	4455	}
3758	4456	catch (Exception e)
3759	4457	{
..	..	@@ -4145,6 +4843,18 @@
4145	4843	refreshContents();
4146	4844	}
4147	4845
	4846	+ void RewindLeaves(boolean hide)
	4847	+ {
	4848	+ group.selection.RewindLeaves(hide);
	4849	+ refreshContents();
	4850	+ }
	4851	+
	4852	+ void RandomLeaves(boolean hide)
	4853	+ {
	4854	+ group.selection.RandomLeaves(hide);
	4855	+ refreshContents();
	4856	+ }
	4857	+
4148	4858	void SetTexRes(int tr)
4149	4859	{
4150	4860	group.selection.SetTexRes(tr);
..	..	@@ -4216,28 +4926,25 @@
4216	4926	// }
4217	4927	// }
4218	4928
4219		- static boolean allparams = true;
4220		-
4221		- static Vector<Object3D> listUI = new Vector<Object3D>();
4222		-
4223	4929	void EditSelection(boolean newWindow)
4224	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
4225	4937	// aConstraints.gridy = 0;
4226	4938	for (int i=0; i<group.selection.size(); i++)
4227	4939	{
4228	4940	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4229	4941	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4230		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4942	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4231	4943
4232	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
4233	4945	if(elem != group \|\| !newWindow)
4234	4946	{
4235		- // if (!(elem instanceof Composite))
4236		- // newWindow = false;
4237		- listUI.add(elem);
4238		- elem.openEditWindow(this, newWindow); //, false);
4239		- System.out.println("edit : " + elem);
4240		- elem.editWindow.refreshContents(true); // ? new
	4947	+ EditElement(elem, newWindow); // ? new
4241	4948	}
4242	4949	}
4243	4950	}
..	..	@@ -4312,7 +5019,8 @@
4312	5019	//new Exception().printStackTrace();
4313	5020
4314	5021	freezemodel = true;
4315		-
	5022	+ ClearUnpinned();
	5023	+
4316	5024	/**/
4317	5025	//switch (event.id)
4318	5026	{
..	..	@@ -4320,7 +5028,6 @@
4320	5028	//case 702: // Event.LIST_DESELECT
4321	5029	group.deselectAll();
4322	5030	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4323		- objEditor.ClearInfo(); // .GetMaterial());
4324	5031	if (tps != null)
4325	5032	{
4326	5033	for (int i=0; i < tps.length; i++)
..	..	@@ -4329,10 +5036,8 @@
4329	5036
4330	5037	//if (child.parent != null)
4331	5038	//child.parent.addSelectee(child);
	5039	+ objEditor.SetMaterial(child);
4332	5040	group.addSelectee(child);
4333		- objEditor.SetMaterial(child); // .GetMaterial());
4334		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4335		- System.err.println("info : " + child.GetPath());
4336	5041	}
4337	5042	}
4338	5043	// else
..	..	@@ -4342,15 +5047,13 @@
4342	5047	// System.err.println("info : " + group.GetPath());
4343	5048	// }
4344	5049
4345		- objEditor.SetText(); // jan 2014
4346		-
4347	5050	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4348	5051	CameraPane.flash = true;
4349	5052
4350	5053	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4351	5054	// a camera
4352	5055	{
4353		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5056	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4354	5057	{
4355	5058	CameraPane.camerachangeframe = 0; // don't refuse it
4356	5059	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4359,6 +5062,13 @@
4359	5062	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4360	5063	}
4361	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
4362	5072	refreshContents();
4363	5073	//return true;
4364	5074	}
..	..	@@ -4367,6 +5077,35 @@
4367	5077
4368	5078	freezemodel = false;
4369	5079	}
	5080	+
	5081	+ void SetPinStates(boolean enabled)
	5082	+ {
	5083	+ editButton.setEnabled(enabled);
	5084	+ uneditButton.setEnabled(enabled);
	5085	+ unselectButton.setEnabled(enabled);
	5086	+ flashSelectionButton.setEnabled(enabled);
	5087	+ }
	5088	+
	5089	+ void refreshContents(boolean cp)
	5090	+ {
	5091	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5092	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5093	+ {
	5094	+ objEditor.ClearInfo(); // .GetMaterial());
	5095	+
	5096	+ for (int i=0; i < group.selection.Size(); i++)
	5097	+ {
	5098	+ Object3D child = (Object3D) group.selection.get(i);
	5099	+
	5100	+ objEditor.AddInfo(child, this, true);
	5101	+ System.err.println("info : " + child.GetPath());
	5102	+ }
	5103	+
	5104	+ objEditor.SetText(); // jan 2014
	5105	+ }
	5106	+
	5107	+ super.refreshContents(cp);
	5108	+ }
4370	5109
4371	5110	void linkSomething(Object3D thing)
4372	5111	{
..	..	@@ -4449,7 +5188,8 @@
4449	5188
4450	5189	if (cut)
4451	5190	{
4452		- Save();
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4453	5193	//int indices[] = jList.getSelectedIndices();
4454	5194	//for (int i = indices.length - 1; i >= 0; i--)
4455	5195	//jList.remove(indices[i]);
..	..	@@ -4552,6 +5292,10 @@
4552	5292
4553	5293	void paste(boolean expand)
4554	5294	{
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4555	5299	// if (GrafreeD.clipboard == null)
4556	5300	// return;
4557	5301	boolean first = true;
..	..	@@ -4611,6 +5355,7 @@
4611	5355	Grafreed.clipboard.get(0).parent = keepparent;
4612	5356	}
4613	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4614	5359	ResetModel();
4615	5360	refreshContents();
4616	5361	}
..	..	@@ -4746,6 +5491,10 @@
4746	5491
4747	5492	void group(Object3D csg, boolean grab)
4748	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
4749	5498	if (//false) // why??
4750	5499	!group.selection.isEmpty())
4751	5500	{
..	..	@@ -4859,10 +5608,15 @@
4859	5608	//node.add(csg);
4860	5609	//makeSomething(node);
4861	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
4862	5612	}
4863	5613
4864	5614	void Ungroup(Object3D g)
4865	5615	{
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
4866	5620	if (g instanceof HiddenObject)
4867	5621	{
4868	5622	HiddenObject h = (HiddenObject) g;
..	..	@@ -4879,6 +5633,7 @@
4879	5633	objEditor.makeSomething(g.get(i), false);
4880	5634	}
4881	5635	}
	5636	+ Globals.REPLACEONMAKE = keep;
4882	5637	}
4883	5638
4884	5639	void ungroup()
..	..	@@ -5167,10 +5922,44 @@
5167	5922	cButton clearpanelButton;
5168	5923	cButton unselectButton;
5169	5924
	5925	+ cButton restoreCameraButton;
	5926	+
5170	5927	cButton saveButton;
5171		- cButton undoButton;
5172		- cButton redoButton;
5173	5928	cButton oneStepButton;
	5929	+
	5930	+ cButton groupButton;
	5931	+ cButton ungroupButton;
	5932	+ cButton compositeButton;
	5933	+ cButton switchButton;
	5934	+ cButton loopButton;
	5935	+ cButton textureButton;
	5936	+
	5937	+ cButton skybox1Button;
	5938	+ cButton skybox2Button;
	5939	+ cButton skybox3Button;
	5940	+ cButton skybox4Button;
	5941	+ cButton skybox5Button;
	5942	+ cButton skybox6Button;
	5943	+ cButton skybox7Button;
	5944	+
	5945	+ cButton skybox11Button;
	5946	+ cButton skybox12Button;
	5947	+ cButton skybox13Button;
	5948	+ cButton skybox14Button;
	5949	+ cButton skybox15Button;
	5950	+ cButton skybox16Button;
	5951	+ cButton skybox17Button;
	5952	+
	5953	+ cButton gridButton;
	5954	+ cButton boxButton;
	5955	+ cButton sphereButton;
	5956	+ cButton coneButton;
	5957	+ cButton torusButton;
	5958	+ cButton superButton;
	5959	+ cButton kleinButton;
	5960	+ cButton particlesButton;
	5961	+ cButton overlayButton;
	5962	+ cButton lightButton;
5174	5963
5175	5964	cButton screenfitButton;
5176	5965	cButton screenfitpointButton;
..	..	@@ -5183,14 +5972,6 @@
5183	5972
5184	5973	cButton setsupportButton;
5185	5974
5186		- cButton twoButton;
5187		- cButton sixButton;
5188		- cButton threeButton;
5189		- cButton sevenButton;
5190		- cButton fourButton; // full panel
5191		- cButton oneButton; // full XYZ
5192		- //cButton currentLayout;
5193		-
5194	5975	//
5195	5976	//Composite
5196	5977	Object3D // to do !!
..	..	@@ -5200,11 +5981,11 @@
5200	5981	//JTree jTree;
5201	5982	private MenuItem lookAtItem;
5202	5983	private MenuItem lookFromItem;
5203		- private MenuItem switchItem;
	5984	+ private MenuItem switchViewItem;
5204	5985	private MenuItem cutItem;
5205	5986	private MenuItem undoItem;
5206	5987	private MenuItem redoItem;
5207		- private MenuItem duplicateItem;
	5988	+ private JMenuItem duplicateItem;
5208	5989	private MenuItem cloneItem;
5209	5990	private MenuItem cloneSupportItem;
5210	5991	private MenuItem overwriteGeoItem;
..	..	@@ -5232,7 +6013,7 @@
5232	6013	private MenuItem pasteLinkItem;
5233	6014	private MenuItem pasteCloneItem;
5234	6015	private MenuItem pasteExpandItem;
5235		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
5236	6017	private MenuItem clearAllItem;
5237	6018	private MenuItem genUVItem;
5238	6019	private MenuItem genNormalsMESHItem;
..	..	@@ -5267,6 +6048,10 @@
5267	6048	private MenuItem showleavesItem;
5268	6049	private MenuItem markleavesItem;
5269	6050	private MenuItem unmarkleavesItem;
	6051	+ private MenuItem rewindleavesItem;
	6052	+ private MenuItem unrewindleavesItem;
	6053	+ private MenuItem randomleavesItem;
	6054	+ private MenuItem unrandomleavesItem;
5270	6055
5271	6056	private MenuItem flipVItem;
5272	6057	private MenuItem unflipVItem;
..	..	@@ -5288,7 +6073,7 @@
5288	6073	private MenuItem frontItem;
5289	6074	private MenuItem cameraItem;
5290	6075	private MenuItem compositeItem;
5291		- private MenuItem randomItem;
	6076	+ private MenuItem switchItem;
5292	6077	private MenuItem physicsItem;
5293	6078	private MenuItem frameselectorItem;
5294	6079	private MenuItem scriptNodeItem;
..	..	@@ -5312,6 +6097,8 @@
5312	6097	private MenuItem attachBumpItem;
5313	6098	private MenuItem detachBumpItem;
5314	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
5315	6102
5316	6103	private MenuItem particleItem;
5317	6104	private MenuItem ragdollItem;
..	..	@@ -5362,5 +6149,5 @@
5362	6149
5363	6150	Menu cameraMenu;
5364	6151	MenuItem editCameraItem;
5365		- MenuItem revertCameraItem;
	6152	+ MenuItem restoreCameraItem;
5366	6153	}