~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,11 +24,12 @@
24	24	ItemListener // ListSelectionListener
25	25	{
26	26
27		- public void AddSkyboxButton(String f, String s, cGridBag row3)
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
28	28	{
29	29	cButton skyboxButton;
30	30	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31		- row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
32	33	skyboxButton.setToolTipText(s);
33	34	skyboxButton.addActionListener(new ActionListener()
34	35	{
..	..	@@ -40,11 +41,281 @@
40	41	});
41	42	}
42	43
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
43	314	public void ChangeSkybox(String name)
44	315	{
45		- cameraView.envyoff = false;
46		- cameraView.skyboxname = name;
47		- cameraView.skyboxext = "jpg";
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
48	319	cameraView.repaint();
49	320	}
50	321
..	..	@@ -85,9 +356,9 @@
85	356	this.copy = this.group = group;
86	357	//selectees = this.group.selectees;
87	358
88		- if (copy.versions == null)
	359	+ if (copy.versionlist == null)
89	360	{
90		- copy.versions = new byte[100][];
	361	+ copy.versionlist = new Object3D[100];
91	362	copy.versionindex = -1;
92	363	}
93	364
..	..	@@ -112,9 +383,9 @@
112	383
113	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
114	385
115		- if (copy.versions == null)
	386	+ if (copy.versionlist == null)
116	387	{
117		- copy.versions = new byte[100][];
	388	+ copy.versionlist = new Object3D[100];
118	389	copy.versionindex = -1;
119	390
120	391	Save(true);
..	..	@@ -660,32 +931,36 @@
660	931	restoreCameraButton.setToolTipText("Restore viewpoint");
661	932	restoreCameraButton.addActionListener(this);
662	933
663		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- saveButton.setToolTipText("New version");
665		- saveButton.addActionListener(this);
	934	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveVersionButton.setToolTipText("Duplicate current version");
	936	+ saveVersionButton.addActionListener(this);
666	937
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);
	938	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ deleteVersionButton.setToolTipText("Delete current version");
	940	+ deleteVersionButton.addActionListener(this);
	941	+
	942	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	943	+ previousVersionButton.setToolTipText("Previous version");
	944	+ previousVersionButton.addActionListener(this);
	945	+ previousVersionButton.setEnabled(false);
671	946
672	947	cGridBag updown = new cGridBag().setVertical(true);
673	948	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- restoreButton.setToolTipText("Restore current");
	949	+ restoreButton.setToolTipText("Undo (restore current version)");
675	950	restoreButton.addActionListener(this);
676		- restoreButton.setEnabled(false);
	951	+ //restoreButton.setEnabled(false);
677	952
678	953	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- replaceButton.setToolTipText("Replace current");
	954	+ replaceButton.setToolTipText("Save (replace current version)");
680	955	replaceButton.addActionListener(this);
681		- replaceButton.setEnabled(false);
	956	+ //replaceButton.setEnabled(false);
682	957
683	958	copyOptionsPanel.add(updown);
684	959
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);
	960	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	961	+ nextVersionButton.setToolTipText("Next version");
	962	+ nextVersionButton.addActionListener(this);
	963	+ nextVersionButton.setEnabled(false);
689	964
690	965	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
691	966	liveCB.setToolTipText("Enable animation");
..	..	@@ -820,106 +1095,18 @@
820	1095	oe.toolboxPanel.add(row2);
821	1096
822	1097	// ENVYMAPS
823		- cGridBag row3 = new cGridBag();
824		- row3.preferredHeight = 20;
	1098	+ cGridBag skyboxpane = new cGridBag();
	1099	+ skyboxpane.preferredHeight = 100;
825	1100
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;
	1101	+ oe.toolboxPanel.add(skyboxpane);
836	1102
837		- AddSkyboxButton("bridge", "Bridge2", row4);
838		- AddSkyboxButton("urban", "GamlaStan2", row4);
839		- AddSkyboxButton("urban", "Parliament", row4);
840		- AddSkyboxButton("urban", "Roundabout", row4);
	1103	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1104	+ skyboxpane.add(skyboxpanel);
841	1105
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		- }
	1106	+ AddSkyboxTab0(skyboxpanel);
	1107	+ AddSkyboxTab1(skyboxpanel);
	1108	+ AddSkyboxTab2(skyboxpanel);
	1109	+ AddSkyboxTab3(skyboxpanel);
923	1110
924	1111	// EDIT panel
925	1112	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -927,14 +1114,14 @@
927	1114	editButton.addActionListener(this);
928	1115
929	1116	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
930		- uneditButton.setToolTipText("Remove selection controls");
	1117	+ uneditButton.setToolTipText("Unpin and remove selection controls");
931	1118	uneditButton.addActionListener(this);
932	1119
933	1120	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
934	1121	allParamsButton.setToolTipText("Show all controle");
935	1122	allParamsButton.addActionListener(this);
936	1123
937		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
938	1125	clearPanelButton.setToolTipText("Clear edit panel");
939	1126	clearPanelButton.addActionListener(this);
940	1127
..	..	@@ -1000,7 +1187,7 @@
1000	1187	dgr.addDragGestureListener(this);
1001	1188	}catch(Exception e) {}
1002	1189	*/
1003		- radio.layout = sixButton; // sevenButton;
	1190	+ radio.layout = threeButton; // sixButton;
1004	1191	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1005	1192	}
1006	1193
..	..	@@ -1051,9 +1238,12 @@
1051	1238	smoothCB.setToolTipText("Snapping delay");
1052	1239	smoothCB.addItemListener(this);
1053	1240
1054		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1055		- slowCB.setToolTipText("Smooth interpolation");
1056		- slowCB.addItemListener(this);
	1241	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1242	+// slowCB.setToolTipText("Smooth interpolation");
	1243	+// slowCB.addItemListener(this);
	1244	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1245	+ minshaderCB.setToolTipText("Minimal fast shader");
	1246	+ minshaderCB.addItemListener(this);
1057	1247
1058	1248	// constraints.gridy += 1;
1059	1249	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1142,7 +1332,7 @@
1142	1332	}
1143	1333
1144	1334	radioButton.SetObject(obj);
1145		- radioButton.layout = sixButton; // sevenButton;
	1335	+ radioButton.layout = threeButton; // sixButton;
1146	1336	radioButton.SetCamera(cameraView.renderCamera, false);
1147	1337	radioButton.addActionListener(this);
1148	1338	radioPanel.add(radioButton);
..	..	@@ -1167,6 +1357,8 @@
1167	1357	cCheckBox localCB;
1168	1358	cCheckBox crowdCB;
1169	1359	cCheckBox smoothCB;
	1360	+ cCheckBox minshaderCB;
	1361	+
1170	1362	cToggleButton fastCB;
1171	1363	cCheckBox slowCB;
1172	1364	cCheckBox boxCB;
..	..	@@ -1237,6 +1429,12 @@
1237	1429	{
1238	1430	cameraView.ToggleInertia();
1239	1431	cameraView.repaint();
	1432	+ }
	1433	+ else if(e.getSource() == minshaderCB)
	1434	+ {
	1435	+ Globals.MINSHADER ^= true;
	1436	+ cameraView.programInitialized = false;
	1437	+ cameraView.repaint();
1240	1438	}
1241	1439	else if(e.getSource() == localCB)
1242	1440	{
..	..	@@ -2377,7 +2575,7 @@
2377	2575	if (source == invariantsItem)
2378	2576	{
2379	2577	System.out.println("Invariants:");
2380		- Grafreed.grafreeD.universe.invariants();
	2578	+ Grafreed.grafreed.universe.invariants();
2381	2579	} else
2382	2580	if (source == memoryItem)
2383	2581	{
..	..	@@ -2408,33 +2606,40 @@
2408	2606	{
2409	2607	ToggleFullScreen();
2410	2608	} else
2411		- if (source == undoButton)
	2609	+ if (source == previousVersionButton)
2412	2610	{
2413	2611	// Go to previous version
2414	2612	//if (!Undo())
2415	2613	//java.awt.Toolkit.getDefaultToolkit().beep();
2416		- Undo();
	2614	+ PreviousVersion();
2417	2615	} else
2418	2616	if (source == restoreButton)
2419	2617	{
2420	2618	// Restore current version
2421	2619	Restore();
	2620	+ //restoreButton.setEnabled(false);
2422	2621	} else
2423	2622	if (source == replaceButton)
2424	2623	{
2425	2624	// Overwrite current version
2426	2625	Replace();
	2626	+ //replaceButton.setEnabled(false);
2427	2627	} else
2428		- if (source == redoButton)
	2628	+ if (source == nextVersionButton)
2429	2629	{
2430	2630	// Go to next version
2431		- Redo();
	2631	+ NextVersion();
2432	2632	} else
2433		- if (source == saveButton)
	2633	+ if (source == saveVersionButton)
2434	2634	{
2435	2635	// Save a new version
2436	2636	if (!Save(true))
2437	2637	java.awt.Toolkit.getDefaultToolkit().beep();
	2638	+ } else
	2639	+ if (source == deleteVersionButton)
	2640	+ {
	2641	+ // Delete a new version
	2642	+ DeleteVersion();
2438	2643	} else
2439	2644	if (source == oneStepButton)
2440	2645	{
..	..	@@ -2489,11 +2694,11 @@
2489	2694	} else
2490	2695	if (source == undoItem)
2491	2696	{
2492		- Undo();
	2697	+ PreviousVersion();
2493	2698	} else
2494	2699	if (source == redoItem)
2495	2700	{
2496		- Redo();
	2701	+ NextVersion();
2497	2702	} else
2498	2703	if (source == duplicateItem)
2499	2704	{
..	..	@@ -3626,10 +3831,10 @@
3626	3831	{
3627	3832	Object3D child = (Object3D)e.nextElement();
3628	3833	if(child.editWindow != null)
3629		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3630	3834	child.pinned = false;
3631	3835	child.CloseUI();
3632	3836	listUI.remove(child);
	3837	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3633	3838
3634	3839	//child.editWindow = null; // ???????????
3635	3840	}
..	..	@@ -3648,6 +3853,7 @@
3648	3853	obj.CloseUI();
3649	3854	}
3650	3855	listUI.clear();
	3856	+ SetPinStates(group.selection.size() > 0);
3651	3857	refreshContents(true);
3652	3858	} else
3653	3859	if (source == allParamsButton)
..	..	@@ -3734,6 +3940,7 @@
3734	3940	radio.layout.doClick();
3735	3941
3736	3942	ClearUnpinned();
	3943	+
3737	3944	//Grafreed.Assert(group != null);
3738	3945	//Grafreed.Assert(group.selection != null);
3739	3946	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3750,11 +3957,13 @@
3750	3957	} else if (event.getSource() == editCameraItem)
3751	3958	{
3752	3959	cameraView.ProtectCamera();
	3960	+ cameraView.requestFocusInWindow();
3753	3961	cameraView.repaint();
3754	3962	return;
3755	3963	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3756	3964	{
3757	3965	cameraView.RevertCamera();
	3966	+ cameraView.requestFocusInWindow();
3758	3967	cameraView.repaint();
3759	3968	return;
3760	3969	// } else if (event.getSource() == textureButton)
..	..	@@ -4887,9 +5096,7 @@
4887	5096
4888	5097	freezemodel = false;
4889	5098	}
4890		-
4891		- boolean flashIt = true;
4892		-
	5099	+
4893	5100	public void valueChanged(TreeSelectionEvent e)
4894	5101	//public boolean handleEvent(Event event)
4895	5102	{
..	..	@@ -4964,6 +5171,8 @@
4964	5171	uneditButton.setEnabled(enabled);
4965	5172	unselectButton.setEnabled(enabled);
4966	5173	flashSelectionButton.setEnabled(enabled);
	5174	+
	5175	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4967	5176	}
4968	5177
4969	5178	void refreshContents(boolean cp)
..	..	@@ -5804,7 +6013,6 @@
5804	6013
5805	6014	cButton restoreCameraButton;
5806	6015
5807		- cButton saveButton;
5808	6016	cButton oneStepButton;
5809	6017
5810	6018	cButton groupButton;