~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,360 @@
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.equals("") ? "No background" : 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", "", 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	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,10 +415,12 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
63		- if (copy.versions == null)
	418	+ if (copy.versionlist == null)
64	419	{
65		- copy.versions = new byte[100][];
	420	+ copy.versionlist = new Object3D[100];
66	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
67	424	}
68	425
69	426	if(ui)
..	..	@@ -87,9 +444,9 @@
87	444
88	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	446
90		- if (copy.versions == null)
	447	+ if (copy.versionlist == null)
91	448	{
92		- copy.versions = new byte[100][];
	449	+ copy.versionlist = new Object3D[100];
93	450	copy.versionindex = -1;
94	451
95	452	Save(true);
..	..	@@ -183,33 +540,35 @@
183	540	// menu.add("-");
184	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
185	542	duplicateItem.addActionListener(this);
186		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
187	545	cloneItem.addActionListener(this);
188		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
189	547	{
190	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
191	549	cloneSupportItem.addActionListener(this);
192	550	}
	551	+ oe.jTree.popup.addSeparator();
193	552	menu.add("-");
194		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
195	554	cutItem.addActionListener(this);
196		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
197	556	copyItem.addActionListener(this);
198	557	pasteItem = menu.add(new MenuItem("Paste"));
199	558	pasteItem.addActionListener(this);
200	559
201		- menu.add("-");
202		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
203	563	pasteIntoItem.addActionListener(this);
204		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
205	565	pasteLinkItem.addActionListener(this);
206		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
207	567	pasteCloneItem.addActionListener(this);
208		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
209	569	// pasteExpandItem.addActionListener(this);
210		- menu.add("-");
211		- deleteItem = menu.add(new MenuItem("Delete"));
212		- deleteItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
213	572
214	573	if (Globals.ADVANCED)
215	574	{
..	..	@@ -295,11 +654,9 @@
295	654	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
296	655	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
297	656	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
298		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
299	657	oe.cameraMenu.add("-");
300	658	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
301	659	openWindowItem.addActionListener(this);
302		- editLeafItem.addActionListener(this);
303	660	lookAtItem.addActionListener(this);
304	661	//lookFromItem.addActinoListener(this);
305	662	//switchViewItem.addActionListener(this);
..	..	@@ -346,9 +703,8 @@
346	703	setMasterItem.addActionListener(this);
347	704	}
348	705
349		- oe.menuBar.add(menu = new Menu("Group"));
350		-// grabItem = menu.add(new MenuItem("Grab"));
351		-// grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
352	708	backItem = menu.add(new MenuItem("Back"));
353	709	backItem.addActionListener(this);
354	710	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -356,13 +712,21 @@
356	712	// compositeItem = menu.add(new MenuItem("Composite"));
357	713	// compositeItem.addActionListener(this);
358	714
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
359	718	if (Globals.ADVANCED)
360	719	{
361	720	hideItem = menu.add(new MenuItem("Hidden Group"));
362	721	hideItem.addActionListener(this);
363	722	}
364		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
365	724	ungroupItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
366	730
367	731	// menu.add("-");
368	732	//
..	..	@@ -547,6 +911,9 @@
547	911	shareGeometriesItem.addActionListener(this);
548	912	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
549	913	mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
550	917	if (Globals.ADVANCED)
551	918	{
552	919	// Pretty much the same as duplicate and clone.
..	..	@@ -563,6 +930,74 @@
563	930	buildToolsMenu(menu);
564	931	}
565	932
	933	+ JTabbedPane resourcecontainer;
	934	+ cGridBag currenttab;
	935	+ //boolean added; // patch for jar
	936	+
	937	+ int tabcount = 0;
	938	+ int colcount = 0;
	939	+ int rowcount = 0;
	940	+ int texturecount = 0;
	941	+
	942	+ int columns = 5;
	943	+ int rows = 7;
	944	+
	945	+ public void ResourceCallBack(String[] path)
	946	+ {
	947	+// for (int i = 0; i < path.length; i++)
	948	+// System.out.print(path[i] + "/");
	949	+// System.out.println();
	950	+
	951	+ if (//rowcount == 0 \|\|
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	953	+ {
	954	+ currenttab = new cGridBag();
	955	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	956	+ currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	960	+ rowcount = 1;
	961	+ colcount = 0;
	962	+ texturecount = 0;
	963	+ }
	964	+
	965	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	966	+ {
	967	+ //if (!added)
	968	+ {
	969	+ //added = true;
	970	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	972	+ }
	973	+
	974	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	975	+
	976	+ if (++colcount >= columns)
	977	+ {
	978	+ colcount = 0;
	979	+ currenttab.Return();
	980	+
	981	+ if (rowcount++ >= rows)
	982	+ {
	983	+ rowcount = 0;
	984	+ }
	985	+ }
	986	+ }
	987	+ else
	988	+ {
	989	+// if (!path[path.length-1].equals("icons"))
	990	+// resourcecontainer.Return();
	991	+ }
	992	+ }
	993	+
	994	+ void CreateTexturePanel(cGridBag container)
	995	+ {
	996	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	997	+ container.add(resourcecontainer);
	998	+
	999	+ Grafreed.ParseResources("textures", this);
	1000	+ }
566	1001
567	1002	void SetupUI2(ObjEditor oe)
568	1003	{
..	..	@@ -581,11 +1016,6 @@
581	1016	//new Exception().printStackTrace();
582	1017
583	1018	oe.radioPanel = new JPanel(new GridBagLayout());
584		- oe.aConstraints.weightx = 1;
585		- oe.aConstraints.weighty = 0;
586		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
587		- oe.aConstraints.gridwidth = 100;
588		- oe.aConstraints.gridheight = 1;
589	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
590	1020
591	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -608,7 +1038,7 @@
608	1038	*/
609	1039	cGridBag copyOptionsPanel = new cGridBag();
610	1040
611		- copyOptionsPanel.preferredHeight = 1;
	1041	+ copyOptionsPanel.preferredHeight = 2;
612	1042
613	1043	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
614	1044
..	..	@@ -618,10 +1048,49 @@
618	1048
619	1049	if (Globals.ADVANCED)
620	1050	{
621		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622		- maxButton.setToolTipText("Maximize window");
623		- maxButton.addActionListener(this);
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
624	1054	}
	1055	+
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
625	1094
626	1095	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627	1096	fullButton.setToolTipText("Full-screen window");
..	..	@@ -635,41 +1104,45 @@
635	1104	restoreCameraButton.setToolTipText("Restore viewpoint");
636	1105	restoreCameraButton.addActionListener(this);
637	1106
638		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639		- saveButton.setToolTipText("New version");
640		- saveButton.addActionListener(this);
	1107	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ saveVersionButton.setToolTipText("Duplicate current version");
	1109	+ saveVersionButton.addActionListener(this);
641	1110
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);
	1111	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ deleteVersionButton.setToolTipText("Delete current version");
	1113	+ deleteVersionButton.addActionListener(this);
	1114	+
	1115	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ previousVersionButton.setToolTipText("Previous version");
	1117	+ previousVersionButton.addActionListener(this);
	1118	+ previousVersionButton.setEnabled(false);
646	1119
647	1120	cGridBag updown = new cGridBag().setVertical(true);
648	1121	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- restoreButton.setToolTipText("Restore current");
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
650	1123	restoreButton.addActionListener(this);
651		- restoreButton.setEnabled(false);
	1124	+ //restoreButton.setEnabled(false);
652	1125
653	1126	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- replaceButton.setToolTipText("Replace current");
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
655	1128	replaceButton.addActionListener(this);
656		- replaceButton.setEnabled(false);
	1129	+ //replaceButton.setEnabled(false);
657	1130
658	1131	copyOptionsPanel.add(updown);
659	1132
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);
	1133	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ nextVersionButton.setToolTipText("Next version");
	1135	+ nextVersionButton.addActionListener(this);
	1136	+ nextVersionButton.setEnabled(false);
	1137	+
	1138	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ oneStepButton.setToolTipText("Animate one step forward");
	1140	+ oneStepButton.addActionListener(this);
664	1141
665	1142	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
666	1143	liveCB.setToolTipText("Enable animation");
667	1144	liveCB.addItemListener(this);
668	1145
669		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- oneStepButton.setToolTipText("Animate one step forward");
671		- oneStepButton.addActionListener(this);
672		-
673	1146	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
674	1147	fastCB.setToolTipText("Fast mode");
675	1148	fastCB.addItemListener(this);
..	..	@@ -688,29 +1161,14 @@
688	1161	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689	1162	snapobjectButton.addActionListener(this);
690	1163	snapobjectButton.setToolTipText("Snap Object");
	1164	+
	1165	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ fourButton.addActionListener(this);
	1167	+ fourButton.setToolTipText("Show control panel only");
691	1168	}
692	1169
693	1170	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
694	1171
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");
701		- twoButton.addActionListener(this);
702		- this.fullscreenLayout = twoButton;
703		-
704		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705		- sixButton.setToolTipText("Show left and right");
706		- 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		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711		-// sevenButton.setToolTipText("3-column layout");
712		-// sevenButton.addActionListener(this);
713		- //
714	1172
715	1173	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
716	1174	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -722,30 +1180,32 @@
722	1180	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
723	1181	//clearButton.addActionListener(this);
724	1182
	1183	+ cGridBag row1 = new cGridBag();
	1184	+
725	1185	// INSERT
726		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727		- gridButton.setToolTipText("Create grid");
	1186	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ gridButton.setToolTipText("Create ground");
728	1188	gridButton.addActionListener(this);
729	1189
730		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1191	boxButton.setToolTipText("Create box");
732	1192	boxButton.addActionListener(this);
733	1193
734		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
	1198	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1199	sphereButton.setToolTipText("Create sphere");
736	1200	sphereButton.addActionListener(this);
737	1201
738		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1203	coneButton.setToolTipText("Create cone");
740	1204	coneButton.addActionListener(this);
741	1205
742		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743	1207	torusButton.setToolTipText("Create torus");
744	1208	torusButton.addActionListener(this);
745		-
746		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
747		- superButton.setToolTipText("Create superellipsoid");
748		- superButton.addActionListener(this);
749	1209
750	1210	if (Globals.ADVANCED)
751	1211	{
..	..	@@ -754,51 +1214,53 @@
754	1214	kleinButton.addActionListener(this);
755	1215	}
756	1216
757		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1217	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
758	1218	particlesButton.setToolTipText("Create particle system");
759	1219	particlesButton.addActionListener(this);
760	1220
761		- oe.toolboxPanel.Return();
	1221	+ oe.toolboxPanel.add(row1);
762	1222
763		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ cGridBag row2 = new cGridBag();
	1224	+
	1225	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1226	groupButton.setToolTipText("Create group");
765	1227	groupButton.addActionListener(this);
766	1228
767		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1230	compositeButton.setToolTipText("Create composite");
769	1231	compositeButton.addActionListener(this);
770	1232
771		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
772	1234	switchButton.setToolTipText("Create item switcher");
773	1235	switchButton.addActionListener(this);
774	1236
775		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776	1238	loopButton.setToolTipText("Create loop");
777	1239	loopButton.addActionListener(this);
778	1240
779		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780	1242	textureButton.setToolTipText("Create texture");
781	1243	textureButton.addActionListener(this);
782	1244
783		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
784	1246	overlayButton.setToolTipText("Create overlay");
785	1247	overlayButton.addActionListener(this);
786	1248
787		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
788	1250	lightButton.setToolTipText("Create light");
789	1251	lightButton.addActionListener(this);
790	1252
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		- }
	1253	+ oe.toolboxPanel.add(row2);
	1254	+
	1255	+ cGridBag textures = new cGridBag();
	1256	+
	1257	+ CreateTexturePanel(textures);
	1258	+
	1259	+ oe.toolboxPanel.add(textures);
	1260	+
	1261	+ textures.preferredHeight = 100;
	1262	+
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
802	1264
803	1265	// EDIT panel
804	1266	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -806,20 +1268,20 @@
806	1268	editButton.addActionListener(this);
807	1269
808	1270	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
809		- uneditButton.setToolTipText("Remove selection controls");
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
810	1272	uneditButton.addActionListener(this);
811	1273
812	1274	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
813		- allParamsButton.setToolTipText("Show all controle");
	1275	+ allParamsButton.setToolTipText("Show all controls");
814	1276	allParamsButton.addActionListener(this);
815	1277
816		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
817		- clearPanelButton.setToolTipText("Clear edit panel");
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
818	1280	clearPanelButton.addActionListener(this);
819	1281
820		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
821		- unselectButton.setToolTipText("Unselect");
822		- unselectButton.addActionListener(this);
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
823	1285
824	1286	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
825	1287	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -858,8 +1320,8 @@
858	1320	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
859	1321	sliderPane.preferredHeight = 1;
860	1322
861		-// mainPanel.setDividerLocation(0.5); //1.0);
862		-// mainPanel.setResizeWeight(0.5);
	1323	+// mainPanel.setDividerLocation(0.1); //1.0);
	1324	+ mainPanel.setResizeWeight(0.4);
863	1325
864	1326	//jList.addListSelectionListener(this);
865	1327	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -867,7 +1329,7 @@
867	1329	//jTree.setEditable(true);
868	1330	oe.jTree.setDragEnabled(true);
869	1331	//jTree.setPreferredSize(new Dimension(10,10));
870		- jSP.setPreferredSize(new Dimension(100,200));
	1332	+ //jSP.setPreferredSize(new Dimension(100,200));
871	1333
872	1334	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
873	1335
..	..	@@ -879,7 +1341,7 @@
879	1341	dgr.addDragGestureListener(this);
880	1342	}catch(Exception e) {}
881	1343	*/
882		- radio.layout = sixButton; // sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
883	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
884	1346	}
885	1347
..	..	@@ -930,9 +1392,12 @@
930	1392	smoothCB.setToolTipText("Snapping delay");
931	1393	smoothCB.addItemListener(this);
932	1394
933		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
934		- slowCB.setToolTipText("Smooth interpolation");
935		- slowCB.addItemListener(this);
	1395	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1396	+// slowCB.setToolTipText("Smooth interpolation");
	1397	+// slowCB.addItemListener(this);
	1398	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1399	+ minshaderCB.setToolTipText("Minimal fast shader");
	1400	+ minshaderCB.addItemListener(this);
936	1401
937	1402	// constraints.gridy += 1;
938	1403	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1011,6 +1476,14 @@
1011	1476
1012	1477	void EditObject(Object3D obj)
1013	1478	{
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
1014	1487	cRadio radioButton = new cRadio(obj.name);
1015	1488
1016	1489	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1021,7 +1494,7 @@
1021	1494	}
1022	1495
1023	1496	radioButton.SetObject(obj);
1024		- radioButton.layout = sixButton; // sevenButton;
	1497	+ radioButton.layout = threeButton; // sixButton;
1025	1498	radioButton.SetCamera(cameraView.renderCamera, false);
1026	1499	radioButton.addActionListener(this);
1027	1500	radioPanel.add(radioButton);
..	..	@@ -1035,6 +1508,7 @@
1035	1508
1036	1509	oe.SetupViews();
1037	1510
	1511	+ if (Globals.DEBUG)
1038	1512	System.out.println("SetupViews");
1039	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1040	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1046,6 +1520,8 @@
1046	1520	cCheckBox localCB;
1047	1521	cCheckBox crowdCB;
1048	1522	cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
1049	1525	cToggleButton fastCB;
1050	1526	cCheckBox slowCB;
1051	1527	cCheckBox boxCB;
..	..	@@ -1116,6 +1592,12 @@
1116	1592	{
1117	1593	cameraView.ToggleInertia();
1118	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
1119	1601	}
1120	1602	else if(e.getSource() == localCB)
1121	1603	{
..	..	@@ -1393,7 +1875,12 @@
1393	1875	TreePath path;
1394	1876
1395	1877	public TransferableTreePath(TreePath tp) {
1396		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
1397	1884	}
1398	1885
1399	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1683,7 +2170,11 @@
1683	2170	shadow.material = new cMaterial(obj.material);
1684	2171	shadow.material.diffuse = 0.0001f;
1685	2172	shadow.material.specular = 0.0001f;
1686		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1687	2178
1688	2179	makeSomething(shadow);
1689	2180	}
..	..	@@ -2139,6 +2630,23 @@
2139	2630	{
2140	2631	makeSomething(new Light());
2141	2632	} else
	2633	+// if (source == skybox1Button \|\|
	2634	+// source == skybox2Button \|\|
	2635	+// source == skybox3Button \|\|
	2636	+// source == skybox4Button \|\|
	2637	+// source == skybox5Button \|\|
	2638	+// source == skybox6Button \|\|
	2639	+// source == skybox7Button \|\|
	2640	+// source == skybox11Button \|\|
	2641	+// source == skybox12Button \|\|
	2642	+// source == skybox13Button \|\|
	2643	+// source == skybox14Button \|\|
	2644	+// source == skybox15Button \|\|
	2645	+// source == skybox16Button \|\|
	2646	+// source == skybox17Button)
	2647	+// {
	2648	+// ChangeSkybox(source);
	2649	+// } else
2142	2650	if (source == csgItem)
2143	2651	{
2144	2652	group(new CSG());
..	..	@@ -2187,27 +2695,35 @@
2187	2695	} else
2188	2696	if (source == loopItem \|\| source == loopButton)
2189	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
2190	2700	Composite csg = new GroupLeaf();
2191	2701	csg.count = 5;
2192		- group(csg);
2193	2702	Composite child = new cGroup("Branch");
2194	2703	csg.addChild(child);
2195	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
2196	2707	} else
2197	2708	if (source == doubleItem)
2198	2709	{
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
2199	2712	Composite csg = new GroupLeaf("Fork");
2200	2713	csg.count = 5;
2201		- group(csg);
2202	2714	Composite child = new cGroup("Branch A");
2203	2715	csg.addChild(child);
2204	2716	child.addChild(csg);
2205	2717	child = new cGroup("Branch B");
2206	2718	csg.addChild(child);
2207	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2208	2722	} else
2209	2723	if (source == tripleItem)
2210	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2211	2727	Composite csg = new GroupLeaf("Trident");
2212	2728	csg.count = 4;
2213	2729	group(csg);
..	..	@@ -2220,11 +2736,12 @@
2220	2736	child = new cGroup();
2221	2737	csg.addChild(child);
2222	2738	child.addChild(csg);
	2739	+ }
2223	2740	} else
2224	2741	if (source == computeAOItem)
2225	2742	{
2226	2743	Globals.drawMode = CameraPane.OCCLUSION;
2227		- Globals.theRenderer.repaint();
	2744	+ cameraView.repaint();
2228	2745	} else
2229	2746	if (source == recompileItem)
2230	2747	{
..	..	@@ -2239,7 +2756,7 @@
2239	2756	if (source == invariantsItem)
2240	2757	{
2241	2758	System.out.println("Invariants:");
2242		- Grafreed.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
2243	2760	} else
2244	2761	if (source == memoryItem)
2245	2762	{
..	..	@@ -2270,33 +2787,52 @@
2270	2787	{
2271	2788	ToggleFullScreen();
2272	2789	} else
2273		- if (source == undoButton)
	2790	+ if (source == collapseButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
	2794	+ } else
	2795	+ if (source == maximize3DButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == previousVersionButton)
2274	2803	{
2275	2804	// Go to previous version
2276	2805	//if (!Undo())
2277	2806	//java.awt.Toolkit.getDefaultToolkit().beep();
2278		- Undo();
	2807	+ PreviousVersion();
2279	2808	} else
2280	2809	if (source == restoreButton)
2281	2810	{
2282	2811	// Restore current version
2283	2812	Restore();
	2813	+ //restoreButton.setEnabled(false);
2284	2814	} else
2285	2815	if (source == replaceButton)
2286	2816	{
2287	2817	// Overwrite current version
2288	2818	Replace();
	2819	+ //replaceButton.setEnabled(false);
2289	2820	} else
2290		- if (source == redoButton)
	2821	+ if (source == nextVersionButton)
2291	2822	{
2292	2823	// Go to next version
2293		- Redo();
	2824	+ NextVersion();
2294	2825	} else
2295		- if (source == saveButton)
	2826	+ if (source == saveVersionButton)
2296	2827	{
2297	2828	// Save a new version
2298	2829	if (!Save(true))
2299	2830	java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
2300	2836	} else
2301	2837	if (source == oneStepButton)
2302	2838	{
..	..	@@ -2351,11 +2887,11 @@
2351	2887	} else
2352	2888	if (source == undoItem)
2353	2889	{
2354		- Undo();
	2890	+ PreviousVersion();
2355	2891	} else
2356	2892	if (source == redoItem)
2357	2893	{
2358		- Redo();
	2894	+ NextVersion();
2359	2895	} else
2360	2896	if (source == duplicateItem)
2361	2897	{
..	..	@@ -2836,22 +3372,34 @@
2836	3372	} else
2837	3373	if (source == ungroupItem \|\| source == ungroupButton)
2838	3374	{
2839		- boolean hasRoot = false;
	3375	+ boolean canUngroup = true;
2840	3376
2841	3377	for (int i=0; i<group.selection.size(); i++)
2842	3378	{
2843		- if (group.selection.get(i) == group)
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
2844	3382	{
2845		- hasRoot = true;
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
2846	3392	break;
2847	3393	}
2848	3394	}
2849	3395
2850		- if (!hasRoot)
	3396	+ if (canUngroup)
2851	3397	{
2852	3398	for (int i=0; i<group.selection.size(); i++)
2853	3399	{
2854		- Ungroup(group.selection.get(i));
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
2855	3403	}
2856	3404
2857	3405	ClearSelection(false);
..	..	@@ -3214,38 +3762,7 @@
3214	3762	if (CameraPane.FULLSCREEN)
3215	3763	fullscreenLayout = radio.layout;
3216	3764
3217		- // bug
3218		- //gridPanel.setDividerLocation(1.0);
3219		- //bigPanel.setDividerLocation(0.0);
3220		-// bigThree.remove(scenePanel);
3221		-// bigThree.remove(centralPanel);
3222		-// bigThree.remove(XYZPanel);
3223		-// aWindowConstraints.gridx = 0;
3224		-// aWindowConstraints.gridy = 0;
3225		-// aWindowConstraints.gridwidth = 1;
3226		-// // aConstraints.gridheight = 3;
3227		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3228		-// aWindowConstraints.weightx = 0;
3229		-// aWindowConstraints.weighty = 1;
3230		-// //bigThree.add(jtp, aWindowConstraints);
3231		-// aWindowConstraints.weightx = 1;
3232		-// aWindowConstraints.gridwidth = 3;
3233		-// // aConstraints.gridheight = 3;
3234		-// aWindowConstraints.gridx = 1;
3235		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3236		-// bigThree.add(centralPanel, aWindowConstraints);
3237		-// aWindowConstraints.weightx = 0;
3238		-// aWindowConstraints.gridx = 4;
3239		-// aWindowConstraints.gridwidth = 1;
3240		-// // aConstraints.gridheight = 3;
3241		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3242		-// //bigThree.add(XYZPanel, aWindowConstraints);
3243		-// scenePanel.setVisible(false);
3244		-// centralPanel.setVisible(true);
3245		-// XYZPanel.setVisible(false);
3246		- bigThree.ClearUI();
3247		- bigThree.add(centralPanel);
3248		- bigThree.FlushUI();
	3765	+ Show3DView();
3249	3766
3250	3767	cameraView.requestFocusInWindow();
3251	3768
..	..	@@ -3300,8 +3817,8 @@
3300	3817	// centralPanel.setVisible(true);
3301	3818	// XYZPanel.setVisible(true);
3302	3819	bigThree.ClearUI();
	3820	+ bigThree.add(scenePanel);
3303	3821	bigThree.add(centralPanel);
3304		- bigThree.add(XYZPanel);
3305	3822	bigThree.FlushUI();
3306	3823
3307	3824	cameraView.requestFocusInWindow();
..	..	@@ -3381,8 +3898,8 @@
3381	3898	// centralPanel.setVisible(true);
3382	3899	// XYZPanel.setVisible(false);
3383	3900	bigThree.ClearUI();
3384		- bigThree.add(scenePanel);
3385	3901	bigThree.add(centralPanel);
	3902	+ bigThree.add(scenePanel);
3386	3903	bigThree.FlushUI();
3387	3904
3388	3905	cameraView.requestFocusInWindow();
..	..	@@ -3431,6 +3948,7 @@
3431	3948	} else
3432	3949	if (source == rootButton)
3433	3950	{
	3951	+ Replace();
3434	3952	Object3D obj;
3435	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3436	3954	{
..	..	@@ -3488,10 +4006,10 @@
3488	4006	{
3489	4007	Object3D child = (Object3D)e.nextElement();
3490	4008	if(child.editWindow != null)
3491		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3492	4009	child.pinned = false;
3493	4010	child.CloseUI();
3494	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3495	4013
3496	4014	//child.editWindow = null; // ???????????
3497	4015	}
..	..	@@ -3510,6 +4028,7 @@
3510	4028	obj.CloseUI();
3511	4029	}
3512	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
3513	4032	refreshContents(true);
3514	4033	} else
3515	4034	if (source == allParamsButton)
..	..	@@ -3566,8 +4085,6 @@
3566	4085
3567	4086	copy = group;
3568	4087
3569		- SetUndoStates();
3570		-
3571	4088	//Globals.theRenderer.object = group;
3572	4089	if(!useclient)
3573	4090	{
..	..	@@ -3595,7 +4112,23 @@
3595	4112	*/
3596	4113	radio.layout.doClick();
3597	4114
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
3598	4130	ClearUnpinned();
	4131	+
3599	4132	//Grafreed.Assert(group != null);
3600	4133	//Grafreed.Assert(group.selection != null);
3601	4134	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3612,11 +4145,13 @@
3612	4145	} else if (event.getSource() == editCameraItem)
3613	4146	{
3614	4147	cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
3615	4149	cameraView.repaint();
3616	4150	return;
3617	4151	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3618	4152	{
3619	4153	cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
3620	4155	cameraView.repaint();
3621	4156	return;
3622	4157	// } else if (event.getSource() == textureButton)
..	..	@@ -4749,9 +5284,7 @@
4749	5284
4750	5285	freezemodel = false;
4751	5286	}
4752		-
4753		- boolean flashIt = true;
4754		-
	5287	+
4755	5288	public void valueChanged(TreeSelectionEvent e)
4756	5289	//public boolean handleEvent(Event event)
4757	5290	{
..	..	@@ -4824,13 +5357,30 @@
4824	5357	{
4825	5358	editButton.setEnabled(enabled);
4826	5359	uneditButton.setEnabled(enabled);
4827		- unselectButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
4828	5361	flashSelectionButton.setEnabled(enabled);
	5362	+
	5363	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
4829	5379	}
4830	5380
4831	5381	void refreshContents(boolean cp)
4832	5382	{
4833		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4834	5384	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4835	5385	{
4836	5386	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4840,7 +5390,7 @@
4840	5390	Object3D child = (Object3D) group.selection.get(i);
4841	5391
4842	5392	objEditor.AddInfo(child, this, true);
4843		- System.err.println("info : " + child.GetPath());
	5393	+// System.err.println("info : " + child.GetPath());
4844	5394	}
4845	5395
4846	5396	objEditor.SetText(); // jan 2014
..	..	@@ -5666,7 +6216,6 @@
5666	6216
5667	6217	cButton restoreCameraButton;
5668	6218
5669		- cButton saveButton;
5670	6219	cButton oneStepButton;
5671	6220
5672	6221	cButton groupButton;
..	..	@@ -5675,6 +6224,22 @@
5675	6224	cButton switchButton;
5676	6225	cButton loopButton;
5677	6226	cButton textureButton;
	6227	+
	6228	+ cButton skybox1Button;
	6229	+ cButton skybox2Button;
	6230	+ cButton skybox3Button;
	6231	+ cButton skybox4Button;
	6232	+ cButton skybox5Button;
	6233	+ cButton skybox6Button;
	6234	+ cButton skybox7Button;
	6235	+
	6236	+ cButton skybox11Button;
	6237	+ cButton skybox12Button;
	6238	+ cButton skybox13Button;
	6239	+ cButton skybox14Button;
	6240	+ cButton skybox15Button;
	6241	+ cButton skybox16Button;
	6242	+ cButton skybox17Button;
5678	6243
5679	6244	cButton gridButton;
5680	6245	cButton boxButton;
..	..	@@ -5708,11 +6273,11 @@
5708	6273	private MenuItem lookAtItem;
5709	6274	private MenuItem lookFromItem;
5710	6275	private MenuItem switchViewItem;
5711		- private MenuItem cutItem;
	6276	+ private JMenuItem cutItem;
5712	6277	private MenuItem undoItem;
5713	6278	private MenuItem redoItem;
5714	6279	private JMenuItem duplicateItem;
5715		- private MenuItem cloneItem;
	6280	+ private JMenuItem cloneItem;
5716	6281	private MenuItem cloneSupportItem;
5717	6282	private MenuItem overwriteGeoItem;
5718	6283	private MenuItem overwriteMatItem;
..	..	@@ -5733,13 +6298,13 @@
5733	6298	private MenuItem cloneGeometriesItem;
5734	6299	private MenuItem shareGeometriesItem;
5735	6300	private MenuItem mergeGeometriesItem;
5736		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
5737	6302	private MenuItem pasteItem;
5738		- private MenuItem pasteIntoItem;
5739		- private MenuItem pasteLinkItem;
5740		- private MenuItem pasteCloneItem;
5741		- private MenuItem pasteExpandItem;
5742		- private MenuItem deleteItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
5743	6308	private MenuItem clearAllItem;
5744	6309	private MenuItem genUVItem;
5745	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -5794,7 +6359,7 @@
5794	6359	private MenuItem transformGeometryItem;
5795	6360	private MenuItem transformChildrenItem;
5796	6361	private MenuItem hideItem;
5797		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
5798	6363	private MenuItem backItem;
5799	6364	private MenuItem frontItem;
5800	6365	private MenuItem cameraItem;
..	..	@@ -5807,7 +6372,7 @@
5807	6372	private MenuItem switchTransfoItem;
5808	6373	private MenuItem morphItem;
5809	6374	private MenuItem linkerItem;
5810		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
5811	6376	private MenuItem editItem;
5812	6377	private MenuItem openWindowItem;
5813	6378	private MenuItem editLeafItem;