~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,9 +406,9 @@
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;
67	413	}
68	414
..	..	@@ -87,9 +433,9 @@
87	433
88	434	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	435
90		- if (copy.versions == null)
	436	+ if (copy.versionlist == null)
91	437	{
92		- copy.versions = new byte[100][];
	438	+ copy.versionlist = new Object3D[100];
93	439	copy.versionindex = -1;
94	440
95	441	Save(true);
..	..	@@ -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);
..	..	@@ -558,6 +909,73 @@
558	909	buildToolsMenu(menu);
559	910	}
560	911
	912	+ JTabbedPane resourcecontainer;
	913	+ cGridBag currenttab;
	914	+ boolean added; // patch for jar
	915	+
	916	+ int tabcount = 0;
	917	+ int colcount = 0;
	918	+ int rowcount = 0;
	919	+ int texturecount = 0;
	920	+
	921	+ int columns = 5;
	922	+ int rows = 7;
	923	+
	924	+ public void ResourceCallBack(String[] path)
	925	+ {
	926	+// for (int i = 0; i < path.length; i++)
	927	+// System.out.print(path[i] + "/");
	928	+// System.out.println();
	929	+
	930	+ if (//rowcount == 0 \|\|
	931	+ path.length == 1)
	932	+ {
	933	+ currenttab = new cGridBag();
	934	+ added = false;
	935	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	936	+ currenttab.setName(tabname);
	937	+ rowcount = 1;
	938	+ colcount = 0;
	939	+ texturecount = 0;
	940	+ }
	941	+
	942	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	943	+ {
	944	+ if (!added)
	945	+ {
	946	+ added = true;
	947	+ resourcecontainer.add(currenttab);
	948	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	949	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	950	+ }
	951	+
	952	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	953	+
	954	+ if (++colcount >= columns)
	955	+ {
	956	+ colcount = 0;
	957	+ currenttab.Return();
	958	+
	959	+ if (rowcount++ >= rows)
	960	+ {
	961	+ rowcount = 0;
	962	+ }
	963	+ }
	964	+ }
	965	+ else
	966	+ {
	967	+// if (!path[path.length-1].equals("icons"))
	968	+// resourcecontainer.Return();
	969	+ }
	970	+ }
	971	+
	972	+ void CreateTexturePanel(cGridBag container)
	973	+ {
	974	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	975	+ container.add(resourcecontainer);
	976	+
	977	+ Grafreed.ParseResources("textures", this);
	978	+ }
561	979
562	980	void SetupUI2(ObjEditor oe)
563	981	{
..	..	@@ -576,11 +994,6 @@
576	994	//new Exception().printStackTrace();
577	995
578	996	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	997	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
585	998
586	999	oe.buttonGroup = new ButtonGroup();
..	..	@@ -603,7 +1016,7 @@
603	1016	*/
604	1017	cGridBag copyOptionsPanel = new cGridBag();
605	1018
606		- copyOptionsPanel.preferredHeight = 1;
	1019	+ copyOptionsPanel.preferredHeight = 2;
607	1020
608	1021	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
609	1022
..	..	@@ -618,6 +1031,45 @@
618	1031	maxButton.addActionListener(this);
619	1032	}
620	1033
	1034	+ cButton gcButton;
	1035	+
	1036	+ oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ gcButton.setToolTipText("Garbage collect");
	1038	+ gcButton.addActionListener(new ActionListener()
	1039	+ {
	1040	+ public void actionPerformed(ActionEvent e)
	1041	+ {
	1042	+ System.gc();
	1043	+ }
	1044	+ });
	1045	+
	1046	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ collapseButton.setToolTipText("Collapse toolbar");
	1048	+ collapseButton.addActionListener(this);
	1049	+
	1050	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1052	+ maximize3DButton.addActionListener(this);
	1053	+
	1054	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ twoButton.setToolTipText("Show 3D view only");
	1056	+ twoButton.addActionListener(this);
	1057	+ this.fullscreenLayout = twoButton;
	1058	+
	1059	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1060	+ threeButton.setToolTipText("Show controls and 3D view");
	1061	+ threeButton.addActionListener(this);
	1062	+ if (Globals.ADVANCED)
	1063	+ {
	1064	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ sixButton.setToolTipText("Show 3D view and controls");
	1066	+ sixButton.addActionListener(this);
	1067	+ }
	1068	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+// sevenButton.setToolTipText("3-column layout");
	1070	+// sevenButton.addActionListener(this);
	1071	+ //
	1072	+
621	1073	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	1074	fullButton.setToolTipText("Full-screen window");
623	1075	fullButton.addActionListener(this);
..	..	@@ -630,41 +1082,45 @@
630	1082	restoreCameraButton.setToolTipText("Restore viewpoint");
631	1083	restoreCameraButton.addActionListener(this);
632	1084
633		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- saveButton.setToolTipText("New version");
635		- saveButton.addActionListener(this);
	1085	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ saveVersionButton.setToolTipText("Duplicate current version");
	1087	+ saveVersionButton.addActionListener(this);
636	1088
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);
	1089	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ deleteVersionButton.setToolTipText("Delete current version");
	1091	+ deleteVersionButton.addActionListener(this);
	1092	+
	1093	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ previousVersionButton.setToolTipText("Previous version");
	1095	+ previousVersionButton.addActionListener(this);
	1096	+ previousVersionButton.setEnabled(false);
641	1097
642	1098	cGridBag updown = new cGridBag().setVertical(true);
643	1099	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- restoreButton.setToolTipText("Restore current");
	1100	+ restoreButton.setToolTipText("Undo (restore current version)");
645	1101	restoreButton.addActionListener(this);
646		- restoreButton.setEnabled(false);
	1102	+ //restoreButton.setEnabled(false);
647	1103
648	1104	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- replaceButton.setToolTipText("Replace current");
	1105	+ replaceButton.setToolTipText("Save (replace current version)");
650	1106	replaceButton.addActionListener(this);
651		- replaceButton.setEnabled(false);
	1107	+ //replaceButton.setEnabled(false);
652	1108
653	1109	copyOptionsPanel.add(updown);
654	1110
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);
	1111	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ nextVersionButton.setToolTipText("Next version");
	1113	+ nextVersionButton.addActionListener(this);
	1114	+ nextVersionButton.setEnabled(false);
	1115	+
	1116	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ oneStepButton.setToolTipText("Animate one step forward");
	1118	+ oneStepButton.addActionListener(this);
659	1119
660	1120	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
661	1121	liveCB.setToolTipText("Enable animation");
662	1122	liveCB.addItemListener(this);
663	1123
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	1124	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
669	1125	fastCB.setToolTipText("Fast mode");
670	1126	fastCB.addItemListener(this);
..	..	@@ -683,29 +1139,14 @@
683	1139	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1140	snapobjectButton.addActionListener(this);
685	1141	snapobjectButton.setToolTipText("Snap Object");
	1142	+
	1143	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ fourButton.addActionListener(this);
	1145	+ fourButton.setToolTipText("Show control panel only");
686	1146	}
687	1147
688	1148	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
689	1149
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	1150
710	1151	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	1152	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -717,28 +1158,30 @@
717	1158	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
718	1159	//clearButton.addActionListener(this);
719	1160
	1161	+ cGridBag row1 = new cGridBag();
	1162	+
720	1163	// INSERT
721		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722	1165	gridButton.setToolTipText("Create grid");
723	1166	gridButton.addActionListener(this);
724	1167
725		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726	1169	boxButton.setToolTipText("Create box");
727	1170	boxButton.addActionListener(this);
728	1171
729		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1173	sphereButton.setToolTipText("Create sphere");
731	1174	sphereButton.addActionListener(this);
732	1175
733		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1177	coneButton.setToolTipText("Create cone");
735	1178	coneButton.addActionListener(this);
736	1179
737		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1181	torusButton.setToolTipText("Create torus");
739	1182	torusButton.addActionListener(this);
740	1183
741		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	1185	superButton.setToolTipText("Create superellipsoid");
743	1186	superButton.addActionListener(this);
744	1187
..	..	@@ -749,51 +1192,53 @@
749	1192	kleinButton.addActionListener(this);
750	1193	}
751	1194
752		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
753	1196	particlesButton.setToolTipText("Create particle system");
754	1197	particlesButton.addActionListener(this);
755	1198
756		- oe.toolboxPanel.Return();
	1199	+ oe.toolboxPanel.add(row1);
757	1200
758		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ cGridBag row2 = new cGridBag();
	1202	+
	1203	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
759	1204	groupButton.setToolTipText("Create group");
760	1205	groupButton.addActionListener(this);
761	1206
762		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
763	1208	compositeButton.setToolTipText("Create composite");
764	1209	compositeButton.addActionListener(this);
765	1210
766		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
767	1212	switchButton.setToolTipText("Create item switcher");
768	1213	switchButton.addActionListener(this);
769	1214
770		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
771	1216	loopButton.setToolTipText("Create loop");
772	1217	loopButton.addActionListener(this);
773	1218
774		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775	1220	textureButton.setToolTipText("Create texture");
776	1221	textureButton.addActionListener(this);
777	1222
778		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
779	1224	overlayButton.setToolTipText("Create overlay");
780	1225	overlayButton.addActionListener(this);
781	1226
782		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783	1228	lightButton.setToolTipText("Create light");
784	1229	lightButton.addActionListener(this);
785	1230
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		- }
	1231	+ oe.toolboxPanel.add(row2);
	1232	+
	1233	+ cGridBag textures = new cGridBag();
	1234	+
	1235	+ CreateTexturePanel(textures);
	1236	+
	1237	+ oe.toolboxPanel.add(textures);
	1238	+
	1239	+ textures.preferredHeight = 100;
	1240	+
	1241	+ CreateSkyboxPanel(oe.skyboxPanel);
797	1242
798	1243	// EDIT panel
799	1244	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -801,20 +1246,20 @@
801	1246	editButton.addActionListener(this);
802	1247
803	1248	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804		- uneditButton.setToolTipText("Remove selection controls");
	1249	+ uneditButton.setToolTipText("Unpin and remove selection controls");
805	1250	uneditButton.addActionListener(this);
806	1251
807	1252	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
808		- allParamsButton.setToolTipText("Show all controle");
	1253	+ allParamsButton.setToolTipText("Show all controls");
809	1254	allParamsButton.addActionListener(this);
810	1255
811		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812		- clearPanelButton.setToolTipText("Clear edit panel");
	1256	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ clearPanelButton.setToolTipText("Clear all controls");
813	1258	clearPanelButton.addActionListener(this);
814	1259
815		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816		- unselectButton.setToolTipText("Unselect");
817		- unselectButton.addActionListener(this);
	1260	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ //unselectButton.setToolTipText("Unselect");
	1262	+ //unselectButton.addActionListener(this);
818	1263
819	1264	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
820	1265	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -853,8 +1298,8 @@
853	1298	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854	1299	sliderPane.preferredHeight = 1;
855	1300
856		-// mainPanel.setDividerLocation(0.5); //1.0);
857		-// mainPanel.setResizeWeight(0.5);
	1301	+// mainPanel.setDividerLocation(0.1); //1.0);
	1302	+ mainPanel.setResizeWeight(0.4);
858	1303
859	1304	//jList.addListSelectionListener(this);
860	1305	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -862,7 +1307,7 @@
862	1307	//jTree.setEditable(true);
863	1308	oe.jTree.setDragEnabled(true);
864	1309	//jTree.setPreferredSize(new Dimension(10,10));
865		- jSP.setPreferredSize(new Dimension(100,200));
	1310	+ //jSP.setPreferredSize(new Dimension(100,200));
866	1311
867	1312	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
868	1313
..	..	@@ -874,7 +1319,7 @@
874	1319	dgr.addDragGestureListener(this);
875	1320	}catch(Exception e) {}
876	1321	*/
877		- radio.layout = sixButton; // sevenButton;
	1322	+ radio.layout = threeButton; // sixButton;
878	1323	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
879	1324	}
880	1325
..	..	@@ -925,9 +1370,12 @@
925	1370	smoothCB.setToolTipText("Snapping delay");
926	1371	smoothCB.addItemListener(this);
927	1372
928		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
929		- slowCB.setToolTipText("Smooth interpolation");
930		- slowCB.addItemListener(this);
	1373	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1374	+// slowCB.setToolTipText("Smooth interpolation");
	1375	+// slowCB.addItemListener(this);
	1376	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1377	+ minshaderCB.setToolTipText("Minimal fast shader");
	1378	+ minshaderCB.addItemListener(this);
931	1379
932	1380	// constraints.gridy += 1;
933	1381	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1016,7 +1464,7 @@
1016	1464	}
1017	1465
1018	1466	radioButton.SetObject(obj);
1019		- radioButton.layout = sixButton; // sevenButton;
	1467	+ radioButton.layout = threeButton; // sixButton;
1020	1468	radioButton.SetCamera(cameraView.renderCamera, false);
1021	1469	radioButton.addActionListener(this);
1022	1470	radioPanel.add(radioButton);
..	..	@@ -1041,6 +1489,8 @@
1041	1489	cCheckBox localCB;
1042	1490	cCheckBox crowdCB;
1043	1491	cCheckBox smoothCB;
	1492	+ cCheckBox minshaderCB;
	1493	+
1044	1494	cToggleButton fastCB;
1045	1495	cCheckBox slowCB;
1046	1496	cCheckBox boxCB;
..	..	@@ -1111,6 +1561,12 @@
1111	1561	{
1112	1562	cameraView.ToggleInertia();
1113	1563	cameraView.repaint();
	1564	+ }
	1565	+ else if(e.getSource() == minshaderCB)
	1566	+ {
	1567	+ Globals.MINSHADER ^= true;
	1568	+ cameraView.programInitialized = false;
	1569	+ cameraView.repaint();
1114	1570	}
1115	1571	else if(e.getSource() == localCB)
1116	1572	{
..	..	@@ -1388,7 +1844,12 @@
1388	1844	TreePath path;
1389	1845
1390	1846	public TransferableTreePath(TreePath tp) {
1391		- path = tp;
	1847	+ Object[] objs = new Object[tp.getPathCount()];
	1848	+ for (int i=0; i<objs.length; i++)
	1849	+ {
	1850	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1851	+ }
	1852	+ path = new TreePath(objs);
1392	1853	}
1393	1854
1394	1855	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2134,6 +2595,23 @@
2134	2595	{
2135	2596	makeSomething(new Light());
2136	2597	} else
	2598	+// if (source == skybox1Button \|\|
	2599	+// source == skybox2Button \|\|
	2600	+// source == skybox3Button \|\|
	2601	+// source == skybox4Button \|\|
	2602	+// source == skybox5Button \|\|
	2603	+// source == skybox6Button \|\|
	2604	+// source == skybox7Button \|\|
	2605	+// source == skybox11Button \|\|
	2606	+// source == skybox12Button \|\|
	2607	+// source == skybox13Button \|\|
	2608	+// source == skybox14Button \|\|
	2609	+// source == skybox15Button \|\|
	2610	+// source == skybox16Button \|\|
	2611	+// source == skybox17Button)
	2612	+// {
	2613	+// ChangeSkybox(source);
	2614	+// } else
2137	2615	if (source == csgItem)
2138	2616	{
2139	2617	group(new CSG());
..	..	@@ -2219,7 +2697,7 @@
2219	2697	if (source == computeAOItem)
2220	2698	{
2221	2699	Globals.drawMode = CameraPane.OCCLUSION;
2222		- Globals.theRenderer.repaint();
	2700	+ cameraView.repaint();
2223	2701	} else
2224	2702	if (source == recompileItem)
2225	2703	{
..	..	@@ -2234,7 +2712,7 @@
2234	2712	if (source == invariantsItem)
2235	2713	{
2236	2714	System.out.println("Invariants:");
2237		- Grafreed.grafreeD.universe.invariants();
	2715	+ Grafreed.grafreed.universe.invariants();
2238	2716	} else
2239	2717	if (source == memoryItem)
2240	2718	{
..	..	@@ -2265,33 +2743,52 @@
2265	2743	{
2266	2744	ToggleFullScreen();
2267	2745	} else
2268		- if (source == undoButton)
	2746	+ if (source == collapseButton)
	2747	+ {
	2748	+ this.expandedLayout = radio.layout;
	2749	+ CollapseToolbar();
	2750	+ } else
	2751	+ if (source == maximize3DButton)
	2752	+ {
	2753	+ this.expandedLayout = radio.layout;
	2754	+ radio.layout = twoButton;
	2755	+ Show3DView();
	2756	+ CollapseToolbar();
	2757	+ } else
	2758	+ if (source == previousVersionButton)
2269	2759	{
2270	2760	// Go to previous version
2271	2761	//if (!Undo())
2272	2762	//java.awt.Toolkit.getDefaultToolkit().beep();
2273		- Undo();
	2763	+ PreviousVersion();
2274	2764	} else
2275	2765	if (source == restoreButton)
2276	2766	{
2277	2767	// Restore current version
2278	2768	Restore();
	2769	+ //restoreButton.setEnabled(false);
2279	2770	} else
2280	2771	if (source == replaceButton)
2281	2772	{
2282	2773	// Overwrite current version
2283	2774	Replace();
	2775	+ //replaceButton.setEnabled(false);
2284	2776	} else
2285		- if (source == redoButton)
	2777	+ if (source == nextVersionButton)
2286	2778	{
2287	2779	// Go to next version
2288		- Redo();
	2780	+ NextVersion();
2289	2781	} else
2290		- if (source == saveButton)
	2782	+ if (source == saveVersionButton)
2291	2783	{
2292	2784	// Save a new version
2293	2785	if (!Save(true))
2294	2786	java.awt.Toolkit.getDefaultToolkit().beep();
	2787	+ } else
	2788	+ if (source == deleteVersionButton)
	2789	+ {
	2790	+ // Delete a new version
	2791	+ DeleteVersion();
2295	2792	} else
2296	2793	if (source == oneStepButton)
2297	2794	{
..	..	@@ -2346,11 +2843,11 @@
2346	2843	} else
2347	2844	if (source == undoItem)
2348	2845	{
2349		- Undo();
	2846	+ PreviousVersion();
2350	2847	} else
2351	2848	if (source == redoItem)
2352	2849	{
2353		- Redo();
	2850	+ NextVersion();
2354	2851	} else
2355	2852	if (source == duplicateItem)
2356	2853	{
..	..	@@ -3153,7 +3650,7 @@
3153	3650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3154	3651	{
3155	3652	obj = (Object3D)e.nextElement();
3156		- obj.SetBumpTexture(null);
	3653	+ obj.ResetBumpTexture();
3157	3654	}
3158	3655
3159	3656	refreshContents();
..	..	@@ -3167,6 +3664,31 @@
3167	3664	obj.SetBumpTexture(obj.GetPigmentTexture());
3168	3665	}
3169	3666
	3667	+ refreshContents();
	3668	+ } else
	3669	+ if (source == embedTexturesItem)
	3670	+ {
	3671	+ Object3D obj;
	3672	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3673	+ {
	3674	+ obj = (Object3D)e.nextElement();
	3675	+ obj.EmbedTextures(true);
	3676	+ }
	3677	+
	3678	+ refreshContents();
	3679	+ } else
	3680	+ if (source == deEmbedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(false);
	3687	+ }
	3688	+
	3689	+ CameraPane.texturepigment.clear();
	3690	+ CameraPane.texturebump.clear();
	3691	+
3170	3692	refreshContents();
3171	3693	} else
3172	3694	if (source == flashSelectionButton)
..	..	@@ -3184,38 +3706,7 @@
3184	3706	if (CameraPane.FULLSCREEN)
3185	3707	fullscreenLayout = radio.layout;
3186	3708
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();
	3709	+ Show3DView();
3219	3710
3220	3711	cameraView.requestFocusInWindow();
3221	3712
..	..	@@ -3270,8 +3761,8 @@
3270	3761	// centralPanel.setVisible(true);
3271	3762	// XYZPanel.setVisible(true);
3272	3763	bigThree.ClearUI();
	3764	+ bigThree.add(scenePanel);
3273	3765	bigThree.add(centralPanel);
3274		- bigThree.add(XYZPanel);
3275	3766	bigThree.FlushUI();
3276	3767
3277	3768	cameraView.requestFocusInWindow();
..	..	@@ -3351,8 +3842,8 @@
3351	3842	// centralPanel.setVisible(true);
3352	3843	// XYZPanel.setVisible(false);
3353	3844	bigThree.ClearUI();
3354		- bigThree.add(scenePanel);
3355	3845	bigThree.add(centralPanel);
	3846	+ bigThree.add(scenePanel);
3356	3847	bigThree.FlushUI();
3357	3848
3358	3849	cameraView.requestFocusInWindow();
..	..	@@ -3458,10 +3949,10 @@
3458	3949	{
3459	3950	Object3D child = (Object3D)e.nextElement();
3460	3951	if(child.editWindow != null)
3461		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3462	3952	child.pinned = false;
3463	3953	child.CloseUI();
3464	3954	listUI.remove(child);
	3955	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3465	3956
3466	3957	//child.editWindow = null; // ???????????
3467	3958	}
..	..	@@ -3480,6 +3971,7 @@
3480	3971	obj.CloseUI();
3481	3972	}
3482	3973	listUI.clear();
	3974	+ SetPinStates(group.selection.size() > 0);
3483	3975	refreshContents(true);
3484	3976	} else
3485	3977	if (source == allParamsButton)
..	..	@@ -3566,6 +4058,7 @@
3566	4058	radio.layout.doClick();
3567	4059
3568	4060	ClearUnpinned();
	4061	+
3569	4062	//Grafreed.Assert(group != null);
3570	4063	//Grafreed.Assert(group.selection != null);
3571	4064	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3582,11 +4075,13 @@
3582	4075	} else if (event.getSource() == editCameraItem)
3583	4076	{
3584	4077	cameraView.ProtectCamera();
	4078	+ cameraView.requestFocusInWindow();
3585	4079	cameraView.repaint();
3586	4080	return;
3587	4081	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3588	4082	{
3589	4083	cameraView.RevertCamera();
	4084	+ cameraView.requestFocusInWindow();
3590	4085	cameraView.repaint();
3591	4086	return;
3592	4087	// } else if (event.getSource() == textureButton)
..	..	@@ -4163,7 +4658,7 @@
4163	4658
4164	4659	try
4165	4660	{
4166		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4661	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167	4662	}
4168	4663	catch (Exception e)
4169	4664	{
..	..	@@ -4719,9 +5214,7 @@
4719	5214
4720	5215	freezemodel = false;
4721	5216	}
4722		-
4723		- boolean flashIt = true;
4724		-
	5217	+
4725	5218	public void valueChanged(TreeSelectionEvent e)
4726	5219	//public boolean handleEvent(Event event)
4727	5220	{
..	..	@@ -4794,13 +5287,15 @@
4794	5287	{
4795	5288	editButton.setEnabled(enabled);
4796	5289	uneditButton.setEnabled(enabled);
4797		- unselectButton.setEnabled(enabled);
	5290	+ //unselectButton.setEnabled(enabled);
4798	5291	flashSelectionButton.setEnabled(enabled);
	5292	+
	5293	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4799	5294	}
4800	5295
4801	5296	void refreshContents(boolean cp)
4802	5297	{
4803		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5298	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4804	5299	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4805	5300	{
4806	5301	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4810,7 +5305,7 @@
4810	5305	Object3D child = (Object3D) group.selection.get(i);
4811	5306
4812	5307	objEditor.AddInfo(child, this, true);
4813		- System.err.println("info : " + child.GetPath());
	5308	+// System.err.println("info : " + child.GetPath());
4814	5309	}
4815	5310
4816	5311	objEditor.SetText(); // jan 2014
..	..	@@ -5636,7 +6131,6 @@
5636	6131
5637	6132	cButton restoreCameraButton;
5638	6133
5639		- cButton saveButton;
5640	6134	cButton oneStepButton;
5641	6135
5642	6136	cButton groupButton;
..	..	@@ -5645,6 +6139,22 @@
5645	6139	cButton switchButton;
5646	6140	cButton loopButton;
5647	6141	cButton textureButton;
	6142	+
	6143	+ cButton skybox1Button;
	6144	+ cButton skybox2Button;
	6145	+ cButton skybox3Button;
	6146	+ cButton skybox4Button;
	6147	+ cButton skybox5Button;
	6148	+ cButton skybox6Button;
	6149	+ cButton skybox7Button;
	6150	+
	6151	+ cButton skybox11Button;
	6152	+ cButton skybox12Button;
	6153	+ cButton skybox13Button;
	6154	+ cButton skybox14Button;
	6155	+ cButton skybox15Button;
	6156	+ cButton skybox16Button;
	6157	+ cButton skybox17Button;
5648	6158
5649	6159	cButton gridButton;
5650	6160	cButton boxButton;
..	..	@@ -5793,6 +6303,8 @@
5793	6303	private MenuItem attachBumpItem;
5794	6304	private MenuItem detachBumpItem;
5795	6305	private MenuItem pigmentBumpItem;
	6306	+ private MenuItem embedTexturesItem;
	6307	+ private MenuItem deEmbedTexturesItem;
5796	6308
5797	6309	private MenuItem particleItem;
5798	6310	private MenuItem ragdollItem;