~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -24,11 +25,12 @@
24	25	ItemListener // ListSelectionListener
25	26	{
26	27
27		- public void AddSkyboxButton(String f, String s, cGridBag row3)
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
28	29	{
29	30	cButton skyboxButton;
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31		- row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
32	34	skyboxButton.setToolTipText(s);
33	35	skyboxButton.addActionListener(new ActionListener()
34	36	{
..	..	@@ -40,12 +42,294 @@
40	42	});
41	43	}
42	44
43		- public void ChangeSkybox(String name)
	45	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
44	46	{
45		- cameraView.envyoff = false;
46		- cameraView.skyboxname = name;
47		- cameraView.skyboxext = "jpg";
	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";
48	330	cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
49	333	}
50	334
51	335	//ObjEditor objEditor;
..	..	@@ -85,9 +369,9 @@
85	369	this.copy = this.group = group;
86	370	//selectees = this.group.selectees;
87	371
88		- if (copy.versions == null)
	372	+ if (copy.versionlist == null)
89	373	{
90		- copy.versions = new byte[100][];
	374	+ copy.versionlist = new Object3D[100];
91	375	copy.versionindex = -1;
92	376	}
93	377
..	..	@@ -112,9 +396,9 @@
112	396
113	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
114	398
115		- if (copy.versions == null)
	399	+ if (copy.versionlist == null)
116	400	{
117		- copy.versions = new byte[100][];
	401	+ copy.versionlist = new Object3D[100];
118	402	copy.versionindex = -1;
119	403
120	404	Save(true);
..	..	@@ -660,32 +944,36 @@
660	944	restoreCameraButton.setToolTipText("Restore viewpoint");
661	945	restoreCameraButton.addActionListener(this);
662	946
663		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- saveButton.setToolTipText("New version");
665		- 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);
666	950
667		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- undoButton.setToolTipText("Previous version");
669		- undoButton.addActionListener(this);
670		- undoButton.setEnabled(false);
	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);
671	959
672	960	cGridBag updown = new cGridBag().setVertical(true);
673	961	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- restoreButton.setToolTipText("Restore current");
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
675	963	restoreButton.addActionListener(this);
676		- restoreButton.setEnabled(false);
	964	+ //restoreButton.setEnabled(false);
677	965
678	966	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- replaceButton.setToolTipText("Replace current");
	967	+ replaceButton.setToolTipText("Save (replace current version)");
680	968	replaceButton.addActionListener(this);
681		- replaceButton.setEnabled(false);
	969	+ //replaceButton.setEnabled(false);
682	970
683	971	copyOptionsPanel.add(updown);
684	972
685		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686		- redoButton.setToolTipText("Next version");
687		- redoButton.addActionListener(this);
688		- redoButton.setEnabled(false);
	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);
689	977
690	978	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
691	979	liveCB.setToolTipText("Enable animation");
..	..	@@ -820,106 +1108,18 @@
820	1108	oe.toolboxPanel.add(row2);
821	1109
822	1110	// ENVYMAPS
823		- cGridBag row3 = new cGridBag();
824		- row3.preferredHeight = 20;
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
825	1113
826		- AddSkyboxButton("default", "rgb", row3);
827		- AddSkyboxButton("default", "cornell", row3);
828		- AddSkyboxButton("default", "uffizi", row3);
829		- AddSkyboxButton("default", "CloudyHills", row3);
830		- AddSkyboxButton("default", "skycube", row3);
831		-
832		- oe.toolboxPanel.add(row3);
833		-
834		- cGridBag row4 = new cGridBag();
835		- row4.preferredHeight = 20;
	1114	+ oe.skyboxPanel.add(skyboxpane);
836	1115
837		- AddSkyboxButton("bridge", "Bridge2", row4);
838		- AddSkyboxButton("urban", "GamlaStan2", row4);
839		- AddSkyboxButton("urban", "Parliament", row4);
840		- AddSkyboxButton("urban", "Roundabout", row4);
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
841	1118
842		- oe.toolboxPanel.add(row4);
843		-
844		- cGridBag row5 = new cGridBag();
845		- row5.preferredHeight = 20;
846		-
847		- AddSkyboxButton("urban", "SaintLazarusChurch", row5);
848		- AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
849		- AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
850		- AddSkyboxButton("urban", "UnionSquare", row5);
851		-
852		- oe.toolboxPanel.add(row5);
853		-
854		- cGridBag row6 = new cGridBag();
855		- row6.preferredHeight = 20;
856		-
857		- AddSkyboxButton("park", "BerzeliiPark", row6);
858		- AddSkyboxButton("park", "Buddha", row6);
859		- AddSkyboxButton("park", "CNTower2", row6);
860		- //AddSkyboxButton("park", "Fatbursparken", row6);
861		- AddSkyboxButton("park", "NiagaraFalls1", row6);
862		-
863		- oe.toolboxPanel.add(row6);
864		-
865		- cGridBag row7 = new cGridBag();
866		- row7.preferredHeight = 20;
867		-
868		- AddSkyboxButton("park", "NiagaraFalls3", row7);
869		- AddSkyboxButton("park", "Park", row7);
870		- //AddSkyboxButton("park", "Park2", row6);
871		- //AddSkyboxButton("park", "Path", row6);
872		- AddSkyboxButton("park", "Pond", row7);
873		- AddSkyboxButton("park", "Skansen", row7);
874		-
875		- oe.toolboxPanel.add(row7);
876		-
877		- cGridBag row8 = new cGridBag();
878		- row8.preferredHeight = 20;
879		-
880		- AddSkyboxButton("park", "Skansen2", row8);
881		- AddSkyboxButton("park", "Skansen3", row8);
882		- AddSkyboxButton("park", "Skansen4", row8);
883		- AddSkyboxButton("park", "Skansen5", row8);
884		-
885		- oe.toolboxPanel.add(row8);
886		-
887		- cGridBag row9 = new cGridBag();
888		- row9.preferredHeight = 20;
889		-
890		- AddSkyboxButton("park", "Stairs", row9);
891		- //AddSkyboxButton("park", "Tantolunden", row6);
892		- //AddSkyboxButton("park", "Tantolunden3", row6);
893		- AddSkyboxButton("park", "Tantolunden4", row9);
894		-
895		- oe.toolboxPanel.add(row9);
896		-/*
897		-BerzeliiPark
898		-Buddha
899		-CNTower2
900		-Fatbursparken
901		-NiagaraFalls1
902		-NiagaraFalls3
903		-Park
904		-Park2
905		-Path
906		-Pond
907		-Skansen
908		-Skansen2
909		-Skansen3
910		-Skansen4
911		-Skansen5
912		-Stairs
913		-Tantolunden
914		-Tantolunden3
915		-Tantolunden4
916		- */
917		-
918		- for (int i=1; --i>=0;)
919		- {
920		- //oe.toolboxPanel.Return();
921		- oe.toolboxPanel.add(new cGridBag());
922		- }
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
923	1123
924	1124	// EDIT panel
925	1125	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -927,20 +1127,20 @@
927	1127	editButton.addActionListener(this);
928	1128
929	1129	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
930		- uneditButton.setToolTipText("Remove selection controls");
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
931	1131	uneditButton.addActionListener(this);
932	1132
933	1133	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
934	1134	allParamsButton.setToolTipText("Show all controle");
935	1135	allParamsButton.addActionListener(this);
936	1136
937		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
938	1138	clearPanelButton.setToolTipText("Clear edit panel");
939	1139	clearPanelButton.addActionListener(this);
940	1140
941		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- unselectButton.setToolTipText("Unselect");
943		- unselectButton.addActionListener(this);
	1141	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ //unselectButton.setToolTipText("Unselect");
	1143	+ //unselectButton.addActionListener(this);
944	1144
945	1145	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
946	1146	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1000,7 +1200,7 @@
1000	1200	dgr.addDragGestureListener(this);
1001	1201	}catch(Exception e) {}
1002	1202	*/
1003		- radio.layout = sixButton; // sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
1004	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1005	1205	}
1006	1206
..	..	@@ -1051,9 +1251,12 @@
1051	1251	smoothCB.setToolTipText("Snapping delay");
1052	1252	smoothCB.addItemListener(this);
1053	1253
1054		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1055		- slowCB.setToolTipText("Smooth interpolation");
1056		- 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);
1057	1260
1058	1261	// constraints.gridy += 1;
1059	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1142,7 +1345,7 @@
1142	1345	}
1143	1346
1144	1347	radioButton.SetObject(obj);
1145		- radioButton.layout = sixButton; // sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
1146	1349	radioButton.SetCamera(cameraView.renderCamera, false);
1147	1350	radioButton.addActionListener(this);
1148	1351	radioPanel.add(radioButton);
..	..	@@ -1167,6 +1370,8 @@
1167	1370	cCheckBox localCB;
1168	1371	cCheckBox crowdCB;
1169	1372	cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
1170	1375	cToggleButton fastCB;
1171	1376	cCheckBox slowCB;
1172	1377	cCheckBox boxCB;
..	..	@@ -1237,6 +1442,12 @@
1237	1442	{
1238	1443	cameraView.ToggleInertia();
1239	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
1240	1451	}
1241	1452	else if(e.getSource() == localCB)
1242	1453	{
..	..	@@ -2377,7 +2588,7 @@
2377	2588	if (source == invariantsItem)
2378	2589	{
2379	2590	System.out.println("Invariants:");
2380		- Grafreed.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
2381	2592	} else
2382	2593	if (source == memoryItem)
2383	2594	{
..	..	@@ -2408,33 +2619,40 @@
2408	2619	{
2409	2620	ToggleFullScreen();
2410	2621	} else
2411		- if (source == undoButton)
	2622	+ if (source == previousVersionButton)
2412	2623	{
2413	2624	// Go to previous version
2414	2625	//if (!Undo())
2415	2626	//java.awt.Toolkit.getDefaultToolkit().beep();
2416		- Undo();
	2627	+ PreviousVersion();
2417	2628	} else
2418	2629	if (source == restoreButton)
2419	2630	{
2420	2631	// Restore current version
2421	2632	Restore();
	2633	+ //restoreButton.setEnabled(false);
2422	2634	} else
2423	2635	if (source == replaceButton)
2424	2636	{
2425	2637	// Overwrite current version
2426	2638	Replace();
	2639	+ //replaceButton.setEnabled(false);
2427	2640	} else
2428		- if (source == redoButton)
	2641	+ if (source == nextVersionButton)
2429	2642	{
2430	2643	// Go to next version
2431		- Redo();
	2644	+ NextVersion();
2432	2645	} else
2433		- if (source == saveButton)
	2646	+ if (source == saveVersionButton)
2434	2647	{
2435	2648	// Save a new version
2436	2649	if (!Save(true))
2437	2650	java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
2438	2656	} else
2439	2657	if (source == oneStepButton)
2440	2658	{
..	..	@@ -2489,11 +2707,11 @@
2489	2707	} else
2490	2708	if (source == undoItem)
2491	2709	{
2492		- Undo();
	2710	+ PreviousVersion();
2493	2711	} else
2494	2712	if (source == redoItem)
2495	2713	{
2496		- Redo();
	2714	+ NextVersion();
2497	2715	} else
2498	2716	if (source == duplicateItem)
2499	2717	{
..	..	@@ -3626,10 +3844,10 @@
3626	3844	{
3627	3845	Object3D child = (Object3D)e.nextElement();
3628	3846	if(child.editWindow != null)
3629		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3630	3847	child.pinned = false;
3631	3848	child.CloseUI();
3632	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3633	3851
3634	3852	//child.editWindow = null; // ???????????
3635	3853	}
..	..	@@ -3648,6 +3866,7 @@
3648	3866	obj.CloseUI();
3649	3867	}
3650	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
3651	3870	refreshContents(true);
3652	3871	} else
3653	3872	if (source == allParamsButton)
..	..	@@ -3734,6 +3953,7 @@
3734	3953	radio.layout.doClick();
3735	3954
3736	3955	ClearUnpinned();
	3956	+
3737	3957	//Grafreed.Assert(group != null);
3738	3958	//Grafreed.Assert(group.selection != null);
3739	3959	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3750,11 +3970,13 @@
3750	3970	} else if (event.getSource() == editCameraItem)
3751	3971	{
3752	3972	cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
3753	3974	cameraView.repaint();
3754	3975	return;
3755	3976	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3756	3977	{
3757	3978	cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
3758	3980	cameraView.repaint();
3759	3981	return;
3760	3982	// } else if (event.getSource() == textureButton)
..	..	@@ -4887,9 +5109,7 @@
4887	5109
4888	5110	freezemodel = false;
4889	5111	}
4890		-
4891		- boolean flashIt = true;
4892		-
	5112	+
4893	5113	public void valueChanged(TreeSelectionEvent e)
4894	5114	//public boolean handleEvent(Event event)
4895	5115	{
..	..	@@ -4962,13 +5182,15 @@
4962	5182	{
4963	5183	editButton.setEnabled(enabled);
4964	5184	uneditButton.setEnabled(enabled);
4965		- unselectButton.setEnabled(enabled);
	5185	+ //unselectButton.setEnabled(enabled);
4966	5186	flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4967	5189	}
4968	5190
4969	5191	void refreshContents(boolean cp)
4970	5192	{
4971		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5193	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4972	5194	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4973	5195	{
4974	5196	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5804,7 +6026,6 @@
5804	6026
5805	6027	cButton restoreCameraButton;
5806	6028
5807		- cButton saveButton;
5808	6029	cButton oneStepButton;
5809	6030
5810	6031	cButton groupButton;