~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,351 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,10 +406,12 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
63		- if (copy.versions == null)
	409	+ if (copy.versionlist == null)
64	410	{
65		- copy.versions = new byte[100][];
	411	+ copy.versionlist = new Object3D[100];
66	412	copy.versionindex = -1;
	413	+
	414	+ Save(true);
67	415	}
68	416
69	417	if(ui)
..	..	@@ -80,18 +428,20 @@
80	428	this.copy = this.group = copy;
81	429	//selectees = this.group.selectees;
82	430
83		- if (copy.versions == null)
84		- {
85		- copy.versions = new byte[100][];
86		- copy.versionindex = -1;
87		- }
88		-
89	431	SetupMenu2(this); //objEditor);
90	432	SetupUI2(objEditor);
91	433	objEditor.SetupUI(true);
92	434	SetupViews(objEditor);
93	435
94	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
95	445	}
96	446
97	447	void CloneSelection(boolean supports)
..	..	@@ -206,8 +556,8 @@
206	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
207	557	// pasteExpandItem.addActionListener(this);
208	558	menu.add("-");
209		- clearItem = menu.add(new MenuItem("Clear"));
210		- clearItem.addActionListener(this);
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
211	561
212	562	if (Globals.ADVANCED)
213	563	{
..	..	@@ -293,11 +643,9 @@
293	643	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
294	644	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
295	645	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
296		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
297	646	oe.cameraMenu.add("-");
298	647	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
299	648	openWindowItem.addActionListener(this);
300		- editLeafItem.addActionListener(this);
301	649	lookAtItem.addActionListener(this);
302	650	//lookFromItem.addActinoListener(this);
303	651	//switchViewItem.addActionListener(this);
..	..	@@ -433,7 +781,7 @@
433	781	genNormalsMESHItem.addActionListener(this);
434	782	if (Globals.ADVANCED)
435	783	{
436		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
437	785	genNormalsMINEItem.addActionListener(this);
438	786	}
439	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -526,10 +874,15 @@
526	874	attachBumpItem.addActionListener(this);
527	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
529	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530	879	detachPigmentItem.addActionListener(this);
531	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532	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);
533	886	menu.add("-");
534	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535	888	sortbysizeItem.addActionListener(this);
..	..	@@ -540,6 +893,9 @@
540	893	shareGeometriesItem.addActionListener(this);
541	894	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
542	895	mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
543	899	if (Globals.ADVANCED)
544	900	{
545	901	// Pretty much the same as duplicate and clone.
..	..	@@ -556,6 +912,73 @@
556	912	buildToolsMenu(menu);
557	913	}
558	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
559	982
560	983	void SetupUI2(ObjEditor oe)
561	984	{
..	..	@@ -574,11 +997,6 @@
574	997	//new Exception().printStackTrace();
575	998
576	999	oe.radioPanel = new JPanel(new GridBagLayout());
577		- oe.aConstraints.weightx = 1;
578		- oe.aConstraints.weighty = 0;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridwidth = 100;
581		- oe.aConstraints.gridheight = 1;
582	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
583	1001
584	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -601,7 +1019,7 @@
601	1019	*/
602	1020	cGridBag copyOptionsPanel = new cGridBag();
603	1021
604		- copyOptionsPanel.preferredHeight = 1;
	1022	+ copyOptionsPanel.preferredHeight = 2;
605	1023
606	1024	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
607	1025
..	..	@@ -611,10 +1029,49 @@
611	1029
612	1030	if (Globals.ADVANCED)
613	1031	{
614		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- maxButton.setToolTipText("Maximize window");
616		- maxButton.addActionListener(this);
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
617	1035	}
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
618	1075
619	1076	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	1077	fullButton.setToolTipText("Full-screen window");
..	..	@@ -628,41 +1085,45 @@
628	1085	restoreCameraButton.setToolTipText("Restore viewpoint");
629	1086	restoreCameraButton.addActionListener(this);
630	1087
631		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- saveButton.setToolTipText("New version");
633		- saveButton.addActionListener(this);
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
634	1091
635		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636		- undoButton.setToolTipText("Previous version");
637		- undoButton.addActionListener(this);
638		- undoButton.setEnabled(false);
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
639	1100
640	1101	cGridBag updown = new cGridBag().setVertical(true);
641	1102	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- restoreButton.setToolTipText("Restore current");
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
643	1104	restoreButton.addActionListener(this);
644		- restoreButton.setEnabled(false);
	1105	+ //restoreButton.setEnabled(false);
645	1106
646	1107	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- replaceButton.setToolTipText("Replace current");
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
648	1109	replaceButton.addActionListener(this);
649		- replaceButton.setEnabled(false);
	1110	+ //replaceButton.setEnabled(false);
650	1111
651	1112	copyOptionsPanel.add(updown);
652	1113
653		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- redoButton.setToolTipText("Next version");
655		- redoButton.addActionListener(this);
656		- redoButton.setEnabled(false);
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ oneStepButton.setToolTipText("Animate one step forward");
	1121	+ oneStepButton.addActionListener(this);
657	1122
658	1123	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
659	1124	liveCB.setToolTipText("Enable animation");
660	1125	liveCB.addItemListener(this);
661	1126
662		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- oneStepButton.setToolTipText("Animate one step forward");
664		- oneStepButton.addActionListener(this);
665		-
666	1127	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
667	1128	fastCB.setToolTipText("Fast mode");
668	1129	fastCB.addItemListener(this);
..	..	@@ -681,31 +1142,17 @@
681	1142	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	1143	snapobjectButton.addActionListener(this);
683	1144	snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ fourButton.addActionListener(this);
	1148	+ fourButton.setToolTipText("Show control panel only");
684	1149	}
685	1150
686	1151	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
687	1152
688		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689		- twoButton.setToolTipText("Show center view only");
690		- twoButton.addActionListener(this);
691		- this.fullscreenLayout = twoButton;
692		-
693		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694		- fourButton.addActionListener(this);
695		- fourButton.setToolTipText("Show left panel only");
696		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697		- sixButton.setToolTipText("2-column layout left");
698		- sixButton.addActionListener(this);
699		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- threeButton.setToolTipText("2-column layout right");
701		- threeButton.addActionListener(this);
702		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703		- sevenButton.setToolTipText("3-column layout");
704		- sevenButton.addActionListener(this);
705		- //
706	1153
707		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708		- rootButton.setToolTipText("Edit selection in new tab");
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
709	1156	rootButton.addActionListener(this);
710	1157
711	1158	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -714,28 +1161,30 @@
714	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
715	1162	//clearButton.addActionListener(this);
716	1163
	1164	+ cGridBag row1 = new cGridBag();
	1165	+
717	1166	// INSERT
718		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719		- gridButton.setToolTipText("Create grid");
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
720	1169	gridButton.addActionListener(this);
721	1170
722		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1172	boxButton.setToolTipText("Create box");
724	1173	boxButton.addActionListener(this);
725	1174
726		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727	1176	sphereButton.setToolTipText("Create sphere");
728	1177	sphereButton.addActionListener(this);
729	1178
730		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1180	coneButton.setToolTipText("Create cone");
732	1181	coneButton.addActionListener(this);
733	1182
734		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1184	torusButton.setToolTipText("Create torus");
736	1185	torusButton.addActionListener(this);
737	1186
738		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1188	superButton.setToolTipText("Create superellipsoid");
740	1189	superButton.addActionListener(this);
741	1190
..	..	@@ -746,51 +1195,53 @@
746	1195	kleinButton.addActionListener(this);
747	1196	}
748	1197
749		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750	1199	particlesButton.setToolTipText("Create particle system");
751	1200	particlesButton.addActionListener(this);
752	1201
753		- oe.toolboxPanel.Return();
	1202	+ oe.toolboxPanel.add(row1);
754	1203
755		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
756	1207	groupButton.setToolTipText("Create group");
757	1208	groupButton.addActionListener(this);
758	1209
759		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760	1211	compositeButton.setToolTipText("Create composite");
761	1212	compositeButton.addActionListener(this);
762	1213
763		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1215	switchButton.setToolTipText("Create item switcher");
765	1216	switchButton.addActionListener(this);
766	1217
767		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1219	loopButton.setToolTipText("Create loop");
769	1220	loopButton.addActionListener(this);
770	1221
771		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
772	1223	textureButton.setToolTipText("Create texture");
773	1224	textureButton.addActionListener(this);
774	1225
775		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776	1227	overlayButton.setToolTipText("Create overlay");
777	1228	overlayButton.addActionListener(this);
778	1229
779		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780	1231	lightButton.setToolTipText("Create light");
781	1232	lightButton.addActionListener(this);
782	1233
783		- for (int i=6; --i>=0;)
784		- {
785		- oe.toolboxPanel.Return();
786		- oe.toolboxPanel.add(new cGridBag());
787		- oe.toolboxPanel.add(new cGridBag());
788		- oe.toolboxPanel.add(new cGridBag());
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		- }
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
794	1245
795	1246	// EDIT panel
796	1247	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -798,20 +1249,20 @@
798	1249	editButton.addActionListener(this);
799	1250
800	1251	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
801		- uneditButton.setToolTipText("Remove selection controls");
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
802	1253	uneditButton.addActionListener(this);
803	1254
804	1255	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
805		- allParamsButton.setToolTipText("Show all controle");
	1256	+ allParamsButton.setToolTipText("Show all controls");
806	1257	allParamsButton.addActionListener(this);
807	1258
808		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
809		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
810	1261	clearPanelButton.addActionListener(this);
811	1262
812		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
813		- unselectButton.setToolTipText("Unselect");
814		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
815	1266
816	1267	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
817	1268	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -850,8 +1301,8 @@
850	1301	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
851	1302	sliderPane.preferredHeight = 1;
852	1303
853		-// mainPanel.setDividerLocation(0.5); //1.0);
854		-// mainPanel.setResizeWeight(0.5);
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
855	1306
856	1307	//jList.addListSelectionListener(this);
857	1308	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -859,7 +1310,7 @@
859	1310	//jTree.setEditable(true);
860	1311	oe.jTree.setDragEnabled(true);
861	1312	//jTree.setPreferredSize(new Dimension(10,10));
862		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
863	1314
864	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
865	1316
..	..	@@ -871,7 +1322,7 @@
871	1322	dgr.addDragGestureListener(this);
872	1323	}catch(Exception e) {}
873	1324	*/
874		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
875	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
876	1327	}
877	1328
..	..	@@ -922,9 +1373,12 @@
922	1373	smoothCB.setToolTipText("Snapping delay");
923	1374	smoothCB.addItemListener(this);
924	1375
925		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
926		- slowCB.setToolTipText("Smooth interpolation");
927		- slowCB.addItemListener(this);
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
928	1382
929	1383	// constraints.gridy += 1;
930	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1003,6 +1457,14 @@
1003	1457
1004	1458	void EditObject(Object3D obj)
1005	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
1006	1468	cRadio radioButton = new cRadio(obj.name);
1007	1469
1008	1470	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1013,7 +1475,7 @@
1013	1475	}
1014	1476
1015	1477	radioButton.SetObject(obj);
1016		- radioButton.layout = sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
1017	1479	radioButton.SetCamera(cameraView.renderCamera, false);
1018	1480	radioButton.addActionListener(this);
1019	1481	radioPanel.add(radioButton);
..	..	@@ -1038,6 +1500,8 @@
1038	1500	cCheckBox localCB;
1039	1501	cCheckBox crowdCB;
1040	1502	cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
1041	1505	cToggleButton fastCB;
1042	1506	cCheckBox slowCB;
1043	1507	cCheckBox boxCB;
..	..	@@ -1108,6 +1572,12 @@
1108	1572	{
1109	1573	cameraView.ToggleInertia();
1110	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
1111	1581	}
1112	1582	else if(e.getSource() == localCB)
1113	1583	{
..	..	@@ -1385,7 +1855,12 @@
1385	1855	TreePath path;
1386	1856
1387	1857	public TransferableTreePath(TreePath tp) {
1388		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
1389	1864	}
1390	1865
1391	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1692,6 +2167,16 @@
1692	2167	listUI.remove(i);
1693	2168	}
1694	2169	}
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
1695	2180	}
1696	2181
1697	2182	/**
..	..	@@ -2121,6 +2606,23 @@
2121	2606	{
2122	2607	makeSomething(new Light());
2123	2608	} else
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
2124	2626	if (source == csgItem)
2125	2627	{
2126	2628	group(new CSG());
..	..	@@ -2206,7 +2708,7 @@
2206	2708	if (source == computeAOItem)
2207	2709	{
2208	2710	Globals.drawMode = CameraPane.OCCLUSION;
2209		- Globals.theRenderer.repaint();
	2711	+ cameraView.repaint();
2210	2712	} else
2211	2713	if (source == recompileItem)
2212	2714	{
..	..	@@ -2221,7 +2723,7 @@
2221	2723	if (source == invariantsItem)
2222	2724	{
2223	2725	System.out.println("Invariants:");
2224		- Grafreed.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
2225	2727	} else
2226	2728	if (source == memoryItem)
2227	2729	{
..	..	@@ -2252,33 +2754,52 @@
2252	2754	{
2253	2755	ToggleFullScreen();
2254	2756	} else
2255		- if (source == undoButton)
	2757	+ if (source == collapseButton)
	2758	+ {
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
	2761	+ } else
	2762	+ if (source == maximize3DButton)
	2763	+ {
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
	2768	+ } else
	2769	+ if (source == previousVersionButton)
2256	2770	{
2257	2771	// Go to previous version
2258	2772	//if (!Undo())
2259	2773	//java.awt.Toolkit.getDefaultToolkit().beep();
2260		- Undo();
	2774	+ PreviousVersion();
2261	2775	} else
2262	2776	if (source == restoreButton)
2263	2777	{
2264	2778	// Restore current version
2265	2779	Restore();
	2780	+ //restoreButton.setEnabled(false);
2266	2781	} else
2267	2782	if (source == replaceButton)
2268	2783	{
2269	2784	// Overwrite current version
2270	2785	Replace();
	2786	+ //replaceButton.setEnabled(false);
2271	2787	} else
2272		- if (source == redoButton)
	2788	+ if (source == nextVersionButton)
2273	2789	{
2274	2790	// Go to next version
2275		- Redo();
	2791	+ NextVersion();
2276	2792	} else
2277		- if (source == saveButton)
	2793	+ if (source == saveVersionButton)
2278	2794	{
2279	2795	// Save a new version
2280	2796	if (!Save(true))
2281	2797	java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
2282	2803	} else
2283	2804	if (source == oneStepButton)
2284	2805	{
..	..	@@ -2333,11 +2854,11 @@
2333	2854	} else
2334	2855	if (source == undoItem)
2335	2856	{
2336		- Undo();
	2857	+ PreviousVersion();
2337	2858	} else
2338	2859	if (source == redoItem)
2339	2860	{
2340		- Redo();
	2861	+ NextVersion();
2341	2862	} else
2342	2863	if (source == duplicateItem)
2343	2864	{
..	..	@@ -2658,7 +3179,7 @@
2658	3179	{
2659	3180	StepAll();
2660	3181	} else
2661		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2662	3183	{
2663	3184	//int indices[] = jList.getSelectedIndices();
2664	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3140,7 +3661,7 @@
3140	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3141	3662	{
3142	3663	obj = (Object3D)e.nextElement();
3143		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
3144	3665	}
3145	3666
3146	3667	refreshContents();
..	..	@@ -3154,6 +3675,31 @@
3154	3675	obj.SetBumpTexture(obj.GetPigmentTexture());
3155	3676	}
3156	3677
	3678	+ refreshContents();
	3679	+ } else
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
3157	3703	refreshContents();
3158	3704	} else
3159	3705	if (source == flashSelectionButton)
..	..	@@ -3171,38 +3717,7 @@
3171	3717	if (CameraPane.FULLSCREEN)
3172	3718	fullscreenLayout = radio.layout;
3173	3719
3174		- // bug
3175		- //gridPanel.setDividerLocation(1.0);
3176		- //bigPanel.setDividerLocation(0.0);
3177		-// bigThree.remove(scenePanel);
3178		-// bigThree.remove(centralPanel);
3179		-// bigThree.remove(XYZPanel);
3180		-// aWindowConstraints.gridx = 0;
3181		-// aWindowConstraints.gridy = 0;
3182		-// aWindowConstraints.gridwidth = 1;
3183		-// // aConstraints.gridheight = 3;
3184		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3185		-// aWindowConstraints.weightx = 0;
3186		-// aWindowConstraints.weighty = 1;
3187		-// //bigThree.add(jtp, aWindowConstraints);
3188		-// aWindowConstraints.weightx = 1;
3189		-// aWindowConstraints.gridwidth = 3;
3190		-// // aConstraints.gridheight = 3;
3191		-// aWindowConstraints.gridx = 1;
3192		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3193		-// bigThree.add(centralPanel, aWindowConstraints);
3194		-// aWindowConstraints.weightx = 0;
3195		-// aWindowConstraints.gridx = 4;
3196		-// aWindowConstraints.gridwidth = 1;
3197		-// // aConstraints.gridheight = 3;
3198		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3199		-// //bigThree.add(XYZPanel, aWindowConstraints);
3200		-// scenePanel.setVisible(false);
3201		-// centralPanel.setVisible(true);
3202		-// XYZPanel.setVisible(false);
3203		- bigThree.ClearUI();
3204		- bigThree.add(centralPanel);
3205		- bigThree.FlushUI();
	3720	+ Show3DView();
3206	3721
3207	3722	cameraView.requestFocusInWindow();
3208	3723
..	..	@@ -3257,8 +3772,8 @@
3257	3772	// centralPanel.setVisible(true);
3258	3773	// XYZPanel.setVisible(true);
3259	3774	bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
3260	3776	bigThree.add(centralPanel);
3261		- bigThree.add(XYZPanel);
3262	3777	bigThree.FlushUI();
3263	3778
3264	3779	cameraView.requestFocusInWindow();
..	..	@@ -3338,8 +3853,8 @@
3338	3853	// centralPanel.setVisible(true);
3339	3854	// XYZPanel.setVisible(false);
3340	3855	bigThree.ClearUI();
3341		- bigThree.add(scenePanel);
3342	3856	bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
3343	3858	bigThree.FlushUI();
3344	3859
3345	3860	cameraView.requestFocusInWindow();
..	..	@@ -3388,6 +3903,7 @@
3388	3903	} else
3389	3904	if (source == rootButton)
3390	3905	{
	3906	+ Replace();
3391	3907	Object3D obj;
3392	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3393	3909	{
..	..	@@ -3445,10 +3961,10 @@
3445	3961	{
3446	3962	Object3D child = (Object3D)e.nextElement();
3447	3963	if(child.editWindow != null)
3448		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3449	3964	child.pinned = false;
3450	3965	child.CloseUI();
3451	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3452	3968
3453	3969	//child.editWindow = null; // ???????????
3454	3970	}
..	..	@@ -3467,6 +3983,7 @@
3467	3983	obj.CloseUI();
3468	3984	}
3469	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
3470	3987	refreshContents(true);
3471	3988	} else
3472	3989	if (source == allParamsButton)
..	..	@@ -3523,8 +4040,6 @@
3523	4040
3524	4041	copy = group;
3525	4042
3526		- SetUndoStates();
3527		-
3528	4043	//Globals.theRenderer.object = group;
3529	4044	if(!useclient)
3530	4045	{
..	..	@@ -3552,11 +4067,14 @@
3552	4067	*/
3553	4068	radio.layout.doClick();
3554	4069
	4070	+ SetUndoStates();
	4071	+
3555	4072	ClearUnpinned();
3556		- Grafreed.Assert(group != null);
3557		- Grafreed.Assert(group.selection != null);
3558		- SetPinStates(group.selection.size() > 0);
3559		- if (group.selection.size() == 1)
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
3560	4078	EditSelection(false);
3561	4079	keepparent = group.parent;
3562	4080	// PARENT = NULL or not???
..	..	@@ -3569,11 +4087,13 @@
3569	4087	} else if (event.getSource() == editCameraItem)
3570	4088	{
3571	4089	cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
3572	4091	cameraView.repaint();
3573	4092	return;
3574	4093	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3575	4094	{
3576	4095	cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
3577	4097	cameraView.repaint();
3578	4098	return;
3579	4099	// } else if (event.getSource() == textureButton)
..	..	@@ -4150,7 +4670,7 @@
4150	4670
4151	4671	try
4152	4672	{
4153		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4154	4674	}
4155	4675	catch (Exception e)
4156	4676	{
..	..	@@ -4627,6 +5147,12 @@
4627	5147
4628	5148	void EditSelection(boolean newWindow)
4629	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
4630	5156	// aConstraints.gridy = 0;
4631	5157	for (int i=0; i<group.selection.size(); i++)
4632	5158	{
..	..	@@ -4637,12 +5163,7 @@
4637	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
4638	5164	if(elem != group \|\| !newWindow)
4639	5165	{
4640		- // if (!(elem instanceof Composite))
4641		- // newWindow = false;
4642		- listUI.add(elem);
4643		- elem.openEditWindow(this, newWindow); //, false);
4644		- System.out.println("edit : " + elem);
4645		- elem.editWindow.refreshContents(true); // ? new
	5166	+ EditElement(elem, newWindow); // ? new
4646	5167	}
4647	5168	}
4648	5169	}
..	..	@@ -4705,9 +5226,7 @@
4705	5226
4706	5227	freezemodel = false;
4707	5228	}
4708		-
4709		- boolean flashIt = true;
4710		-
	5229	+
4711	5230	public void valueChanged(TreeSelectionEvent e)
4712	5231	//public boolean handleEvent(Event event)
4713	5232	{
..	..	@@ -4780,13 +5299,28 @@
4780	5299	{
4781	5300	editButton.setEnabled(enabled);
4782	5301	uneditButton.setEnabled(enabled);
4783		- unselectButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
4784	5303	flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
4785	5319	}
4786	5320
4787	5321	void refreshContents(boolean cp)
4788	5322	{
4789		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4790	5324	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4791	5325	{
4792	5326	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4796,7 +5330,7 @@
4796	5330	Object3D child = (Object3D) group.selection.get(i);
4797	5331
4798	5332	objEditor.AddInfo(child, this, true);
4799		- System.err.println("info : " + child.GetPath());
	5333	+// System.err.println("info : " + child.GetPath());
4800	5334	}
4801	5335
4802	5336	objEditor.SetText(); // jan 2014
..	..	@@ -5622,7 +6156,6 @@
5622	6156
5623	6157	cButton restoreCameraButton;
5624	6158
5625		- cButton saveButton;
5626	6159	cButton oneStepButton;
5627	6160
5628	6161	cButton groupButton;
..	..	@@ -5631,6 +6164,22 @@
5631	6164	cButton switchButton;
5632	6165	cButton loopButton;
5633	6166	cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
5634	6183
5635	6184	cButton gridButton;
5636	6185	cButton boxButton;
..	..	@@ -5695,7 +6244,7 @@
5695	6244	private MenuItem pasteLinkItem;
5696	6245	private MenuItem pasteCloneItem;
5697	6246	private MenuItem pasteExpandItem;
5698		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
5699	6248	private MenuItem clearAllItem;
5700	6249	private MenuItem genUVItem;
5701	6250	private MenuItem genNormalsMESHItem;
..	..	@@ -5779,6 +6328,8 @@
5779	6328	private MenuItem attachBumpItem;
5780	6329	private MenuItem detachBumpItem;
5781	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5782	6333
5783	6334	private MenuItem particleItem;
5784	6335	private MenuItem ragdollItem;