~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,
..	..	@@ -24,11 +25,12 @@
24	25	ItemListener // ListSelectionListener
25	26	{
26	27
27		- public void AddSkyboxButton(String f, String s, cGridBag row3)
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
28	29	{
29	30	cButton skyboxButton;
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31		- row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
32	34	skyboxButton.setToolTipText(s);
33	35	skyboxButton.addActionListener(new ActionListener()
34	36	{
..	..	@@ -40,14 +42,333 @@
40	42	});
41	43	}
42	44
43		- public void ChangeSkybox(String name)
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
44	46	{
45		- cameraView.envyoff = false;
46		- cameraView.skyboxname = name;
47		- cameraView.skyboxext = "jpg";
48		- cameraView.repaint();
	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	+ });
49	59	}
50	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	+
51	372	//ObjEditor objEditor;
52	373	public void closeUI2()
53	374	{
..	..	@@ -85,10 +406,12 @@
85	406	this.copy = this.group = group;
86	407	//selectees = this.group.selectees;
87	408
88		- if (copy.versions == null)
	409	+ if (copy.versionlist == null)
89	410	{
90		- copy.versions = new byte[100][];
	411	+ copy.versionlist = new Object3D[100];
91	412	copy.versionindex = -1;
	413	+
	414	+ Save(true);
92	415	}
93	416
94	417	if(ui)
..	..	@@ -112,9 +435,9 @@
112	435
113	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
114	437
115		- if (copy.versions == null)
	438	+ if (copy.versionlist == null)
116	439	{
117		- copy.versions = new byte[100][];
	440	+ copy.versionlist = new Object3D[100];
118	441	copy.versionindex = -1;
119	442
120	443	Save(true);
..	..	@@ -320,11 +643,9 @@
320	643	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
321	644	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
322	645	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
323		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
324	646	oe.cameraMenu.add("-");
325	647	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
326	648	openWindowItem.addActionListener(this);
327		- editLeafItem.addActionListener(this);
328	649	lookAtItem.addActionListener(this);
329	650	//lookFromItem.addActinoListener(this);
330	651	//switchViewItem.addActionListener(this);
..	..	@@ -572,6 +893,9 @@
572	893	shareGeometriesItem.addActionListener(this);
573	894	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
574	895	mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
575	899	if (Globals.ADVANCED)
576	900	{
577	901	// Pretty much the same as duplicate and clone.
..	..	@@ -588,6 +912,73 @@
588	912	buildToolsMenu(menu);
589	913	}
590	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	+ }
591	982
592	983	void SetupUI2(ObjEditor oe)
593	984	{
..	..	@@ -606,11 +997,6 @@
606	997	//new Exception().printStackTrace();
607	998
608	999	oe.radioPanel = new JPanel(new GridBagLayout());
609		- oe.aConstraints.weightx = 1;
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
612		- oe.aConstraints.gridwidth = 100;
613		- oe.aConstraints.gridheight = 1;
614	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
615	1001
616	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -643,10 +1029,49 @@
643	1029
644	1030	if (Globals.ADVANCED)
645	1031	{
646		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- maxButton.setToolTipText("Maximize window");
648		- 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);
649	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	+ //
650	1075
651	1076	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652	1077	fullButton.setToolTipText("Full-screen window");
..	..	@@ -660,41 +1085,45 @@
660	1085	restoreCameraButton.setToolTipText("Restore viewpoint");
661	1086	restoreCameraButton.addActionListener(this);
662	1087
663		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- saveButton.setToolTipText("New version");
665		- 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);
666	1091
667		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- undoButton.setToolTipText("Previous version");
669		- undoButton.addActionListener(this);
670		- 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);
671	1100
672	1101	cGridBag updown = new cGridBag().setVertical(true);
673	1102	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- restoreButton.setToolTipText("Restore current");
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
675	1104	restoreButton.addActionListener(this);
676		- restoreButton.setEnabled(false);
	1105	+ //restoreButton.setEnabled(false);
677	1106
678	1107	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- replaceButton.setToolTipText("Replace current");
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
680	1109	replaceButton.addActionListener(this);
681		- replaceButton.setEnabled(false);
	1110	+ //replaceButton.setEnabled(false);
682	1111
683	1112	copyOptionsPanel.add(updown);
684	1113
685		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686		- redoButton.setToolTipText("Next version");
687		- redoButton.addActionListener(this);
688		- 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);
689	1122
690	1123	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
691	1124	liveCB.setToolTipText("Enable animation");
692	1125	liveCB.addItemListener(this);
693	1126
694		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695		- oneStepButton.setToolTipText("Animate one step forward");
696		- oneStepButton.addActionListener(this);
697		-
698	1127	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
699	1128	fastCB.setToolTipText("Fast mode");
700	1129	fastCB.addItemListener(this);
..	..	@@ -721,21 +1150,6 @@
721	1150
722	1151	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
723	1152
724		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725		- twoButton.setToolTipText("Show 3D view only");
726		- twoButton.addActionListener(this);
727		- this.fullscreenLayout = twoButton;
728		-
729		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- threeButton.setToolTipText("Show controls and 3D view");
731		- threeButton.addActionListener(this);
732		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733		- sixButton.setToolTipText("Show 3D view and controls");
734		- sixButton.addActionListener(this);
735		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736		-// sevenButton.setToolTipText("3-column layout");
737		-// sevenButton.addActionListener(this);
738		- //
739	1153
740	1154	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1155	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -751,7 +1165,7 @@
751	1165
752	1166	// INSERT
753	1167	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754		- gridButton.setToolTipText("Create grid");
	1168	+ gridButton.setToolTipText("Create ground");
755	1169	gridButton.addActionListener(this);
756	1170
757	1171	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -819,107 +1233,15 @@
819	1233
820	1234	oe.toolboxPanel.add(row2);
821	1235
822		- // ENVYMAPS
823		- cGridBag row3 = new cGridBag();
824		- row3.preferredHeight = 20;
	1236	+ cGridBag textures = new cGridBag();
825	1237
826		- AddSkyboxButton("default", "rgb", row3);
827		- AddSkyboxButton("default", "cornell", row3);
828		- AddSkyboxButton("default", "uffizi", row3);
829		- AddSkyboxButton("default", "CloudyHills", row3);
830		- AddSkyboxButton("default", "skycube", row3);
831		-
832		- oe.toolboxPanel.add(row3);
833		-
834		- cGridBag row4 = new cGridBag();
835		- row4.preferredHeight = 20;
	1238	+ CreateTexturePanel(textures);
836	1239
837		- AddSkyboxButton("bridge", "Bridge2", row4);
838		- AddSkyboxButton("urban", "GamlaStan2", row4);
839		- AddSkyboxButton("urban", "Parliament", row4);
840		- AddSkyboxButton("urban", "Roundabout", row4);
	1240	+ oe.toolboxPanel.add(textures);
841	1241
842		- oe.toolboxPanel.add(row4);
843		-
844		- cGridBag row5 = new cGridBag();
845		- row5.preferredHeight = 20;
	1242	+ textures.preferredHeight = 100;
846	1243
847		- AddSkyboxButton("urban", "SaintLazarusChurch", row5);
848		- AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
849		- AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
850		- AddSkyboxButton("urban", "UnionSquare", row5);
851		-
852		- oe.toolboxPanel.add(row5);
853		-
854		- cGridBag row6 = new cGridBag();
855		- row6.preferredHeight = 20;
856		-
857		- AddSkyboxButton("park", "BerzeliiPark", row6);
858		- AddSkyboxButton("park", "Buddha", row6);
859		- AddSkyboxButton("park", "CNTower2", row6);
860		- //AddSkyboxButton("park", "Fatbursparken", row6);
861		- AddSkyboxButton("park", "NiagaraFalls1", row6);
862		-
863		- oe.toolboxPanel.add(row6);
864		-
865		- cGridBag row7 = new cGridBag();
866		- row7.preferredHeight = 20;
867		-
868		- AddSkyboxButton("park", "NiagaraFalls3", row7);
869		- AddSkyboxButton("park", "Park", row7);
870		- //AddSkyboxButton("park", "Park2", row6);
871		- //AddSkyboxButton("park", "Path", row6);
872		- AddSkyboxButton("park", "Pond", row7);
873		- AddSkyboxButton("park", "Skansen", row7);
874		-
875		- oe.toolboxPanel.add(row7);
876		-
877		- cGridBag row8 = new cGridBag();
878		- row8.preferredHeight = 20;
879		-
880		- AddSkyboxButton("park", "Skansen2", row8);
881		- AddSkyboxButton("park", "Skansen3", row8);
882		- AddSkyboxButton("park", "Skansen4", row8);
883		- AddSkyboxButton("park", "Skansen5", row8);
884		-
885		- oe.toolboxPanel.add(row8);
886		-
887		- cGridBag row9 = new cGridBag();
888		- row9.preferredHeight = 20;
889		-
890		- AddSkyboxButton("park", "Stairs", row9);
891		- //AddSkyboxButton("park", "Tantolunden", row6);
892		- //AddSkyboxButton("park", "Tantolunden3", row6);
893		- AddSkyboxButton("park", "Tantolunden4", row9);
894		-
895		- oe.toolboxPanel.add(row9);
896		-/*
897		-BerzeliiPark
898		-Buddha
899		-CNTower2
900		-Fatbursparken
901		-NiagaraFalls1
902		-NiagaraFalls3
903		-Park
904		-Park2
905		-Path
906		-Pond
907		-Skansen
908		-Skansen2
909		-Skansen3
910		-Skansen4
911		-Skansen5
912		-Stairs
913		-Tantolunden
914		-Tantolunden3
915		-Tantolunden4
916		- */
917		-
918		- for (int i=1; --i>=0;)
919		- {
920		- //oe.toolboxPanel.Return();
921		- oe.toolboxPanel.add(new cGridBag());
922		- }
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
923	1245
924	1246	// EDIT panel
925	1247	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -927,20 +1249,20 @@
927	1249	editButton.addActionListener(this);
928	1250
929	1251	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
930		- uneditButton.setToolTipText("Remove selection controls");
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
931	1253	uneditButton.addActionListener(this);
932	1254
933	1255	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
934		- allParamsButton.setToolTipText("Show all controle");
	1256	+ allParamsButton.setToolTipText("Show all controls");
935	1257	allParamsButton.addActionListener(this);
936	1258
937		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
938		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
939	1261	clearPanelButton.addActionListener(this);
940	1262
941		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- unselectButton.setToolTipText("Unselect");
943		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
944	1266
945	1267	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
946	1268	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1000,7 +1322,7 @@
1000	1322	dgr.addDragGestureListener(this);
1001	1323	}catch(Exception e) {}
1002	1324	*/
1003		- radio.layout = sixButton; // sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
1004	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1005	1327	}
1006	1328
..	..	@@ -1051,9 +1373,12 @@
1051	1373	smoothCB.setToolTipText("Snapping delay");
1052	1374	smoothCB.addItemListener(this);
1053	1375
1054		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1055		- slowCB.setToolTipText("Smooth interpolation");
1056		- 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);
1057	1382
1058	1383	// constraints.gridy += 1;
1059	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1132,6 +1457,14 @@
1132	1457
1133	1458	void EditObject(Object3D obj)
1134	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	+
1135	1468	cRadio radioButton = new cRadio(obj.name);
1136	1469
1137	1470	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1142,7 +1475,7 @@
1142	1475	}
1143	1476
1144	1477	radioButton.SetObject(obj);
1145		- radioButton.layout = sixButton; // sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
1146	1479	radioButton.SetCamera(cameraView.renderCamera, false);
1147	1480	radioButton.addActionListener(this);
1148	1481	radioPanel.add(radioButton);
..	..	@@ -1167,6 +1500,8 @@
1167	1500	cCheckBox localCB;
1168	1501	cCheckBox crowdCB;
1169	1502	cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
1170	1505	cToggleButton fastCB;
1171	1506	cCheckBox slowCB;
1172	1507	cCheckBox boxCB;
..	..	@@ -1237,6 +1572,12 @@
1237	1572	{
1238	1573	cameraView.ToggleInertia();
1239	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
1240	1581	}
1241	1582	else if(e.getSource() == localCB)
1242	1583	{
..	..	@@ -1514,7 +1855,12 @@
1514	1855	TreePath path;
1515	1856
1516	1857	public TransferableTreePath(TreePath tp) {
1517		- 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);
1518	1864	}
1519	1865
1520	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2377,7 +2723,7 @@
2377	2723	if (source == invariantsItem)
2378	2724	{
2379	2725	System.out.println("Invariants:");
2380		- Grafreed.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
2381	2727	} else
2382	2728	if (source == memoryItem)
2383	2729	{
..	..	@@ -2408,33 +2754,52 @@
2408	2754	{
2409	2755	ToggleFullScreen();
2410	2756	} else
2411		- 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)
2412	2770	{
2413	2771	// Go to previous version
2414	2772	//if (!Undo())
2415	2773	//java.awt.Toolkit.getDefaultToolkit().beep();
2416		- Undo();
	2774	+ PreviousVersion();
2417	2775	} else
2418	2776	if (source == restoreButton)
2419	2777	{
2420	2778	// Restore current version
2421	2779	Restore();
	2780	+ //restoreButton.setEnabled(false);
2422	2781	} else
2423	2782	if (source == replaceButton)
2424	2783	{
2425	2784	// Overwrite current version
2426	2785	Replace();
	2786	+ //replaceButton.setEnabled(false);
2427	2787	} else
2428		- if (source == redoButton)
	2788	+ if (source == nextVersionButton)
2429	2789	{
2430	2790	// Go to next version
2431		- Redo();
	2791	+ NextVersion();
2432	2792	} else
2433		- if (source == saveButton)
	2793	+ if (source == saveVersionButton)
2434	2794	{
2435	2795	// Save a new version
2436	2796	if (!Save(true))
2437	2797	java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
2438	2803	} else
2439	2804	if (source == oneStepButton)
2440	2805	{
..	..	@@ -2489,11 +2854,11 @@
2489	2854	} else
2490	2855	if (source == undoItem)
2491	2856	{
2492		- Undo();
	2857	+ PreviousVersion();
2493	2858	} else
2494	2859	if (source == redoItem)
2495	2860	{
2496		- Redo();
	2861	+ NextVersion();
2497	2862	} else
2498	2863	if (source == duplicateItem)
2499	2864	{
..	..	@@ -3352,38 +3717,7 @@
3352	3717	if (CameraPane.FULLSCREEN)
3353	3718	fullscreenLayout = radio.layout;
3354	3719
3355		- // bug
3356		- //gridPanel.setDividerLocation(1.0);
3357		- //bigPanel.setDividerLocation(0.0);
3358		-// bigThree.remove(scenePanel);
3359		-// bigThree.remove(centralPanel);
3360		-// bigThree.remove(XYZPanel);
3361		-// aWindowConstraints.gridx = 0;
3362		-// aWindowConstraints.gridy = 0;
3363		-// aWindowConstraints.gridwidth = 1;
3364		-// // aConstraints.gridheight = 3;
3365		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3366		-// aWindowConstraints.weightx = 0;
3367		-// aWindowConstraints.weighty = 1;
3368		-// //bigThree.add(jtp, aWindowConstraints);
3369		-// aWindowConstraints.weightx = 1;
3370		-// aWindowConstraints.gridwidth = 3;
3371		-// // aConstraints.gridheight = 3;
3372		-// aWindowConstraints.gridx = 1;
3373		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3374		-// bigThree.add(centralPanel, aWindowConstraints);
3375		-// aWindowConstraints.weightx = 0;
3376		-// aWindowConstraints.gridx = 4;
3377		-// aWindowConstraints.gridwidth = 1;
3378		-// // aConstraints.gridheight = 3;
3379		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3380		-// //bigThree.add(XYZPanel, aWindowConstraints);
3381		-// scenePanel.setVisible(false);
3382		-// centralPanel.setVisible(true);
3383		-// XYZPanel.setVisible(false);
3384		- bigThree.ClearUI();
3385		- bigThree.add(centralPanel);
3386		- bigThree.FlushUI();
	3720	+ Show3DView();
3387	3721
3388	3722	cameraView.requestFocusInWindow();
3389	3723
..	..	@@ -3569,6 +3903,7 @@
3569	3903	} else
3570	3904	if (source == rootButton)
3571	3905	{
	3906	+ Replace();
3572	3907	Object3D obj;
3573	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3574	3909	{
..	..	@@ -3626,10 +3961,10 @@
3626	3961	{
3627	3962	Object3D child = (Object3D)e.nextElement();
3628	3963	if(child.editWindow != null)
3629		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3630	3964	child.pinned = false;
3631	3965	child.CloseUI();
3632	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3633	3968
3634	3969	//child.editWindow = null; // ???????????
3635	3970	}
..	..	@@ -3648,6 +3983,7 @@
3648	3983	obj.CloseUI();
3649	3984	}
3650	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
3651	3987	refreshContents(true);
3652	3988	} else
3653	3989	if (source == allParamsButton)
..	..	@@ -3704,8 +4040,6 @@
3704	4040
3705	4041	copy = group;
3706	4042
3707		- SetUndoStates();
3708		-
3709	4043	//Globals.theRenderer.object = group;
3710	4044	if(!useclient)
3711	4045	{
..	..	@@ -3733,7 +4067,10 @@
3733	4067	*/
3734	4068	radio.layout.doClick();
3735	4069
	4070	+ SetUndoStates();
	4071	+
3736	4072	ClearUnpinned();
	4073	+
3737	4074	//Grafreed.Assert(group != null);
3738	4075	//Grafreed.Assert(group.selection != null);
3739	4076	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3750,11 +4087,13 @@
3750	4087	} else if (event.getSource() == editCameraItem)
3751	4088	{
3752	4089	cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
3753	4091	cameraView.repaint();
3754	4092	return;
3755	4093	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3756	4094	{
3757	4095	cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
3758	4097	cameraView.repaint();
3759	4098	return;
3760	4099	// } else if (event.getSource() == textureButton)
..	..	@@ -4887,9 +5226,7 @@
4887	5226
4888	5227	freezemodel = false;
4889	5228	}
4890		-
4891		- boolean flashIt = true;
4892		-
	5229	+
4893	5230	public void valueChanged(TreeSelectionEvent e)
4894	5231	//public boolean handleEvent(Event event)
4895	5232	{
..	..	@@ -4962,13 +5299,28 @@
4962	5299	{
4963	5300	editButton.setEnabled(enabled);
4964	5301	uneditButton.setEnabled(enabled);
4965		- unselectButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
4966	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);
4967	5319	}
4968	5320
4969	5321	void refreshContents(boolean cp)
4970	5322	{
4971		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4972	5324	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4973	5325	{
4974	5326	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4978,7 +5330,7 @@
4978	5330	Object3D child = (Object3D) group.selection.get(i);
4979	5331
4980	5332	objEditor.AddInfo(child, this, true);
4981		- System.err.println("info : " + child.GetPath());
	5333	+// System.err.println("info : " + child.GetPath());
4982	5334	}
4983	5335
4984	5336	objEditor.SetText(); // jan 2014
..	..	@@ -5804,7 +6156,6 @@
5804	6156
5805	6157	cButton restoreCameraButton;
5806	6158
5807		- cButton saveButton;
5808	6159	cButton oneStepButton;
5809	6160
5810	6161	cButton groupButton;