~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,6 +406,12 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+ }
	414	+
63	415	if(ui)
64	416	SetupUI(objEditor);
65	417	}
..	..	@@ -80,6 +432,14 @@
80	432	SetupViews(objEditor);
81	433
82	434	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	435	+
	436	+ if (copy.versionlist == null)
	437	+ {
	438	+ copy.versionlist = new Object3D[100];
	439	+ copy.versionindex = -1;
	440	+
	441	+ Save(true);
	442	+ }
83	443	}
84	444
85	445	void CloneSelection(boolean supports)
..	..	@@ -194,8 +554,8 @@
194	554	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195	555	// pasteExpandItem.addActionListener(this);
196	556	menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	557	+ deleteItem = menu.add(new MenuItem("Delete"));
	558	+ deleteItem.addActionListener(this);
199	559
200	560	if (Globals.ADVANCED)
201	561	{
..	..	@@ -421,7 +781,7 @@
421	781	genNormalsMESHItem.addActionListener(this);
422	782	if (Globals.ADVANCED)
423	783	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	785	genNormalsMINEItem.addActionListener(this);
426	786	}
427	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -514,10 +874,15 @@
514	874	attachBumpItem.addActionListener(this);
515	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
517	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	879	detachPigmentItem.addActionListener(this);
519	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	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);
521	886	menu.add("-");
522	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	888	sortbysizeItem.addActionListener(this);
..	..	@@ -544,6 +909,73 @@
544	909	buildToolsMenu(menu);
545	910	}
546	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	+ }
547	979
548	980	void SetupUI2(ObjEditor oe)
549	981	{
..	..	@@ -562,11 +994,6 @@
562	994	//new Exception().printStackTrace();
563	995
564	996	oe.radioPanel = new JPanel(new GridBagLayout());
565		- oe.aConstraints.weightx = 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridwidth = 100;
569		- oe.aConstraints.gridheight = 1;
570	997	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
571	998
572	999	oe.buttonGroup = new ButtonGroup();
..	..	@@ -589,7 +1016,7 @@
589	1016	*/
590	1017	cGridBag copyOptionsPanel = new cGridBag();
591	1018
592		- copyOptionsPanel.preferredHeight = 1;
	1019	+ copyOptionsPanel.preferredHeight = 2;
593	1020
594	1021	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
595	1022
..	..	@@ -604,6 +1031,45 @@
604	1031	maxButton.addActionListener(this);
605	1032	}
606	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	+
607	1073	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	1074	fullButton.setToolTipText("Full-screen window");
609	1075	fullButton.addActionListener(this);
..	..	@@ -616,41 +1082,45 @@
616	1082	restoreCameraButton.setToolTipText("Restore viewpoint");
617	1083	restoreCameraButton.addActionListener(this);
618	1084
619		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- saveButton.setToolTipText("New version");
621		- 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);
622	1088
623		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- undoButton.setToolTipText("Previous version");
625		- undoButton.addActionListener(this);
626		- 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);
627	1097
628	1098	cGridBag updown = new cGridBag().setVertical(true);
629	1099	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- restoreButton.setToolTipText("Restore current");
	1100	+ restoreButton.setToolTipText("Undo (restore current version)");
631	1101	restoreButton.addActionListener(this);
632		- restoreButton.setEnabled(false);
	1102	+ //restoreButton.setEnabled(false);
633	1103
634	1104	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- replaceButton.setToolTipText("Replace current");
	1105	+ replaceButton.setToolTipText("Save (replace current version)");
636	1106	replaceButton.addActionListener(this);
637		- replaceButton.setEnabled(false);
	1107	+ //replaceButton.setEnabled(false);
638	1108
639	1109	copyOptionsPanel.add(updown);
640	1110
641		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- redoButton.setToolTipText("Next version");
643		- redoButton.addActionListener(this);
644		- 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);
645	1119
646	1120	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
647	1121	liveCB.setToolTipText("Enable animation");
648	1122	liveCB.addItemListener(this);
649	1123
650		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651		- oneStepButton.setToolTipText("Animate one step forward");
652		- oneStepButton.addActionListener(this);
653		-
654	1124	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
655	1125	fastCB.setToolTipText("Fast mode");
656	1126	fastCB.addItemListener(this);
..	..	@@ -669,31 +1139,17 @@
669	1139	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670	1140	snapobjectButton.addActionListener(this);
671	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");
672	1146	}
673	1147
674	1148	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
675	1149
676		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- twoButton.setToolTipText("Show center view only");
678		- twoButton.addActionListener(this);
679		- this.fullscreenLayout = twoButton;
680		-
681		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- fourButton.addActionListener(this);
683		- fourButton.setToolTipText("Show left panel only");
684		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
685		- sixButton.setToolTipText("2-column layout left");
686		- sixButton.addActionListener(this);
687		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688		- threeButton.setToolTipText("2-column layout right");
689		- threeButton.addActionListener(this);
690		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691		- sevenButton.setToolTipText("3-column layout");
692		- sevenButton.addActionListener(this);
693		- //
694	1150
695		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- rootButton.setToolTipText("Edit selection in new tab");
	1151	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ rootButton.setToolTipText("Open selection in new tab");
697	1153	rootButton.addActionListener(this);
698	1154
699	1155	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -702,28 +1158,30 @@
702	1158	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
703	1159	//clearButton.addActionListener(this);
704	1160
	1161	+ cGridBag row1 = new cGridBag();
	1162	+
705	1163	// INSERT
706		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707	1165	gridButton.setToolTipText("Create grid");
708	1166	gridButton.addActionListener(this);
709	1167
710		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	1169	boxButton.setToolTipText("Create box");
712	1170	boxButton.addActionListener(this);
713	1171
714		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1173	sphereButton.setToolTipText("Create sphere");
716	1174	sphereButton.addActionListener(this);
717	1175
718		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1177	coneButton.setToolTipText("Create cone");
720	1178	coneButton.addActionListener(this);
721	1179
722		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1181	torusButton.setToolTipText("Create torus");
724	1182	torusButton.addActionListener(this);
725	1183
726		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727	1185	superButton.setToolTipText("Create superellipsoid");
728	1186	superButton.addActionListener(this);
729	1187
..	..	@@ -734,51 +1192,53 @@
734	1192	kleinButton.addActionListener(this);
735	1193	}
736	1194
737		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1196	particlesButton.setToolTipText("Create particle system");
739	1197	particlesButton.addActionListener(this);
740	1198
741		- oe.toolboxPanel.Return();
	1199	+ oe.toolboxPanel.add(row1);
742	1200
743		- 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);
744	1204	groupButton.setToolTipText("Create group");
745	1205	groupButton.addActionListener(this);
746	1206
747		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748	1208	compositeButton.setToolTipText("Create composite");
749	1209	compositeButton.addActionListener(this);
750	1210
751		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752	1212	switchButton.setToolTipText("Create item switcher");
753	1213	switchButton.addActionListener(this);
754	1214
755		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
756	1216	loopButton.setToolTipText("Create loop");
757	1217	loopButton.addActionListener(this);
758	1218
759		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760	1220	textureButton.setToolTipText("Create texture");
761	1221	textureButton.addActionListener(this);
762	1222
763		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1224	overlayButton.setToolTipText("Create overlay");
765	1225	overlayButton.addActionListener(this);
766	1226
767		- 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);
768	1228	lightButton.setToolTipText("Create light");
769	1229	lightButton.addActionListener(this);
770	1230
771		- for (int i=6; --i>=0;)
772		- {
773		- oe.toolboxPanel.Return();
774		- oe.toolboxPanel.add(new cGridBag());
775		- oe.toolboxPanel.add(new cGridBag());
776		- oe.toolboxPanel.add(new cGridBag());
777		- oe.toolboxPanel.add(new cGridBag());
778		- oe.toolboxPanel.add(new cGridBag());
779		- oe.toolboxPanel.add(new cGridBag());
780		- oe.toolboxPanel.add(new cGridBag());
781		- }
	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);
782	1242
783	1243	// EDIT panel
784	1244	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -786,20 +1246,20 @@
786	1246	editButton.addActionListener(this);
787	1247
788	1248	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
789		- uneditButton.setToolTipText("Remove selection controls");
	1249	+ uneditButton.setToolTipText("Unpin and remove selection controls");
790	1250	uneditButton.addActionListener(this);
791	1251
792	1252	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
793		- allParamsButton.setToolTipText("Show all controle");
	1253	+ allParamsButton.setToolTipText("Show all controls");
794	1254	allParamsButton.addActionListener(this);
795	1255
796		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
797		- clearPanelButton.setToolTipText("Clear edit panel");
	1256	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ clearPanelButton.setToolTipText("Clear all controls");
798	1258	clearPanelButton.addActionListener(this);
799	1259
800		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
801		- unselectButton.setToolTipText("Unselect");
802		- unselectButton.addActionListener(this);
	1260	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ //unselectButton.setToolTipText("Unselect");
	1262	+ //unselectButton.addActionListener(this);
803	1263
804	1264	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
805	1265	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -834,12 +1294,12 @@
834	1294
835	1295	oe.treePanel.add(copyOptionsPanel);
836	1296	oe.treePanel.Return();
837		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
838		- versionField = (cNumberSlider)sliderPane.getComponent(1);
	1297	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1298	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
839	1299	sliderPane.preferredHeight = 1;
840	1300
841		-// mainPanel.setDividerLocation(0.5); //1.0);
842		-// mainPanel.setResizeWeight(0.5);
	1301	+// mainPanel.setDividerLocation(0.1); //1.0);
	1302	+ mainPanel.setResizeWeight(0.4);
843	1303
844	1304	//jList.addListSelectionListener(this);
845	1305	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -847,7 +1307,7 @@
847	1307	//jTree.setEditable(true);
848	1308	oe.jTree.setDragEnabled(true);
849	1309	//jTree.setPreferredSize(new Dimension(10,10));
850		- jSP.setPreferredSize(new Dimension(100,200));
	1310	+ //jSP.setPreferredSize(new Dimension(100,200));
851	1311
852	1312	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
853	1313
..	..	@@ -859,7 +1319,7 @@
859	1319	dgr.addDragGestureListener(this);
860	1320	}catch(Exception e) {}
861	1321	*/
862		- radio.layout = sevenButton;
	1322	+ radio.layout = threeButton; // sixButton;
863	1323	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
864	1324	}
865	1325
..	..	@@ -910,9 +1370,12 @@
910	1370	smoothCB.setToolTipText("Snapping delay");
911	1371	smoothCB.addItemListener(this);
912	1372
913		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
914		- slowCB.setToolTipText("Smooth interpolation");
915		- 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);
916	1379
917	1380	// constraints.gridy += 1;
918	1381	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1001,7 +1464,7 @@
1001	1464	}
1002	1465
1003	1466	radioButton.SetObject(obj);
1004		- radioButton.layout = sevenButton;
	1467	+ radioButton.layout = threeButton; // sixButton;
1005	1468	radioButton.SetCamera(cameraView.renderCamera, false);
1006	1469	radioButton.addActionListener(this);
1007	1470	radioPanel.add(radioButton);
..	..	@@ -1026,6 +1489,8 @@
1026	1489	cCheckBox localCB;
1027	1490	cCheckBox crowdCB;
1028	1491	cCheckBox smoothCB;
	1492	+ cCheckBox minshaderCB;
	1493	+
1029	1494	cToggleButton fastCB;
1030	1495	cCheckBox slowCB;
1031	1496	cCheckBox boxCB;
..	..	@@ -1096,6 +1561,12 @@
1096	1561	{
1097	1562	cameraView.ToggleInertia();
1098	1563	cameraView.repaint();
	1564	+ }
	1565	+ else if(e.getSource() == minshaderCB)
	1566	+ {
	1567	+ Globals.MINSHADER ^= true;
	1568	+ cameraView.programInitialized = false;
	1569	+ cameraView.repaint();
1099	1570	}
1100	1571	else if(e.getSource() == localCB)
1101	1572	{
..	..	@@ -1373,7 +1844,12 @@
1373	1844	TreePath path;
1374	1845
1375	1846	public TransferableTreePath(TreePath tp) {
1376		- 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);
1377	1853	}
1378	1854
1379	1855	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1680,6 +2156,16 @@
1680	2156	listUI.remove(i);
1681	2157	}
1682	2158	}
	2159	+ }
	2160	+
	2161	+ private void EditElement(Object3D elem, boolean newWindow)
	2162	+ {
	2163	+ // if (!(elem instanceof Composite))
	2164	+ // newWindow = false;
	2165	+ listUI.add(elem);
	2166	+ elem.openEditWindow(this, newWindow); //, false);
	2167	+ System.out.println("edit : " + elem);
	2168	+ elem.editWindow.refreshContents(true); // ? new
1683	2169	}
1684	2170
1685	2171	/**
..	..	@@ -2109,6 +2595,23 @@
2109	2595	{
2110	2596	makeSomething(new Light());
2111	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
2112	2615	if (source == csgItem)
2113	2616	{
2114	2617	group(new CSG());
..	..	@@ -2194,7 +2697,7 @@
2194	2697	if (source == computeAOItem)
2195	2698	{
2196	2699	Globals.drawMode = CameraPane.OCCLUSION;
2197		- Globals.theRenderer.repaint();
	2700	+ cameraView.repaint();
2198	2701	} else
2199	2702	if (source == recompileItem)
2200	2703	{
..	..	@@ -2209,7 +2712,7 @@
2209	2712	if (source == invariantsItem)
2210	2713	{
2211	2714	System.out.println("Invariants:");
2212		- Grafreed.grafreeD.universe.invariants();
	2715	+ Grafreed.grafreed.universe.invariants();
2213	2716	} else
2214	2717	if (source == memoryItem)
2215	2718	{
..	..	@@ -2240,33 +2743,52 @@
2240	2743	{
2241	2744	ToggleFullScreen();
2242	2745	} else
2243		- 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)
2244	2759	{
2245	2760	// Go to previous version
2246	2761	//if (!Undo())
2247	2762	//java.awt.Toolkit.getDefaultToolkit().beep();
2248		- Undo();
	2763	+ PreviousVersion();
2249	2764	} else
2250	2765	if (source == restoreButton)
2251	2766	{
2252	2767	// Restore current version
2253	2768	Restore();
	2769	+ //restoreButton.setEnabled(false);
2254	2770	} else
2255	2771	if (source == replaceButton)
2256	2772	{
2257	2773	// Overwrite current version
2258	2774	Replace();
	2775	+ //replaceButton.setEnabled(false);
2259	2776	} else
2260		- if (source == redoButton)
	2777	+ if (source == nextVersionButton)
2261	2778	{
2262	2779	// Go to next version
2263		- Redo();
	2780	+ NextVersion();
2264	2781	} else
2265		- if (source == saveButton)
	2782	+ if (source == saveVersionButton)
2266	2783	{
2267	2784	// Save a new version
2268	2785	if (!Save(true))
2269	2786	java.awt.Toolkit.getDefaultToolkit().beep();
	2787	+ } else
	2788	+ if (source == deleteVersionButton)
	2789	+ {
	2790	+ // Delete a new version
	2791	+ DeleteVersion();
2270	2792	} else
2271	2793	if (source == oneStepButton)
2272	2794	{
..	..	@@ -2321,11 +2843,11 @@
2321	2843	} else
2322	2844	if (source == undoItem)
2323	2845	{
2324		- Undo();
	2846	+ PreviousVersion();
2325	2847	} else
2326	2848	if (source == redoItem)
2327	2849	{
2328		- Redo();
	2850	+ NextVersion();
2329	2851	} else
2330	2852	if (source == duplicateItem)
2331	2853	{
..	..	@@ -2646,7 +3168,7 @@
2646	3168	{
2647	3169	StepAll();
2648	3170	} else
2649		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3171	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2650	3172	{
2651	3173	//int indices[] = jList.getSelectedIndices();
2652	3174	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3128,7 +3650,7 @@
3128	3650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3129	3651	{
3130	3652	obj = (Object3D)e.nextElement();
3131		- obj.SetBumpTexture(null);
	3653	+ obj.ResetBumpTexture();
3132	3654	}
3133	3655
3134	3656	refreshContents();
..	..	@@ -3142,6 +3664,31 @@
3142	3664	obj.SetBumpTexture(obj.GetPigmentTexture());
3143	3665	}
3144	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	+
3145	3692	refreshContents();
3146	3693	} else
3147	3694	if (source == flashSelectionButton)
..	..	@@ -3159,38 +3706,7 @@
3159	3706	if (CameraPane.FULLSCREEN)
3160	3707	fullscreenLayout = radio.layout;
3161	3708
3162		- // bug
3163		- //gridPanel.setDividerLocation(1.0);
3164		- //bigPanel.setDividerLocation(0.0);
3165		-// bigThree.remove(scenePanel);
3166		-// bigThree.remove(centralPanel);
3167		-// bigThree.remove(XYZPanel);
3168		-// aWindowConstraints.gridx = 0;
3169		-// aWindowConstraints.gridy = 0;
3170		-// aWindowConstraints.gridwidth = 1;
3171		-// // aConstraints.gridheight = 3;
3172		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3173		-// aWindowConstraints.weightx = 0;
3174		-// aWindowConstraints.weighty = 1;
3175		-// //bigThree.add(jtp, aWindowConstraints);
3176		-// aWindowConstraints.weightx = 1;
3177		-// aWindowConstraints.gridwidth = 3;
3178		-// // aConstraints.gridheight = 3;
3179		-// aWindowConstraints.gridx = 1;
3180		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3181		-// bigThree.add(centralPanel, aWindowConstraints);
3182		-// aWindowConstraints.weightx = 0;
3183		-// aWindowConstraints.gridx = 4;
3184		-// aWindowConstraints.gridwidth = 1;
3185		-// // aConstraints.gridheight = 3;
3186		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3187		-// //bigThree.add(XYZPanel, aWindowConstraints);
3188		-// scenePanel.setVisible(false);
3189		-// centralPanel.setVisible(true);
3190		-// XYZPanel.setVisible(false);
3191		- bigThree.ClearUI();
3192		- bigThree.add(centralPanel);
3193		- bigThree.FlushUI();
	3709	+ Show3DView();
3194	3710
3195	3711	cameraView.requestFocusInWindow();
3196	3712
..	..	@@ -3245,8 +3761,8 @@
3245	3761	// centralPanel.setVisible(true);
3246	3762	// XYZPanel.setVisible(true);
3247	3763	bigThree.ClearUI();
	3764	+ bigThree.add(scenePanel);
3248	3765	bigThree.add(centralPanel);
3249		- bigThree.add(XYZPanel);
3250	3766	bigThree.FlushUI();
3251	3767
3252	3768	cameraView.requestFocusInWindow();
..	..	@@ -3326,8 +3842,8 @@
3326	3842	// centralPanel.setVisible(true);
3327	3843	// XYZPanel.setVisible(false);
3328	3844	bigThree.ClearUI();
3329		- bigThree.add(scenePanel);
3330	3845	bigThree.add(centralPanel);
	3846	+ bigThree.add(scenePanel);
3331	3847	bigThree.FlushUI();
3332	3848
3333	3849	cameraView.requestFocusInWindow();
..	..	@@ -3433,10 +3949,10 @@
3433	3949	{
3434	3950	Object3D child = (Object3D)e.nextElement();
3435	3951	if(child.editWindow != null)
3436		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3437	3952	child.pinned = false;
3438	3953	child.CloseUI();
3439	3954	listUI.remove(child);
	3955	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3440	3956
3441	3957	//child.editWindow = null; // ???????????
3442	3958	}
..	..	@@ -3455,6 +3971,7 @@
3455	3971	obj.CloseUI();
3456	3972	}
3457	3973	listUI.clear();
	3974	+ SetPinStates(group.selection.size() > 0);
3458	3975	refreshContents(true);
3459	3976	} else
3460	3977	if (source == allParamsButton)
..	..	@@ -3541,8 +4058,11 @@
3541	4058	radio.layout.doClick();
3542	4059
3543	4060	ClearUnpinned();
3544		- SetPinStates(group.selection.size() > 0);
3545		- if (group.selection.size() == 1)
	4061	+
	4062	+ //Grafreed.Assert(group != null);
	4063	+ //Grafreed.Assert(group.selection != null);
	4064	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4065	+ if (group.selection == null \|\| group.selection.size() == 1)
3546	4066	EditSelection(false);
3547	4067	keepparent = group.parent;
3548	4068	// PARENT = NULL or not???
..	..	@@ -3555,11 +4075,13 @@
3555	4075	} else if (event.getSource() == editCameraItem)
3556	4076	{
3557	4077	cameraView.ProtectCamera();
	4078	+ cameraView.requestFocusInWindow();
3558	4079	cameraView.repaint();
3559	4080	return;
3560	4081	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3561	4082	{
3562	4083	cameraView.RevertCamera();
	4084	+ cameraView.requestFocusInWindow();
3563	4085	cameraView.repaint();
3564	4086	return;
3565	4087	// } else if (event.getSource() == textureButton)
..	..	@@ -4136,7 +4658,7 @@
4136	4658
4137	4659	try
4138	4660	{
4139		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4661	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4140	4662	}
4141	4663	catch (Exception e)
4142	4664	{
..	..	@@ -4613,6 +5135,12 @@
4613	5135
4614	5136	void EditSelection(boolean newWindow)
4615	5137	{
	5138	+ if (group.selection == null)
	5139	+ {
	5140	+ EditElement(group, newWindow); // ? new
	5141	+ return;
	5142	+ }
	5143	+
4616	5144	// aConstraints.gridy = 0;
4617	5145	for (int i=0; i<group.selection.size(); i++)
4618	5146	{
..	..	@@ -4623,12 +5151,7 @@
4623	5151	Object3D elem = (Object3D)group.selection.elementAt(i);
4624	5152	if(elem != group \|\| !newWindow)
4625	5153	{
4626		- // if (!(elem instanceof Composite))
4627		- // newWindow = false;
4628		- listUI.add(elem);
4629		- elem.openEditWindow(this, newWindow); //, false);
4630		- System.out.println("edit : " + elem);
4631		- elem.editWindow.refreshContents(true); // ? new
	5154	+ EditElement(elem, newWindow); // ? new
4632	5155	}
4633	5156	}
4634	5157	}
..	..	@@ -4691,9 +5214,7 @@
4691	5214
4692	5215	freezemodel = false;
4693	5216	}
4694		-
4695		- boolean flashIt = true;
4696		-
	5217	+
4697	5218	public void valueChanged(TreeSelectionEvent e)
4698	5219	//public boolean handleEvent(Event event)
4699	5220	{
..	..	@@ -4766,13 +5287,15 @@
4766	5287	{
4767	5288	editButton.setEnabled(enabled);
4768	5289	uneditButton.setEnabled(enabled);
4769		- unselectButton.setEnabled(enabled);
	5290	+ //unselectButton.setEnabled(enabled);
4770	5291	flashSelectionButton.setEnabled(enabled);
	5292	+
	5293	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4771	5294	}
4772	5295
4773	5296	void refreshContents(boolean cp)
4774	5297	{
4775		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5298	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4776	5299	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4777	5300	{
4778	5301	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4782,7 +5305,7 @@
4782	5305	Object3D child = (Object3D) group.selection.get(i);
4783	5306
4784	5307	objEditor.AddInfo(child, this, true);
4785		- System.err.println("info : " + child.GetPath());
	5308	+// System.err.println("info : " + child.GetPath());
4786	5309	}
4787	5310
4788	5311	objEditor.SetText(); // jan 2014
..	..	@@ -5608,7 +6131,6 @@
5608	6131
5609	6132	cButton restoreCameraButton;
5610	6133
5611		- cButton saveButton;
5612	6134	cButton oneStepButton;
5613	6135
5614	6136	cButton groupButton;
..	..	@@ -5617,6 +6139,22 @@
5617	6139	cButton switchButton;
5618	6140	cButton loopButton;
5619	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;
5620	6158
5621	6159	cButton gridButton;
5622	6160	cButton boxButton;
..	..	@@ -5681,7 +6219,7 @@
5681	6219	private MenuItem pasteLinkItem;
5682	6220	private MenuItem pasteCloneItem;
5683	6221	private MenuItem pasteExpandItem;
5684		- private MenuItem clearItem;
	6222	+ private MenuItem deleteItem;
5685	6223	private MenuItem clearAllItem;
5686	6224	private MenuItem genUVItem;
5687	6225	private MenuItem genNormalsMESHItem;
..	..	@@ -5765,6 +6303,8 @@
5765	6303	private MenuItem attachBumpItem;
5766	6304	private MenuItem detachBumpItem;
5767	6305	private MenuItem pigmentBumpItem;
	6306	+ private MenuItem embedTexturesItem;
	6307	+ private MenuItem deEmbedTexturesItem;
5768	6308
5769	6309	private MenuItem particleItem;
5770	6310	private MenuItem ragdollItem;