~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,335 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, final String t, cGridBag row)
	46	+ {
	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	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ cameraView.repaint();
	354	+ }
	355	+
26	356	//ObjEditor objEditor;
27	357	public void closeUI2()
28	358	{
..	..	@@ -60,9 +390,9 @@
60	390	this.copy = this.group = group;
61	391	//selectees = this.group.selectees;
62	392
63		- if (copy.versions == null)
	393	+ if (copy.versionlist == null)
64	394	{
65		- copy.versions = new byte[100][];
	395	+ copy.versionlist = new Object3D[100];
66	396	copy.versionindex = -1;
67	397	}
68	398
..	..	@@ -87,9 +417,9 @@
87	417
88	418	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	419
90		- if (copy.versions == null)
	420	+ if (copy.versionlist == null)
91	421	{
92		- copy.versions = new byte[100][];
	422	+ copy.versionlist = new Object3D[100];
93	423	copy.versionindex = -1;
94	424
95	425	Save(true);
..	..	@@ -563,6 +893,67 @@
563	893	buildToolsMenu(menu);
564	894	}
565	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	+ }
566	957
567	958	void SetupUI2(ObjEditor oe)
568	959	{
..	..	@@ -608,7 +999,7 @@
608	999	*/
609	1000	cGridBag copyOptionsPanel = new cGridBag();
610	1001
611		- copyOptionsPanel.preferredHeight = 1;
	1002	+ copyOptionsPanel.preferredHeight = 2;
612	1003
613	1004	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
614	1005
..	..	@@ -635,32 +1026,36 @@
635	1026	restoreCameraButton.setToolTipText("Restore viewpoint");
636	1027	restoreCameraButton.addActionListener(this);
637	1028
638		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639		- saveButton.setToolTipText("New version");
640		- 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);
641	1032
642		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- undoButton.setToolTipText("Previous version");
644		- undoButton.addActionListener(this);
645		- 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);
646	1041
647	1042	cGridBag updown = new cGridBag().setVertical(true);
648	1043	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- restoreButton.setToolTipText("Restore current");
	1044	+ restoreButton.setToolTipText("Undo (restore current version)");
650	1045	restoreButton.addActionListener(this);
651		- restoreButton.setEnabled(false);
	1046	+ //restoreButton.setEnabled(false);
652	1047
653	1048	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- replaceButton.setToolTipText("Replace current");
	1049	+ replaceButton.setToolTipText("Save (replace current version)");
655	1050	replaceButton.addActionListener(this);
656		- replaceButton.setEnabled(false);
	1051	+ //replaceButton.setEnabled(false);
657	1052
658	1053	copyOptionsPanel.add(updown);
659	1054
660		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661		- redoButton.setToolTipText("Next version");
662		- redoButton.addActionListener(this);
663		- 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);
664	1059
665	1060	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
666	1061	liveCB.setToolTipText("Enable animation");
..	..	@@ -688,25 +1083,25 @@
688	1083	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689	1084	snapobjectButton.addActionListener(this);
690	1085	snapobjectButton.setToolTipText("Snap Object");
	1086	+
	1087	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ fourButton.addActionListener(this);
	1089	+ fourButton.setToolTipText("Show control panel only");
691	1090	}
692	1091
693	1092	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
694	1093
695		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- fourButton.addActionListener(this);
697		- fourButton.setToolTipText("Show left panel only");
698		-
699		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- twoButton.setToolTipText("Show right view only");
	1094	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ twoButton.setToolTipText("Show 3D view only");
701	1096	twoButton.addActionListener(this);
702	1097	this.fullscreenLayout = twoButton;
703	1098
704		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705		- sixButton.setToolTipText("Show left and right");
	1099	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ threeButton.setToolTipText("Show controls and 3D view");
	1101	+ threeButton.addActionListener(this);
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
706	1104	sixButton.addActionListener(this);
707		-// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708		-// threeButton.setToolTipText("2-column layout right");
709		-// threeButton.addActionListener(this);
710	1105	// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	1106	// sevenButton.setToolTipText("3-column layout");
712	1107	// sevenButton.addActionListener(this);
..	..	@@ -722,28 +1117,30 @@
722	1117	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
723	1118	//clearButton.addActionListener(this);
724	1119
	1120	+ cGridBag row1 = new cGridBag();
	1121	+
725	1122	// INSERT
726		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727	1124	gridButton.setToolTipText("Create grid");
728	1125	gridButton.addActionListener(this);
729	1126
730		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1128	boxButton.setToolTipText("Create box");
732	1129	boxButton.addActionListener(this);
733	1130
734		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1131	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1132	sphereButton.setToolTipText("Create sphere");
736	1133	sphereButton.addActionListener(this);
737	1134
738		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1136	coneButton.setToolTipText("Create cone");
740	1137	coneButton.addActionListener(this);
741	1138
742		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743	1140	torusButton.setToolTipText("Create torus");
744	1141	torusButton.addActionListener(this);
745	1142
746		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
747	1144	superButton.setToolTipText("Create superellipsoid");
748	1145	superButton.addActionListener(this);
749	1146
..	..	@@ -754,51 +1151,53 @@
754	1151	kleinButton.addActionListener(this);
755	1152	}
756	1153
757		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1154	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
758	1155	particlesButton.setToolTipText("Create particle system");
759	1156	particlesButton.addActionListener(this);
760	1157
761		- oe.toolboxPanel.Return();
	1158	+ oe.toolboxPanel.add(row1);
762	1159
763		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1160	+ cGridBag row2 = new cGridBag();
	1161	+
	1162	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1163	groupButton.setToolTipText("Create group");
765	1164	groupButton.addActionListener(this);
766	1165
767		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1167	compositeButton.setToolTipText("Create composite");
769	1168	compositeButton.addActionListener(this);
770	1169
771		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
772	1171	switchButton.setToolTipText("Create item switcher");
773	1172	switchButton.addActionListener(this);
774	1173
775		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776	1175	loopButton.setToolTipText("Create loop");
777	1176	loopButton.addActionListener(this);
778	1177
779		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780	1179	textureButton.setToolTipText("Create texture");
781	1180	textureButton.addActionListener(this);
782	1181
783		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
784	1183	overlayButton.setToolTipText("Create overlay");
785	1184	overlayButton.addActionListener(this);
786	1185
787		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
788	1187	lightButton.setToolTipText("Create light");
789	1188	lightButton.addActionListener(this);
790	1189
791		- for (int i=6; --i>=0;)
792		- {
793		- oe.toolboxPanel.Return();
794		- oe.toolboxPanel.add(new cGridBag());
795		- oe.toolboxPanel.add(new cGridBag());
796		- oe.toolboxPanel.add(new cGridBag());
797		- oe.toolboxPanel.add(new cGridBag());
798		- oe.toolboxPanel.add(new cGridBag());
799		- oe.toolboxPanel.add(new cGridBag());
800		- oe.toolboxPanel.add(new cGridBag());
801		- }
	1190	+ oe.toolboxPanel.add(row2);
	1191	+
	1192	+ cGridBag textures = new cGridBag();
	1193	+
	1194	+ CreateTexturePanel(textures);
	1195	+
	1196	+ oe.toolboxPanel.add(textures);
	1197	+
	1198	+ textures.preferredHeight = 100;
	1199	+
	1200	+ CreateSkyboxPanel(oe.skyboxPanel);
802	1201
803	1202	// EDIT panel
804	1203	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -806,20 +1205,20 @@
806	1205	editButton.addActionListener(this);
807	1206
808	1207	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
809		- uneditButton.setToolTipText("Remove selection controls");
	1208	+ uneditButton.setToolTipText("Unpin and remove selection controls");
810	1209	uneditButton.addActionListener(this);
811	1210
812	1211	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
813		- allParamsButton.setToolTipText("Show all controle");
	1212	+ allParamsButton.setToolTipText("Show all controls");
814	1213	allParamsButton.addActionListener(this);
815	1214
816		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
817		- clearPanelButton.setToolTipText("Clear edit panel");
	1215	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ clearPanelButton.setToolTipText("Clear all controls");
818	1217	clearPanelButton.addActionListener(this);
819	1218
820		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
821		- unselectButton.setToolTipText("Unselect");
822		- unselectButton.addActionListener(this);
	1219	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ //unselectButton.setToolTipText("Unselect");
	1221	+ //unselectButton.addActionListener(this);
823	1222
824	1223	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
825	1224	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -858,8 +1257,8 @@
858	1257	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
859	1258	sliderPane.preferredHeight = 1;
860	1259
861		-// mainPanel.setDividerLocation(0.5); //1.0);
862		-// mainPanel.setResizeWeight(0.5);
	1260	+// mainPanel.setDividerLocation(0.1); //1.0);
	1261	+ mainPanel.setResizeWeight(0.4);
863	1262
864	1263	//jList.addListSelectionListener(this);
865	1264	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -867,7 +1266,7 @@
867	1266	//jTree.setEditable(true);
868	1267	oe.jTree.setDragEnabled(true);
869	1268	//jTree.setPreferredSize(new Dimension(10,10));
870		- jSP.setPreferredSize(new Dimension(100,200));
	1269	+ //jSP.setPreferredSize(new Dimension(100,200));
871	1270
872	1271	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
873	1272
..	..	@@ -879,7 +1278,7 @@
879	1278	dgr.addDragGestureListener(this);
880	1279	}catch(Exception e) {}
881	1280	*/
882		- radio.layout = sixButton; // sevenButton;
	1281	+ radio.layout = threeButton; // sixButton;
883	1282	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
884	1283	}
885	1284
..	..	@@ -930,9 +1329,12 @@
930	1329	smoothCB.setToolTipText("Snapping delay");
931	1330	smoothCB.addItemListener(this);
932	1331
933		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
934		- slowCB.setToolTipText("Smooth interpolation");
935		- 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);
936	1338
937	1339	// constraints.gridy += 1;
938	1340	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1021,7 +1423,7 @@
1021	1423	}
1022	1424
1023	1425	radioButton.SetObject(obj);
1024		- radioButton.layout = sixButton; // sevenButton;
	1426	+ radioButton.layout = threeButton; // sixButton;
1025	1427	radioButton.SetCamera(cameraView.renderCamera, false);
1026	1428	radioButton.addActionListener(this);
1027	1429	radioPanel.add(radioButton);
..	..	@@ -1046,6 +1448,8 @@
1046	1448	cCheckBox localCB;
1047	1449	cCheckBox crowdCB;
1048	1450	cCheckBox smoothCB;
	1451	+ cCheckBox minshaderCB;
	1452	+
1049	1453	cToggleButton fastCB;
1050	1454	cCheckBox slowCB;
1051	1455	cCheckBox boxCB;
..	..	@@ -1116,6 +1520,12 @@
1116	1520	{
1117	1521	cameraView.ToggleInertia();
1118	1522	cameraView.repaint();
	1523	+ }
	1524	+ else if(e.getSource() == minshaderCB)
	1525	+ {
	1526	+ Globals.MINSHADER ^= true;
	1527	+ cameraView.programInitialized = false;
	1528	+ cameraView.repaint();
1119	1529	}
1120	1530	else if(e.getSource() == localCB)
1121	1531	{
..	..	@@ -2139,6 +2549,23 @@
2139	2549	{
2140	2550	makeSomething(new Light());
2141	2551	} else
	2552	+// if (source == skybox1Button \|\|
	2553	+// source == skybox2Button \|\|
	2554	+// source == skybox3Button \|\|
	2555	+// source == skybox4Button \|\|
	2556	+// source == skybox5Button \|\|
	2557	+// source == skybox6Button \|\|
	2558	+// source == skybox7Button \|\|
	2559	+// source == skybox11Button \|\|
	2560	+// source == skybox12Button \|\|
	2561	+// source == skybox13Button \|\|
	2562	+// source == skybox14Button \|\|
	2563	+// source == skybox15Button \|\|
	2564	+// source == skybox16Button \|\|
	2565	+// source == skybox17Button)
	2566	+// {
	2567	+// ChangeSkybox(source);
	2568	+// } else
2142	2569	if (source == csgItem)
2143	2570	{
2144	2571	group(new CSG());
..	..	@@ -2224,7 +2651,7 @@
2224	2651	if (source == computeAOItem)
2225	2652	{
2226	2653	Globals.drawMode = CameraPane.OCCLUSION;
2227		- Globals.theRenderer.repaint();
	2654	+ cameraView.repaint();
2228	2655	} else
2229	2656	if (source == recompileItem)
2230	2657	{
..	..	@@ -2239,7 +2666,7 @@
2239	2666	if (source == invariantsItem)
2240	2667	{
2241	2668	System.out.println("Invariants:");
2242		- Grafreed.grafreeD.universe.invariants();
	2669	+ Grafreed.grafreed.universe.invariants();
2243	2670	} else
2244	2671	if (source == memoryItem)
2245	2672	{
..	..	@@ -2270,33 +2697,40 @@
2270	2697	{
2271	2698	ToggleFullScreen();
2272	2699	} else
2273		- if (source == undoButton)
	2700	+ if (source == previousVersionButton)
2274	2701	{
2275	2702	// Go to previous version
2276	2703	//if (!Undo())
2277	2704	//java.awt.Toolkit.getDefaultToolkit().beep();
2278		- Undo();
	2705	+ PreviousVersion();
2279	2706	} else
2280	2707	if (source == restoreButton)
2281	2708	{
2282	2709	// Restore current version
2283	2710	Restore();
	2711	+ //restoreButton.setEnabled(false);
2284	2712	} else
2285	2713	if (source == replaceButton)
2286	2714	{
2287	2715	// Overwrite current version
2288	2716	Replace();
	2717	+ //replaceButton.setEnabled(false);
2289	2718	} else
2290		- if (source == redoButton)
	2719	+ if (source == nextVersionButton)
2291	2720	{
2292	2721	// Go to next version
2293		- Redo();
	2722	+ NextVersion();
2294	2723	} else
2295		- if (source == saveButton)
	2724	+ if (source == saveVersionButton)
2296	2725	{
2297	2726	// Save a new version
2298	2727	if (!Save(true))
2299	2728	java.awt.Toolkit.getDefaultToolkit().beep();
	2729	+ } else
	2730	+ if (source == deleteVersionButton)
	2731	+ {
	2732	+ // Delete a new version
	2733	+ DeleteVersion();
2300	2734	} else
2301	2735	if (source == oneStepButton)
2302	2736	{
..	..	@@ -2351,11 +2785,11 @@
2351	2785	} else
2352	2786	if (source == undoItem)
2353	2787	{
2354		- Undo();
	2788	+ PreviousVersion();
2355	2789	} else
2356	2790	if (source == redoItem)
2357	2791	{
2358		- Redo();
	2792	+ NextVersion();
2359	2793	} else
2360	2794	if (source == duplicateItem)
2361	2795	{
..	..	@@ -3300,8 +3734,8 @@
3300	3734	// centralPanel.setVisible(true);
3301	3735	// XYZPanel.setVisible(true);
3302	3736	bigThree.ClearUI();
	3737	+ bigThree.add(scenePanel);
3303	3738	bigThree.add(centralPanel);
3304		- bigThree.add(XYZPanel);
3305	3739	bigThree.FlushUI();
3306	3740
3307	3741	cameraView.requestFocusInWindow();
..	..	@@ -3381,8 +3815,8 @@
3381	3815	// centralPanel.setVisible(true);
3382	3816	// XYZPanel.setVisible(false);
3383	3817	bigThree.ClearUI();
3384		- bigThree.add(scenePanel);
3385	3818	bigThree.add(centralPanel);
	3819	+ bigThree.add(scenePanel);
3386	3820	bigThree.FlushUI();
3387	3821
3388	3822	cameraView.requestFocusInWindow();
..	..	@@ -3488,10 +3922,10 @@
3488	3922	{
3489	3923	Object3D child = (Object3D)e.nextElement();
3490	3924	if(child.editWindow != null)
3491		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3492	3925	child.pinned = false;
3493	3926	child.CloseUI();
3494	3927	listUI.remove(child);
	3928	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3495	3929
3496	3930	//child.editWindow = null; // ???????????
3497	3931	}
..	..	@@ -3510,6 +3944,7 @@
3510	3944	obj.CloseUI();
3511	3945	}
3512	3946	listUI.clear();
	3947	+ SetPinStates(group.selection.size() > 0);
3513	3948	refreshContents(true);
3514	3949	} else
3515	3950	if (source == allParamsButton)
..	..	@@ -3596,6 +4031,7 @@
3596	4031	radio.layout.doClick();
3597	4032
3598	4033	ClearUnpinned();
	4034	+
3599	4035	//Grafreed.Assert(group != null);
3600	4036	//Grafreed.Assert(group.selection != null);
3601	4037	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3612,11 +4048,13 @@
3612	4048	} else if (event.getSource() == editCameraItem)
3613	4049	{
3614	4050	cameraView.ProtectCamera();
	4051	+ cameraView.requestFocusInWindow();
3615	4052	cameraView.repaint();
3616	4053	return;
3617	4054	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3618	4055	{
3619	4056	cameraView.RevertCamera();
	4057	+ cameraView.requestFocusInWindow();
3620	4058	cameraView.repaint();
3621	4059	return;
3622	4060	// } else if (event.getSource() == textureButton)
..	..	@@ -4749,9 +5187,7 @@
4749	5187
4750	5188	freezemodel = false;
4751	5189	}
4752		-
4753		- boolean flashIt = true;
4754		-
	5190	+
4755	5191	public void valueChanged(TreeSelectionEvent e)
4756	5192	//public boolean handleEvent(Event event)
4757	5193	{
..	..	@@ -4824,13 +5260,15 @@
4824	5260	{
4825	5261	editButton.setEnabled(enabled);
4826	5262	uneditButton.setEnabled(enabled);
4827		- unselectButton.setEnabled(enabled);
	5263	+ //unselectButton.setEnabled(enabled);
4828	5264	flashSelectionButton.setEnabled(enabled);
	5265	+
	5266	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4829	5267	}
4830	5268
4831	5269	void refreshContents(boolean cp)
4832	5270	{
4833		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5271	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4834	5272	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4835	5273	{
4836	5274	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5666,7 +6104,6 @@
5666	6104
5667	6105	cButton restoreCameraButton;
5668	6106
5669		- cButton saveButton;
5670	6107	cButton oneStepButton;
5671	6108
5672	6109	cButton groupButton;
..	..	@@ -5676,6 +6113,22 @@
5676	6113	cButton loopButton;
5677	6114	cButton textureButton;
5678	6115
	6116	+ cButton skybox1Button;
	6117	+ cButton skybox2Button;
	6118	+ cButton skybox3Button;
	6119	+ cButton skybox4Button;
	6120	+ cButton skybox5Button;
	6121	+ cButton skybox6Button;
	6122	+ cButton skybox7Button;
	6123	+
	6124	+ cButton skybox11Button;
	6125	+ cButton skybox12Button;
	6126	+ cButton skybox13Button;
	6127	+ cButton skybox14Button;
	6128	+ cButton skybox15Button;
	6129	+ cButton skybox16Button;
	6130	+ cButton skybox17Button;
	6131	+
5679	6132	cButton gridButton;
5680	6133	cButton boxButton;
5681	6134	cButton sphereButton;