~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,314 @@
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 AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,9 +369,9 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
63		- if (copy.versions == null)
	372	+ if (copy.versionlist == null)
64	373	{
65		- copy.versions = new byte[100][];
	374	+ copy.versionlist = new Object3D[100];
66	375	copy.versionindex = -1;
67	376	}
68	377
..	..	@@ -80,18 +389,20 @@
80	389	this.copy = this.group = copy;
81	390	//selectees = this.group.selectees;
82	391
83		- if (copy.versions == null)
84		- {
85		- copy.versions = new byte[100][];
86		- copy.versionindex = -1;
87		- }
88		-
89	392	SetupMenu2(this); //objEditor);
90	393	SetupUI2(objEditor);
91	394	objEditor.SetupUI(true);
92	395	SetupViews(objEditor);
93	396
94	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
95	406	}
96	407
97	408	void CloneSelection(boolean supports)
..	..	@@ -206,8 +517,8 @@
206	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
207	518	// pasteExpandItem.addActionListener(this);
208	519	menu.add("-");
209		- clearItem = menu.add(new MenuItem("Clear"));
210		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
211	522
212	523	if (Globals.ADVANCED)
213	524	{
..	..	@@ -433,7 +744,7 @@
433	744	genNormalsMESHItem.addActionListener(this);
434	745	if (Globals.ADVANCED)
435	746	{
436		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
437	748	genNormalsMINEItem.addActionListener(this);
438	749	}
439	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -526,10 +837,15 @@
526	837	attachBumpItem.addActionListener(this);
527	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
529	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530	842	detachPigmentItem.addActionListener(this);
531	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
533	849	menu.add("-");
534	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535	851	sortbysizeItem.addActionListener(this);
..	..	@@ -601,7 +917,7 @@
601	917	*/
602	918	cGridBag copyOptionsPanel = new cGridBag();
603	919
604		- copyOptionsPanel.preferredHeight = 1;
	920	+ copyOptionsPanel.preferredHeight = 2;
605	921
606	922	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
607	923
..	..	@@ -628,32 +944,36 @@
628	944	restoreCameraButton.setToolTipText("Restore viewpoint");
629	945	restoreCameraButton.addActionListener(this);
630	946
631		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- saveButton.setToolTipText("New version");
633		- saveButton.addActionListener(this);
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
634	950
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);
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
639	959
640	960	cGridBag updown = new cGridBag().setVertical(true);
641	961	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- restoreButton.setToolTipText("Restore current");
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
643	963	restoreButton.addActionListener(this);
644		- restoreButton.setEnabled(false);
	964	+ //restoreButton.setEnabled(false);
645	965
646	966	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- replaceButton.setToolTipText("Replace current");
	967	+ replaceButton.setToolTipText("Save (replace current version)");
648	968	replaceButton.addActionListener(this);
649		- replaceButton.setEnabled(false);
	969	+ //replaceButton.setEnabled(false);
650	970
651	971	copyOptionsPanel.add(updown);
652	972
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);
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
657	977
658	978	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
659	979	liveCB.setToolTipText("Enable animation");
..	..	@@ -681,31 +1001,32 @@
681	1001	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	1002	snapobjectButton.addActionListener(this);
683	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
684	1008	}
685	1009
686	1010	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
687	1011
688		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689		- twoButton.setToolTipText("Show center view only");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
690	1014	twoButton.addActionListener(this);
691	1015	this.fullscreenLayout = twoButton;
692	1016
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");
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
701	1019	threeButton.addActionListener(this);
702		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703		- sevenButton.setToolTipText("3-column layout");
704		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
705	1026	//
706	1027
707		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
709	1030	rootButton.addActionListener(this);
710	1031
711	1032	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -714,28 +1035,30 @@
714	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
715	1036	//clearButton.addActionListener(this);
716	1037
	1038	+ cGridBag row1 = new cGridBag();
	1039	+
717	1040	// INSERT
718		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1042	gridButton.setToolTipText("Create grid");
720	1043	gridButton.addActionListener(this);
721	1044
722		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1046	boxButton.setToolTipText("Create box");
724	1047	boxButton.addActionListener(this);
725	1048
726		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727	1050	sphereButton.setToolTipText("Create sphere");
728	1051	sphereButton.addActionListener(this);
729	1052
730		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1054	coneButton.setToolTipText("Create cone");
732	1055	coneButton.addActionListener(this);
733	1056
734		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1058	torusButton.setToolTipText("Create torus");
736	1059	torusButton.addActionListener(this);
737	1060
738		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1062	superButton.setToolTipText("Create superellipsoid");
740	1063	superButton.addActionListener(this);
741	1064
..	..	@@ -746,51 +1069,57 @@
746	1069	kleinButton.addActionListener(this);
747	1070	}
748	1071
749		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750	1073	particlesButton.setToolTipText("Create particle system");
751	1074	particlesButton.addActionListener(this);
752	1075
753		- oe.toolboxPanel.Return();
	1076	+ oe.toolboxPanel.add(row1);
754	1077
755		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
756	1081	groupButton.setToolTipText("Create group");
757	1082	groupButton.addActionListener(this);
758	1083
759		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760	1085	compositeButton.setToolTipText("Create composite");
761	1086	compositeButton.addActionListener(this);
762	1087
763		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1089	switchButton.setToolTipText("Create item switcher");
765	1090	switchButton.addActionListener(this);
766	1091
767		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1093	loopButton.setToolTipText("Create loop");
769	1094	loopButton.addActionListener(this);
770	1095
771		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
772	1097	textureButton.setToolTipText("Create texture");
773	1098	textureButton.addActionListener(this);
774	1099
775		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776	1101	overlayButton.setToolTipText("Create overlay");
777	1102	overlayButton.addActionListener(this);
778	1103
779		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780	1105	lightButton.setToolTipText("Create light");
781	1106	lightButton.addActionListener(this);
782	1107
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		- }
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.toolboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
794	1123
795	1124	// EDIT panel
796	1125	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -798,14 +1127,14 @@
798	1127	editButton.addActionListener(this);
799	1128
800	1129	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
801		- uneditButton.setToolTipText("Remove selection controls");
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
802	1131	uneditButton.addActionListener(this);
803	1132
804	1133	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
805	1134	allParamsButton.setToolTipText("Show all controle");
806	1135	allParamsButton.addActionListener(this);
807	1136
808		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
809	1138	clearPanelButton.setToolTipText("Clear edit panel");
810	1139	clearPanelButton.addActionListener(this);
811	1140
..	..	@@ -850,8 +1179,8 @@
850	1179	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
851	1180	sliderPane.preferredHeight = 1;
852	1181
853		-// mainPanel.setDividerLocation(0.5); //1.0);
854		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
855	1184
856	1185	//jList.addListSelectionListener(this);
857	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -859,7 +1188,7 @@
859	1188	//jTree.setEditable(true);
860	1189	oe.jTree.setDragEnabled(true);
861	1190	//jTree.setPreferredSize(new Dimension(10,10));
862		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
863	1192
864	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
865	1194
..	..	@@ -871,7 +1200,7 @@
871	1200	dgr.addDragGestureListener(this);
872	1201	}catch(Exception e) {}
873	1202	*/
874		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
875	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
876	1205	}
877	1206
..	..	@@ -922,9 +1251,12 @@
922	1251	smoothCB.setToolTipText("Snapping delay");
923	1252	smoothCB.addItemListener(this);
924	1253
925		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
926		- slowCB.setToolTipText("Smooth interpolation");
927		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
928	1260
929	1261	// constraints.gridy += 1;
930	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1013,7 +1345,7 @@
1013	1345	}
1014	1346
1015	1347	radioButton.SetObject(obj);
1016		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
1017	1349	radioButton.SetCamera(cameraView.renderCamera, false);
1018	1350	radioButton.addActionListener(this);
1019	1351	radioPanel.add(radioButton);
..	..	@@ -1038,6 +1370,8 @@
1038	1370	cCheckBox localCB;
1039	1371	cCheckBox crowdCB;
1040	1372	cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
1041	1375	cToggleButton fastCB;
1042	1376	cCheckBox slowCB;
1043	1377	cCheckBox boxCB;
..	..	@@ -1108,6 +1442,12 @@
1108	1442	{
1109	1443	cameraView.ToggleInertia();
1110	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
1111	1451	}
1112	1452	else if(e.getSource() == localCB)
1113	1453	{
..	..	@@ -1693,6 +2033,16 @@
1693	2033	}
1694	2034	}
1695	2035	}
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1696	2046
1697	2047	/**
1698	2048	* applyExample
..	..	@@ -2121,6 +2471,23 @@
2121	2471	{
2122	2472	makeSomething(new Light());
2123	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
2124	2491	if (source == csgItem)
2125	2492	{
2126	2493	group(new CSG());
..	..	@@ -2206,7 +2573,7 @@
2206	2573	if (source == computeAOItem)
2207	2574	{
2208	2575	Globals.drawMode = CameraPane.OCCLUSION;
2209		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
2210	2577	} else
2211	2578	if (source == recompileItem)
2212	2579	{
..	..	@@ -2221,7 +2588,7 @@
2221	2588	if (source == invariantsItem)
2222	2589	{
2223	2590	System.out.println("Invariants:");
2224		- Grafreed.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
2225	2592	} else
2226	2593	if (source == memoryItem)
2227	2594	{
..	..	@@ -2252,33 +2619,40 @@
2252	2619	{
2253	2620	ToggleFullScreen();
2254	2621	} else
2255		- if (source == undoButton)
	2622	+ if (source == previousVersionButton)
2256	2623	{
2257	2624	// Go to previous version
2258	2625	//if (!Undo())
2259	2626	//java.awt.Toolkit.getDefaultToolkit().beep();
2260		- Undo();
	2627	+ PreviousVersion();
2261	2628	} else
2262	2629	if (source == restoreButton)
2263	2630	{
2264	2631	// Restore current version
2265	2632	Restore();
	2633	+ //restoreButton.setEnabled(false);
2266	2634	} else
2267	2635	if (source == replaceButton)
2268	2636	{
2269	2637	// Overwrite current version
2270	2638	Replace();
	2639	+ //replaceButton.setEnabled(false);
2271	2640	} else
2272		- if (source == redoButton)
	2641	+ if (source == nextVersionButton)
2273	2642	{
2274	2643	// Go to next version
2275		- Redo();
	2644	+ NextVersion();
2276	2645	} else
2277		- if (source == saveButton)
	2646	+ if (source == saveVersionButton)
2278	2647	{
2279	2648	// Save a new version
2280	2649	if (!Save(true))
2281	2650	java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
2282	2656	} else
2283	2657	if (source == oneStepButton)
2284	2658	{
..	..	@@ -2333,11 +2707,11 @@
2333	2707	} else
2334	2708	if (source == undoItem)
2335	2709	{
2336		- Undo();
	2710	+ PreviousVersion();
2337	2711	} else
2338	2712	if (source == redoItem)
2339	2713	{
2340		- Redo();
	2714	+ NextVersion();
2341	2715	} else
2342	2716	if (source == duplicateItem)
2343	2717	{
..	..	@@ -2658,7 +3032,7 @@
2658	3032	{
2659	3033	StepAll();
2660	3034	} else
2661		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2662	3036	{
2663	3037	//int indices[] = jList.getSelectedIndices();
2664	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3140,7 +3514,7 @@
3140	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3141	3515	{
3142	3516	obj = (Object3D)e.nextElement();
3143		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
3144	3518	}
3145	3519
3146	3520	refreshContents();
..	..	@@ -3154,6 +3528,31 @@
3154	3528	obj.SetBumpTexture(obj.GetPigmentTexture());
3155	3529	}
3156	3530
	3531	+ refreshContents();
	3532	+ } else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
3157	3556	refreshContents();
3158	3557	} else
3159	3558	if (source == flashSelectionButton)
..	..	@@ -3257,8 +3656,8 @@
3257	3656	// centralPanel.setVisible(true);
3258	3657	// XYZPanel.setVisible(true);
3259	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
3260	3660	bigThree.add(centralPanel);
3261		- bigThree.add(XYZPanel);
3262	3661	bigThree.FlushUI();
3263	3662
3264	3663	cameraView.requestFocusInWindow();
..	..	@@ -3338,8 +3737,8 @@
3338	3737	// centralPanel.setVisible(true);
3339	3738	// XYZPanel.setVisible(false);
3340	3739	bigThree.ClearUI();
3341		- bigThree.add(scenePanel);
3342	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
3343	3742	bigThree.FlushUI();
3344	3743
3345	3744	cameraView.requestFocusInWindow();
..	..	@@ -3445,10 +3844,10 @@
3445	3844	{
3446	3845	Object3D child = (Object3D)e.nextElement();
3447	3846	if(child.editWindow != null)
3448		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3449	3847	child.pinned = false;
3450	3848	child.CloseUI();
3451	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3452	3851
3453	3852	//child.editWindow = null; // ???????????
3454	3853	}
..	..	@@ -3467,6 +3866,7 @@
3467	3866	obj.CloseUI();
3468	3867	}
3469	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
3470	3870	refreshContents(true);
3471	3871	} else
3472	3872	if (source == allParamsButton)
..	..	@@ -3553,10 +3953,11 @@
3553	3953	radio.layout.doClick();
3554	3954
3555	3955	ClearUnpinned();
3556		- Grafreed.Assert(group != null);
3557		- Grafreed.Assert(group.selection != null);
3558		- SetPinStates(group.selection.size() > 0);
3559		- if (group.selection.size() == 1)
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
3560	3961	EditSelection(false);
3561	3962	keepparent = group.parent;
3562	3963	// PARENT = NULL or not???
..	..	@@ -3569,11 +3970,13 @@
3569	3970	} else if (event.getSource() == editCameraItem)
3570	3971	{
3571	3972	cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
3572	3974	cameraView.repaint();
3573	3975	return;
3574	3976	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3575	3977	{
3576	3978	cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
3577	3980	cameraView.repaint();
3578	3981	return;
3579	3982	// } else if (event.getSource() == textureButton)
..	..	@@ -4150,7 +4553,7 @@
4150	4553
4151	4554	try
4152	4555	{
4153		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4154	4557	}
4155	4558	catch (Exception e)
4156	4559	{
..	..	@@ -4627,6 +5030,12 @@
4627	5030
4628	5031	void EditSelection(boolean newWindow)
4629	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4630	5039	// aConstraints.gridy = 0;
4631	5040	for (int i=0; i<group.selection.size(); i++)
4632	5041	{
..	..	@@ -4637,12 +5046,7 @@
4637	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4638	5047	if(elem != group \|\| !newWindow)
4639	5048	{
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
	5049	+ EditElement(elem, newWindow); // ? new
4646	5050	}
4647	5051	}
4648	5052	}
..	..	@@ -4705,9 +5109,7 @@
4705	5109
4706	5110	freezemodel = false;
4707	5111	}
4708		-
4709		- boolean flashIt = true;
4710		-
	5112	+
4711	5113	public void valueChanged(TreeSelectionEvent e)
4712	5114	//public boolean handleEvent(Event event)
4713	5115	{
..	..	@@ -4782,11 +5184,13 @@
4782	5184	uneditButton.setEnabled(enabled);
4783	5185	unselectButton.setEnabled(enabled);
4784	5186	flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4785	5189	}
4786	5190
4787	5191	void refreshContents(boolean cp)
4788	5192	{
4789		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5193	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4790	5194	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4791	5195	{
4792	5196	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5622,7 +6026,6 @@
5622	6026
5623	6027	cButton restoreCameraButton;
5624	6028
5625		- cButton saveButton;
5626	6029	cButton oneStepButton;
5627	6030
5628	6031	cButton groupButton;
..	..	@@ -5631,6 +6034,22 @@
5631	6034	cButton switchButton;
5632	6035	cButton loopButton;
5633	6036	cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
5634	6053
5635	6054	cButton gridButton;
5636	6055	cButton boxButton;
..	..	@@ -5695,7 +6114,7 @@
5695	6114	private MenuItem pasteLinkItem;
5696	6115	private MenuItem pasteCloneItem;
5697	6116	private MenuItem pasteExpandItem;
5698		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5699	6118	private MenuItem clearAllItem;
5700	6119	private MenuItem genUVItem;
5701	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5779,6 +6198,8 @@
5779	6198	private MenuItem attachBumpItem;
5780	6199	private MenuItem detachBumpItem;
5781	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5782	6203
5783	6204	private MenuItem particleItem;
5784	6205	private MenuItem ragdollItem;