~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,237 @@
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 + "/" + s + ".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("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
26	257	//ObjEditor objEditor;
27	258	public void closeUI2()
28	259	{
..	..	@@ -60,6 +291,12 @@
60	291	this.copy = this.group = group;
61	292	//selectees = this.group.selectees;
62	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
63	300	if(ui)
64	301	SetupUI(objEditor);
65	302	}
..	..	@@ -80,10 +317,22 @@
80	317	SetupViews(objEditor);
81	318
82	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
83	328	}
84	329
85	330	void CloneSelection(boolean supports)
86	331	{
	332	+ if (Globals.REPLACEONMAKE)
	333	+ Save();
	334	+ boolean keep = Globals.REPLACEONMAKE;
	335	+ Globals.REPLACEONMAKE = false;
87	336	// Object3D keep = GrafreeD.clipboard;
88	337	//Object3D obj;
89	338	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +343,7 @@
94	343
95	344	makeSomething(clone, i==group.selection.size()-1);
96	345	}
	346	+ Globals.REPLACEONMAKE = keep;
97	347	}
98	348
99	349	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +400,8 @@
150	400
151	401	void SetupMenu2(GroupEditor oe)
152	402	{
	403	+ oe.jTree = new cTree();
	404	+
153	405	Menu menu;
154	406	oe.menuBar.add(menu = new Menu("Edit"));
155	407	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +412,7 @@
160	412	// redoItem = menu.add(new MenuItem("Redo"));
161	413	// redoItem.addActionListener(this);
162	414	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	415	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	416	duplicateItem.addActionListener(this);
165	417	cloneItem = menu.add(new MenuItem("Clone"));
166	418	cloneItem.addActionListener(this);
..	..	@@ -176,7 +428,6 @@
176	428	copyItem.addActionListener(this);
177	429	pasteItem = menu.add(new MenuItem("Paste"));
178	430	pasteItem.addActionListener(this);
179		- menu.add("-");
180	431
181	432	menu.add("-");
182	433	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +439,8 @@
188	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	440	// pasteExpandItem.addActionListener(this);
190	441	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
193	444
194	445	if (Globals.ADVANCED)
195	446	{
..	..	@@ -203,23 +454,23 @@
203	454	//zBufferItem.addActionListener(this);
204	455	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	456	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	457	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	458	+ restoreCameraItem.addActionListener(this);
208	459
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	460	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	461	+// toggleFullScreenItem.addItemListener(this);
	462	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	463	+// cameraMenu.add("-");
	464	+//
	465	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	466	+// toggleTextureItem.addItemListener(this);
	467	+// toggleTextureItem.setState(CameraPane.textureon);
	468	+//
	469	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	470	+// toggleSwitchItem.addItemListener(this);
	471	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	472
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"));
	473	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	474	toggleHandleItem.addItemListener(this);
224	475	toggleHandleItem.setState(CameraPane.HANDLES);
225	476
..	..	@@ -274,7 +525,7 @@
274	525	{
275	526	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	527	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	528	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	529	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	530	oe.cameraMenu.add("-");
280	531	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +533,7 @@
282	533	editLeafItem.addActionListener(this);
283	534	lookAtItem.addActionListener(this);
284	535	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	536	+ //switchViewItem.addActionListener(this);
286	537	}
287	538
288	539	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +578,29 @@
327	578	}
328	579
329	580	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	581	+// grabItem = menu.add(new MenuItem("Grab"));
	582	+// grabItem.addActionListener(this);
332	583	backItem = menu.add(new MenuItem("Back"));
333	584	backItem.addActionListener(this);
334	585	frontItem = menu.add(new MenuItem("Front"));
335	586	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	587	+// compositeItem = menu.add(new MenuItem("Composite"));
	588	+// compositeItem.addActionListener(this);
	589	+
	590	+ if (Globals.ADVANCED)
	591	+ {
338	592	hideItem = menu.add(new MenuItem("Hidden Group"));
339	593	hideItem.addActionListener(this);
	594	+ }
340	595	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	596	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	597	+
	598	+// menu.add("-");
	599	+//
	600	+// switchItem = menu.add(new MenuItem("Switch node"));
	601	+// switchItem.addActionListener(this);
	602	+ if (Globals.ADVANCED)
	603	+ {
345	604	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	605	switchGeoItem.addActionListener(this);
347	606	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +608,6 @@
349	608	morphItem = menu.add(new MenuItem("Morph Group"));
350	609	morphItem.addActionListener(this);
351	610
352		- if (Globals.ADVANCED)
353		- {
354	611	menu.add("-");
355	612	physicsItem = menu.add(new MenuItem("Physics"));
356	613	physicsItem.addActionListener(this);
..	..	@@ -358,30 +615,29 @@
358	615	frameselectorItem.addActionListener(this);
359	616	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	617	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	618	}
364	619
365	620	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	621	+// textureItem = menu.add(new MenuItem("Texture"));
	622	+// textureItem.addActionListener(this);
368	623	billboardItem = menu.add(new MenuItem("Billboard"));
369	624	billboardItem.addActionListener(this);
370	625	csgItem = menu.add(new MenuItem("CSG"));
371	626	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	627	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	628	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	629	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	630	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	631	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	632	shadowZItem.addActionListener(this);
	633	+ attributeItem = menu.add(new MenuItem("Attribute"));
	634	+ attributeItem.addActionListener(this);
	635	+
378	636	if (Globals.ADVANCED)
379	637	{
380	638	menu.add("-");
381	639	linkerItem = menu.add(new MenuItem("Linker"));
382	640	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	641	templateItem = menu.add(new MenuItem("Template"));
386	642	templateItem.addActionListener(this);
387	643	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +666,7 @@
410	666	genNormalsMESHItem.addActionListener(this);
411	667	if (Globals.ADVANCED)
412	668	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	670	genNormalsMINEItem.addActionListener(this);
415	671	}
416	672	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -503,10 +759,15 @@
503	759	attachBumpItem.addActionListener(this);
504	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
506	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	764	detachPigmentItem.addActionListener(this);
508	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
510	771	menu.add("-");
511	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	773	sortbysizeItem.addActionListener(this);
..	..	@@ -533,6 +794,7 @@
533	794	buildToolsMenu(menu);
534	795	}
535	796
	797	+
536	798	void SetupUI2(ObjEditor oe)
537	799	{
538	800	// June 2019
..	..	@@ -575,51 +837,79 @@
575	837	oe.radioPanel.add(dummyButton);
576	838	oe.buttonGroup.add(dummyButton);
577	839	*/
	840	+ cGridBag copyOptionsPanel = new cGridBag();
	841	+
	842	+ copyOptionsPanel.preferredHeight = 2;
	843	+
578	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	845
580	846	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	847	//minButton.setToolTipText("Minimize window");
582	848	//minButton.addActionListener(this);
583	849
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	850	+ if (Globals.ADVANCED)
	851	+ {
	852	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	853	+ maxButton.setToolTipText("Maximize window");
	854	+ maxButton.addActionListener(this);
	855	+ }
587	856
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	857	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	858	fullButton.setToolTipText("Full-screen window");
590	859	fullButton.addActionListener(this);
591	860
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
	861	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	862	+ screenfitButton.setToolTipText("Screen fit");
	863	+ screenfitButton.addActionListener(this);
	864	+
	865	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	866	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	867	+ restoreCameraButton.addActionListener(this);
595	868
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
599		-
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
	869	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	870	+ saveButton.setToolTipText("New version");
602	871	saveButton.addActionListener(this);
	872	+
	873	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	874	+ undoButton.setToolTipText("Previous version");
	875	+ undoButton.addActionListener(this);
	876	+ undoButton.setEnabled(false);
603	877
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	878	+ cGridBag updown = new cGridBag().setVertical(true);
	879	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	880	+ restoreButton.setToolTipText("Restore current");
	881	+ restoreButton.addActionListener(this);
	882	+ restoreButton.setEnabled(false);
	883	+
	884	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	885	+ replaceButton.setToolTipText("Replace current");
	886	+ replaceButton.addActionListener(this);
	887	+ replaceButton.setEnabled(false);
	888	+
	889	+ copyOptionsPanel.add(updown);
	890	+
	891	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	892	+ redoButton.setToolTipText("Next version");
	893	+ redoButton.addActionListener(this);
	894	+ redoButton.setEnabled(false);
	895	+
	896	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
605	897	liveCB.setToolTipText("Enable animation");
606	898	liveCB.addItemListener(this);
607	899
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	900	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	901	oneStepButton.setToolTipText("Animate one step forward");
610	902	oneStepButton.addActionListener(this);
611	903
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	904	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	905	fastCB.setToolTipText("Fast mode");
614	906	fastCB.addItemListener(this);
615	907
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);
	908	+ //oe.toolboxPanel.Return();
	909	+
	910	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	911	+// trackCB.setToolTipText("Enable tracking");
	912	+// trackCB.addItemListener(this);
623	913
624	914	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	915	// screenfitpointButton.addActionListener(this);
..	..	@@ -629,67 +919,155 @@
629	919	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	920	snapobjectButton.addActionListener(this);
631	921	snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	924	+ fourButton.addActionListener(this);
	925	+ fourButton.setToolTipText("Show control panel only");
632	926	}
633	927
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	928	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	929
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");
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
642	932	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");
	933	+ this.fullscreenLayout = twoButton;
	934	+
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
651	937	threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
655	944	//
656	945
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
659	948	rootButton.addActionListener(this);
660	949
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	951	closeButton.setToolTipText("Close tab");
663	952	closeButton.addActionListener(this);
664	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	954	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	955	+
	956	+ cGridBag row1 = new cGridBag();
668	957
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	958	+ // INSERT
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	960	+ gridButton.setToolTipText("Create grid");
	961	+ gridButton.addActionListener(this);
	962	+
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	964	+ boxButton.setToolTipText("Create box");
	965	+ boxButton.addActionListener(this);
	966	+
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	968	+ sphereButton.setToolTipText("Create sphere");
	969	+ sphereButton.addActionListener(this);
	970	+
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	972	+ coneButton.setToolTipText("Create cone");
	973	+ coneButton.addActionListener(this);
	974	+
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	976	+ torusButton.setToolTipText("Create torus");
	977	+ torusButton.addActionListener(this);
	978	+
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	980	+ superButton.setToolTipText("Create superellipsoid");
	981	+ superButton.addActionListener(this);
	982	+
	983	+ if (Globals.ADVANCED)
	984	+ {
	985	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	986	+ kleinButton.setToolTipText("Create Klein bottle");
	987	+ kleinButton.addActionListener(this);
	988	+ }
	989	+
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	991	+ particlesButton.setToolTipText("Create particle system");
	992	+ particlesButton.addActionListener(this);
	993	+
	994	+ oe.toolboxPanel.add(row1);
	995	+
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ groupButton.setToolTipText("Create group");
	1000	+ groupButton.addActionListener(this);
	1001	+
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1003	+ compositeButton.setToolTipText("Create composite");
	1004	+ compositeButton.addActionListener(this);
	1005	+
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ switchButton.setToolTipText("Create item switcher");
	1008	+ switchButton.addActionListener(this);
	1009	+
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+ loopButton.setToolTipText("Create loop");
	1012	+ loopButton.addActionListener(this);
	1013	+
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ textureButton.setToolTipText("Create texture");
	1016	+ textureButton.addActionListener(this);
	1017	+
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ overlayButton.setToolTipText("Create overlay");
	1020	+ overlayButton.addActionListener(this);
	1021	+
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1023	+ lightButton.setToolTipText("Create light");
	1024	+ lightButton.addActionListener(this);
	1025	+
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
	1040	+
	1041	+ // EDIT panel
	1042	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1043	+ editButton.setToolTipText("Pin selection controls");
671	1044	editButton.addActionListener(this);
672	1045
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1046	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ uneditButton.setToolTipText("Remove selection controls");
675	1048	uneditButton.addActionListener(this);
676	1049
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1050	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1051	+ allParamsButton.setToolTipText("Show all controle");
679	1052	allParamsButton.addActionListener(this);
680	1053
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	1055	clearPanelButton.setToolTipText("Clear edit panel");
683	1056	clearPanelButton.addActionListener(this);
684	1057
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	1059	unselectButton.setToolTipText("Unselect");
687	1060	unselectButton.addActionListener(this);
688	1061
689		- commandsPanel.preferredHeight = 1;
	1062	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ flashSelectionButton.setToolTipText("Highlight selection");
	1064	+ flashSelectionButton.addActionListener(this);
690	1065
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1066	+ editCommandsPanel.preferredHeight = 1;
	1067	+
	1068	+ SetPinStates(false);
	1069	+// oe.treePanel.add(commandsPanel);
	1070	+// oe.treePanel.Return();
693	1071
694	1072	// oe.aConstraints.gridx += 1;
695	1073	// oe.aConstraints.weighty = 0;
..	..	@@ -706,32 +1084,20 @@
706	1084
707	1085	JScrollPane jSP;
708	1086	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1087	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1088	ResetModel();
711	1089
712	1090	oe.treePanel.add(jSPPanel);
713	1091	oe.treePanel.Return();
714	1092
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	1093	oe.treePanel.add(copyOptionsPanel);
731	1094	oe.treePanel.Return();
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1097	+ sliderPane.preferredHeight = 1;
732	1098
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
735	1101
736	1102	//jList.addListSelectionListener(this);
737	1103	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1105,7 @@
739	1105	//jTree.setEditable(true);
740	1106	oe.jTree.setDragEnabled(true);
741	1107	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1109
744	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1111
..	..	@@ -751,29 +1117,49 @@
751	1117	dgr.addDragGestureListener(this);
752	1118	}catch(Exception e) {}
753	1119	*/
754		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
755	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1122	}
757	1123
758	1124	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1125	{
	1126	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1127	+ colorCB.setToolTipText("Copy color when dropped");
	1128	+ colorCB.addItemListener(this);
	1129	+
	1130	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1131	+ materialCB.setToolTipText("Copy material when dropped");
	1132	+ materialCB.addItemListener(this);
	1133	+
	1134	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1135	+ textureCB.setToolTipText("Copy texture when dropped");
	1136	+ textureCB.addItemListener(this);
	1137	+
	1138	+ panel.Return();
	1139	+
760	1140	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1141	boxCB.setToolTipText("Display bounding boxes");
762	1142	boxCB.addItemListener(this);
763	1143
764	1144	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1145	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1146	zoomBoxCB.addItemListener(this);
767	1147
768	1148	if (true) // Globals.ADVANCED)
769	1149	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1150	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1151	+// supportCB.setToolTipText("Enable rigging");
	1152	+// supportCB.addItemListener(this);
	1153	+
	1154	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1155	+ freezeCB.setToolTipText("Fast moving camera");
	1156	+ freezeCB.addItemListener(this);
773	1157
774	1158	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1159	// localCB.addItemListener(this);
776	1160
	1161	+ panel.Return();
	1162	+
777	1163	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1164	crowdCB.setToolTipText("Used for crowds");
779	1165	crowdCB.addItemListener(this);
..	..	@@ -790,6 +1176,8 @@
790	1176	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1177	// speakerMocapCB.addItemListener(this);
792	1178
	1179	+ panel.Return();
	1180	+
793	1181	if (false)
794	1182	{
795	1183	// handled in scripts
..	..	@@ -804,34 +1192,74 @@
804	1192	//constraints.gridy += 1;
805	1193	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1194	smoothfocusCB.addItemListener(this);
	1195	+ panel.Return();
807	1196	}
808	1197
809	1198	//constraints.gridx += 1;
810	1199	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1200	// debugCB.addItemListener(this);
812	1201
	1202	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1203	+ trackCB.setToolTipText("Enable tracking target");
	1204	+ trackCB.addItemListener(this);
	1205	+
813	1206	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1207	+ oeilCB.setToolTipText("Move camera when tracking");
814	1208	oeilCB.addItemListener(this);
815	1209
	1210	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1211	+ shadowCB.setToolTipText("When live compute shadows");
	1212	+ shadowCB.addItemListener(this);
	1213	+
	1214	+ panel.Return();
	1215	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1216	+ toggleTextureCB.setToolTipText("Load textures");
	1217	+ toggleTextureCB.addItemListener(this);
	1218	+
	1219	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1220	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1221	+ toggleSwitchCB.addItemListener(this);
	1222	+
	1223	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1224	+ autokeepCB.setToolTipText("On structure change");
	1225	+ autokeepCB.addItemListener(this);
	1226	+
	1227	+ panel.Return();
	1228	+ if (Globals.ADVANCED)
	1229	+ {
816	1230	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1231	lookAtCB.setToolTipText("Look-at target");
818	1232	lookAtCB.addItemListener(this);
	1233	+ }
819	1234
820	1235	}
821	1236
822	1237	cGridBag fill = new cGridBag();
823		-
824	1238	fill.preferredHeight = 200;
	1239	+ cGridBag fill2 = new cGridBag();
	1240	+ fill2.preferredHeight = 200;
	1241	+ cGridBag fill3 = new cGridBag();
	1242	+ fill3.preferredHeight = 200;
825	1243
826	1244	panel.add(fill);
	1245	+ panel.add(fill2);
	1246	+ panel.add(fill3);
827	1247
828	1248	}
829	1249
830	1250	void EditObject(Object3D obj)
831	1251	{
832	1252	cRadio radioButton = new cRadio(obj.name);
	1253	+
	1254	+ // June 2019. Patch to avoid bug with transparency.
	1255	+ radioButton.hadMaterial = obj.material != null;
	1256	+ if (!radioButton.hadMaterial)
	1257	+ {
	1258	+ obj.material = new cMaterial();
	1259	+ }
	1260	+
833	1261	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
835	1263	radioButton.SetCamera(cameraView.renderCamera, false);
836	1264	radioButton.addActionListener(this);
837	1265	radioPanel.add(radioButton);
..	..	@@ -851,23 +1279,28 @@
851	1279	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1280	}
853	1281
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;
	1282	+ cToggleButton liveCB;
	1283	+ cCheckBox supportCB;
	1284	+ cCheckBox localCB;
	1285	+ cCheckBox crowdCB;
	1286	+ cCheckBox smoothCB;
	1287	+ cToggleButton fastCB;
	1288	+ cCheckBox slowCB;
	1289	+ cCheckBox boxCB;
	1290	+ cCheckBox zoomBoxCB;
	1291	+ cCheckBox freezeCB;
	1292	+ //cToggleButton trackCB;
	1293	+ cCheckBox trackCB;
	1294	+ cCheckBox smoothfocusCB;
865	1295	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1296	+ cCheckBox speakerCameraCB;
	1297	+ cCheckBox speakerFocusCB;
	1298	+ cCheckBox debugCB;
	1299	+
	1300	+ cCheckBox oeilCB;
	1301	+ cCheckBox shadowCB;
	1302	+ cCheckBox autokeepCB;
	1303	+ cCheckBox lookAtCB;
871	1304
872	1305	// static int COLOR = 1;
873	1306	// static int MATERIAL = 2;
..	..	@@ -875,9 +1308,9 @@
875	1308
876	1309	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1310
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1311	+ cCheckBox colorCB;
	1312	+ cCheckBox materialCB;
	1313	+ cCheckBox textureCB;
881	1314
882	1315	public void itemStateChanged(ItemEvent e)
883	1316	{
..	..	@@ -970,6 +1403,18 @@
970	1403	{
971	1404	cameraView.ToggleOeil();
972	1405	}
	1406	+ else if(e.getSource() == shadowCB)
	1407	+ {
	1408	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1409	+ }
	1410	+ else if(e.getSource() == freezeCB)
	1411	+ {
	1412	+ Globals.FREEZEONMOVE ^= true;
	1413	+ }
	1414	+ else if(e.getSource() == autokeepCB)
	1415	+ {
	1416	+ Globals.REPLACEONMAKE ^= true;
	1417	+ }
973	1418	else if(e.getSource() == lookAtCB)
974	1419	{
975	1420	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1431,8 @@
986	1431
987	1432	/**/
988	1433	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1434	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1435	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1436	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1437	// We can't move the root node or an empty selection
992	1438	return;
..	..	@@ -1049,8 +1495,6 @@
1049	1495	}
1050	1496	}
1051	1497
1052		- String string = (String) object;
1053		-
1054	1498	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1499	// if( object instanceof java.io.File[])
1056	1500	// {
..	..	@@ -1058,6 +1502,8 @@
1058	1502	// objEditor.DropFile((java.io.File[]) object, true);
1059	1503	// return;
1060	1504	// }
	1505	+
	1506	+ String string = object.toString();
1061	1507
1062	1508	// File path for Mac and Windows
1063	1509	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1549,33 @@
1103	1549
1104	1550	assert target == objEditor.jTree;
1105	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
1106	1553	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1555	} catch (Exception e) {
1109	1556	System.out.println("destinationPath : " + destinationPath);
1110	1557	return;
1111	1558	}
1112	1559
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1560	+ for (int i=group.selection.size(); --i>=0;)
1114	1561	{
	1562	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1563	+
	1564	+ // Cannot move into itself
	1565	+ if (child == destinationLeaf)
	1566	+ return;
	1567	+ }
	1568	+
	1569	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1570	+// {
1115	1571	loadClipboard(true);
1116	1572	objEditor.jTree.setSelectionPath(destinationPath);
1117	1573	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1574	+// } else {
	1575	+// loadClipboard(false);
	1576	+// objEditor.jTree.setSelectionPath(destinationPath);
	1577	+// pasteInto(false, false); // true); // ???
	1578	+// }
1123	1579	}
1124	1580	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1581	// Called if the user has modified the current drop gesture
..	..	@@ -1224,22 +1680,30 @@
1224	1680	{
1225	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1682	//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);
	1683	+// gridItem = menu.add(new MenuItem("Grid"));
	1684	+// gridItem.addActionListener(this);
	1685	+// rectoidItem = menu.add(new MenuItem("Box"));
	1686	+// rectoidItem.addActionListener(this);
	1687	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1688	+// ellipsoidItem.addActionListener(this);
	1689	+// coneItem = menu.add(new MenuItem("Cone"));
	1690	+// coneItem.addActionListener(this);
	1691	+// torusItem = menu.add(new MenuItem("Torus"));
	1692	+// torusItem.addActionListener(this);
	1693	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1694	+// superItem.addActionListener(this);
	1695	+
	1696	+ cameraItem = menu.add(new MenuItem("Camera"));
	1697	+ cameraItem.addActionListener(this);
	1698	+
	1699	+ if (!Globals.ADVANCED)
	1700	+ {
1239	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1702	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
1243	1707	if (Globals.ADVANCED)
1244	1708	{
1245	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1729,15 @@
1265	1729	}
1266	1730	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1731	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);
	1732	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1733	+// overlayItem.addActionListener(this);
	1734	+// lightItem = menu.add(new MenuItem("Light"));
	1735	+// lightItem.addActionListener(this);
1272	1736	menu.add("-");
1273	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1738	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1277	1741	doubleItem = menu.add(new MenuItem("Fork"));
1278	1742	doubleItem.addActionListener(this);
1279	1743	if (Globals.ADVANCED)
..	..	@@ -1289,6 +1753,9 @@
1289	1753	animationItem.addItemListener(this);
1290	1754	animationItem.setState(Globals.ANIMATION);
1291	1755
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
	1758	+
1292	1759	menu.add("-");
1293	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	1761	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +1768,8 @@
1301	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	1769	reduce34MorphItem.addActionListener(this);
1303	1770	menu.add("-");
	1771	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1772	+ memoryItem.addActionListener(this);
1304	1773	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	1774	computeAOItem.addActionListener(this);
1306	1775
..	..	@@ -1309,8 +1778,6 @@
1309	1778	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	1779	mirrorItem.addActionListener(this);
1311	1780	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	1782	analyzeItem.addActionListener(this);
1316	1783	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +1921,34 @@
1454	1921	shadow.material = new cMaterial(obj.material);
1455	1922	shadow.material.diffuse = 0.0001f;
1456	1923	shadow.material.specular = 0.0001f;
	1924	+ //shadow.projectedVertices[1].x = 300;
1457	1925
1458	1926	makeSomething(shadow);
1459	1927	}
	1928	+
	1929	+ private void ClearUnpinned()
	1930	+ {
	1931	+ //for (Object3D obj : listUI)
	1932	+ for (int i=listUI.size(); --i>=0;)
	1933	+ {
	1934	+ Object3D obj = listUI.elementAt(i);
	1935	+ if (!obj.pinned)
	1936	+ {
	1937	+ obj.CloseUI();
	1938	+ listUI.remove(i);
	1939	+ }
	1940	+ }
	1941	+ }
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1460	1952
1461	1953	/**
1462	1954	* applyExample
..	..	@@ -1701,7 +2193,7 @@
1701	2193	{
1702	2194	ScreenFit();
1703	2195	} else
1704		- if (source == switchItem)
	2196	+ if (source == switchViewItem)
1705	2197	{
1706	2198	cVector v1 = new cVector();
1707	2199	cVector v2 = new cVector();
..	..	@@ -1710,11 +2202,11 @@
1710	2202	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2203	objEditor.cameraView.repaint();
1712	2204	} else
1713		- if (source == rectoidItem)
	2205	+ if (source == rectoidItem \|\| source == boxButton)
1714	2206	{
1715	2207	makeSomething(new Box());
1716	2208	} else
1717		- if (source == particleItem)
	2209	+ if (source == particleItem \|\| source == particlesButton)
1718	2210	{
1719	2211	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2212	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2285,27 @@
1793	2285
1794	2286	makeSomething(obj);
1795	2287	} else
1796		- if (source == gridItem)
	2288	+ if (source == gridItem \|\| source == gridButton)
1797	2289	{
1798	2290	makeSomething(new Grid());
1799	2291	} else
1800		- if (source == ellipsoidItem)
	2292	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2293	{
1802	2294	makeSomething(new Sphere());
1803	2295	} else
1804		- if (source == coneItem)
	2296	+ if (source == coneItem \|\| source == coneButton)
1805	2297	{
1806	2298	makeSomething(new Cone());
1807	2299	} else
1808		- if (source == torusItem)
	2300	+ if (source == torusItem \|\| source == torusButton)
1809	2301	{
1810	2302	makeSomething(new Torus());
1811	2303	} else
1812		- if (source == superItem)
	2304	+ if (source == superItem \|\| source == superButton)
1813	2305	{
1814	2306	makeSomething(new Superellipsoid());
1815	2307	} else
1816		- if (source == kleinItem)
	2308	+ if (source == kleinItem \|\| source == kleinButton)
1817	2309	{
1818	2310	makeSomething(new Klein());
1819	2311	} else
..	..	@@ -1833,7 +2325,7 @@
1833	2325	{
1834	2326	makeSomething(new BezierSurface());
1835	2327	} else
1836		- if (source == overlayItem)
	2328	+ if (source == overlayItem \|\| source == overlayButton)
1837	2329	{
1838	2330	/*
1839	2331	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2373,27 @@
1881	2373	s.setup();
1882	2374	makeSomething(s);
1883	2375	} else
1884		- if (source == lightItem)
	2376	+ if (source == lightItem \|\| source == lightButton)
1885	2377	{
1886	2378	makeSomething(new Light());
1887	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
1888	2397	if (source == csgItem)
1889	2398	{
1890	2399	group(new CSG());
..	..	@@ -1931,30 +2440,30 @@
1931	2440
1932	2441	group(g);
1933	2442	} else
1934		- if (source == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
1935	2444	{
1936	2445	Composite csg = new GroupLeaf();
1937	2446	csg.count = 5;
1938	2447	group(csg);
1939		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
1940	2449	csg.addChild(child);
1941	2450	child.addChild(csg);
1942	2451	} else
1943	2452	if (source == doubleItem)
1944	2453	{
1945		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
1946	2455	csg.count = 5;
1947	2456	group(csg);
1948		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
1949	2458	csg.addChild(child);
1950	2459	child.addChild(csg);
1951		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
1952	2461	csg.addChild(child);
1953	2462	child.addChild(csg);
1954	2463	} else
1955	2464	if (source == tripleItem)
1956	2465	{
1957		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
1958	2467	csg.count = 4;
1959	2468	group(csg);
1960	2469	Composite child = new cGroup();
..	..	@@ -1970,7 +2479,7 @@
1970	2479	if (source == computeAOItem)
1971	2480	{
1972	2481	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
1974	2483	} else
1975	2484	if (source == recompileItem)
1976	2485	{
..	..	@@ -2018,15 +2527,31 @@
2018	2527	} else
2019	2528	if (source == undoButton)
2020	2529	{
	2530	+ // Go to previous version
	2531	+ //if (!Undo())
	2532	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2021	2533	Undo();
	2534	+ } else
	2535	+ if (source == restoreButton)
	2536	+ {
	2537	+ // Restore current version
	2538	+ Restore();
	2539	+ } else
	2540	+ if (source == replaceButton)
	2541	+ {
	2542	+ // Overwrite current version
	2543	+ Replace();
2022	2544	} else
2023	2545	if (source == redoButton)
2024	2546	{
	2547	+ // Go to next version
2025	2548	Redo();
2026	2549	} else
2027	2550	if (source == saveButton)
2028	2551	{
2029		- Save();
	2552	+ // Save a new version
	2553	+ if (!Save(true))
	2554	+ java.awt.Toolkit.getDefaultToolkit().beep();
2030	2555	} else
2031	2556	if (source == oneStepButton)
2032	2557	{
..	..	@@ -2035,17 +2560,14 @@
2035	2560	} else
2036	2561	if (source == screenfitButton)
2037	2562	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2563	ScreenFit();
2040	2564	} else
2041	2565	if (source == screenfitpointButton)
2042	2566	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2567	ScreenFitPoint();
2045	2568	} else
2046	2569	if (source == snapobjectButton)
2047	2570	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2571	SnapObject();
2050	2572	} else
2051	2573	// if (event.getSource() == recompileButton)
..	..	@@ -2409,7 +2931,7 @@
2409	2931	{
2410	2932	StepAll();
2411	2933	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	2935	{
2414	2936	//int indices[] = jList.getSelectedIndices();
2415	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +2943,9 @@
2421	2943	{
2422	2944	ClearSelection(true);
2423	2945	} else
2424		- if (source == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2425	2947	{
2426		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2427	2949	} else
2428	2950	if (source == hideItem)
2429	2951	{
..	..	@@ -2441,11 +2963,11 @@
2441	2963	{
2442	2964	makeSomething(new Camera());
2443	2965	} else
2444		- if (source == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2445	2967	{
2446	2968	group(new Composite());
2447	2969	} else
2448		- if (source == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2449	2971	{
2450	2972	RandomNode random = new RandomNode();
2451	2973	group(random);
..	..	@@ -2547,7 +3069,7 @@
2547	3069	{
2548	3070	group(new cLinker());
2549	3071	} else
2550		- if (source == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2551	3073	{
2552	3074	group(new TextureNode());
2553	3075	} else
..	..	@@ -2567,17 +3089,30 @@
2567	3089	{
2568	3090	CastShadow(2);
2569	3091	} else
2570		- if (source == ungroupItem)
	3092	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3093	{
2572		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2573	3096	for (int i=0; i<group.selection.size(); i++)
2574	3097	{
2575		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2576	3103	}
2577	3104
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3105	+ if (!hasRoot)
	3106	+ {
	3107	+ for (int i=0; i<group.selection.size(); i++)
	3108	+ {
	3109	+ Ungroup(group.selection.get(i));
	3110	+ }
	3111	+
	3112	+ ClearSelection(false);
	3113	+
	3114	+ refreshContents();
	3115	+ }
2581	3116	} else
2582	3117	if (source == genUVItem)
2583	3118	{
..	..	@@ -2878,7 +3413,7 @@
2878	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3414	{
2880	3415	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2882	3417	}
2883	3418
2884	3419	refreshContents();
..	..	@@ -2894,6 +3429,31 @@
2894	3429
2895	3430	refreshContents();
2896	3431	} else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
	3455	+ refreshContents();
	3456	+ } else
2897	3457	if (source == flashSelectionButton)
2898	3458	{
2899	3459	CameraPane.flash = true;
..	..	@@ -2905,6 +3465,10 @@
2905	3465	if (source == twoButton)
2906	3466	{
2907	3467	radio.layout = twoButton;
	3468	+
	3469	+ if (CameraPane.FULLSCREEN)
	3470	+ fullscreenLayout = radio.layout;
	3471	+
2908	3472	// bug
2909	3473	//gridPanel.setDividerLocation(1.0);
2910	3474	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2960,6 +3524,9 @@
2960	3524	{
2961	3525	radio.layout = threeButton;
2962	3526
	3527	+ if (CameraPane.FULLSCREEN)
	3528	+ fullscreenLayout = radio.layout;
	3529	+
2963	3530	// bigThree.remove(scenePanel);
2964	3531	// bigThree.remove(centralPanel);
2965	3532	// bigThree.remove(XYZPanel);
..	..	@@ -2988,8 +3555,8 @@
2988	3555	// centralPanel.setVisible(true);
2989	3556	// XYZPanel.setVisible(true);
2990	3557	bigThree.ClearUI();
	3558	+ bigThree.add(scenePanel);
2991	3559	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3560	bigThree.FlushUI();
2994	3561
2995	3562	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3564,9 @@
2997	3564	if (source == fourButton)
2998	3565	{
2999	3566	radio.layout = fourButton;
	3567	+
	3568	+ if (CameraPane.FULLSCREEN)
	3569	+ fullscreenLayout = radio.layout;
3000	3570
3001	3571	// bigThree.remove(scenePanel);
3002	3572	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3605,9 @@
3035	3605	{
3036	3606	radio.layout = sixButton;
3037	3607
	3608	+ if (CameraPane.FULLSCREEN)
	3609	+ fullscreenLayout = radio.layout;
	3610	+
3038	3611	// bigThree.remove(scenePanel);
3039	3612	// bigThree.remove(centralPanel);
3040	3613	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3636,8 @@
3063	3636	// centralPanel.setVisible(true);
3064	3637	// XYZPanel.setVisible(false);
3065	3638	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3639	bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
3068	3641	bigThree.FlushUI();
3069	3642
3070	3643	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3645,9 @@
3072	3645	if (source == sevenButton)
3073	3646	{
3074	3647	radio.layout = sevenButton;
	3648	+
	3649	+ if (CameraPane.FULLSCREEN)
	3650	+ fullscreenLayout = radio.layout;
3075	3651
3076	3652	// bigThree.remove(scenePanel);
3077	3653	// bigThree.remove(centralPanel);
..	..	@@ -3128,12 +3704,19 @@
3128	3704	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3705	{
3130	3706	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3707	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3708	{
	3709	+ // Patch to avoid bug with transparency.
	3710	+ if (!ab.hadMaterial)
	3711	+ {
	3712	+ ab.object.material = null;
	3713	+ }
	3714	+
3133	3715	buttonGroup.remove(ab);
3134	3716	radioPanel.remove(ab);
3135	3717
3136		- ab.GetObject().editWindow = null;
	3718	+ //ab.GetObject().editWindow = null;
	3719	+ ab.GetObject().manipWindow = null;
3137	3720	// ab.GetObject().objectUI = null; // ?????????
3138	3721
3139	3722	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3729,12 @@
3146	3729	} else
3147	3730	if (source == editItem \|\| source == editButton)
3148	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
3149	3738	EditSelection(false);
3150	3739	} else
3151	3740	if (source == uneditButton)
..	..	@@ -3155,6 +3744,7 @@
3155	3744	Object3D child = (Object3D)e.nextElement();
3156	3745	if(child.editWindow != null)
3157	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
3158	3748	child.CloseUI();
3159	3749	listUI.remove(child);
3160	3750
..	..	@@ -3171,6 +3761,7 @@
3171	3761	//copy.ClearUI();
3172	3762	for (Object3D obj : listUI)
3173	3763	{
	3764	+ obj.pinned = false;
3174	3765	obj.CloseUI();
3175	3766	}
3176	3767	listUI.clear();
..	..	@@ -3180,7 +3771,7 @@
3180	3771	{
3181	3772	assert(copy == group);
3182	3773
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	3775
3185	3776	for (Object3D obj : listUI)
3186	3777	{
..	..	@@ -3229,6 +3820,9 @@
3229	3820	}
3230	3821
3231	3822	copy = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
3232	3826	//Globals.theRenderer.object = group;
3233	3827	if(!useclient)
3234	3828	{
..	..	@@ -3247,6 +3841,7 @@
3247	3841
3248	3842	// fix "+" issue
3249	3843	//group.editWindow = this;
	3844	+ group.manipWindow = this;
3250	3845
3251	3846	/*
3252	3847	currentLayout = radio.layout;
..	..	@@ -3254,6 +3849,13 @@
3254	3849	currentLayout = sevenButton;
3255	3850	*/
3256	3851	radio.layout.doClick();
	3852	+
	3853	+ ClearUnpinned();
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
	3858	+ EditSelection(false);
3257	3859	keepparent = group.parent;
3258	3860	// PARENT = NULL or not???
3259	3861	//group.parent = null; // ROOT
..	..	@@ -3267,7 +3869,7 @@
3267	3869	cameraView.ProtectCamera();
3268	3870	cameraView.repaint();
3269	3871	return;
3270		- } else if (event.getSource() == revertCameraItem)
	3872	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	3873	{
3272	3874	cameraView.RevertCamera();
3273	3875	cameraView.repaint();
..	..	@@ -3846,7 +4448,7 @@
3846	4448
3847	4449	try
3848	4450	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4452	}
3851	4453	catch (Exception e)
3852	4454	{
..	..	@@ -4321,28 +4923,25 @@
4321	4923	// }
4322	4924	// }
4323	4925
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	4926	void EditSelection(boolean newWindow)
4329	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
4330	4934	// aConstraints.gridy = 0;
4331	4935	for (int i=0; i<group.selection.size(); i++)
4332	4936	{
4333	4937	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	4938	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4939	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	4940
4337	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	4942	if(elem != group \|\| !newWindow)
4339	4943	{
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
	4944	+ EditElement(elem, newWindow); // ? new
4346	4945	}
4347	4946	}
4348	4947	}
..	..	@@ -4417,7 +5016,8 @@
4417	5016	//new Exception().printStackTrace();
4418	5017
4419	5018	freezemodel = true;
4420		-
	5019	+ ClearUnpinned();
	5020	+
4421	5021	/**/
4422	5022	//switch (event.id)
4423	5023	{
..	..	@@ -4450,7 +5050,7 @@
4450	5050	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5051	// a camera
4452	5052	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5053	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	5054	{
4455	5055	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5056	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5059,13 @@
4459	5059	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5060	}
4461	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4462	5069	refreshContents();
4463	5070	//return true;
4464	5071	}
..	..	@@ -4468,9 +5075,18 @@
4468	5075	freezemodel = false;
4469	5076	}
4470	5077
	5078	+ void SetPinStates(boolean enabled)
	5079	+ {
	5080	+ editButton.setEnabled(enabled);
	5081	+ uneditButton.setEnabled(enabled);
	5082	+ unselectButton.setEnabled(enabled);
	5083	+ flashSelectionButton.setEnabled(enabled);
	5084	+ }
	5085	+
4471	5086	void refreshContents(boolean cp)
4472	5087	{
4473		- if (!Globals.MOUSEDRAGGED)
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5089	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5090	{
4475	5091	objEditor.ClearInfo(); // .GetMaterial());
4476	5092
..	..	@@ -4569,7 +5185,8 @@
4569	5185
4570	5186	if (cut)
4571	5187	{
4572		- Save();
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4573	5190	//int indices[] = jList.getSelectedIndices();
4574	5191	//for (int i = indices.length - 1; i >= 0; i--)
4575	5192	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5289,10 @@
4672	5289
4673	5290	void paste(boolean expand)
4674	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4675	5296	// if (GrafreeD.clipboard == null)
4676	5297	// return;
4677	5298	boolean first = true;
..	..	@@ -4731,6 +5352,7 @@
4731	5352	Grafreed.clipboard.get(0).parent = keepparent;
4732	5353	}
4733	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4734	5356	ResetModel();
4735	5357	refreshContents();
4736	5358	}
..	..	@@ -4866,6 +5488,10 @@
4866	5488
4867	5489	void group(Object3D csg, boolean grab)
4868	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4869	5495	if (//false) // why??
4870	5496	!group.selection.isEmpty())
4871	5497	{
..	..	@@ -4979,10 +5605,15 @@
4979	5605	//node.add(csg);
4980	5606	//makeSomething(node);
4981	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
4982	5609	}
4983	5610
4984	5611	void Ungroup(Object3D g)
4985	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
4986	5617	if (g instanceof HiddenObject)
4987	5618	{
4988	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5630,7 @@
4999	5630	objEditor.makeSomething(g.get(i), false);
5000	5631	}
5001	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
5002	5634	}
5003	5635
5004	5636	void ungroup()
..	..	@@ -5287,13 +5919,44 @@
5287	5919	cButton clearpanelButton;
5288	5920	cButton unselectButton;
5289	5921
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
	5922	+ cButton restoreCameraButton;
	5923	+
5295	5924	cButton saveButton;
5296	5925	cButton oneStepButton;
	5926	+
	5927	+ cButton groupButton;
	5928	+ cButton ungroupButton;
	5929	+ cButton compositeButton;
	5930	+ cButton switchButton;
	5931	+ cButton loopButton;
	5932	+ cButton textureButton;
	5933	+
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
	5949	+
	5950	+ cButton gridButton;
	5951	+ cButton boxButton;
	5952	+ cButton sphereButton;
	5953	+ cButton coneButton;
	5954	+ cButton torusButton;
	5955	+ cButton superButton;
	5956	+ cButton kleinButton;
	5957	+ cButton particlesButton;
	5958	+ cButton overlayButton;
	5959	+ cButton lightButton;
5297	5960
5298	5961	cButton screenfitButton;
5299	5962	cButton screenfitpointButton;
..	..	@@ -5315,11 +5978,11 @@
5315	5978	//JTree jTree;
5316	5979	private MenuItem lookAtItem;
5317	5980	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
5319	5982	private MenuItem cutItem;
5320	5983	private MenuItem undoItem;
5321	5984	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
	5985	+ private JMenuItem duplicateItem;
5323	5986	private MenuItem cloneItem;
5324	5987	private MenuItem cloneSupportItem;
5325	5988	private MenuItem overwriteGeoItem;
..	..	@@ -5347,7 +6010,7 @@
5347	6010	private MenuItem pasteLinkItem;
5348	6011	private MenuItem pasteCloneItem;
5349	6012	private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5351	6014	private MenuItem clearAllItem;
5352	6015	private MenuItem genUVItem;
5353	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5407,7 +6070,7 @@
5407	6070	private MenuItem frontItem;
5408	6071	private MenuItem cameraItem;
5409	6072	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
5411	6074	private MenuItem physicsItem;
5412	6075	private MenuItem frameselectorItem;
5413	6076	private MenuItem scriptNodeItem;
..	..	@@ -5431,6 +6094,8 @@
5431	6094	private MenuItem attachBumpItem;
5432	6095	private MenuItem detachBumpItem;
5433	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5434	6099
5435	6100	private MenuItem particleItem;
5436	6101	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6146,5 @@
5481	6146
5482	6147	Menu cameraMenu;
5483	6148	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6149	+ MenuItem restoreCameraItem;
5485	6150	}