~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -28,9 +29,9 @@
28	29	{
29	30	cButton skyboxButton;
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31		- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
32	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
34	35	skyboxButton.addActionListener(new ActionListener()
35	36	{
36	37	@Override
..	..	@@ -41,6 +42,22 @@
41	42	});
42	43	}
43	44
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
44	61	public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45	62	{
46	63	cGridBag tab0 = new cGridBag().setVertical(true);
..	..	@@ -56,11 +73,11 @@
56	73	cGridBag row5 = new cGridBag();
57	74	cGridBag row6 = new cGridBag();
58	75
59		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
60	77	//AddSkyboxButton("default", "cornell", row0);
61	78	AddSkyboxButton("penguins", "dust", row0);
62	79	AddSkyboxButton("penguins", "tropic", row0);
63		- AddSkyboxButton("default", "skycube", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
64	81
65	82	AddSkyboxButton("default", "uffizi", row1);
66	83	AddSkyboxButton("bridge", "Bridge", row1);
..	..	@@ -90,7 +107,7 @@
90	107	AddSkyboxButton("park", "Skansen3", row6);
91	108	AddSkyboxButton("park", "Skansen4", row6);
92	109	AddSkyboxButton("park", "Skansen5", row6);
93		- AddSkyboxButton("park", "Stairs", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94	111
95	112	tab0.add(row0);
96	113	tab0.add(row1);
..	..	@@ -144,21 +161,18 @@
144	161
145	162	AddSkyboxButton("mountain", "Maskonaive2", row4);
146	163	AddSkyboxButton("mountain", "Maskonaive3", row4);
147		- AddSkyboxButton("mountain", "Ryfjallet", row4);
148	164	AddSkyboxButton("mountain", "Teide", row4);
149	165	AddSkyboxButton("park", "Tantolunden4", row4);
150	166
151		- AddSkyboxButton("penguins", "wrath", row5);
152		- AddSkyboxButton("penguins", "yonder", row5);
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
153	169	AddSkyboxButton("rocky", "Langholmen", row5);
154	170	AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155		- AddSkyboxButton("rocky", "Tantolunden6", row5);
156	171
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
157	173	AddSkyboxButton("default", "CloudyHills", row6);
158	174	AddSkyboxButton("daz", "Autumn", row6);
159		- AddSkyboxButton("daz", "Greenlands", row6);
160	175	AddSkyboxButton("daz", "MountainTrail", row6);
161		- AddSkyboxButton("daz", "Oasis", row6);
162	176	/*
163	177	Autumn
164	178	Greenlands
..	..	@@ -210,8 +224,8 @@
210	224	AddSkyboxButton("penguins", "sleepyhollow", row1);
211	225
212	226	AddSkyboxButton("penguins", "kenon_star", row2);
213		- AddSkyboxButton("indoors", "DallasW", row2);
214		- AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
215	229	AddSkyboxButton("indoors", "Vasa", row2);
216	230
217	231	AddSkyboxButton("winter", "Backyard", row3);
..	..	@@ -232,7 +246,7 @@
232	246	AddSkyboxButton("daz", "TheRock", row6);
233	247	AddSkyboxButton("daz", "TopOfTheWorld", row6);
234	248	AddSkyboxButton("daz", "Winter", row6);
235		- AddSkyboxButton("penguins", "desertdawn", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
236	250
237	251	tab0.add(row0);
238	252	tab0.add(row1);
..	..	@@ -248,15 +262,112 @@
248	262	//tab0.add(new cGridBag());
249	263	}
250	264	}
251		-
252		- public void ChangeSkybox(String name)
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
253	267	{
254		- cameraView.envyoff = false;
255		- cameraView.skyboxname = name;
256		- cameraView.skyboxext = "jpg";
257		- cameraView.repaint();
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
258	358	}
259	359
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
260	371	//ObjEditor objEditor;
261	372	public void closeUI2()
262	373	{
..	..	@@ -294,11 +405,15 @@
294	405	this.copy = this.group = group;
295	406	//selectees = this.group.selectees;
296	407
297		- if (copy.versions == null)
298		- {
299		- copy.versions = new byte[100][];
300		- copy.versionindex = -1;
301		- }
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
302	417
303	418	if(ui)
304	419	SetupUI(objEditor);
..	..	@@ -321,13 +436,13 @@
321	436
322	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323	438
324		- if (copy.versions == null)
325		- {
326		- copy.versions = new byte[100][];
327		- copy.versionindex = -1;
328		-
329		- Save(true);
330		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
331	446	}
332	447
333	448	void CloneSelection(boolean supports)
..	..	@@ -368,11 +483,16 @@
368	483
369	484	Object3D parent = obj.parent;
370	485	obj.parent = null;
	486	+
371	487	// Object3D support = obj.support;
372	488	// obj.support = null;
373	489	if (!supports)
374	490	obj.SaveSupports();
	491	+
375	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
376	496	obj.parent = parent;
377	497	// obj.support = support;
378	498	// clone.support = support; // aout 2013
..	..	@@ -417,33 +537,37 @@
417	537	// menu.add("-");
418	538	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
419	539	duplicateItem.addActionListener(this);
420		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
421	542	cloneItem.addActionListener(this);
422		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
423	544	{
424	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
425	546	cloneSupportItem.addActionListener(this);
426	547	}
	548	+ oe.jTree.popup.addSeparator();
427	549	menu.add("-");
428		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
429	551	cutItem.addActionListener(this);
430		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
431	553	copyItem.addActionListener(this);
432	554	pasteItem = menu.add(new MenuItem("Paste"));
433	555	pasteItem.addActionListener(this);
434	556
435		- menu.add("-");
436		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
437	560	pasteIntoItem.addActionListener(this);
438		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
439	562	pasteLinkItem.addActionListener(this);
440		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
441	564	pasteCloneItem.addActionListener(this);
442		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
443		-// pasteExpandItem.addActionListener(this);
444		- menu.add("-");
445		- deleteItem = menu.add(new MenuItem("Delete"));
446		- deleteItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
447	571
448	572	if (Globals.ADVANCED)
449	573	{
..	..	@@ -529,11 +653,9 @@
529	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
530	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
531	655	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
532		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
533	656	oe.cameraMenu.add("-");
534	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
535	658	openWindowItem.addActionListener(this);
536		- editLeafItem.addActionListener(this);
537	659	lookAtItem.addActionListener(this);
538	660	//lookFromItem.addActinoListener(this);
539	661	//switchViewItem.addActionListener(this);
..	..	@@ -580,9 +702,8 @@
580	702	setMasterItem.addActionListener(this);
581	703	}
582	704
583		- oe.menuBar.add(menu = new Menu("Group"));
584		-// grabItem = menu.add(new MenuItem("Grab"));
585		-// grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
586	707	backItem = menu.add(new MenuItem("Back"));
587	708	backItem.addActionListener(this);
588	709	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -590,13 +711,21 @@
590	711	// compositeItem = menu.add(new MenuItem("Composite"));
591	712	// compositeItem.addActionListener(this);
592	713
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
593	717	if (Globals.ADVANCED)
594	718	{
595	719	hideItem = menu.add(new MenuItem("Hidden Group"));
596	720	hideItem.addActionListener(this);
597	721	}
598		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
599	723	ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
600	729
601	730	// menu.add("-");
602	731	//
..	..	@@ -633,9 +762,9 @@
633	762	shadowYItem.addActionListener(this);
634	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
635	764	shadowZItem.addActionListener(this);
	765	+
636	766	attributeItem = menu.add(new MenuItem("Attribute"));
637	767	attributeItem.addActionListener(this);
638		-
639	768	if (Globals.ADVANCED)
640	769	{
641	770	menu.add("-");
..	..	@@ -647,11 +776,18 @@
647	776	pointflowItem.addActionListener(this);
648	777	}
649	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
650	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
651	787	resetTransformItem.addActionListener(this);
652	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
653	789	resetCentroidItem.addActionListener(this);
654		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
655	791	resetCentroidXZItem.addActionListener(this);
656	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
657	793	transformGeometryItem.addActionListener(this);
..	..	@@ -667,7 +803,7 @@
667	803	genNormalsCADItem.addActionListener(this);
668	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
669	805	genNormalsMESHItem.addActionListener(this);
670		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
671	807	{
672	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
673	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -703,6 +839,8 @@
703	839	}
704	840
705	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
706	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
707	845	clearMaterialsItem.addActionListener(this);
708	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -725,9 +863,9 @@
725	863	hideleavesItem.addActionListener(this);
726	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
727	865	showleavesItem.addActionListener(this);
728		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
729	867	markleavesItem.addActionListener(this);
730		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
731	869	unmarkleavesItem.addActionListener(this);
732	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
733	871	rewindleavesItem.addActionListener(this);
..	..	@@ -781,6 +919,9 @@
781	919	shareGeometriesItem.addActionListener(this);
782	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
783	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
784	925	if (Globals.ADVANCED)
785	926	{
786	927	// Pretty much the same as duplicate and clone.
..	..	@@ -797,6 +938,84 @@
797	938	buildToolsMenu(menu);
798	939	}
799	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
800	1019
801	1020	void SetupUI2(ObjEditor oe)
802	1021	{
..	..	@@ -815,11 +1034,6 @@
815	1034	//new Exception().printStackTrace();
816	1035
817	1036	oe.radioPanel = new JPanel(new GridBagLayout());
818		- oe.aConstraints.weightx = 1;
819		- oe.aConstraints.weighty = 0;
820		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- oe.aConstraints.gridwidth = 100;
822		- oe.aConstraints.gridheight = 1;
823	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
824	1038
825	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -840,9 +1054,9 @@
840	1054	oe.radioPanel.add(dummyButton);
841	1055	oe.buttonGroup.add(dummyButton);
842	1056	*/
843		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
844	1058
845		- copyOptionsPanel.preferredHeight = 2;
	1059	+ versionManagerPanel.preferredHeight = 4;
846	1060
847	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
848	1062
..	..	@@ -852,58 +1066,102 @@
852	1066
853	1067	if (Globals.ADVANCED)
854	1068	{
855		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
856		- maxButton.setToolTipText("Maximize window");
857		- maxButton.addActionListener(this);
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
858	1072	}
859	1073
860		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
861		- fullButton.setToolTipText("Full-screen window");
862		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
863	1075
864		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
865	1118	screenfitButton.setToolTipText("Screen fit");
866	1119	screenfitButton.addActionListener(this);
867	1120
868		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
869	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
870	1123	restoreCameraButton.addActionListener(this);
871	1124
872		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873		- saveButton.setToolTipText("New version");
874		- saveButton.addActionListener(this);
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
875	1128
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);
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
880	1138
881	1139	cGridBag updown = new cGridBag().setVertical(true);
882		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883		- restoreButton.setToolTipText("Restore current");
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
884	1142	restoreButton.addActionListener(this);
885	1143	restoreButton.setEnabled(false);
886	1144
887		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888		- replaceButton.setToolTipText("Replace current");
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
889	1147	replaceButton.addActionListener(this);
890	1148	replaceButton.setEnabled(false);
891	1149
892		- copyOptionsPanel.add(updown);
	1150	+ versionManagerPanel.add(updown);
893	1151
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);
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oneStepButton.setToolTipText("Animate one step forward");
	1159	+ oneStepButton.addActionListener(this);
898	1160
899	1161	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
900	1162	liveCB.setToolTipText("Enable animation");
901	1163	liveCB.addItemListener(this);
902	1164
903		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
904		- oneStepButton.setToolTipText("Animate one step forward");
905		- oneStepButton.addActionListener(this);
906		-
907	1165	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
908	1166	fastCB.setToolTipText("Fast mode");
909	1167	fastCB.addItemListener(this);
..	..	@@ -919,150 +1177,139 @@
919	1177
920	1178	if (Globals.ADVANCED)
921	1179	{
922		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
923	1181	snapobjectButton.addActionListener(this);
924	1182	snapobjectButton.setToolTipText("Snap Object");
925	1183
926		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
927	1185	fourButton.addActionListener(this);
928	1186	fourButton.setToolTipText("Show control panel only");
929	1187	}
930	1188
931	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
932	1190
933		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
934		- twoButton.setToolTipText("Show 3D view only");
935		- twoButton.addActionListener(this);
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");
940		- threeButton.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);
947		- //
948	1191
949		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
950	1193	rootButton.setToolTipText("Open selection in new tab");
951	1194	rootButton.addActionListener(this);
952	1195
953		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
954	1197	closeButton.setToolTipText("Close tab");
955	1198	closeButton.addActionListener(this);
956	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
957	1200	//clearButton.addActionListener(this);
958	1201
959	1202	cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
960	1204
961	1205	// INSERT
962		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
963		- gridButton.setToolTipText("Create grid");
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
964	1208	gridButton.addActionListener(this);
965	1209
966		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
967	1211	boxButton.setToolTipText("Create box");
968	1212	boxButton.addActionListener(this);
969	1213
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);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
983	1215	superButton.setToolTipText("Create superellipsoid");
984	1216	superButton.addActionListener(this);
985	1217
986		- if (Globals.ADVANCED)
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
987	1231	{
988		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
989	1233	kleinButton.setToolTipText("Create Klein bottle");
990	1234	kleinButton.addActionListener(this);
991	1235	}
992	1236
993		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
994	1238	particlesButton.setToolTipText("Create particle system");
995	1239	particlesButton.addActionListener(this);
996	1240
997	1241	oe.toolboxPanel.add(row1);
998	1242
999	1243	cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
1000	1245
1001		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1002	1247	groupButton.setToolTipText("Create group");
1003	1248	groupButton.addActionListener(this);
1004	1249
1005		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1006	1251	compositeButton.setToolTipText("Create composite");
1007	1252	compositeButton.addActionListener(this);
1008	1253
1009		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1010	1255	switchButton.setToolTipText("Create item switcher");
1011	1256	switchButton.addActionListener(this);
1012	1257
1013		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1014	1259	loopButton.setToolTipText("Create loop");
1015	1260	loopButton.addActionListener(this);
1016	1261
1017		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1018	1263	textureButton.setToolTipText("Create texture");
1019	1264	textureButton.addActionListener(this);
1020	1265
1021		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1022	1267	overlayButton.setToolTipText("Create overlay");
1023	1268	overlayButton.addActionListener(this);
1024	1269
1025		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1026	1271	lightButton.setToolTipText("Create light");
1027	1272	lightButton.addActionListener(this);
1028	1273
1029	1274	oe.toolboxPanel.add(row2);
1030	1275
1031		- // ENVYMAPS
1032		- cGridBag skyboxpane = new cGridBag();
1033		- skyboxpane.preferredHeight = 100;
	1276	+ cGridBag textures = new cGridBag();
1034	1277
1035		- oe.toolboxPanel.add(skyboxpane);
	1278	+ CreateTexturePanel(textures);
1036	1279
1037		- JTabbedPane skyboxpanel = new JTabbedPane();
1038		- skyboxpane.add(skyboxpanel);
	1280	+ int tabCount = resourcecontainer.getTabCount();
1039	1281
1040		- AddSkyboxTab0(skyboxpanel);
1041		- AddSkyboxTab1(skyboxpanel);
1042		- AddSkyboxTab2(skyboxpanel);
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
1043	1290
1044	1291	// EDIT panel
1045		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1046	1293	editButton.setToolTipText("Pin selection controls");
1047	1294	editButton.addActionListener(this);
1048	1295
1049		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050		- uneditButton.setToolTipText("Remove selection controls");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1051	1298	uneditButton.addActionListener(this);
1052	1299
1053	1300	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1054		- allParamsButton.setToolTipText("Show all controle");
	1301	+ allParamsButton.setToolTipText("Show all controls");
1055	1302	allParamsButton.addActionListener(this);
1056	1303
1057		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
1059	1306	clearPanelButton.addActionListener(this);
1060	1307
1061		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1062		- unselectButton.setToolTipText("Unselect");
1063		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
1064	1311
1065		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1066	1313	flashSelectionButton.setToolTipText("Highlight selection");
1067	1314	flashSelectionButton.addActionListener(this);
1068	1315
..	..	@@ -1085,6 +1332,8 @@
1085	1332
1086	1333	cGridBag jSPPanel = new cGridBag();
1087	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
1088	1337	JScrollPane jSP;
1089	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1090	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1093,11 +1342,12 @@
1093	1342	oe.treePanel.add(jSPPanel);
1094	1343	oe.treePanel.Return();
1095	1344
1096		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
1097	1346	oe.treePanel.Return();
1098		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1099		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1100		- sliderPane.preferredHeight = 1;
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
1101	1351
1102	1352	// mainPanel.setDividerLocation(0.1); //1.0);
1103	1353	mainPanel.setResizeWeight(0.4);
..	..	@@ -1120,7 +1370,7 @@
1120	1370	dgr.addDragGestureListener(this);
1121	1371	}catch(Exception e) {}
1122	1372	*/
1123		- radio.layout = sixButton; // sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
1124	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1125	1375	}
1126	1376
..	..	@@ -1154,7 +1404,7 @@
1154	1404	// supportCB.setToolTipText("Enable rigging");
1155	1405	// supportCB.addItemListener(this);
1156	1406
1157		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1158	1408	freezeCB.setToolTipText("Fast moving camera");
1159	1409	freezeCB.addItemListener(this);
1160	1410
..	..	@@ -1163,42 +1413,44 @@
1163	1413
1164	1414	panel.Return();
1165	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
1166	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1167	1419	crowdCB.setToolTipText("Used for crowds");
1168	1420	crowdCB.addItemListener(this);
	1421	+ }
1169	1422
1170	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1171	1424	smoothCB.setToolTipText("Snapping delay");
1172	1425	smoothCB.addItemListener(this);
1173	1426
1174		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175		- slowCB.setToolTipText("Smooth interpolation");
1176		- slowCB.addItemListener(this);
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
1177	1433
1178		-// constraints.gridy += 1;
1179	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1180	1435	// speakerMocapCB.addItemListener(this);
1181	1436
1182		- panel.Return();
1183		-
1184	1437	if (false)
1185	1438	{
1186	1439	// handled in scripts
1187		- //constraints.gridy += 1;
1188	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1189	1441	speakerCameraCB.addItemListener(this);
1190	1442
1191		- //constraints.gridy += 1;
1192	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1193	1444	speakerFocusCB.addItemListener(this);
1194	1445
1195		- //constraints.gridy += 1;
1196		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1197		- smoothfocusCB.addItemListener(this);
1198	1446	panel.Return();
1199	1447	}
1200	1448
1201		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
1202	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1203	1455	// debugCB.addItemListener(this);
1204	1456
..	..	@@ -1252,6 +1504,14 @@
1252	1504
1253	1505	void EditObject(Object3D obj)
1254	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
1255	1515	cRadio radioButton = new cRadio(obj.name);
1256	1516
1257	1517	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1262,7 +1522,7 @@
1262	1522	}
1263	1523
1264	1524	radioButton.SetObject(obj);
1265		- radioButton.layout = sixButton; // sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
1266	1526	radioButton.SetCamera(cameraView.renderCamera, false);
1267	1527	radioButton.addActionListener(this);
1268	1528	radioPanel.add(radioButton);
..	..	@@ -1276,6 +1536,7 @@
1276	1536
1277	1537	oe.SetupViews();
1278	1538
	1539	+ if (Globals.DEBUG)
1279	1540	System.out.println("SetupViews");
1280	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1281	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1287,6 +1548,8 @@
1287	1548	cCheckBox localCB;
1288	1549	cCheckBox crowdCB;
1289	1550	cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
1290	1553	cToggleButton fastCB;
1291	1554	cCheckBox slowCB;
1292	1555	cCheckBox boxCB;
..	..	@@ -1357,6 +1620,12 @@
1357	1620	{
1358	1621	cameraView.ToggleInertia();
1359	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
1360	1629	}
1361	1630	else if(e.getSource() == localCB)
1362	1631	{
..	..	@@ -1634,7 +1903,12 @@
1634	1903	TreePath path;
1635	1904
1636	1905	public TransferableTreePath(TreePath tp) {
1637		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1638	1912	}
1639	1913
1640	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1815,7 +2089,7 @@
1815	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1816	2090	objEditor.ScreenFit(obj, false);
1817	2091
1818		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1819	2093	refreshContents();
1820	2094	}
1821	2095
..	..	@@ -1852,7 +2126,7 @@
1852	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1853	2127	}
1854	2128
1855		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1856	2130
1857	2131	shadow.toParent = LA.newMatrix();
1858	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1866,24 +2140,24 @@
1866	2140	switch(axis)
1867	2141	{
1868	2142	case 0 :
1869		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1870		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1871		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1872		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1873	2147	norm = cVector.X;
1874	2148	break;
1875	2149	case 1 :
1876		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1877		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1878		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1879		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1880	2154	norm = cVector.Y;
1881	2155	break;
1882	2156	case 2 :
1883		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1884		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1885		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1886		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1887	2161	norm = cVector.Z;
1888	2162	break;
1889	2163	}
..	..	@@ -1924,7 +2198,11 @@
1924	2198	shadow.material = new cMaterial(obj.material);
1925	2199	shadow.material.diffuse = 0.0001f;
1926	2200	shadow.material.specular = 0.0001f;
1927		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1928	2206
1929	2207	makeSomething(shadow);
1930	2208	}
..	..	@@ -2445,27 +2723,35 @@
2445	2723	} else
2446	2724	if (source == loopItem \|\| source == loopButton)
2447	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
2448	2728	Composite csg = new GroupLeaf();
2449		- csg.count = 5;
2450	2729	group(csg);
	2730	+ csg.count = 5;
2451	2731	Composite child = new cGroup("Branch");
2452	2732	csg.addChild(child);
2453	2733	child.addChild(csg);
	2734	+ }
2454	2735	} else
2455	2736	if (source == doubleItem)
2456	2737	{
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
2457	2740	Composite csg = new GroupLeaf("Fork");
2458		- csg.count = 5;
2459	2741	group(csg);
	2742	+ csg.count = 5;
2460	2743	Composite child = new cGroup("Branch A");
2461	2744	csg.addChild(child);
2462	2745	child.addChild(csg);
2463	2746	child = new cGroup("Branch B");
2464	2747	csg.addChild(child);
2465	2748	child.addChild(csg);
	2749	+ }
2466	2750	} else
2467	2751	if (source == tripleItem)
2468	2752	{
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
2469	2755	Composite csg = new GroupLeaf("Trident");
2470	2756	csg.count = 4;
2471	2757	group(csg);
..	..	@@ -2478,6 +2764,7 @@
2478	2764	child = new cGroup();
2479	2765	csg.addChild(child);
2480	2766	child.addChild(csg);
	2767	+ }
2481	2768	} else
2482	2769	if (source == computeAOItem)
2483	2770	{
..	..	@@ -2497,7 +2784,7 @@
2497	2784	if (source == invariantsItem)
2498	2785	{
2499	2786	System.out.println("Invariants:");
2500		- Grafreed.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
2501	2788	} else
2502	2789	if (source == memoryItem)
2503	2790	{
..	..	@@ -2524,37 +2811,56 @@
2524	2811	{
2525	2812	Maximize();
2526	2813	} else
2527		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2528	2815	{
2529	2816	ToggleFullScreen();
2530	2817	} else
2531		- if (source == undoButton)
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
2532	2831	{
2533	2832	// Go to previous version
2534	2833	//if (!Undo())
2535	2834	//java.awt.Toolkit.getDefaultToolkit().beep();
2536		- Undo();
	2835	+ PreviousVersion();
2537	2836	} else
2538	2837	if (source == restoreButton)
2539	2838	{
2540	2839	// Restore current version
2541	2840	Restore();
	2841	+ //restoreButton.setEnabled(false);
2542	2842	} else
2543	2843	if (source == replaceButton)
2544	2844	{
2545	2845	// Overwrite current version
2546	2846	Replace();
	2847	+ //replaceButton.setEnabled(false);
2547	2848	} else
2548		- if (source == redoButton)
	2849	+ if (source == nextVersionButton)
2549	2850	{
2550	2851	// Go to next version
2551		- Redo();
	2852	+ NextVersion();
2552	2853	} else
2553		- if (source == saveButton)
	2854	+ if (source == saveVersionButton)
2554	2855	{
2555	2856	// Save a new version
2556		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2557	2858	java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
2558	2864	} else
2559	2865	if (source == oneStepButton)
2560	2866	{
..	..	@@ -2609,11 +2915,11 @@
2609	2915	} else
2610	2916	if (source == undoItem)
2611	2917	{
2612		- Undo();
	2918	+ PreviousVersion();
2613	2919	} else
2614	2920	if (source == redoItem)
2615	2921	{
2616		- Redo();
	2922	+ NextVersion();
2617	2923	} else
2618	2924	if (source == duplicateItem)
2619	2925	{
..	..	@@ -3094,22 +3400,34 @@
3094	3400	} else
3095	3401	if (source == ungroupItem \|\| source == ungroupButton)
3096	3402	{
3097		- boolean hasRoot = false;
	3403	+ boolean canUngroup = true;
3098	3404
3099	3405	for (int i=0; i<group.selection.size(); i++)
3100	3406	{
3101		- if (group.selection.get(i) == group)
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
3102	3410	{
3103		- hasRoot = true;
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
3104	3420	break;
3105	3421	}
3106	3422	}
3107	3423
3108		- if (!hasRoot)
	3424	+ if (canUngroup)
3109	3425	{
3110	3426	for (int i=0; i<group.selection.size(); i++)
3111	3427	{
3112		- Ungroup(group.selection.get(i));
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
3113	3431	}
3114	3432
3115	3433	ClearSelection(false);
..	..	@@ -3160,6 +3478,10 @@
3160	3478	if (source == clearMaterialsItem)
3161	3479	{
3162	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
3163	3485	} else
3164	3486	if (source == liveleavesItem)
3165	3487	{
..	..	@@ -3300,6 +3622,18 @@
3300	3622	if (source == transformChildrenItem)
3301	3623	{
3302	3624	TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
3303	3637	} else
3304	3638	if (source == resetTransformItem)
3305	3639	{
..	..	@@ -3472,38 +3806,7 @@
3472	3806	if (CameraPane.FULLSCREEN)
3473	3807	fullscreenLayout = radio.layout;
3474	3808
3475		- // bug
3476		- //gridPanel.setDividerLocation(1.0);
3477		- //bigPanel.setDividerLocation(0.0);
3478		-// bigThree.remove(scenePanel);
3479		-// bigThree.remove(centralPanel);
3480		-// bigThree.remove(XYZPanel);
3481		-// aWindowConstraints.gridx = 0;
3482		-// aWindowConstraints.gridy = 0;
3483		-// aWindowConstraints.gridwidth = 1;
3484		-// // aConstraints.gridheight = 3;
3485		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3486		-// aWindowConstraints.weightx = 0;
3487		-// aWindowConstraints.weighty = 1;
3488		-// //bigThree.add(jtp, aWindowConstraints);
3489		-// aWindowConstraints.weightx = 1;
3490		-// aWindowConstraints.gridwidth = 3;
3491		-// // aConstraints.gridheight = 3;
3492		-// aWindowConstraints.gridx = 1;
3493		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3494		-// bigThree.add(centralPanel, aWindowConstraints);
3495		-// aWindowConstraints.weightx = 0;
3496		-// aWindowConstraints.gridx = 4;
3497		-// aWindowConstraints.gridwidth = 1;
3498		-// // aConstraints.gridheight = 3;
3499		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3500		-// //bigThree.add(XYZPanel, aWindowConstraints);
3501		-// scenePanel.setVisible(false);
3502		-// centralPanel.setVisible(true);
3503		-// XYZPanel.setVisible(false);
3504		- bigThree.ClearUI();
3505		- bigThree.add(centralPanel);
3506		- bigThree.FlushUI();
	3809	+ Show3DView();
3507	3810
3508	3811	cameraView.requestFocusInWindow();
3509	3812
..	..	@@ -3689,6 +3992,7 @@
3689	3992	} else
3690	3993	if (source == rootButton)
3691	3994	{
	3995	+ Replace();
3692	3996	Object3D obj;
3693	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3694	3998	{
..	..	@@ -3703,6 +4007,9 @@
3703	4007	if (source == closeButton)
3704	4008	{
3705	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3706	4013	cRadio ab;
3707	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3708	4015	{
..	..	@@ -3746,10 +4053,10 @@
3746	4053	{
3747	4054	Object3D child = (Object3D)e.nextElement();
3748	4055	if(child.editWindow != null)
3749		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	4056	child.pinned = false;
3751	4057	child.CloseUI();
3752	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3753	4060
3754	4061	//child.editWindow = null; // ???????????
3755	4062	}
..	..	@@ -3768,6 +4075,7 @@
3768	4075	obj.CloseUI();
3769	4076	}
3770	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
3771	4079	refreshContents(true);
3772	4080	} else
3773	4081	if (source == allParamsButton)
..	..	@@ -3800,6 +4108,9 @@
3800	4108	} else
3801	4109	if(source instanceof cRadio)
3802	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3803	4114	group.parent = keepparent;
3804	4115	group.attributes = 0;
3805	4116	//group.editWindow = null;
..	..	@@ -3824,8 +4135,6 @@
3824	4135
3825	4136	copy = group;
3826	4137
3827		- SetUndoStates();
3828		-
3829	4138	//Globals.theRenderer.object = group;
3830	4139	if(!useclient)
3831	4140	{
..	..	@@ -3853,7 +4162,34 @@
3853	4162	*/
3854	4163	radio.layout.doClick();
3855	4164
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
3856	4191	ClearUnpinned();
	4192	+
3857	4193	//Grafreed.Assert(group != null);
3858	4194	//Grafreed.Assert(group.selection != null);
3859	4195	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3870,11 +4206,13 @@
3870	4206	} else if (event.getSource() == editCameraItem)
3871	4207	{
3872	4208	cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
3873	4210	cameraView.repaint();
3874	4211	return;
3875	4212	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3876	4213	{
3877	4214	cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
3878	4216	cameraView.repaint();
3879	4217	return;
3880	4218	// } else if (event.getSource() == textureButton)
..	..	@@ -3963,9 +4301,46 @@
3963	4301	refreshContents();
3964	4302	}
3965	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
3966	4316	void ResetTransform()
3967	4317	{
3968	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
3969	4344	}
3970	4345
3971	4346	void ResetTransform(int mask)
..	..	@@ -3978,42 +4353,8 @@
3978	4353	if (obj.toParent == null)
3979	4354	continue;
3980	4355
3981		- if (mask == -1)
3982		- {
3983		- if (obj instanceof Camera) // jan 2014
3984		- {
3985		- LA.matIdentity(obj.toParent);
3986		- LA.matIdentity(obj.fromParent);
3987		- }
3988		- else
3989		- {
3990		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3991		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3992		- }
3993		- TouchTransform(obj);
3994		- continue;
3995		- }
3996		- if ((mask&2) != 0) // Scale
3997		- {
3998		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3999		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4000		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4001		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4002		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4003		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4004		- }
4005		- if ((mask&4) != 0) // Rotation
4006		- {
4007		- // ?
4008		- }
4009		- if ((mask&1) != 0) // Translation
4010		- {
4011		- if (obj.toParent != null)
4012		- {
4013		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4014		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4015		- }
4016		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
4017	4358	if (obj.parent == null)
4018	4359	{
4019	4360	System.out.println("NULL PARENT!");
..	..	@@ -4522,10 +4863,17 @@
4522	4863	{
4523	4864	Object3D obj = group.selection.get(i);
4524	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4525	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4526	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4527	4874	}
4528	4875
	4876	+ Globals.lighttouched = true;
4529	4877	refreshContents();
4530	4878	}
4531	4879
..	..	@@ -4813,6 +5161,12 @@
4813	5161	refreshContents();
4814	5162	}
4815	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4816	5170	void FlipV(boolean flip)
4817	5171	{
4818	5172	group.selection.FlipV(flip);
..	..	@@ -5007,9 +5361,7 @@
5007	5361
5008	5362	freezemodel = false;
5009	5363	}
5010		-
5011		- boolean flashIt = true;
5012		-
	5364	+
5013	5365	public void valueChanged(TreeSelectionEvent e)
5014	5366	//public boolean handleEvent(Event event)
5015	5367	{
..	..	@@ -5053,10 +5405,10 @@
5053	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5054	5406	// a camera
5055	5407	{
5056		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5057	5409	{
5058	5410	CameraPane.camerachangeframe = 0; // don't refuse it
5059		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5060	5412	}
5061	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5062	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -5082,13 +5434,31 @@
5082	5434	{
5083	5435	editButton.setEnabled(enabled);
5084	5436	uneditButton.setEnabled(enabled);
5085		- unselectButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
5086	5438	flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
5087	5456	}
5088	5457
5089	5458	void refreshContents(boolean cp)
5090	5459	{
5091		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5092	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5093	5463	{
5094	5464	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5098,7 +5468,7 @@
5098	5468	Object3D child = (Object3D) group.selection.get(i);
5099	5469
5100	5470	objEditor.AddInfo(child, this, true);
5101		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
5102	5472	}
5103	5473
5104	5474	objEditor.SetText(); // jan 2014
..	..	@@ -5924,7 +6294,6 @@
5924	6294
5925	6295	cButton restoreCameraButton;
5926	6296
5927		- cButton saveButton;
5928	6297	cButton oneStepButton;
5929	6298
5930	6299	cButton groupButton;
..	..	@@ -5982,11 +6351,11 @@
5982	6351	private MenuItem lookAtItem;
5983	6352	private MenuItem lookFromItem;
5984	6353	private MenuItem switchViewItem;
5985		- private MenuItem cutItem;
	6354	+ private JMenuItem cutItem;
5986	6355	private MenuItem undoItem;
5987	6356	private MenuItem redoItem;
5988	6357	private JMenuItem duplicateItem;
5989		- private MenuItem cloneItem;
	6358	+ private JMenuItem cloneItem;
5990	6359	private MenuItem cloneSupportItem;
5991	6360	private MenuItem overwriteGeoItem;
5992	6361	private MenuItem overwriteMatItem;
..	..	@@ -6007,13 +6376,13 @@
6007	6376	private MenuItem cloneGeometriesItem;
6008	6377	private MenuItem shareGeometriesItem;
6009	6378	private MenuItem mergeGeometriesItem;
6010		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
6011	6380	private MenuItem pasteItem;
6012		- private MenuItem pasteIntoItem;
6013		- private MenuItem pasteLinkItem;
6014		- private MenuItem pasteCloneItem;
6015		- private MenuItem pasteExpandItem;
6016		- private MenuItem deleteItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
6017	6386	private MenuItem clearAllItem;
6018	6387	private MenuItem genUVItem;
6019	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -6039,6 +6408,7 @@
6039	6408	private MenuItem clipMeshItem;
6040	6409	private MenuItem smoothMeshItem;
6041	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
6042	6412
6043	6413	private MenuItem liveleavesItem;
6044	6414	private MenuItem unliveleavesItem;
..	..	@@ -6062,13 +6432,16 @@
6062	6432	private MenuItem maxTexturesItem;
6063	6433	private MenuItem panoTexturesItem;
6064	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
6065	6438	private MenuItem resetCentroidItem;
6066	6439	private MenuItem resetCentroidXZItem;
6067	6440	private MenuItem resetTransformItem;
6068	6441	private MenuItem transformGeometryItem;
6069	6442	private MenuItem transformChildrenItem;
6070	6443	private MenuItem hideItem;
6071		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
6072	6445	private MenuItem backItem;
6073	6446	private MenuItem frontItem;
6074	6447	private MenuItem cameraItem;
..	..	@@ -6081,7 +6454,7 @@
6081	6454	private MenuItem switchTransfoItem;
6082	6455	private MenuItem morphItem;
6083	6456	private MenuItem linkerItem;
6084		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
6085	6458	private MenuItem editItem;
6086	6459	private MenuItem openWindowItem;
6087	6460	private MenuItem editLeafItem;