~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void 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, !Grafreed.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	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	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);
	358	+ }
	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	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,10 +415,12 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
63		- if (copy.versions == null)
	418	+ if (copy.versionlist == null)
64	419	{
65		- copy.versions = new byte[100][];
	420	+ copy.versionlist = new Object3D[100];
66	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
67	424	}
68	425
69	426	if(ui)
..	..	@@ -87,9 +444,9 @@
87	444
88	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	446
90		- if (copy.versions == null)
	447	+ if (copy.versionlist == null)
91	448	{
92		- copy.versions = new byte[100][];
	449	+ copy.versionlist = new Object3D[100];
93	450	copy.versionindex = -1;
94	451
95	452	Save(true);
..	..	@@ -295,11 +652,9 @@
295	652	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
296	653	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
297	654	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
298		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
299	655	oe.cameraMenu.add("-");
300	656	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
301	657	openWindowItem.addActionListener(this);
302		- editLeafItem.addActionListener(this);
303	658	lookAtItem.addActionListener(this);
304	659	//lookFromItem.addActinoListener(this);
305	660	//switchViewItem.addActionListener(this);
..	..	@@ -528,10 +883,15 @@
528	883	attachBumpItem.addActionListener(this);
529	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
531	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532	888	detachPigmentItem.addActionListener(this);
533	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
535	895	menu.add("-");
536	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537	897	sortbysizeItem.addActionListener(this);
..	..	@@ -542,6 +902,9 @@
542	902	shareGeometriesItem.addActionListener(this);
543	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
544	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
545	908	if (Globals.ADVANCED)
546	909	{
547	910	// Pretty much the same as duplicate and clone.
..	..	@@ -558,6 +921,73 @@
558	921	buildToolsMenu(menu);
559	922	}
560	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
561	991
562	992	void SetupUI2(ObjEditor oe)
563	993	{
..	..	@@ -576,11 +1006,6 @@
576	1006	//new Exception().printStackTrace();
577	1007
578	1008	oe.radioPanel = new JPanel(new GridBagLayout());
579		- oe.aConstraints.weightx = 1;
580		- oe.aConstraints.weighty = 0;
581		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
582		- oe.aConstraints.gridwidth = 100;
583		- oe.aConstraints.gridheight = 1;
584	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
585	1010
586	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -603,7 +1028,7 @@
603	1028	*/
604	1029	cGridBag copyOptionsPanel = new cGridBag();
605	1030
606		- copyOptionsPanel.preferredHeight = 1;
	1031	+ copyOptionsPanel.preferredHeight = 2;
607	1032
608	1033	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
609	1034
..	..	@@ -613,10 +1038,49 @@
613	1038
614	1039	if (Globals.ADVANCED)
615	1040	{
616		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- maxButton.setToolTipText("Maximize window");
618		- maxButton.addActionListener(this);
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
619	1044	}
	1045	+
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
620	1084
621	1085	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	1086	fullButton.setToolTipText("Full-screen window");
..	..	@@ -630,41 +1094,45 @@
630	1094	restoreCameraButton.setToolTipText("Restore viewpoint");
631	1095	restoreCameraButton.addActionListener(this);
632	1096
633		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- saveButton.setToolTipText("New version");
635		- saveButton.addActionListener(this);
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
636	1100
637		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- undoButton.setToolTipText("Previous version");
639		- undoButton.addActionListener(this);
640		- undoButton.setEnabled(false);
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
641	1109
642	1110	cGridBag updown = new cGridBag().setVertical(true);
643	1111	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- restoreButton.setToolTipText("Restore current");
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
645	1113	restoreButton.addActionListener(this);
646		- restoreButton.setEnabled(false);
	1114	+ //restoreButton.setEnabled(false);
647	1115
648	1116	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- replaceButton.setToolTipText("Replace current");
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
650	1118	replaceButton.addActionListener(this);
651		- replaceButton.setEnabled(false);
	1119	+ //replaceButton.setEnabled(false);
652	1120
653	1121	copyOptionsPanel.add(updown);
654	1122
655		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656		- redoButton.setToolTipText("Next version");
657		- redoButton.addActionListener(this);
658		- redoButton.setEnabled(false);
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ oneStepButton.setToolTipText("Animate one step forward");
	1130	+ oneStepButton.addActionListener(this);
659	1131
660	1132	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
661	1133	liveCB.setToolTipText("Enable animation");
662	1134	liveCB.addItemListener(this);
663	1135
664		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- oneStepButton.setToolTipText("Animate one step forward");
666		- oneStepButton.addActionListener(this);
667		-
668	1136	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
669	1137	fastCB.setToolTipText("Fast mode");
670	1138	fastCB.addItemListener(this);
..	..	@@ -683,29 +1151,14 @@
683	1151	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1152	snapobjectButton.addActionListener(this);
685	1153	snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ fourButton.addActionListener(this);
	1157	+ fourButton.setToolTipText("Show control panel only");
686	1158	}
687	1159
688	1160	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
689	1161
690		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691		- fourButton.addActionListener(this);
692		- fourButton.setToolTipText("Show left panel only");
693		-
694		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695		- twoButton.setToolTipText("Show right view only");
696		- twoButton.addActionListener(this);
697		- this.fullscreenLayout = twoButton;
698		-
699		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- sixButton.setToolTipText("Show left and right");
701		- sixButton.addActionListener(this);
702		-// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703		-// threeButton.setToolTipText("2-column layout right");
704		-// threeButton.addActionListener(this);
705		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
706		-// sevenButton.setToolTipText("3-column layout");
707		-// sevenButton.addActionListener(this);
708		- //
709	1162
710	1163	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	1164	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -717,28 +1170,30 @@
717	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
718	1171	//clearButton.addActionListener(this);
719	1172
	1173	+ cGridBag row1 = new cGridBag();
	1174	+
720	1175	// INSERT
721		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722		- gridButton.setToolTipText("Create grid");
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
723	1178	gridButton.addActionListener(this);
724	1179
725		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726	1181	boxButton.setToolTipText("Create box");
727	1182	boxButton.addActionListener(this);
728	1183
729		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1185	sphereButton.setToolTipText("Create sphere");
731	1186	sphereButton.addActionListener(this);
732	1187
733		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1189	coneButton.setToolTipText("Create cone");
735	1190	coneButton.addActionListener(this);
736	1191
737		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1193	torusButton.setToolTipText("Create torus");
739	1194	torusButton.addActionListener(this);
740	1195
741		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	1197	superButton.setToolTipText("Create superellipsoid");
743	1198	superButton.addActionListener(this);
744	1199
..	..	@@ -749,51 +1204,53 @@
749	1204	kleinButton.addActionListener(this);
750	1205	}
751	1206
752		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
753	1208	particlesButton.setToolTipText("Create particle system");
754	1209	particlesButton.addActionListener(this);
755	1210
756		- oe.toolboxPanel.Return();
	1211	+ oe.toolboxPanel.add(row1);
757	1212
758		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
759	1216	groupButton.setToolTipText("Create group");
760	1217	groupButton.addActionListener(this);
761	1218
762		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
763	1220	compositeButton.setToolTipText("Create composite");
764	1221	compositeButton.addActionListener(this);
765	1222
766		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
767	1224	switchButton.setToolTipText("Create item switcher");
768	1225	switchButton.addActionListener(this);
769	1226
770		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
771	1228	loopButton.setToolTipText("Create loop");
772	1229	loopButton.addActionListener(this);
773	1230
774		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775	1232	textureButton.setToolTipText("Create texture");
776	1233	textureButton.addActionListener(this);
777	1234
778		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
779	1236	overlayButton.setToolTipText("Create overlay");
780	1237	overlayButton.addActionListener(this);
781	1238
782		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783	1240	lightButton.setToolTipText("Create light");
784	1241	lightButton.addActionListener(this);
785	1242
786		- for (int i=6; --i>=0;)
787		- {
788		- oe.toolboxPanel.Return();
789		- oe.toolboxPanel.add(new cGridBag());
790		- oe.toolboxPanel.add(new cGridBag());
791		- oe.toolboxPanel.add(new cGridBag());
792		- oe.toolboxPanel.add(new cGridBag());
793		- oe.toolboxPanel.add(new cGridBag());
794		- oe.toolboxPanel.add(new cGridBag());
795		- oe.toolboxPanel.add(new cGridBag());
796		- }
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
797	1254
798	1255	// EDIT panel
799	1256	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -801,20 +1258,20 @@
801	1258	editButton.addActionListener(this);
802	1259
803	1260	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804		- uneditButton.setToolTipText("Remove selection controls");
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
805	1262	uneditButton.addActionListener(this);
806	1263
807	1264	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
808		- allParamsButton.setToolTipText("Show all controle");
	1265	+ allParamsButton.setToolTipText("Show all controls");
809	1266	allParamsButton.addActionListener(this);
810	1267
811		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
813	1270	clearPanelButton.addActionListener(this);
814	1271
815		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816		- unselectButton.setToolTipText("Unselect");
817		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
818	1275
819	1276	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
820	1277	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -853,8 +1310,8 @@
853	1310	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854	1311	sliderPane.preferredHeight = 1;
855	1312
856		-// mainPanel.setDividerLocation(0.5); //1.0);
857		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
858	1315
859	1316	//jList.addListSelectionListener(this);
860	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -862,7 +1319,7 @@
862	1319	//jTree.setEditable(true);
863	1320	oe.jTree.setDragEnabled(true);
864	1321	//jTree.setPreferredSize(new Dimension(10,10));
865		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
866	1323
867	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
868	1325
..	..	@@ -874,7 +1331,7 @@
874	1331	dgr.addDragGestureListener(this);
875	1332	}catch(Exception e) {}
876	1333	*/
877		- radio.layout = sixButton; // sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
878	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
879	1336	}
880	1337
..	..	@@ -925,9 +1382,12 @@
925	1382	smoothCB.setToolTipText("Snapping delay");
926	1383	smoothCB.addItemListener(this);
927	1384
928		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
929		- slowCB.setToolTipText("Smooth interpolation");
930		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
931	1391
932	1392	// constraints.gridy += 1;
933	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1006,6 +1466,14 @@
1006	1466
1007	1467	void EditObject(Object3D obj)
1008	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
1009	1477	cRadio radioButton = new cRadio(obj.name);
1010	1478
1011	1479	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1016,7 +1484,7 @@
1016	1484	}
1017	1485
1018	1486	radioButton.SetObject(obj);
1019		- radioButton.layout = sixButton; // sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
1020	1488	radioButton.SetCamera(cameraView.renderCamera, false);
1021	1489	radioButton.addActionListener(this);
1022	1490	radioPanel.add(radioButton);
..	..	@@ -1041,6 +1509,8 @@
1041	1509	cCheckBox localCB;
1042	1510	cCheckBox crowdCB;
1043	1511	cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
1044	1514	cToggleButton fastCB;
1045	1515	cCheckBox slowCB;
1046	1516	cCheckBox boxCB;
..	..	@@ -1111,6 +1581,12 @@
1111	1581	{
1112	1582	cameraView.ToggleInertia();
1113	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
1114	1590	}
1115	1591	else if(e.getSource() == localCB)
1116	1592	{
..	..	@@ -1388,7 +1864,12 @@
1388	1864	TreePath path;
1389	1865
1390	1866	public TransferableTreePath(TreePath tp) {
1391		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1392	1873	}
1393	1874
1394	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2134,6 +2615,23 @@
2134	2615	{
2135	2616	makeSomething(new Light());
2136	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
2137	2635	if (source == csgItem)
2138	2636	{
2139	2637	group(new CSG());
..	..	@@ -2219,7 +2717,7 @@
2219	2717	if (source == computeAOItem)
2220	2718	{
2221	2719	Globals.drawMode = CameraPane.OCCLUSION;
2222		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
2223	2721	} else
2224	2722	if (source == recompileItem)
2225	2723	{
..	..	@@ -2234,7 +2732,7 @@
2234	2732	if (source == invariantsItem)
2235	2733	{
2236	2734	System.out.println("Invariants:");
2237		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
2238	2736	} else
2239	2737	if (source == memoryItem)
2240	2738	{
..	..	@@ -2265,33 +2763,52 @@
2265	2763	{
2266	2764	ToggleFullScreen();
2267	2765	} else
2268		- if (source == undoButton)
	2766	+ if (source == collapseButton)
	2767	+ {
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
	2770	+ } else
	2771	+ if (source == maximize3DButton)
	2772	+ {
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
	2777	+ } else
	2778	+ if (source == previousVersionButton)
2269	2779	{
2270	2780	// Go to previous version
2271	2781	//if (!Undo())
2272	2782	//java.awt.Toolkit.getDefaultToolkit().beep();
2273		- Undo();
	2783	+ PreviousVersion();
2274	2784	} else
2275	2785	if (source == restoreButton)
2276	2786	{
2277	2787	// Restore current version
2278	2788	Restore();
	2789	+ //restoreButton.setEnabled(false);
2279	2790	} else
2280	2791	if (source == replaceButton)
2281	2792	{
2282	2793	// Overwrite current version
2283	2794	Replace();
	2795	+ //replaceButton.setEnabled(false);
2284	2796	} else
2285		- if (source == redoButton)
	2797	+ if (source == nextVersionButton)
2286	2798	{
2287	2799	// Go to next version
2288		- Redo();
	2800	+ NextVersion();
2289	2801	} else
2290		- if (source == saveButton)
	2802	+ if (source == saveVersionButton)
2291	2803	{
2292	2804	// Save a new version
2293	2805	if (!Save(true))
2294	2806	java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
2295	2812	} else
2296	2813	if (source == oneStepButton)
2297	2814	{
..	..	@@ -2346,11 +2863,11 @@
2346	2863	} else
2347	2864	if (source == undoItem)
2348	2865	{
2349		- Undo();
	2866	+ PreviousVersion();
2350	2867	} else
2351	2868	if (source == redoItem)
2352	2869	{
2353		- Redo();
	2870	+ NextVersion();
2354	2871	} else
2355	2872	if (source == duplicateItem)
2356	2873	{
..	..	@@ -3153,7 +3670,7 @@
3153	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3154	3671	{
3155	3672	obj = (Object3D)e.nextElement();
3156		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
3157	3674	}
3158	3675
3159	3676	refreshContents();
..	..	@@ -3167,6 +3684,31 @@
3167	3684	obj.SetBumpTexture(obj.GetPigmentTexture());
3168	3685	}
3169	3686
	3687	+ refreshContents();
	3688	+ } else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
3170	3712	refreshContents();
3171	3713	} else
3172	3714	if (source == flashSelectionButton)
..	..	@@ -3184,38 +3726,7 @@
3184	3726	if (CameraPane.FULLSCREEN)
3185	3727	fullscreenLayout = radio.layout;
3186	3728
3187		- // bug
3188		- //gridPanel.setDividerLocation(1.0);
3189		- //bigPanel.setDividerLocation(0.0);
3190		-// bigThree.remove(scenePanel);
3191		-// bigThree.remove(centralPanel);
3192		-// bigThree.remove(XYZPanel);
3193		-// aWindowConstraints.gridx = 0;
3194		-// aWindowConstraints.gridy = 0;
3195		-// aWindowConstraints.gridwidth = 1;
3196		-// // aConstraints.gridheight = 3;
3197		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3198		-// aWindowConstraints.weightx = 0;
3199		-// aWindowConstraints.weighty = 1;
3200		-// //bigThree.add(jtp, aWindowConstraints);
3201		-// aWindowConstraints.weightx = 1;
3202		-// aWindowConstraints.gridwidth = 3;
3203		-// // aConstraints.gridheight = 3;
3204		-// aWindowConstraints.gridx = 1;
3205		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3206		-// bigThree.add(centralPanel, aWindowConstraints);
3207		-// aWindowConstraints.weightx = 0;
3208		-// aWindowConstraints.gridx = 4;
3209		-// aWindowConstraints.gridwidth = 1;
3210		-// // aConstraints.gridheight = 3;
3211		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3212		-// //bigThree.add(XYZPanel, aWindowConstraints);
3213		-// scenePanel.setVisible(false);
3214		-// centralPanel.setVisible(true);
3215		-// XYZPanel.setVisible(false);
3216		- bigThree.ClearUI();
3217		- bigThree.add(centralPanel);
3218		- bigThree.FlushUI();
	3729	+ Show3DView();
3219	3730
3220	3731	cameraView.requestFocusInWindow();
3221	3732
..	..	@@ -3270,8 +3781,8 @@
3270	3781	// centralPanel.setVisible(true);
3271	3782	// XYZPanel.setVisible(true);
3272	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
3273	3785	bigThree.add(centralPanel);
3274		- bigThree.add(XYZPanel);
3275	3786	bigThree.FlushUI();
3276	3787
3277	3788	cameraView.requestFocusInWindow();
..	..	@@ -3351,8 +3862,8 @@
3351	3862	// centralPanel.setVisible(true);
3352	3863	// XYZPanel.setVisible(false);
3353	3864	bigThree.ClearUI();
3354		- bigThree.add(scenePanel);
3355	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
3356	3867	bigThree.FlushUI();
3357	3868
3358	3869	cameraView.requestFocusInWindow();
..	..	@@ -3401,6 +3912,7 @@
3401	3912	} else
3402	3913	if (source == rootButton)
3403	3914	{
	3915	+ Replace();
3404	3916	Object3D obj;
3405	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3406	3918	{
..	..	@@ -3458,10 +3970,10 @@
3458	3970	{
3459	3971	Object3D child = (Object3D)e.nextElement();
3460	3972	if(child.editWindow != null)
3461		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3462	3973	child.pinned = false;
3463	3974	child.CloseUI();
3464	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3465	3977
3466	3978	//child.editWindow = null; // ???????????
3467	3979	}
..	..	@@ -3480,6 +3992,7 @@
3480	3992	obj.CloseUI();
3481	3993	}
3482	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3483	3996	refreshContents(true);
3484	3997	} else
3485	3998	if (source == allParamsButton)
..	..	@@ -3536,8 +4049,6 @@
3536	4049
3537	4050	copy = group;
3538	4051
3539		- SetUndoStates();
3540		-
3541	4052	//Globals.theRenderer.object = group;
3542	4053	if(!useclient)
3543	4054	{
..	..	@@ -3565,7 +4076,20 @@
3565	4076	*/
3566	4077	radio.layout.doClick();
3567	4078
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
3568	4091	ClearUnpinned();
	4092	+
3569	4093	//Grafreed.Assert(group != null);
3570	4094	//Grafreed.Assert(group.selection != null);
3571	4095	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3582,11 +4106,13 @@
3582	4106	} else if (event.getSource() == editCameraItem)
3583	4107	{
3584	4108	cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
3585	4110	cameraView.repaint();
3586	4111	return;
3587	4112	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3588	4113	{
3589	4114	cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
3590	4116	cameraView.repaint();
3591	4117	return;
3592	4118	// } else if (event.getSource() == textureButton)
..	..	@@ -4163,7 +4689,7 @@
4163	4689
4164	4690	try
4165	4691	{
4166		- texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167	4693	}
4168	4694	catch (Exception e)
4169	4695	{
..	..	@@ -4719,9 +5245,7 @@
4719	5245
4720	5246	freezemodel = false;
4721	5247	}
4722		-
4723		- boolean flashIt = true;
4724		-
	5248	+
4725	5249	public void valueChanged(TreeSelectionEvent e)
4726	5250	//public boolean handleEvent(Event event)
4727	5251	{
..	..	@@ -4794,13 +5318,28 @@
4794	5318	{
4795	5319	editButton.setEnabled(enabled);
4796	5320	uneditButton.setEnabled(enabled);
4797		- unselectButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
4798	5322	flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
4799	5338	}
4800	5339
4801	5340	void refreshContents(boolean cp)
4802	5341	{
4803		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5342	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4804	5343	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4805	5344	{
4806	5345	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4810,7 +5349,7 @@
4810	5349	Object3D child = (Object3D) group.selection.get(i);
4811	5350
4812	5351	objEditor.AddInfo(child, this, true);
4813		- System.err.println("info : " + child.GetPath());
	5352	+// System.err.println("info : " + child.GetPath());
4814	5353	}
4815	5354
4816	5355	objEditor.SetText(); // jan 2014
..	..	@@ -5636,7 +6175,6 @@
5636	6175
5637	6176	cButton restoreCameraButton;
5638	6177
5639		- cButton saveButton;
5640	6178	cButton oneStepButton;
5641	6179
5642	6180	cButton groupButton;
..	..	@@ -5645,6 +6183,22 @@
5645	6183	cButton switchButton;
5646	6184	cButton loopButton;
5647	6185	cButton textureButton;
	6186	+
	6187	+ cButton skybox1Button;
	6188	+ cButton skybox2Button;
	6189	+ cButton skybox3Button;
	6190	+ cButton skybox4Button;
	6191	+ cButton skybox5Button;
	6192	+ cButton skybox6Button;
	6193	+ cButton skybox7Button;
	6194	+
	6195	+ cButton skybox11Button;
	6196	+ cButton skybox12Button;
	6197	+ cButton skybox13Button;
	6198	+ cButton skybox14Button;
	6199	+ cButton skybox15Button;
	6200	+ cButton skybox16Button;
	6201	+ cButton skybox17Button;
5648	6202
5649	6203	cButton gridButton;
5650	6204	cButton boxButton;
..	..	@@ -5793,6 +6347,8 @@
5793	6347	private MenuItem attachBumpItem;
5794	6348	private MenuItem detachBumpItem;
5795	6349	private MenuItem pigmentBumpItem;
	6350	+ private MenuItem embedTexturesItem;
	6351	+ private MenuItem deEmbedTexturesItem;
5796	6352
5797	6353	private MenuItem particleItem;
5798	6354	private MenuItem ragdollItem;