~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,351 @@
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);
	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", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,10 +406,12 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
63		- if (copy.versions == null)
	409	+ if (copy.versionlist == null)
64	410	{
65		- copy.versions = new byte[100][];
	411	+ copy.versionlist = new Object3D[100];
66	412	copy.versionindex = -1;
	413	+
	414	+ Save(true);
67	415	}
68	416
69	417	if(ui)
..	..	@@ -87,9 +435,9 @@
87	435
88	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	437
90		- if (copy.versions == null)
	438	+ if (copy.versionlist == null)
91	439	{
92		- copy.versions = new byte[100][];
	440	+ copy.versionlist = new Object3D[100];
93	441	copy.versionindex = -1;
94	442
95	443	Save(true);
..	..	@@ -295,11 +643,9 @@
295	643	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
296	644	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
297	645	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
298		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
299	646	oe.cameraMenu.add("-");
300	647	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
301	648	openWindowItem.addActionListener(this);
302		- editLeafItem.addActionListener(this);
303	649	lookAtItem.addActionListener(this);
304	650	//lookFromItem.addActinoListener(this);
305	651	//switchViewItem.addActionListener(this);
..	..	@@ -528,10 +874,15 @@
528	874	attachBumpItem.addActionListener(this);
529	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
531	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532	879	detachPigmentItem.addActionListener(this);
533	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
535	886	menu.add("-");
536	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537	888	sortbysizeItem.addActionListener(this);
..	..	@@ -542,6 +893,9 @@
542	893	shareGeometriesItem.addActionListener(this);
543	894	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
544	895	mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
545	899	if (Globals.ADVANCED)
546	900	{
547	901	// Pretty much the same as duplicate and clone.
..	..	@@ -558,6 +912,73 @@
558	912	buildToolsMenu(menu);
559	913	}
560	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
561	982
562	983	void SetupUI2(ObjEditor oe)
563	984	{
..	..	@@ -576,11 +997,6 @@
576	997	//new Exception().printStackTrace();
577	998
578	999	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	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
585	1001
586	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -603,7 +1019,7 @@
603	1019	*/
604	1020	cGridBag copyOptionsPanel = new cGridBag();
605	1021
606		- copyOptionsPanel.preferredHeight = 1;
	1022	+ copyOptionsPanel.preferredHeight = 2;
607	1023
608	1024	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
609	1025
..	..	@@ -613,10 +1029,49 @@
613	1029
614	1030	if (Globals.ADVANCED)
615	1031	{
616		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- maxButton.setToolTipText("Maximize window");
618		- maxButton.addActionListener(this);
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
619	1035	}
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
620	1075
621	1076	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	1077	fullButton.setToolTipText("Full-screen window");
..	..	@@ -630,41 +1085,45 @@
630	1085	restoreCameraButton.setToolTipText("Restore viewpoint");
631	1086	restoreCameraButton.addActionListener(this);
632	1087
633		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- saveButton.setToolTipText("New version");
635		- saveButton.addActionListener(this);
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
636	1091
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);
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
641	1100
642	1101	cGridBag updown = new cGridBag().setVertical(true);
643	1102	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- restoreButton.setToolTipText("Restore current");
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
645	1104	restoreButton.addActionListener(this);
646		- restoreButton.setEnabled(false);
	1105	+ //restoreButton.setEnabled(false);
647	1106
648	1107	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- replaceButton.setToolTipText("Replace current");
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
650	1109	replaceButton.addActionListener(this);
651		- replaceButton.setEnabled(false);
	1110	+ //replaceButton.setEnabled(false);
652	1111
653	1112	copyOptionsPanel.add(updown);
654	1113
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);
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ oneStepButton.setToolTipText("Animate one step forward");
	1121	+ oneStepButton.addActionListener(this);
659	1122
660	1123	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
661	1124	liveCB.setToolTipText("Enable animation");
662	1125	liveCB.addItemListener(this);
663	1126
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	1127	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
669	1128	fastCB.setToolTipText("Fast mode");
670	1129	fastCB.addItemListener(this);
..	..	@@ -683,29 +1142,14 @@
683	1142	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1143	snapobjectButton.addActionListener(this);
685	1144	snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ fourButton.addActionListener(this);
	1148	+ fourButton.setToolTipText("Show control panel only");
686	1149	}
687	1150
688	1151	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
689	1152
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	1153
710	1154	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	1155	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -717,28 +1161,30 @@
717	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
718	1162	//clearButton.addActionListener(this);
719	1163
	1164	+ cGridBag row1 = new cGridBag();
	1165	+
720	1166	// INSERT
721		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722		- gridButton.setToolTipText("Create grid");
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
723	1169	gridButton.addActionListener(this);
724	1170
725		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726	1172	boxButton.setToolTipText("Create box");
727	1173	boxButton.addActionListener(this);
728	1174
729		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1176	sphereButton.setToolTipText("Create sphere");
731	1177	sphereButton.addActionListener(this);
732	1178
733		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1180	coneButton.setToolTipText("Create cone");
735	1181	coneButton.addActionListener(this);
736	1182
737		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1184	torusButton.setToolTipText("Create torus");
739	1185	torusButton.addActionListener(this);
740	1186
741		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	1188	superButton.setToolTipText("Create superellipsoid");
743	1189	superButton.addActionListener(this);
744	1190
..	..	@@ -749,51 +1195,53 @@
749	1195	kleinButton.addActionListener(this);
750	1196	}
751	1197
752		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
753	1199	particlesButton.setToolTipText("Create particle system");
754	1200	particlesButton.addActionListener(this);
755	1201
756		- oe.toolboxPanel.Return();
	1202	+ oe.toolboxPanel.add(row1);
757	1203
758		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
759	1207	groupButton.setToolTipText("Create group");
760	1208	groupButton.addActionListener(this);
761	1209
762		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
763	1211	compositeButton.setToolTipText("Create composite");
764	1212	compositeButton.addActionListener(this);
765	1213
766		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
767	1215	switchButton.setToolTipText("Create item switcher");
768	1216	switchButton.addActionListener(this);
769	1217
770		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
771	1219	loopButton.setToolTipText("Create loop");
772	1220	loopButton.addActionListener(this);
773	1221
774		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775	1223	textureButton.setToolTipText("Create texture");
776	1224	textureButton.addActionListener(this);
777	1225
778		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
779	1227	overlayButton.setToolTipText("Create overlay");
780	1228	overlayButton.addActionListener(this);
781	1229
782		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783	1231	lightButton.setToolTipText("Create light");
784	1232	lightButton.addActionListener(this);
785	1233
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		- }
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
797	1245
798	1246	// EDIT panel
799	1247	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -801,20 +1249,20 @@
801	1249	editButton.addActionListener(this);
802	1250
803	1251	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804		- uneditButton.setToolTipText("Remove selection controls");
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
805	1253	uneditButton.addActionListener(this);
806	1254
807	1255	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
808		- allParamsButton.setToolTipText("Show all controle");
	1256	+ allParamsButton.setToolTipText("Show all controls");
809	1257	allParamsButton.addActionListener(this);
810	1258
811		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
813	1261	clearPanelButton.addActionListener(this);
814	1262
815		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816		- unselectButton.setToolTipText("Unselect");
817		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
818	1266
819	1267	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
820	1268	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -853,8 +1301,8 @@
853	1301	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854	1302	sliderPane.preferredHeight = 1;
855	1303
856		-// mainPanel.setDividerLocation(0.5); //1.0);
857		-// mainPanel.setResizeWeight(0.5);
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
858	1306
859	1307	//jList.addListSelectionListener(this);
860	1308	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -862,7 +1310,7 @@
862	1310	//jTree.setEditable(true);
863	1311	oe.jTree.setDragEnabled(true);
864	1312	//jTree.setPreferredSize(new Dimension(10,10));
865		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
866	1314
867	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
868	1316
..	..	@@ -874,7 +1322,7 @@
874	1322	dgr.addDragGestureListener(this);
875	1323	}catch(Exception e) {}
876	1324	*/
877		- radio.layout = sixButton; // sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
878	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
879	1327	}
880	1328
..	..	@@ -925,9 +1373,12 @@
925	1373	smoothCB.setToolTipText("Snapping delay");
926	1374	smoothCB.addItemListener(this);
927	1375
928		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
929		- slowCB.setToolTipText("Smooth interpolation");
930		- slowCB.addItemListener(this);
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
931	1382
932	1383	// constraints.gridy += 1;
933	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1006,6 +1457,14 @@
1006	1457
1007	1458	void EditObject(Object3D obj)
1008	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
1009	1468	cRadio radioButton = new cRadio(obj.name);
1010	1469
1011	1470	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1016,7 +1475,7 @@
1016	1475	}
1017	1476
1018	1477	radioButton.SetObject(obj);
1019		- radioButton.layout = sixButton; // sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
1020	1479	radioButton.SetCamera(cameraView.renderCamera, false);
1021	1480	radioButton.addActionListener(this);
1022	1481	radioPanel.add(radioButton);
..	..	@@ -1041,6 +1500,8 @@
1041	1500	cCheckBox localCB;
1042	1501	cCheckBox crowdCB;
1043	1502	cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
1044	1505	cToggleButton fastCB;
1045	1506	cCheckBox slowCB;
1046	1507	cCheckBox boxCB;
..	..	@@ -1111,6 +1572,12 @@
1111	1572	{
1112	1573	cameraView.ToggleInertia();
1113	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
1114	1581	}
1115	1582	else if(e.getSource() == localCB)
1116	1583	{
..	..	@@ -1388,7 +1855,12 @@
1388	1855	TreePath path;
1389	1856
1390	1857	public TransferableTreePath(TreePath tp) {
1391		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
1392	1864	}
1393	1865
1394	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2134,6 +2606,23 @@
2134	2606	{
2135	2607	makeSomething(new Light());
2136	2608	} else
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
2137	2626	if (source == csgItem)
2138	2627	{
2139	2628	group(new CSG());
..	..	@@ -2219,7 +2708,7 @@
2219	2708	if (source == computeAOItem)
2220	2709	{
2221	2710	Globals.drawMode = CameraPane.OCCLUSION;
2222		- Globals.theRenderer.repaint();
	2711	+ cameraView.repaint();
2223	2712	} else
2224	2713	if (source == recompileItem)
2225	2714	{
..	..	@@ -2234,7 +2723,7 @@
2234	2723	if (source == invariantsItem)
2235	2724	{
2236	2725	System.out.println("Invariants:");
2237		- Grafreed.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
2238	2727	} else
2239	2728	if (source == memoryItem)
2240	2729	{
..	..	@@ -2265,33 +2754,52 @@
2265	2754	{
2266	2755	ToggleFullScreen();
2267	2756	} else
2268		- if (source == undoButton)
	2757	+ if (source == collapseButton)
	2758	+ {
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
	2761	+ } else
	2762	+ if (source == maximize3DButton)
	2763	+ {
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
	2768	+ } else
	2769	+ if (source == previousVersionButton)
2269	2770	{
2270	2771	// Go to previous version
2271	2772	//if (!Undo())
2272	2773	//java.awt.Toolkit.getDefaultToolkit().beep();
2273		- Undo();
	2774	+ PreviousVersion();
2274	2775	} else
2275	2776	if (source == restoreButton)
2276	2777	{
2277	2778	// Restore current version
2278	2779	Restore();
	2780	+ //restoreButton.setEnabled(false);
2279	2781	} else
2280	2782	if (source == replaceButton)
2281	2783	{
2282	2784	// Overwrite current version
2283	2785	Replace();
	2786	+ //replaceButton.setEnabled(false);
2284	2787	} else
2285		- if (source == redoButton)
	2788	+ if (source == nextVersionButton)
2286	2789	{
2287	2790	// Go to next version
2288		- Redo();
	2791	+ NextVersion();
2289	2792	} else
2290		- if (source == saveButton)
	2793	+ if (source == saveVersionButton)
2291	2794	{
2292	2795	// Save a new version
2293	2796	if (!Save(true))
2294	2797	java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
2295	2803	} else
2296	2804	if (source == oneStepButton)
2297	2805	{
..	..	@@ -2346,11 +2854,11 @@
2346	2854	} else
2347	2855	if (source == undoItem)
2348	2856	{
2349		- Undo();
	2857	+ PreviousVersion();
2350	2858	} else
2351	2859	if (source == redoItem)
2352	2860	{
2353		- Redo();
	2861	+ NextVersion();
2354	2862	} else
2355	2863	if (source == duplicateItem)
2356	2864	{
..	..	@@ -3169,6 +3677,31 @@
3169	3677
3170	3678	refreshContents();
3171	3679	} else
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
	3703	+ refreshContents();
	3704	+ } else
3172	3705	if (source == flashSelectionButton)
3173	3706	{
3174	3707	CameraPane.flash = true;
..	..	@@ -3184,38 +3717,7 @@
3184	3717	if (CameraPane.FULLSCREEN)
3185	3718	fullscreenLayout = radio.layout;
3186	3719
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();
	3720	+ Show3DView();
3219	3721
3220	3722	cameraView.requestFocusInWindow();
3221	3723
..	..	@@ -3270,8 +3772,8 @@
3270	3772	// centralPanel.setVisible(true);
3271	3773	// XYZPanel.setVisible(true);
3272	3774	bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
3273	3776	bigThree.add(centralPanel);
3274		- bigThree.add(XYZPanel);
3275	3777	bigThree.FlushUI();
3276	3778
3277	3779	cameraView.requestFocusInWindow();
..	..	@@ -3351,8 +3853,8 @@
3351	3853	// centralPanel.setVisible(true);
3352	3854	// XYZPanel.setVisible(false);
3353	3855	bigThree.ClearUI();
3354		- bigThree.add(scenePanel);
3355	3856	bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
3356	3858	bigThree.FlushUI();
3357	3859
3358	3860	cameraView.requestFocusInWindow();
..	..	@@ -3401,6 +3903,7 @@
3401	3903	} else
3402	3904	if (source == rootButton)
3403	3905	{
	3906	+ Replace();
3404	3907	Object3D obj;
3405	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3406	3909	{
..	..	@@ -3458,10 +3961,10 @@
3458	3961	{
3459	3962	Object3D child = (Object3D)e.nextElement();
3460	3963	if(child.editWindow != null)
3461		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3462	3964	child.pinned = false;
3463	3965	child.CloseUI();
3464	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3465	3968
3466	3969	//child.editWindow = null; // ???????????
3467	3970	}
..	..	@@ -3480,6 +3983,7 @@
3480	3983	obj.CloseUI();
3481	3984	}
3482	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
3483	3987	refreshContents(true);
3484	3988	} else
3485	3989	if (source == allParamsButton)
..	..	@@ -3536,8 +4040,6 @@
3536	4040
3537	4041	copy = group;
3538	4042
3539		- SetUndoStates();
3540		-
3541	4043	//Globals.theRenderer.object = group;
3542	4044	if(!useclient)
3543	4045	{
..	..	@@ -3565,7 +4067,10 @@
3565	4067	*/
3566	4068	radio.layout.doClick();
3567	4069
	4070	+ SetUndoStates();
	4071	+
3568	4072	ClearUnpinned();
	4073	+
3569	4074	//Grafreed.Assert(group != null);
3570	4075	//Grafreed.Assert(group.selection != null);
3571	4076	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3582,11 +4087,13 @@
3582	4087	} else if (event.getSource() == editCameraItem)
3583	4088	{
3584	4089	cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
3585	4091	cameraView.repaint();
3586	4092	return;
3587	4093	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3588	4094	{
3589	4095	cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
3590	4097	cameraView.repaint();
3591	4098	return;
3592	4099	// } else if (event.getSource() == textureButton)
..	..	@@ -4163,7 +4670,7 @@
4163	4670
4164	4671	try
4165	4672	{
4166		- texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167	4674	}
4168	4675	catch (Exception e)
4169	4676	{
..	..	@@ -4719,9 +5226,7 @@
4719	5226
4720	5227	freezemodel = false;
4721	5228	}
4722		-
4723		- boolean flashIt = true;
4724		-
	5229	+
4725	5230	public void valueChanged(TreeSelectionEvent e)
4726	5231	//public boolean handleEvent(Event event)
4727	5232	{
..	..	@@ -4794,13 +5299,28 @@
4794	5299	{
4795	5300	editButton.setEnabled(enabled);
4796	5301	uneditButton.setEnabled(enabled);
4797		- unselectButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
4798	5303	flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
4799	5319	}
4800	5320
4801	5321	void refreshContents(boolean cp)
4802	5322	{
4803		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4804	5324	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4805	5325	{
4806	5326	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4810,7 +5330,7 @@
4810	5330	Object3D child = (Object3D) group.selection.get(i);
4811	5331
4812	5332	objEditor.AddInfo(child, this, true);
4813		- System.err.println("info : " + child.GetPath());
	5333	+// System.err.println("info : " + child.GetPath());
4814	5334	}
4815	5335
4816	5336	objEditor.SetText(); // jan 2014
..	..	@@ -5636,7 +6156,6 @@
5636	6156
5637	6157	cButton restoreCameraButton;
5638	6158
5639		- cButton saveButton;
5640	6159	cButton oneStepButton;
5641	6160
5642	6161	cButton groupButton;
..	..	@@ -5645,6 +6164,22 @@
5645	6164	cButton switchButton;
5646	6165	cButton loopButton;
5647	6166	cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
5648	6183
5649	6184	cButton gridButton;
5650	6185	cButton boxButton;
..	..	@@ -5793,6 +6328,8 @@
5793	6328	private MenuItem attachBumpItem;
5794	6329	private MenuItem detachBumpItem;
5795	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5796	6333
5797	6334	private MenuItem particleItem;
5798	6335	private MenuItem ragdollItem;