~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,14 +42,317 @@
40	42	});
41	43	}
42	44
43		- public void ChangeSkybox(String name)
	45	+ public void AddTextureButton(String f, final String t, cGridBag row)
44	46	{
45		- cameraView.envyoff = false;
46		- cameraView.skyboxname = name;
47		- cameraView.skyboxext = "jpg";
48		- cameraView.repaint();
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(f + "s");
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
49	59	}
50	60
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ cameraView.repaint();
	354	+ }
	355	+
51	356	//ObjEditor objEditor;
52	357	public void closeUI2()
53	358	{
..	..	@@ -85,9 +390,9 @@
85	390	this.copy = this.group = group;
86	391	//selectees = this.group.selectees;
87	392
88		- if (copy.versions == null)
	393	+ if (copy.versionlist == null)
89	394	{
90		- copy.versions = new byte[100][];
	395	+ copy.versionlist = new Object3D[100];
91	396	copy.versionindex = -1;
92	397	}
93	398
..	..	@@ -112,9 +417,9 @@
112	417
113	418	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
114	419
115		- if (copy.versions == null)
	420	+ if (copy.versionlist == null)
116	421	{
117		- copy.versions = new byte[100][];
	422	+ copy.versionlist = new Object3D[100];
118	423	copy.versionindex = -1;
119	424
120	425	Save(true);
..	..	@@ -588,6 +893,67 @@
588	893	buildToolsMenu(menu);
589	894	}
590	895
	896	+ JTabbedPane resourcecontainer;
	897	+ cGridBag currenttab;
	898	+ boolean added; // patch for jar
	899	+
	900	+ int tabcount = 0;
	901	+ int colcount = 0;
	902	+ int rowcount = 0;
	903	+
	904	+ int columns = 5;
	905	+ int rows = 7;
	906	+
	907	+ public void ResourceCallBack(String[] path)
	908	+ {
	909	+ for (int i = 0; i < path.length; i++)
	910	+ System.out.print(path[i] + "/");
	911	+ System.out.println();
	912	+ if (rowcount == 0)
	913	+ {
	914	+ currenttab = new cGridBag();
	915	+ added = false;
	916	+ String tabname = String.valueOf((char)('A'+tabcount));
	917	+ currenttab.setName(tabname);
	918	+ rowcount = 1;
	919	+ }
	920	+
	921	+ if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	922	+ {
	923	+ if (!added)
	924	+ {
	925	+ added = true;
	926	+ resourcecontainer.add(currenttab);
	927	+ String tabname = String.valueOf((char)('A'+tabcount));
	928	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	929	+ }
	930	+
	931	+ AddTextureButton(path[0], path[1], currenttab);
	932	+ if (++colcount >= columns)
	933	+ {
	934	+ colcount = 0;
	935	+ currenttab.Return();
	936	+
	937	+ if (rowcount++ >= rows)
	938	+ {
	939	+ rowcount = 0;
	940	+ }
	941	+ }
	942	+ }
	943	+ else
	944	+ {
	945	+// if (!path[path.length-1].equals("icons"))
	946	+// resourcecontainer.Return();
	947	+ }
	948	+ }
	949	+
	950	+ void CreateTexturePanel(cGridBag container)
	951	+ {
	952	+ resourcecontainer = new JTabbedPane();
	953	+ container.add(resourcecontainer);
	954	+
	955	+ Grafreed.ParseResources("textures", this);
	956	+ }
591	957
592	958	void SetupUI2(ObjEditor oe)
593	959	{
..	..	@@ -660,32 +1026,36 @@
660	1026	restoreCameraButton.setToolTipText("Restore viewpoint");
661	1027	restoreCameraButton.addActionListener(this);
662	1028
663		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- saveButton.setToolTipText("New version");
665		- saveButton.addActionListener(this);
	1029	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ saveVersionButton.setToolTipText("Duplicate current version");
	1031	+ saveVersionButton.addActionListener(this);
666	1032
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);
	1033	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ deleteVersionButton.setToolTipText("Delete current version");
	1035	+ deleteVersionButton.addActionListener(this);
	1036	+
	1037	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ previousVersionButton.setToolTipText("Previous version");
	1039	+ previousVersionButton.addActionListener(this);
	1040	+ previousVersionButton.setEnabled(false);
671	1041
672	1042	cGridBag updown = new cGridBag().setVertical(true);
673	1043	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- restoreButton.setToolTipText("Restore current");
	1044	+ restoreButton.setToolTipText("Undo (restore current version)");
675	1045	restoreButton.addActionListener(this);
676		- restoreButton.setEnabled(false);
	1046	+ //restoreButton.setEnabled(false);
677	1047
678	1048	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- replaceButton.setToolTipText("Replace current");
	1049	+ replaceButton.setToolTipText("Save (replace current version)");
680	1050	replaceButton.addActionListener(this);
681		- replaceButton.setEnabled(false);
	1051	+ //replaceButton.setEnabled(false);
682	1052
683	1053	copyOptionsPanel.add(updown);
684	1054
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);
	1055	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ nextVersionButton.setToolTipText("Next version");
	1057	+ nextVersionButton.addActionListener(this);
	1058	+ nextVersionButton.setEnabled(false);
689	1059
690	1060	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
691	1061	liveCB.setToolTipText("Enable animation");
..	..	@@ -819,107 +1189,15 @@
819	1189
820	1190	oe.toolboxPanel.add(row2);
821	1191
822		- // ENVYMAPS
823		- cGridBag row3 = new cGridBag();
824		- row3.preferredHeight = 20;
	1192	+ cGridBag textures = new cGridBag();
825	1193
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;
	1194	+ CreateTexturePanel(textures);
836	1195
837		- AddSkyboxButton("bridge", "Bridge2", row4);
838		- AddSkyboxButton("urban", "GamlaStan2", row4);
839		- AddSkyboxButton("urban", "Parliament", row4);
840		- AddSkyboxButton("urban", "Roundabout", row4);
	1196	+ oe.toolboxPanel.add(textures);
841	1197
842		- oe.toolboxPanel.add(row4);
843		-
844		- cGridBag row5 = new cGridBag();
845		- row5.preferredHeight = 20;
	1198	+ textures.preferredHeight = 100;
846	1199
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		- }
	1200	+ CreateSkyboxPanel(oe.skyboxPanel);
923	1201
924	1202	// EDIT panel
925	1203	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -927,20 +1205,20 @@
927	1205	editButton.addActionListener(this);
928	1206
929	1207	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
930		- uneditButton.setToolTipText("Remove selection controls");
	1208	+ uneditButton.setToolTipText("Unpin and remove selection controls");
931	1209	uneditButton.addActionListener(this);
932	1210
933	1211	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
934		- allParamsButton.setToolTipText("Show all controle");
	1212	+ allParamsButton.setToolTipText("Show all controls");
935	1213	allParamsButton.addActionListener(this);
936	1214
937		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
938		- clearPanelButton.setToolTipText("Clear edit panel");
	1215	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ clearPanelButton.setToolTipText("Clear all controls");
939	1217	clearPanelButton.addActionListener(this);
940	1218
941		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- unselectButton.setToolTipText("Unselect");
943		- unselectButton.addActionListener(this);
	1219	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ //unselectButton.setToolTipText("Unselect");
	1221	+ //unselectButton.addActionListener(this);
944	1222
945	1223	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
946	1224	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1000,7 +1278,7 @@
1000	1278	dgr.addDragGestureListener(this);
1001	1279	}catch(Exception e) {}
1002	1280	*/
1003		- radio.layout = sixButton; // sevenButton;
	1281	+ radio.layout = threeButton; // sixButton;
1004	1282	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1005	1283	}
1006	1284
..	..	@@ -1051,9 +1329,12 @@
1051	1329	smoothCB.setToolTipText("Snapping delay");
1052	1330	smoothCB.addItemListener(this);
1053	1331
1054		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1055		- slowCB.setToolTipText("Smooth interpolation");
1056		- slowCB.addItemListener(this);
	1332	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1333	+// slowCB.setToolTipText("Smooth interpolation");
	1334	+// slowCB.addItemListener(this);
	1335	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1336	+ minshaderCB.setToolTipText("Minimal fast shader");
	1337	+ minshaderCB.addItemListener(this);
1057	1338
1058	1339	// constraints.gridy += 1;
1059	1340	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1142,7 +1423,7 @@
1142	1423	}
1143	1424
1144	1425	radioButton.SetObject(obj);
1145		- radioButton.layout = sixButton; // sevenButton;
	1426	+ radioButton.layout = threeButton; // sixButton;
1146	1427	radioButton.SetCamera(cameraView.renderCamera, false);
1147	1428	radioButton.addActionListener(this);
1148	1429	radioPanel.add(radioButton);
..	..	@@ -1167,6 +1448,8 @@
1167	1448	cCheckBox localCB;
1168	1449	cCheckBox crowdCB;
1169	1450	cCheckBox smoothCB;
	1451	+ cCheckBox minshaderCB;
	1452	+
1170	1453	cToggleButton fastCB;
1171	1454	cCheckBox slowCB;
1172	1455	cCheckBox boxCB;
..	..	@@ -1237,6 +1520,12 @@
1237	1520	{
1238	1521	cameraView.ToggleInertia();
1239	1522	cameraView.repaint();
	1523	+ }
	1524	+ else if(e.getSource() == minshaderCB)
	1525	+ {
	1526	+ Globals.MINSHADER ^= true;
	1527	+ cameraView.programInitialized = false;
	1528	+ cameraView.repaint();
1240	1529	}
1241	1530	else if(e.getSource() == localCB)
1242	1531	{
..	..	@@ -2377,7 +2666,7 @@
2377	2666	if (source == invariantsItem)
2378	2667	{
2379	2668	System.out.println("Invariants:");
2380		- Grafreed.grafreeD.universe.invariants();
	2669	+ Grafreed.grafreed.universe.invariants();
2381	2670	} else
2382	2671	if (source == memoryItem)
2383	2672	{
..	..	@@ -2408,33 +2697,40 @@
2408	2697	{
2409	2698	ToggleFullScreen();
2410	2699	} else
2411		- if (source == undoButton)
	2700	+ if (source == previousVersionButton)
2412	2701	{
2413	2702	// Go to previous version
2414	2703	//if (!Undo())
2415	2704	//java.awt.Toolkit.getDefaultToolkit().beep();
2416		- Undo();
	2705	+ PreviousVersion();
2417	2706	} else
2418	2707	if (source == restoreButton)
2419	2708	{
2420	2709	// Restore current version
2421	2710	Restore();
	2711	+ //restoreButton.setEnabled(false);
2422	2712	} else
2423	2713	if (source == replaceButton)
2424	2714	{
2425	2715	// Overwrite current version
2426	2716	Replace();
	2717	+ //replaceButton.setEnabled(false);
2427	2718	} else
2428		- if (source == redoButton)
	2719	+ if (source == nextVersionButton)
2429	2720	{
2430	2721	// Go to next version
2431		- Redo();
	2722	+ NextVersion();
2432	2723	} else
2433		- if (source == saveButton)
	2724	+ if (source == saveVersionButton)
2434	2725	{
2435	2726	// Save a new version
2436	2727	if (!Save(true))
2437	2728	java.awt.Toolkit.getDefaultToolkit().beep();
	2729	+ } else
	2730	+ if (source == deleteVersionButton)
	2731	+ {
	2732	+ // Delete a new version
	2733	+ DeleteVersion();
2438	2734	} else
2439	2735	if (source == oneStepButton)
2440	2736	{
..	..	@@ -2489,11 +2785,11 @@
2489	2785	} else
2490	2786	if (source == undoItem)
2491	2787	{
2492		- Undo();
	2788	+ PreviousVersion();
2493	2789	} else
2494	2790	if (source == redoItem)
2495	2791	{
2496		- Redo();
	2792	+ NextVersion();
2497	2793	} else
2498	2794	if (source == duplicateItem)
2499	2795	{
..	..	@@ -3626,10 +3922,10 @@
3626	3922	{
3627	3923	Object3D child = (Object3D)e.nextElement();
3628	3924	if(child.editWindow != null)
3629		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3630	3925	child.pinned = false;
3631	3926	child.CloseUI();
3632	3927	listUI.remove(child);
	3928	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3633	3929
3634	3930	//child.editWindow = null; // ???????????
3635	3931	}
..	..	@@ -3648,6 +3944,7 @@
3648	3944	obj.CloseUI();
3649	3945	}
3650	3946	listUI.clear();
	3947	+ SetPinStates(group.selection.size() > 0);
3651	3948	refreshContents(true);
3652	3949	} else
3653	3950	if (source == allParamsButton)
..	..	@@ -3734,6 +4031,7 @@
3734	4031	radio.layout.doClick();
3735	4032
3736	4033	ClearUnpinned();
	4034	+
3737	4035	//Grafreed.Assert(group != null);
3738	4036	//Grafreed.Assert(group.selection != null);
3739	4037	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3750,11 +4048,13 @@
3750	4048	} else if (event.getSource() == editCameraItem)
3751	4049	{
3752	4050	cameraView.ProtectCamera();
	4051	+ cameraView.requestFocusInWindow();
3753	4052	cameraView.repaint();
3754	4053	return;
3755	4054	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3756	4055	{
3757	4056	cameraView.RevertCamera();
	4057	+ cameraView.requestFocusInWindow();
3758	4058	cameraView.repaint();
3759	4059	return;
3760	4060	// } else if (event.getSource() == textureButton)
..	..	@@ -4887,9 +5187,7 @@
4887	5187
4888	5188	freezemodel = false;
4889	5189	}
4890		-
4891		- boolean flashIt = true;
4892		-
	5190	+
4893	5191	public void valueChanged(TreeSelectionEvent e)
4894	5192	//public boolean handleEvent(Event event)
4895	5193	{
..	..	@@ -4962,13 +5260,15 @@
4962	5260	{
4963	5261	editButton.setEnabled(enabled);
4964	5262	uneditButton.setEnabled(enabled);
4965		- unselectButton.setEnabled(enabled);
	5263	+ //unselectButton.setEnabled(enabled);
4966	5264	flashSelectionButton.setEnabled(enabled);
	5265	+
	5266	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4967	5267	}
4968	5268
4969	5269	void refreshContents(boolean cp)
4970	5270	{
4971		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5271	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4972	5272	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4973	5273	{
4974	5274	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5804,7 +6104,6 @@
5804	6104
5805	6105	cButton restoreCameraButton;
5806	6106
5807		- cButton saveButton;
5808	6107	cButton oneStepButton;
5809	6108
5810	6109	cButton groupButton;