~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,122 @@
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();
	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	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
260	381	//ObjEditor objEditor;
261	382	public void closeUI2()
262	383	{
..	..	@@ -294,10 +415,14 @@
294	415	this.copy = this.group = group;
295	416	//selectees = this.group.selectees;
296	417
297		- if (copy.versions == null)
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
298	421	{
299		- copy.versions = new byte[100][];
	422	+ copy.versionlist = new Object3D[100];
300	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
301	426	}
302	427
303	428	if(ui)
..	..	@@ -321,12 +446,12 @@
321	446
322	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323	448
324		- if (copy.versions == null)
	449	+ if (copy.versionlist == null)
325	450	{
326		- copy.versions = new byte[100][];
	451	+ copy.versionlist = new Object3D[100];
327	452	copy.versionindex = -1;
328	453
329		- Save(true);
	454	+ //Save(true);
330	455	}
331	456	}
332	457
..	..	@@ -417,33 +542,35 @@
417	542	// menu.add("-");
418	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
419	544	duplicateItem.addActionListener(this);
420		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
421	547	cloneItem.addActionListener(this);
422		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
423	549	{
424	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
425	551	cloneSupportItem.addActionListener(this);
426	552	}
	553	+ oe.jTree.popup.addSeparator();
427	554	menu.add("-");
428		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
429	556	cutItem.addActionListener(this);
430		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
431	558	copyItem.addActionListener(this);
432	559	pasteItem = menu.add(new MenuItem("Paste"));
433	560	pasteItem.addActionListener(this);
434	561
435		- menu.add("-");
436		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
437	565	pasteIntoItem.addActionListener(this);
438		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
439	567	pasteLinkItem.addActionListener(this);
440		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
441	569	pasteCloneItem.addActionListener(this);
442		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
443	571	// pasteExpandItem.addActionListener(this);
444		- menu.add("-");
445		- deleteItem = menu.add(new MenuItem("Delete"));
446		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
447	574
448	575	if (Globals.ADVANCED)
449	576	{
..	..	@@ -529,11 +656,9 @@
529	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
530	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
531	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
532		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
533	659	oe.cameraMenu.add("-");
534	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
535	661	openWindowItem.addActionListener(this);
536		- editLeafItem.addActionListener(this);
537	662	lookAtItem.addActionListener(this);
538	663	//lookFromItem.addActinoListener(this);
539	664	//switchViewItem.addActionListener(this);
..	..	@@ -580,9 +705,8 @@
580	705	setMasterItem.addActionListener(this);
581	706	}
582	707
583		- oe.menuBar.add(menu = new Menu("Group"));
584		-// grabItem = menu.add(new MenuItem("Grab"));
585		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
586	710	backItem = menu.add(new MenuItem("Back"));
587	711	backItem.addActionListener(this);
588	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -590,13 +714,21 @@
590	714	// compositeItem = menu.add(new MenuItem("Composite"));
591	715	// compositeItem.addActionListener(this);
592	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
593	720	if (Globals.ADVANCED)
594	721	{
595	722	hideItem = menu.add(new MenuItem("Hidden Group"));
596	723	hideItem.addActionListener(this);
597	724	}
598		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
599	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
600	732
601	733	// menu.add("-");
602	734	//
..	..	@@ -725,9 +857,9 @@
725	857	hideleavesItem.addActionListener(this);
726	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
727	859	showleavesItem.addActionListener(this);
728		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
729	861	markleavesItem.addActionListener(this);
730		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
731	863	unmarkleavesItem.addActionListener(this);
732	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
733	865	rewindleavesItem.addActionListener(this);
..	..	@@ -781,6 +913,9 @@
781	913	shareGeometriesItem.addActionListener(this);
782	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
783	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
784	919	if (Globals.ADVANCED)
785	920	{
786	921	// Pretty much the same as duplicate and clone.
..	..	@@ -797,6 +932,74 @@
797	932	buildToolsMenu(menu);
798	933	}
799	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
800	1003
801	1004	void SetupUI2(ObjEditor oe)
802	1005	{
..	..	@@ -815,11 +1018,6 @@
815	1018	//new Exception().printStackTrace();
816	1019
817	1020	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	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
824	1022
825	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -840,9 +1038,9 @@
840	1038	oe.radioPanel.add(dummyButton);
841	1039	oe.buttonGroup.add(dummyButton);
842	1040	*/
843		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
844	1042
845		- copyOptionsPanel.preferredHeight = 2;
	1043	+ versionManagerPanel.preferredHeight = 4;
846	1044
847	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
848	1046
..	..	@@ -852,58 +1050,102 @@
852	1050
853	1051	if (Globals.ADVANCED)
854	1052	{
855		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
856		- maxButton.setToolTipText("Maximize window");
857		- maxButton.addActionListener(this);
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
858	1056	}
859	1057
860		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
861	1098	fullButton.setToolTipText("Full-screen window");
862	1099	fullButton.addActionListener(this);
863	1100
864		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
865	1102	screenfitButton.setToolTipText("Screen fit");
866	1103	screenfitButton.addActionListener(this);
867	1104
868		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
869	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
870	1107	restoreCameraButton.addActionListener(this);
871	1108
872		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873		- saveButton.setToolTipText("New version");
874		- saveButton.addActionListener(this);
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
875	1112
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);
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
880	1122
881	1123	cGridBag updown = new cGridBag().setVertical(true);
882		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883		- restoreButton.setToolTipText("Restore current");
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
884	1126	restoreButton.addActionListener(this);
885	1127	restoreButton.setEnabled(false);
886	1128
887		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888		- replaceButton.setToolTipText("Replace current");
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
889	1131	replaceButton.addActionListener(this);
890	1132	replaceButton.setEnabled(false);
891	1133
892		- copyOptionsPanel.add(updown);
	1134	+ versionManagerPanel.add(updown);
893	1135
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);
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
898	1144
899	1145	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
900	1146	liveCB.setToolTipText("Enable animation");
901	1147	liveCB.addItemListener(this);
902	1148
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	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
908	1150	fastCB.setToolTipText("Fast mode");
909	1151	fastCB.addItemListener(this);
..	..	@@ -919,38 +1161,23 @@
919	1161
920	1162	if (Globals.ADVANCED)
921	1163	{
922		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
923	1165	snapobjectButton.addActionListener(this);
924	1166	snapobjectButton.setToolTipText("Snap Object");
925	1167
926		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
927	1169	fourButton.addActionListener(this);
928	1170	fourButton.setToolTipText("Show control panel only");
929	1171	}
930	1172
931	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
932	1174
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	1175
949		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
950	1177	rootButton.setToolTipText("Open selection in new tab");
951	1178	rootButton.addActionListener(this);
952	1179
953		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
954	1181	closeButton.setToolTipText("Close tab");
955	1182	closeButton.addActionListener(this);
956	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -959,38 +1186,38 @@
959	1186	cGridBag row1 = new cGridBag();
960	1187
961	1188	// INSERT
962		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
963		- gridButton.setToolTipText("Create grid");
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
964	1191	gridButton.addActionListener(this);
965	1192
966		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
967	1194	boxButton.setToolTipText("Create box");
968	1195	boxButton.addActionListener(this);
969	1196
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);
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
983	1198	superButton.setToolTipText("Create superellipsoid");
984	1199	superButton.addActionListener(this);
985	1200
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
986	1213	if (Globals.ADVANCED)
987	1214	{
988		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
989	1216	kleinButton.setToolTipText("Create Klein bottle");
990	1217	kleinButton.addActionListener(this);
991	1218	}
992	1219
993		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
994	1221	particlesButton.setToolTipText("Create particle system");
995	1222	particlesButton.addActionListener(this);
996	1223
..	..	@@ -998,71 +1225,70 @@
998	1225
999	1226	cGridBag row2 = new cGridBag();
1000	1227
1001		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1002	1229	groupButton.setToolTipText("Create group");
1003	1230	groupButton.addActionListener(this);
1004	1231
1005		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1006	1233	compositeButton.setToolTipText("Create composite");
1007	1234	compositeButton.addActionListener(this);
1008	1235
1009		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1010	1237	switchButton.setToolTipText("Create item switcher");
1011	1238	switchButton.addActionListener(this);
1012	1239
1013		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1014	1241	loopButton.setToolTipText("Create loop");
1015	1242	loopButton.addActionListener(this);
1016	1243
1017		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1018	1245	textureButton.setToolTipText("Create texture");
1019	1246	textureButton.addActionListener(this);
1020	1247
1021		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1022	1249	overlayButton.setToolTipText("Create overlay");
1023	1250	overlayButton.addActionListener(this);
1024	1251
1025		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1026	1253	lightButton.setToolTipText("Create light");
1027	1254	lightButton.addActionListener(this);
1028	1255
1029	1256	oe.toolboxPanel.add(row2);
1030	1257
1031		- // ENVYMAPS
1032		- cGridBag skyboxpane = new cGridBag();
1033		- skyboxpane.preferredHeight = 100;
	1258	+ cGridBag textures = new cGridBag();
1034	1259
1035		- oe.toolboxPanel.add(skyboxpane);
	1260	+ CreateTexturePanel(textures);
1036	1261
1037		- JTabbedPane skyboxpanel = new JTabbedPane();
1038		- skyboxpane.add(skyboxpanel);
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1039	1263
1040		- AddSkyboxTab0(skyboxpanel);
1041		- AddSkyboxTab1(skyboxpanel);
1042		- AddSkyboxTab2(skyboxpanel);
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
1043	1269
1044	1270	// EDIT panel
1045		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1046	1272	editButton.setToolTipText("Pin selection controls");
1047	1273	editButton.addActionListener(this);
1048	1274
1049		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050		- uneditButton.setToolTipText("Remove selection controls");
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1051	1277	uneditButton.addActionListener(this);
1052	1278
1053	1279	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1054		- allParamsButton.setToolTipText("Show all controle");
	1280	+ allParamsButton.setToolTipText("Show all controls");
1055	1281	allParamsButton.addActionListener(this);
1056	1282
1057		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058		- clearPanelButton.setToolTipText("Clear edit panel");
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
1059	1285	clearPanelButton.addActionListener(this);
1060	1286
1061		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1062		- unselectButton.setToolTipText("Unselect");
1063		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
1064	1290
1065		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1066	1292	flashSelectionButton.setToolTipText("Highlight selection");
1067	1293	flashSelectionButton.addActionListener(this);
1068	1294
..	..	@@ -1085,6 +1311,8 @@
1085	1311
1086	1312	cGridBag jSPPanel = new cGridBag();
1087	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
1088	1316	JScrollPane jSP;
1089	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1090	1318	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1093,11 +1321,11 @@
1093	1321	oe.treePanel.add(jSPPanel);
1094	1322	oe.treePanel.Return();
1095	1323
1096		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
1097	1325	oe.treePanel.Return();
1098		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1099		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1100		- sliderPane.preferredHeight = 1;
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
1101	1329
1102	1330	// mainPanel.setDividerLocation(0.1); //1.0);
1103	1331	mainPanel.setResizeWeight(0.4);
..	..	@@ -1120,7 +1348,7 @@
1120	1348	dgr.addDragGestureListener(this);
1121	1349	}catch(Exception e) {}
1122	1350	*/
1123		- radio.layout = sixButton; // sevenButton;
	1351	+ radio.layout = threeButton; // sixButton;
1124	1352	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1125	1353	}
1126	1354
..	..	@@ -1171,9 +1399,12 @@
1171	1399	smoothCB.setToolTipText("Snapping delay");
1172	1400	smoothCB.addItemListener(this);
1173	1401
1174		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175		- slowCB.setToolTipText("Smooth interpolation");
1176		- slowCB.addItemListener(this);
	1402	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1403	+// slowCB.setToolTipText("Smooth interpolation");
	1404	+// slowCB.addItemListener(this);
	1405	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1406	+ minshaderCB.setToolTipText("Minimal fast shader");
	1407	+ minshaderCB.addItemListener(this);
1177	1408
1178	1409	// constraints.gridy += 1;
1179	1410	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1252,6 +1483,14 @@
1252	1483
1253	1484	void EditObject(Object3D obj)
1254	1485	{
	1486	+ assert(obj instanceof Composite);
	1487	+
	1488	+// if (obj.versionlist == null)
	1489	+// {
	1490	+// obj.versionlist = new Object3D[100];
	1491	+// obj.versionindex = -1;
	1492	+// }
	1493	+
1255	1494	cRadio radioButton = new cRadio(obj.name);
1256	1495
1257	1496	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1262,7 +1501,7 @@
1262	1501	}
1263	1502
1264	1503	radioButton.SetObject(obj);
1265		- radioButton.layout = sixButton; // sevenButton;
	1504	+ radioButton.layout = threeButton; // sixButton;
1266	1505	radioButton.SetCamera(cameraView.renderCamera, false);
1267	1506	radioButton.addActionListener(this);
1268	1507	radioPanel.add(radioButton);
..	..	@@ -1276,6 +1515,7 @@
1276	1515
1277	1516	oe.SetupViews();
1278	1517
	1518	+ if (Globals.DEBUG)
1279	1519	System.out.println("SetupViews");
1280	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1281	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1287,6 +1527,8 @@
1287	1527	cCheckBox localCB;
1288	1528	cCheckBox crowdCB;
1289	1529	cCheckBox smoothCB;
	1530	+ cCheckBox minshaderCB;
	1531	+
1290	1532	cToggleButton fastCB;
1291	1533	cCheckBox slowCB;
1292	1534	cCheckBox boxCB;
..	..	@@ -1357,6 +1599,12 @@
1357	1599	{
1358	1600	cameraView.ToggleInertia();
1359	1601	cameraView.repaint();
	1602	+ }
	1603	+ else if(e.getSource() == minshaderCB)
	1604	+ {
	1605	+ Globals.MINSHADER ^= true;
	1606	+ cameraView.programInitialized = false;
	1607	+ cameraView.repaint();
1360	1608	}
1361	1609	else if(e.getSource() == localCB)
1362	1610	{
..	..	@@ -1634,7 +1882,12 @@
1634	1882	TreePath path;
1635	1883
1636	1884	public TransferableTreePath(TreePath tp) {
1637		- path = tp;
	1885	+ Object[] objs = new Object[tp.getPathCount()];
	1886	+ for (int i=0; i<objs.length; i++)
	1887	+ {
	1888	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1889	+ }
	1890	+ path = new TreePath(objs);
1638	1891	}
1639	1892
1640	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1924,7 +2177,11 @@
1924	2177	shadow.material = new cMaterial(obj.material);
1925	2178	shadow.material.diffuse = 0.0001f;
1926	2179	shadow.material.specular = 0.0001f;
1927		- //shadow.projectedVertices[1].x = 300;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
1928	2185
1929	2186	makeSomething(shadow);
1930	2187	}
..	..	@@ -2445,27 +2702,35 @@
2445	2702	} else
2446	2703	if (source == loopItem \|\| source == loopButton)
2447	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2448	2707	Composite csg = new GroupLeaf();
2449	2708	csg.count = 5;
2450		- group(csg);
2451	2709	Composite child = new cGroup("Branch");
2452	2710	csg.addChild(child);
2453	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
2454	2714	} else
2455	2715	if (source == doubleItem)
2456	2716	{
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
2457	2719	Composite csg = new GroupLeaf("Fork");
2458	2720	csg.count = 5;
2459		- group(csg);
2460	2721	Composite child = new cGroup("Branch A");
2461	2722	csg.addChild(child);
2462	2723	child.addChild(csg);
2463	2724	child = new cGroup("Branch B");
2464	2725	csg.addChild(child);
2465	2726	child.addChild(csg);
	2727	+ group(csg);
	2728	+ }
2466	2729	} else
2467	2730	if (source == tripleItem)
2468	2731	{
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
2469	2734	Composite csg = new GroupLeaf("Trident");
2470	2735	csg.count = 4;
2471	2736	group(csg);
..	..	@@ -2478,6 +2743,7 @@
2478	2743	child = new cGroup();
2479	2744	csg.addChild(child);
2480	2745	child.addChild(csg);
	2746	+ }
2481	2747	} else
2482	2748	if (source == computeAOItem)
2483	2749	{
..	..	@@ -2497,7 +2763,7 @@
2497	2763	if (source == invariantsItem)
2498	2764	{
2499	2765	System.out.println("Invariants:");
2500		- Grafreed.grafreeD.universe.invariants();
	2766	+ Grafreed.grafreed.universe.invariants();
2501	2767	} else
2502	2768	if (source == memoryItem)
2503	2769	{
..	..	@@ -2528,33 +2794,52 @@
2528	2794	{
2529	2795	ToggleFullScreen();
2530	2796	} else
2531		- if (source == undoButton)
	2797	+ if (source == collapseButton)
	2798	+ {
	2799	+ this.expandedLayout = radio.layout;
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == maximize3DButton)
	2803	+ {
	2804	+ this.expandedLayout = radio.layout;
	2805	+ radio.layout = twoButton;
	2806	+ Show3DView();
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+ if (source == previousVersionButton)
2532	2810	{
2533	2811	// Go to previous version
2534	2812	//if (!Undo())
2535	2813	//java.awt.Toolkit.getDefaultToolkit().beep();
2536		- Undo();
	2814	+ PreviousVersion();
2537	2815	} else
2538	2816	if (source == restoreButton)
2539	2817	{
2540	2818	// Restore current version
2541	2819	Restore();
	2820	+ //restoreButton.setEnabled(false);
2542	2821	} else
2543	2822	if (source == replaceButton)
2544	2823	{
2545	2824	// Overwrite current version
2546	2825	Replace();
	2826	+ //replaceButton.setEnabled(false);
2547	2827	} else
2548		- if (source == redoButton)
	2828	+ if (source == nextVersionButton)
2549	2829	{
2550	2830	// Go to next version
2551		- Redo();
	2831	+ NextVersion();
2552	2832	} else
2553		- if (source == saveButton)
	2833	+ if (source == saveVersionButton)
2554	2834	{
2555	2835	// Save a new version
2556	2836	if (!Save(true))
2557	2837	java.awt.Toolkit.getDefaultToolkit().beep();
	2838	+ } else
	2839	+ if (source == deleteVersionButton)
	2840	+ {
	2841	+ // Delete a new version
	2842	+ DeleteVersion();
2558	2843	} else
2559	2844	if (source == oneStepButton)
2560	2845	{
..	..	@@ -2609,11 +2894,11 @@
2609	2894	} else
2610	2895	if (source == undoItem)
2611	2896	{
2612		- Undo();
	2897	+ PreviousVersion();
2613	2898	} else
2614	2899	if (source == redoItem)
2615	2900	{
2616		- Redo();
	2901	+ NextVersion();
2617	2902	} else
2618	2903	if (source == duplicateItem)
2619	2904	{
..	..	@@ -3094,22 +3379,34 @@
3094	3379	} else
3095	3380	if (source == ungroupItem \|\| source == ungroupButton)
3096	3381	{
3097		- boolean hasRoot = false;
	3382	+ boolean canUngroup = true;
3098	3383
3099	3384	for (int i=0; i<group.selection.size(); i++)
3100	3385	{
3101		- if (group.selection.get(i) == group)
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
3102	3389	{
3103		- hasRoot = true;
	3390	+ // Cannot ungroup leaves
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+
	3395	+ if (selectedItem == group)
	3396	+ {
	3397	+ // Cannot ungroup root
	3398	+ canUngroup = false;
3104	3399	break;
3105	3400	}
3106	3401	}
3107	3402
3108		- if (!hasRoot)
	3403	+ if (canUngroup)
3109	3404	{
3110	3405	for (int i=0; i<group.selection.size(); i++)
3111	3406	{
3112		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
3113	3410	}
3114	3411
3115	3412	ClearSelection(false);
..	..	@@ -3472,38 +3769,7 @@
3472	3769	if (CameraPane.FULLSCREEN)
3473	3770	fullscreenLayout = radio.layout;
3474	3771
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();
	3772	+ Show3DView();
3507	3773
3508	3774	cameraView.requestFocusInWindow();
3509	3775
..	..	@@ -3689,6 +3955,7 @@
3689	3955	} else
3690	3956	if (source == rootButton)
3691	3957	{
	3958	+ Replace();
3692	3959	Object3D obj;
3693	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3694	3961	{
..	..	@@ -3703,6 +3970,8 @@
3703	3970	if (source == closeButton)
3704	3971	{
3705	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3706	3975	cRadio ab;
3707	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3708	3977	{
..	..	@@ -3746,10 +4015,10 @@
3746	4015	{
3747	4016	Object3D child = (Object3D)e.nextElement();
3748	4017	if(child.editWindow != null)
3749		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	4018	child.pinned = false;
3751	4019	child.CloseUI();
3752	4020	listUI.remove(child);
	4021	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3753	4022
3754	4023	//child.editWindow = null; // ???????????
3755	4024	}
..	..	@@ -3768,6 +4037,7 @@
3768	4037	obj.CloseUI();
3769	4038	}
3770	4039	listUI.clear();
	4040	+ SetPinStates(group.selection.size() > 0);
3771	4041	refreshContents(true);
3772	4042	} else
3773	4043	if (source == allParamsButton)
..	..	@@ -3800,6 +4070,8 @@
3800	4070	} else
3801	4071	if(source instanceof cRadio)
3802	4072	{
	4073	+ Replace();
	4074	+
3803	4075	group.parent = keepparent;
3804	4076	group.attributes = 0;
3805	4077	//group.editWindow = null;
..	..	@@ -3824,8 +4096,6 @@
3824	4096
3825	4097	copy = group;
3826	4098
3827		- SetUndoStates();
3828		-
3829	4099	//Globals.theRenderer.object = group;
3830	4100	if(!useclient)
3831	4101	{
..	..	@@ -3853,7 +4123,31 @@
3853	4123	*/
3854	4124	radio.layout.doClick();
3855	4125
	4126	+ assert(copy instanceof Composite);
	4127	+
	4128	+ if (copy.versionlist == null)
	4129	+ {
	4130	+ copy.versionindex = -1;
	4131	+
	4132	+ // Cannot work with loops
	4133	+ // To fix this issue, we first mark all nodes above the root,
	4134	+ // and check if any of these nodes are reachable below the root.
	4135	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4136	+
	4137	+ if (!copy.HasTags())
	4138	+ {
	4139	+ copy.versionlist = new Object3D[100];
	4140	+
	4141	+ Save(true);
	4142	+ }
	4143	+
	4144	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4145	+ }
	4146	+
	4147	+ SetVersionStates();
	4148	+
3856	4149	ClearUnpinned();
	4150	+
3857	4151	//Grafreed.Assert(group != null);
3858	4152	//Grafreed.Assert(group.selection != null);
3859	4153	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3870,11 +4164,13 @@
3870	4164	} else if (event.getSource() == editCameraItem)
3871	4165	{
3872	4166	cameraView.ProtectCamera();
	4167	+ cameraView.requestFocusInWindow();
3873	4168	cameraView.repaint();
3874	4169	return;
3875	4170	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3876	4171	{
3877	4172	cameraView.RevertCamera();
	4173	+ cameraView.requestFocusInWindow();
3878	4174	cameraView.repaint();
3879	4175	return;
3880	4176	// } else if (event.getSource() == textureButton)
..	..	@@ -3993,7 +4289,7 @@
3993	4289	TouchTransform(obj);
3994	4290	continue;
3995	4291	}
3996		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
3997	4293	{
3998	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3999	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -4001,10 +4297,6 @@
4001	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4002	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4003	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4004		- }
4005		- if ((mask&4) != 0) // Rotation
4006		- {
4007		- // ?
4008	4300	}
4009	4301	if ((mask&1) != 0) // Translation
4010	4302	{
..	..	@@ -5007,9 +5299,7 @@
5007	5299
5008	5300	freezemodel = false;
5009	5301	}
5010		-
5011		- boolean flashIt = true;
5012		-
	5302	+
5013	5303	public void valueChanged(TreeSelectionEvent e)
5014	5304	//public boolean handleEvent(Event event)
5015	5305	{
..	..	@@ -5082,13 +5372,31 @@
5082	5372	{
5083	5373	editButton.setEnabled(enabled);
5084	5374	uneditButton.setEnabled(enabled);
5085		- unselectButton.setEnabled(enabled);
	5375	+ //unselectButton.setEnabled(enabled);
5086	5376	flashSelectionButton.setEnabled(enabled);
	5377	+
	5378	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5379	+
	5380	+ boolean allComposites = true;
	5381	+
	5382	+ if (group.selection != null)
	5383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5384	+ {
	5385	+ Object next = e.nextElement();
	5386	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5387	+ {
	5388	+ allComposites = false;
	5389	+ break;
	5390	+ }
	5391	+ }
	5392	+
	5393	+ rootButton.setEnabled(allComposites);
5087	5394	}
5088	5395
5089	5396	void refreshContents(boolean cp)
5090	5397	{
5091		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5398	+ if (Globals.ADVANCED)
	5399	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5092	5400	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5093	5401	{
5094	5402	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5098,7 +5406,7 @@
5098	5406	Object3D child = (Object3D) group.selection.get(i);
5099	5407
5100	5408	objEditor.AddInfo(child, this, true);
5101		- System.err.println("info : " + child.GetPath());
	5409	+// System.err.println("info : " + child.GetPath());
5102	5410	}
5103	5411
5104	5412	objEditor.SetText(); // jan 2014
..	..	@@ -5924,7 +6232,6 @@
5924	6232
5925	6233	cButton restoreCameraButton;
5926	6234
5927		- cButton saveButton;
5928	6235	cButton oneStepButton;
5929	6236
5930	6237	cButton groupButton;
..	..	@@ -5982,11 +6289,11 @@
5982	6289	private MenuItem lookAtItem;
5983	6290	private MenuItem lookFromItem;
5984	6291	private MenuItem switchViewItem;
5985		- private MenuItem cutItem;
	6292	+ private JMenuItem cutItem;
5986	6293	private MenuItem undoItem;
5987	6294	private MenuItem redoItem;
5988	6295	private JMenuItem duplicateItem;
5989		- private MenuItem cloneItem;
	6296	+ private JMenuItem cloneItem;
5990	6297	private MenuItem cloneSupportItem;
5991	6298	private MenuItem overwriteGeoItem;
5992	6299	private MenuItem overwriteMatItem;
..	..	@@ -6007,13 +6314,13 @@
6007	6314	private MenuItem cloneGeometriesItem;
6008	6315	private MenuItem shareGeometriesItem;
6009	6316	private MenuItem mergeGeometriesItem;
6010		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
6011	6318	private MenuItem pasteItem;
6012		- private MenuItem pasteIntoItem;
6013		- private MenuItem pasteLinkItem;
6014		- private MenuItem pasteCloneItem;
6015		- private MenuItem pasteExpandItem;
6016		- private MenuItem deleteItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
6017	6324	private MenuItem clearAllItem;
6018	6325	private MenuItem genUVItem;
6019	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -6068,7 +6375,7 @@
6068	6375	private MenuItem transformGeometryItem;
6069	6376	private MenuItem transformChildrenItem;
6070	6377	private MenuItem hideItem;
6071		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
6072	6379	private MenuItem backItem;
6073	6380	private MenuItem frontItem;
6074	6381	private MenuItem cameraItem;
..	..	@@ -6081,7 +6388,7 @@
6081	6388	private MenuItem switchTransfoItem;
6082	6389	private MenuItem morphItem;
6083	6390	private MenuItem linkerItem;
6084		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
6085	6392	private MenuItem editItem;
6086	6393	private MenuItem openWindowItem;
6087	6394	private MenuItem editLeafItem;