~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,341 @@
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, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	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	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
26	362	//ObjEditor objEditor;
27	363	public void closeUI2()
28	364	{
..	..	@@ -60,9 +396,9 @@
60	396	this.copy = this.group = group;
61	397	//selectees = this.group.selectees;
62	398
63		- if (copy.versions == null)
	399	+ if (copy.versionlist == null)
64	400	{
65		- copy.versions = new byte[100][];
	401	+ copy.versionlist = new Object3D[100];
66	402	copy.versionindex = -1;
67	403	}
68	404
..	..	@@ -87,9 +423,9 @@
87	423
88	424	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	425
90		- if (copy.versions == null)
	426	+ if (copy.versionlist == null)
91	427	{
92		- copy.versions = new byte[100][];
	428	+ copy.versionlist = new Object3D[100];
93	429	copy.versionindex = -1;
94	430
95	431	Save(true);
..	..	@@ -563,6 +899,73 @@
563	899	buildToolsMenu(menu);
564	900	}
565	901
	902	+ JTabbedPane resourcecontainer;
	903	+ cGridBag currenttab;
	904	+ boolean added; // patch for jar
	905	+
	906	+ int tabcount = 0;
	907	+ int colcount = 0;
	908	+ int rowcount = 0;
	909	+ int texturecount = 0;
	910	+
	911	+ int columns = 5;
	912	+ int rows = 7;
	913	+
	914	+ public void ResourceCallBack(String[] path)
	915	+ {
	916	+// for (int i = 0; i < path.length; i++)
	917	+// System.out.print(path[i] + "/");
	918	+// System.out.println();
	919	+
	920	+ if (//rowcount == 0 \|\|
	921	+ path.length == 1)
	922	+ {
	923	+ currenttab = new cGridBag();
	924	+ added = false;
	925	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	926	+ currenttab.setName(tabname);
	927	+ rowcount = 1;
	928	+ colcount = 0;
	929	+ texturecount = 0;
	930	+ }
	931	+
	932	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	933	+ {
	934	+ if (!added)
	935	+ {
	936	+ added = true;
	937	+ resourcecontainer.add(currenttab);
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	940	+ }
	941	+
	942	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	943	+
	944	+ if (++colcount >= columns)
	945	+ {
	946	+ colcount = 0;
	947	+ currenttab.Return();
	948	+
	949	+ if (rowcount++ >= rows)
	950	+ {
	951	+ rowcount = 0;
	952	+ }
	953	+ }
	954	+ }
	955	+ else
	956	+ {
	957	+// if (!path[path.length-1].equals("icons"))
	958	+// resourcecontainer.Return();
	959	+ }
	960	+ }
	961	+
	962	+ void CreateTexturePanel(cGridBag container)
	963	+ {
	964	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	965	+ container.add(resourcecontainer);
	966	+
	967	+ Grafreed.ParseResources("textures", this);
	968	+ }
566	969
567	970	void SetupUI2(ObjEditor oe)
568	971	{
..	..	@@ -608,7 +1011,7 @@
608	1011	*/
609	1012	cGridBag copyOptionsPanel = new cGridBag();
610	1013
611		- copyOptionsPanel.preferredHeight = 1;
	1014	+ copyOptionsPanel.preferredHeight = 2;
612	1015
613	1016	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
614	1017
..	..	@@ -635,32 +1038,36 @@
635	1038	restoreCameraButton.setToolTipText("Restore viewpoint");
636	1039	restoreCameraButton.addActionListener(this);
637	1040
638		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639		- saveButton.setToolTipText("New version");
640		- saveButton.addActionListener(this);
	1041	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ saveVersionButton.setToolTipText("Duplicate current version");
	1043	+ saveVersionButton.addActionListener(this);
641	1044
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);
	1045	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ deleteVersionButton.setToolTipText("Delete current version");
	1047	+ deleteVersionButton.addActionListener(this);
	1048	+
	1049	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ previousVersionButton.setToolTipText("Previous version");
	1051	+ previousVersionButton.addActionListener(this);
	1052	+ previousVersionButton.setEnabled(false);
646	1053
647	1054	cGridBag updown = new cGridBag().setVertical(true);
648	1055	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- restoreButton.setToolTipText("Restore current");
	1056	+ restoreButton.setToolTipText("Undo (restore current version)");
650	1057	restoreButton.addActionListener(this);
651		- restoreButton.setEnabled(false);
	1058	+ //restoreButton.setEnabled(false);
652	1059
653	1060	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- replaceButton.setToolTipText("Replace current");
	1061	+ replaceButton.setToolTipText("Save (replace current version)");
655	1062	replaceButton.addActionListener(this);
656		- replaceButton.setEnabled(false);
	1063	+ //replaceButton.setEnabled(false);
657	1064
658	1065	copyOptionsPanel.add(updown);
659	1066
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);
	1067	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ nextVersionButton.setToolTipText("Next version");
	1069	+ nextVersionButton.addActionListener(this);
	1070	+ nextVersionButton.setEnabled(false);
664	1071
665	1072	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
666	1073	liveCB.setToolTipText("Enable animation");
..	..	@@ -722,28 +1129,30 @@
722	1129	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
723	1130	//clearButton.addActionListener(this);
724	1131
	1132	+ cGridBag row1 = new cGridBag();
	1133	+
725	1134	// INSERT
726		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727	1136	gridButton.setToolTipText("Create grid");
728	1137	gridButton.addActionListener(this);
729	1138
730		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1140	boxButton.setToolTipText("Create box");
732	1141	boxButton.addActionListener(this);
733	1142
734		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1144	sphereButton.setToolTipText("Create sphere");
736	1145	sphereButton.addActionListener(this);
737	1146
738		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1148	coneButton.setToolTipText("Create cone");
740	1149	coneButton.addActionListener(this);
741	1150
742		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743	1152	torusButton.setToolTipText("Create torus");
744	1153	torusButton.addActionListener(this);
745	1154
746		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
747	1156	superButton.setToolTipText("Create superellipsoid");
748	1157	superButton.addActionListener(this);
749	1158
..	..	@@ -754,51 +1163,53 @@
754	1163	kleinButton.addActionListener(this);
755	1164	}
756	1165
757		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
758	1167	particlesButton.setToolTipText("Create particle system");
759	1168	particlesButton.addActionListener(this);
760	1169
761		- oe.toolboxPanel.Return();
	1170	+ oe.toolboxPanel.add(row1);
762	1171
763		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ cGridBag row2 = new cGridBag();
	1173	+
	1174	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1175	groupButton.setToolTipText("Create group");
765	1176	groupButton.addActionListener(this);
766	1177
767		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1179	compositeButton.setToolTipText("Create composite");
769	1180	compositeButton.addActionListener(this);
770	1181
771		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
772	1183	switchButton.setToolTipText("Create item switcher");
773	1184	switchButton.addActionListener(this);
774	1185
775		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776	1187	loopButton.setToolTipText("Create loop");
777	1188	loopButton.addActionListener(this);
778	1189
779		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780	1191	textureButton.setToolTipText("Create texture");
781	1192	textureButton.addActionListener(this);
782	1193
783		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
784	1195	overlayButton.setToolTipText("Create overlay");
785	1196	overlayButton.addActionListener(this);
786	1197
787		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
788	1199	lightButton.setToolTipText("Create light");
789	1200	lightButton.addActionListener(this);
790	1201
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		- }
	1202	+ oe.toolboxPanel.add(row2);
	1203	+
	1204	+ cGridBag textures = new cGridBag();
	1205	+
	1206	+ CreateTexturePanel(textures);
	1207	+
	1208	+ oe.toolboxPanel.add(textures);
	1209	+
	1210	+ textures.preferredHeight = 100;
	1211	+
	1212	+ CreateSkyboxPanel(oe.skyboxPanel);
802	1213
803	1214	// EDIT panel
804	1215	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -806,20 +1217,20 @@
806	1217	editButton.addActionListener(this);
807	1218
808	1219	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
809		- uneditButton.setToolTipText("Remove selection controls");
	1220	+ uneditButton.setToolTipText("Unpin and remove selection controls");
810	1221	uneditButton.addActionListener(this);
811	1222
812	1223	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
813		- allParamsButton.setToolTipText("Show all controle");
	1224	+ allParamsButton.setToolTipText("Show all controls");
814	1225	allParamsButton.addActionListener(this);
815	1226
816		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
817		- clearPanelButton.setToolTipText("Clear edit panel");
	1227	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ clearPanelButton.setToolTipText("Clear all controls");
818	1229	clearPanelButton.addActionListener(this);
819	1230
820		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
821		- unselectButton.setToolTipText("Unselect");
822		- unselectButton.addActionListener(this);
	1231	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ //unselectButton.setToolTipText("Unselect");
	1233	+ //unselectButton.addActionListener(this);
823	1234
824	1235	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
825	1236	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -858,8 +1269,8 @@
858	1269	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
859	1270	sliderPane.preferredHeight = 1;
860	1271
861		-// mainPanel.setDividerLocation(0.5); //1.0);
862		-// mainPanel.setResizeWeight(0.5);
	1272	+// mainPanel.setDividerLocation(0.1); //1.0);
	1273	+ mainPanel.setResizeWeight(0.4);
863	1274
864	1275	//jList.addListSelectionListener(this);
865	1276	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -867,7 +1278,7 @@
867	1278	//jTree.setEditable(true);
868	1279	oe.jTree.setDragEnabled(true);
869	1280	//jTree.setPreferredSize(new Dimension(10,10));
870		- jSP.setPreferredSize(new Dimension(100,200));
	1281	+ //jSP.setPreferredSize(new Dimension(100,200));
871	1282
872	1283	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
873	1284
..	..	@@ -879,7 +1290,7 @@
879	1290	dgr.addDragGestureListener(this);
880	1291	}catch(Exception e) {}
881	1292	*/
882		- radio.layout = sixButton; // sevenButton;
	1293	+ radio.layout = threeButton; // sixButton;
883	1294	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
884	1295	}
885	1296
..	..	@@ -930,9 +1341,12 @@
930	1341	smoothCB.setToolTipText("Snapping delay");
931	1342	smoothCB.addItemListener(this);
932	1343
933		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
934		- slowCB.setToolTipText("Smooth interpolation");
935		- slowCB.addItemListener(this);
	1344	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1345	+// slowCB.setToolTipText("Smooth interpolation");
	1346	+// slowCB.addItemListener(this);
	1347	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1348	+ minshaderCB.setToolTipText("Minimal fast shader");
	1349	+ minshaderCB.addItemListener(this);
936	1350
937	1351	// constraints.gridy += 1;
938	1352	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1021,7 +1435,7 @@
1021	1435	}
1022	1436
1023	1437	radioButton.SetObject(obj);
1024		- radioButton.layout = sixButton; // sevenButton;
	1438	+ radioButton.layout = threeButton; // sixButton;
1025	1439	radioButton.SetCamera(cameraView.renderCamera, false);
1026	1440	radioButton.addActionListener(this);
1027	1441	radioPanel.add(radioButton);
..	..	@@ -1046,6 +1460,8 @@
1046	1460	cCheckBox localCB;
1047	1461	cCheckBox crowdCB;
1048	1462	cCheckBox smoothCB;
	1463	+ cCheckBox minshaderCB;
	1464	+
1049	1465	cToggleButton fastCB;
1050	1466	cCheckBox slowCB;
1051	1467	cCheckBox boxCB;
..	..	@@ -1116,6 +1532,12 @@
1116	1532	{
1117	1533	cameraView.ToggleInertia();
1118	1534	cameraView.repaint();
	1535	+ }
	1536	+ else if(e.getSource() == minshaderCB)
	1537	+ {
	1538	+ Globals.MINSHADER ^= true;
	1539	+ cameraView.programInitialized = false;
	1540	+ cameraView.repaint();
1119	1541	}
1120	1542	else if(e.getSource() == localCB)
1121	1543	{
..	..	@@ -2139,6 +2561,23 @@
2139	2561	{
2140	2562	makeSomething(new Light());
2141	2563	} else
	2564	+// if (source == skybox1Button \|\|
	2565	+// source == skybox2Button \|\|
	2566	+// source == skybox3Button \|\|
	2567	+// source == skybox4Button \|\|
	2568	+// source == skybox5Button \|\|
	2569	+// source == skybox6Button \|\|
	2570	+// source == skybox7Button \|\|
	2571	+// source == skybox11Button \|\|
	2572	+// source == skybox12Button \|\|
	2573	+// source == skybox13Button \|\|
	2574	+// source == skybox14Button \|\|
	2575	+// source == skybox15Button \|\|
	2576	+// source == skybox16Button \|\|
	2577	+// source == skybox17Button)
	2578	+// {
	2579	+// ChangeSkybox(source);
	2580	+// } else
2142	2581	if (source == csgItem)
2143	2582	{
2144	2583	group(new CSG());
..	..	@@ -2224,7 +2663,7 @@
2224	2663	if (source == computeAOItem)
2225	2664	{
2226	2665	Globals.drawMode = CameraPane.OCCLUSION;
2227		- Globals.theRenderer.repaint();
	2666	+ cameraView.repaint();
2228	2667	} else
2229	2668	if (source == recompileItem)
2230	2669	{
..	..	@@ -2239,7 +2678,7 @@
2239	2678	if (source == invariantsItem)
2240	2679	{
2241	2680	System.out.println("Invariants:");
2242		- Grafreed.grafreeD.universe.invariants();
	2681	+ Grafreed.grafreed.universe.invariants();
2243	2682	} else
2244	2683	if (source == memoryItem)
2245	2684	{
..	..	@@ -2270,33 +2709,40 @@
2270	2709	{
2271	2710	ToggleFullScreen();
2272	2711	} else
2273		- if (source == undoButton)
	2712	+ if (source == previousVersionButton)
2274	2713	{
2275	2714	// Go to previous version
2276	2715	//if (!Undo())
2277	2716	//java.awt.Toolkit.getDefaultToolkit().beep();
2278		- Undo();
	2717	+ PreviousVersion();
2279	2718	} else
2280	2719	if (source == restoreButton)
2281	2720	{
2282	2721	// Restore current version
2283	2722	Restore();
	2723	+ //restoreButton.setEnabled(false);
2284	2724	} else
2285	2725	if (source == replaceButton)
2286	2726	{
2287	2727	// Overwrite current version
2288	2728	Replace();
	2729	+ //replaceButton.setEnabled(false);
2289	2730	} else
2290		- if (source == redoButton)
	2731	+ if (source == nextVersionButton)
2291	2732	{
2292	2733	// Go to next version
2293		- Redo();
	2734	+ NextVersion();
2294	2735	} else
2295		- if (source == saveButton)
	2736	+ if (source == saveVersionButton)
2296	2737	{
2297	2738	// Save a new version
2298	2739	if (!Save(true))
2299	2740	java.awt.Toolkit.getDefaultToolkit().beep();
	2741	+ } else
	2742	+ if (source == deleteVersionButton)
	2743	+ {
	2744	+ // Delete a new version
	2745	+ DeleteVersion();
2300	2746	} else
2301	2747	if (source == oneStepButton)
2302	2748	{
..	..	@@ -2351,11 +2797,11 @@
2351	2797	} else
2352	2798	if (source == undoItem)
2353	2799	{
2354		- Undo();
	2800	+ PreviousVersion();
2355	2801	} else
2356	2802	if (source == redoItem)
2357	2803	{
2358		- Redo();
	2804	+ NextVersion();
2359	2805	} else
2360	2806	if (source == duplicateItem)
2361	2807	{
..	..	@@ -3488,10 +3934,10 @@
3488	3934	{
3489	3935	Object3D child = (Object3D)e.nextElement();
3490	3936	if(child.editWindow != null)
3491		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3492	3937	child.pinned = false;
3493	3938	child.CloseUI();
3494	3939	listUI.remove(child);
	3940	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3495	3941
3496	3942	//child.editWindow = null; // ???????????
3497	3943	}
..	..	@@ -3510,6 +3956,7 @@
3510	3956	obj.CloseUI();
3511	3957	}
3512	3958	listUI.clear();
	3959	+ SetPinStates(group.selection.size() > 0);
3513	3960	refreshContents(true);
3514	3961	} else
3515	3962	if (source == allParamsButton)
..	..	@@ -3596,6 +4043,7 @@
3596	4043	radio.layout.doClick();
3597	4044
3598	4045	ClearUnpinned();
	4046	+
3599	4047	//Grafreed.Assert(group != null);
3600	4048	//Grafreed.Assert(group.selection != null);
3601	4049	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3612,11 +4060,13 @@
3612	4060	} else if (event.getSource() == editCameraItem)
3613	4061	{
3614	4062	cameraView.ProtectCamera();
	4063	+ cameraView.requestFocusInWindow();
3615	4064	cameraView.repaint();
3616	4065	return;
3617	4066	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3618	4067	{
3619	4068	cameraView.RevertCamera();
	4069	+ cameraView.requestFocusInWindow();
3620	4070	cameraView.repaint();
3621	4071	return;
3622	4072	// } else if (event.getSource() == textureButton)
..	..	@@ -4749,9 +5199,7 @@
4749	5199
4750	5200	freezemodel = false;
4751	5201	}
4752		-
4753		- boolean flashIt = true;
4754		-
	5202	+
4755	5203	public void valueChanged(TreeSelectionEvent e)
4756	5204	//public boolean handleEvent(Event event)
4757	5205	{
..	..	@@ -4824,13 +5272,15 @@
4824	5272	{
4825	5273	editButton.setEnabled(enabled);
4826	5274	uneditButton.setEnabled(enabled);
4827		- unselectButton.setEnabled(enabled);
	5275	+ //unselectButton.setEnabled(enabled);
4828	5276	flashSelectionButton.setEnabled(enabled);
	5277	+
	5278	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4829	5279	}
4830	5280
4831	5281	void refreshContents(boolean cp)
4832	5282	{
4833		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5283	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4834	5284	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4835	5285	{
4836	5286	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5666,7 +6116,6 @@
5666	6116
5667	6117	cButton restoreCameraButton;
5668	6118
5669		- cButton saveButton;
5670	6119	cButton oneStepButton;
5671	6120
5672	6121	cButton groupButton;
..	..	@@ -5676,6 +6125,22 @@
5676	6125	cButton loopButton;
5677	6126	cButton textureButton;
5678	6127
	6128	+ cButton skybox1Button;
	6129	+ cButton skybox2Button;
	6130	+ cButton skybox3Button;
	6131	+ cButton skybox4Button;
	6132	+ cButton skybox5Button;
	6133	+ cButton skybox6Button;
	6134	+ cButton skybox7Button;
	6135	+
	6136	+ cButton skybox11Button;
	6137	+ cButton skybox12Button;
	6138	+ cButton skybox13Button;
	6139	+ cButton skybox14Button;
	6140	+ cButton skybox15Button;
	6141	+ cButton skybox16Button;
	6142	+ cButton skybox17Button;
	6143	+
5679	6144	cButton gridButton;
5680	6145	cButton boxButton;
5681	6146	cButton sphereButton;