~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -24,12 +25,13 @@
24	25	ItemListener // ListSelectionListener
25	26	{
26	27
27		- public void AddSkyboxButton(String f, String s, cGridBag row3)
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
28	29	{
29	30	cButton skyboxButton;
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31		- row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
32		- skyboxButton.setToolTipText(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);
33	35	skyboxButton.addActionListener(new ActionListener()
34	36	{
35	37	@Override
..	..	@@ -40,14 +42,342 @@
40	42	});
41	43	}
42	44
43		- public void ChangeSkybox(String name)
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
44	46	{
45		- cameraView.envyoff = false;
46		- cameraView.skyboxname = name;
47		- cameraView.skyboxext = "jpg";
48		- cameraView.repaint();
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + 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	+ });
49	59	}
50	60
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", 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	+
51	381	//ObjEditor objEditor;
52	382	public void closeUI2()
53	383	{
..	..	@@ -85,10 +415,12 @@
85	415	this.copy = this.group = group;
86	416	//selectees = this.group.selectees;
87	417
88		- if (copy.versions == null)
	418	+ if (copy.versionlist == null)
89	419	{
90		- copy.versions = new byte[100][];
	420	+ copy.versionlist = new Object3D[100];
91	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
92	424	}
93	425
94	426	if(ui)
..	..	@@ -112,9 +444,9 @@
112	444
113	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
114	446
115		- if (copy.versions == null)
	447	+ if (copy.versionlist == null)
116	448	{
117		- copy.versions = new byte[100][];
	449	+ copy.versionlist = new Object3D[100];
118	450	copy.versionindex = -1;
119	451
120	452	Save(true);
..	..	@@ -208,33 +540,35 @@
208	540	// menu.add("-");
209	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
210	542	duplicateItem.addActionListener(this);
211		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
212	545	cloneItem.addActionListener(this);
213		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
214	547	{
215	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
216	549	cloneSupportItem.addActionListener(this);
217	550	}
	551	+ oe.jTree.popup.addSeparator();
218	552	menu.add("-");
219		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
220	554	cutItem.addActionListener(this);
221		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
222	556	copyItem.addActionListener(this);
223	557	pasteItem = menu.add(new MenuItem("Paste"));
224	558	pasteItem.addActionListener(this);
225	559
226		- menu.add("-");
227		- 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"));
228	563	pasteIntoItem.addActionListener(this);
229		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
230	565	pasteLinkItem.addActionListener(this);
231		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
232	567	pasteCloneItem.addActionListener(this);
233		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
234	569	// pasteExpandItem.addActionListener(this);
235		- menu.add("-");
236		- deleteItem = menu.add(new MenuItem("Delete"));
237		- deleteItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
238	572
239	573	if (Globals.ADVANCED)
240	574	{
..	..	@@ -320,11 +654,9 @@
320	654	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
321	655	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
322	656	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
323		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
324	657	oe.cameraMenu.add("-");
325	658	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
326	659	openWindowItem.addActionListener(this);
327		- editLeafItem.addActionListener(this);
328	660	lookAtItem.addActionListener(this);
329	661	//lookFromItem.addActinoListener(this);
330	662	//switchViewItem.addActionListener(this);
..	..	@@ -371,9 +703,8 @@
371	703	setMasterItem.addActionListener(this);
372	704	}
373	705
374		- oe.menuBar.add(menu = new Menu("Group"));
375		-// grabItem = menu.add(new MenuItem("Grab"));
376		-// grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
377	708	backItem = menu.add(new MenuItem("Back"));
378	709	backItem.addActionListener(this);
379	710	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -381,13 +712,21 @@
381	712	// compositeItem = menu.add(new MenuItem("Composite"));
382	713	// compositeItem.addActionListener(this);
383	714
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
384	718	if (Globals.ADVANCED)
385	719	{
386	720	hideItem = menu.add(new MenuItem("Hidden Group"));
387	721	hideItem.addActionListener(this);
388	722	}
389		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
390	724	ungroupItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
391	730
392	731	// menu.add("-");
393	732	//
..	..	@@ -572,6 +911,9 @@
572	911	shareGeometriesItem.addActionListener(this);
573	912	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
574	913	mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
575	917	if (Globals.ADVANCED)
576	918	{
577	919	// Pretty much the same as duplicate and clone.
..	..	@@ -588,6 +930,74 @@
588	930	buildToolsMenu(menu);
589	931	}
590	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	+ }
591	1001
592	1002	void SetupUI2(ObjEditor oe)
593	1003	{
..	..	@@ -606,11 +1016,6 @@
606	1016	//new Exception().printStackTrace();
607	1017
608	1018	oe.radioPanel = new JPanel(new GridBagLayout());
609		- oe.aConstraints.weightx = 1;
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
612		- oe.aConstraints.gridwidth = 100;
613		- oe.aConstraints.gridheight = 1;
614	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
615	1020
616	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -643,10 +1048,49 @@
643	1048
644	1049	if (Globals.ADVANCED)
645	1050	{
646		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- maxButton.setToolTipText("Maximize window");
648		- 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);
649	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	+ //
650	1094
651	1095	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652	1096	fullButton.setToolTipText("Full-screen window");
..	..	@@ -660,41 +1104,45 @@
660	1104	restoreCameraButton.setToolTipText("Restore viewpoint");
661	1105	restoreCameraButton.addActionListener(this);
662	1106
663		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- saveButton.setToolTipText("New version");
665		- 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);
666	1110
667		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- undoButton.setToolTipText("Previous version");
669		- undoButton.addActionListener(this);
670		- undoButton.setEnabled(false);
	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);
671	1119
672	1120	cGridBag updown = new cGridBag().setVertical(true);
673	1121	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- restoreButton.setToolTipText("Restore current");
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
675	1123	restoreButton.addActionListener(this);
676		- restoreButton.setEnabled(false);
	1124	+ //restoreButton.setEnabled(false);
677	1125
678	1126	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- replaceButton.setToolTipText("Replace current");
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
680	1128	replaceButton.addActionListener(this);
681		- replaceButton.setEnabled(false);
	1129	+ //replaceButton.setEnabled(false);
682	1130
683	1131	copyOptionsPanel.add(updown);
684	1132
685		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686		- redoButton.setToolTipText("Next version");
687		- redoButton.addActionListener(this);
688		- redoButton.setEnabled(false);
	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);
689	1141
690	1142	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
691	1143	liveCB.setToolTipText("Enable animation");
692	1144	liveCB.addItemListener(this);
693	1145
694		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695		- oneStepButton.setToolTipText("Animate one step forward");
696		- oneStepButton.addActionListener(this);
697		-
698	1146	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
699	1147	fastCB.setToolTipText("Fast mode");
700	1148	fastCB.addItemListener(this);
..	..	@@ -721,21 +1169,6 @@
721	1169
722	1170	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
723	1171
724		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725		- twoButton.setToolTipText("Show 3D view only");
726		- twoButton.addActionListener(this);
727		- this.fullscreenLayout = twoButton;
728		-
729		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- threeButton.setToolTipText("Show controls and 3D view");
731		- threeButton.addActionListener(this);
732		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733		- sixButton.setToolTipText("Show 3D view and controls");
734		- sixButton.addActionListener(this);
735		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736		-// sevenButton.setToolTipText("3-column layout");
737		-// sevenButton.addActionListener(this);
738		- //
739	1172
740	1173	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1174	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -751,12 +1184,16 @@
751	1184
752	1185	// INSERT
753	1186	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754		- gridButton.setToolTipText("Create grid");
	1187	+ gridButton.setToolTipText("Create ground");
755	1188	gridButton.addActionListener(this);
756	1189
757	1190	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
758	1191	boxButton.setToolTipText("Create box");
759	1192	boxButton.addActionListener(this);
	1193	+
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
760	1197
761	1198	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762	1199	sphereButton.setToolTipText("Create sphere");
..	..	@@ -769,10 +1206,6 @@
769	1206	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
770	1207	torusButton.setToolTipText("Create torus");
771	1208	torusButton.addActionListener(this);
772		-
773		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- superButton.setToolTipText("Create superellipsoid");
775		- superButton.addActionListener(this);
776	1209
777	1210	if (Globals.ADVANCED)
778	1211	{
..	..	@@ -819,107 +1252,15 @@
819	1252
820	1253	oe.toolboxPanel.add(row2);
821	1254
822		- // ENVYMAPS
823		- cGridBag row3 = new cGridBag();
824		- row3.preferredHeight = 20;
	1255	+ cGridBag textures = new cGridBag();
825	1256
826		- AddSkyboxButton("default", "rgb", row3);
827		- AddSkyboxButton("default", "cornell", row3);
828		- AddSkyboxButton("default", "uffizi", row3);
829		- AddSkyboxButton("default", "CloudyHills", row3);
830		- AddSkyboxButton("default", "skycube", row3);
831		-
832		- oe.toolboxPanel.add(row3);
833		-
834		- cGridBag row4 = new cGridBag();
835		- row4.preferredHeight = 20;
	1257	+ CreateTexturePanel(textures);
836	1258
837		- AddSkyboxButton("bridge", "Bridge2", row4);
838		- AddSkyboxButton("urban", "GamlaStan2", row4);
839		- AddSkyboxButton("urban", "Parliament", row4);
840		- AddSkyboxButton("urban", "Roundabout", row4);
	1259	+ oe.toolboxPanel.add(textures);
841	1260
842		- oe.toolboxPanel.add(row4);
843		-
844		- cGridBag row5 = new cGridBag();
845		- row5.preferredHeight = 20;
	1261	+ textures.preferredHeight = 100;
846	1262
847		- AddSkyboxButton("urban", "SaintLazarusChurch", row5);
848		- AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
849		- AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
850		- AddSkyboxButton("urban", "UnionSquare", row5);
851		-
852		- oe.toolboxPanel.add(row5);
853		-
854		- cGridBag row6 = new cGridBag();
855		- row6.preferredHeight = 20;
856		-
857		- AddSkyboxButton("park", "BerzeliiPark", row6);
858		- AddSkyboxButton("park", "Buddha", row6);
859		- AddSkyboxButton("park", "CNTower2", row6);
860		- //AddSkyboxButton("park", "Fatbursparken", row6);
861		- AddSkyboxButton("park", "NiagaraFalls1", row6);
862		-
863		- oe.toolboxPanel.add(row6);
864		-
865		- cGridBag row7 = new cGridBag();
866		- row7.preferredHeight = 20;
867		-
868		- AddSkyboxButton("park", "NiagaraFalls3", row7);
869		- AddSkyboxButton("park", "Park", row7);
870		- //AddSkyboxButton("park", "Park2", row6);
871		- //AddSkyboxButton("park", "Path", row6);
872		- AddSkyboxButton("park", "Pond", row7);
873		- AddSkyboxButton("park", "Skansen", row7);
874		-
875		- oe.toolboxPanel.add(row7);
876		-
877		- cGridBag row8 = new cGridBag();
878		- row8.preferredHeight = 20;
879		-
880		- AddSkyboxButton("park", "Skansen2", row8);
881		- AddSkyboxButton("park", "Skansen3", row8);
882		- AddSkyboxButton("park", "Skansen4", row8);
883		- AddSkyboxButton("park", "Skansen5", row8);
884		-
885		- oe.toolboxPanel.add(row8);
886		-
887		- cGridBag row9 = new cGridBag();
888		- row9.preferredHeight = 20;
889		-
890		- AddSkyboxButton("park", "Stairs", row9);
891		- //AddSkyboxButton("park", "Tantolunden", row6);
892		- //AddSkyboxButton("park", "Tantolunden3", row6);
893		- AddSkyboxButton("park", "Tantolunden4", row9);
894		-
895		- oe.toolboxPanel.add(row9);
896		-/*
897		-BerzeliiPark
898		-Buddha
899		-CNTower2
900		-Fatbursparken
901		-NiagaraFalls1
902		-NiagaraFalls3
903		-Park
904		-Park2
905		-Path
906		-Pond
907		-Skansen
908		-Skansen2
909		-Skansen3
910		-Skansen4
911		-Skansen5
912		-Stairs
913		-Tantolunden
914		-Tantolunden3
915		-Tantolunden4
916		- */
917		-
918		- for (int i=1; --i>=0;)
919		- {
920		- //oe.toolboxPanel.Return();
921		- oe.toolboxPanel.add(new cGridBag());
922		- }
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
923	1264
924	1265	// EDIT panel
925	1266	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -927,20 +1268,20 @@
927	1268	editButton.addActionListener(this);
928	1269
929	1270	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
930		- uneditButton.setToolTipText("Remove selection controls");
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
931	1272	uneditButton.addActionListener(this);
932	1273
933	1274	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
934		- allParamsButton.setToolTipText("Show all controle");
	1275	+ allParamsButton.setToolTipText("Show all controls");
935	1276	allParamsButton.addActionListener(this);
936	1277
937		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
938		- clearPanelButton.setToolTipText("Clear edit panel");
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
939	1280	clearPanelButton.addActionListener(this);
940	1281
941		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- unselectButton.setToolTipText("Unselect");
943		- unselectButton.addActionListener(this);
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
944	1285
945	1286	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
946	1287	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1000,7 +1341,7 @@
1000	1341	dgr.addDragGestureListener(this);
1001	1342	}catch(Exception e) {}
1002	1343	*/
1003		- radio.layout = sixButton; // sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
1004	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1005	1346	}
1006	1347
..	..	@@ -1051,9 +1392,12 @@
1051	1392	smoothCB.setToolTipText("Snapping delay");
1052	1393	smoothCB.addItemListener(this);
1053	1394
1054		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1055		- slowCB.setToolTipText("Smooth interpolation");
1056		- 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);
1057	1401
1058	1402	// constraints.gridy += 1;
1059	1403	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1132,6 +1476,14 @@
1132	1476
1133	1477	void EditObject(Object3D obj)
1134	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	+
1135	1487	cRadio radioButton = new cRadio(obj.name);
1136	1488
1137	1489	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1142,7 +1494,7 @@
1142	1494	}
1143	1495
1144	1496	radioButton.SetObject(obj);
1145		- radioButton.layout = sixButton; // sevenButton;
	1497	+ radioButton.layout = threeButton; // sixButton;
1146	1498	radioButton.SetCamera(cameraView.renderCamera, false);
1147	1499	radioButton.addActionListener(this);
1148	1500	radioPanel.add(radioButton);
..	..	@@ -1156,6 +1508,7 @@
1156	1508
1157	1509	oe.SetupViews();
1158	1510
	1511	+ if (Globals.DEBUG)
1159	1512	System.out.println("SetupViews");
1160	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1161	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1167,6 +1520,8 @@
1167	1520	cCheckBox localCB;
1168	1521	cCheckBox crowdCB;
1169	1522	cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
1170	1525	cToggleButton fastCB;
1171	1526	cCheckBox slowCB;
1172	1527	cCheckBox boxCB;
..	..	@@ -1237,6 +1592,12 @@
1237	1592	{
1238	1593	cameraView.ToggleInertia();
1239	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
1240	1601	}
1241	1602	else if(e.getSource() == localCB)
1242	1603	{
..	..	@@ -1514,7 +1875,12 @@
1514	1875	TreePath path;
1515	1876
1516	1877	public TransferableTreePath(TreePath tp) {
1517		- 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);
1518	1884	}
1519	1885
1520	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1804,7 +2170,11 @@
1804	2170	shadow.material = new cMaterial(obj.material);
1805	2171	shadow.material.diffuse = 0.0001f;
1806	2172	shadow.material.specular = 0.0001f;
1807		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1808	2178
1809	2179	makeSomething(shadow);
1810	2180	}
..	..	@@ -2325,27 +2695,35 @@
2325	2695	} else
2326	2696	if (source == loopItem \|\| source == loopButton)
2327	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
2328	2700	Composite csg = new GroupLeaf();
2329	2701	csg.count = 5;
2330		- group(csg);
2331	2702	Composite child = new cGroup("Branch");
2332	2703	csg.addChild(child);
2333	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
2334	2707	} else
2335	2708	if (source == doubleItem)
2336	2709	{
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
2337	2712	Composite csg = new GroupLeaf("Fork");
2338	2713	csg.count = 5;
2339		- group(csg);
2340	2714	Composite child = new cGroup("Branch A");
2341	2715	csg.addChild(child);
2342	2716	child.addChild(csg);
2343	2717	child = new cGroup("Branch B");
2344	2718	csg.addChild(child);
2345	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2346	2722	} else
2347	2723	if (source == tripleItem)
2348	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2349	2727	Composite csg = new GroupLeaf("Trident");
2350	2728	csg.count = 4;
2351	2729	group(csg);
..	..	@@ -2358,6 +2736,7 @@
2358	2736	child = new cGroup();
2359	2737	csg.addChild(child);
2360	2738	child.addChild(csg);
	2739	+ }
2361	2740	} else
2362	2741	if (source == computeAOItem)
2363	2742	{
..	..	@@ -2377,7 +2756,7 @@
2377	2756	if (source == invariantsItem)
2378	2757	{
2379	2758	System.out.println("Invariants:");
2380		- Grafreed.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
2381	2760	} else
2382	2761	if (source == memoryItem)
2383	2762	{
..	..	@@ -2408,33 +2787,52 @@
2408	2787	{
2409	2788	ToggleFullScreen();
2410	2789	} else
2411		- 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)
2412	2803	{
2413	2804	// Go to previous version
2414	2805	//if (!Undo())
2415	2806	//java.awt.Toolkit.getDefaultToolkit().beep();
2416		- Undo();
	2807	+ PreviousVersion();
2417	2808	} else
2418	2809	if (source == restoreButton)
2419	2810	{
2420	2811	// Restore current version
2421	2812	Restore();
	2813	+ //restoreButton.setEnabled(false);
2422	2814	} else
2423	2815	if (source == replaceButton)
2424	2816	{
2425	2817	// Overwrite current version
2426	2818	Replace();
	2819	+ //replaceButton.setEnabled(false);
2427	2820	} else
2428		- if (source == redoButton)
	2821	+ if (source == nextVersionButton)
2429	2822	{
2430	2823	// Go to next version
2431		- Redo();
	2824	+ NextVersion();
2432	2825	} else
2433		- if (source == saveButton)
	2826	+ if (source == saveVersionButton)
2434	2827	{
2435	2828	// Save a new version
2436	2829	if (!Save(true))
2437	2830	java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
2438	2836	} else
2439	2837	if (source == oneStepButton)
2440	2838	{
..	..	@@ -2489,11 +2887,11 @@
2489	2887	} else
2490	2888	if (source == undoItem)
2491	2889	{
2492		- Undo();
	2890	+ PreviousVersion();
2493	2891	} else
2494	2892	if (source == redoItem)
2495	2893	{
2496		- Redo();
	2894	+ NextVersion();
2497	2895	} else
2498	2896	if (source == duplicateItem)
2499	2897	{
..	..	@@ -2974,22 +3372,34 @@
2974	3372	} else
2975	3373	if (source == ungroupItem \|\| source == ungroupButton)
2976	3374	{
2977		- boolean hasRoot = false;
	3375	+ boolean canUngroup = true;
2978	3376
2979	3377	for (int i=0; i<group.selection.size(); i++)
2980	3378	{
2981		- if (group.selection.get(i) == group)
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
2982	3382	{
2983		- 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;
2984	3392	break;
2985	3393	}
2986	3394	}
2987	3395
2988		- if (!hasRoot)
	3396	+ if (canUngroup)
2989	3397	{
2990	3398	for (int i=0; i<group.selection.size(); i++)
2991	3399	{
2992		- Ungroup(group.selection.get(i));
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
2993	3403	}
2994	3404
2995	3405	ClearSelection(false);
..	..	@@ -3352,38 +3762,7 @@
3352	3762	if (CameraPane.FULLSCREEN)
3353	3763	fullscreenLayout = radio.layout;
3354	3764
3355		- // bug
3356		- //gridPanel.setDividerLocation(1.0);
3357		- //bigPanel.setDividerLocation(0.0);
3358		-// bigThree.remove(scenePanel);
3359		-// bigThree.remove(centralPanel);
3360		-// bigThree.remove(XYZPanel);
3361		-// aWindowConstraints.gridx = 0;
3362		-// aWindowConstraints.gridy = 0;
3363		-// aWindowConstraints.gridwidth = 1;
3364		-// // aConstraints.gridheight = 3;
3365		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3366		-// aWindowConstraints.weightx = 0;
3367		-// aWindowConstraints.weighty = 1;
3368		-// //bigThree.add(jtp, aWindowConstraints);
3369		-// aWindowConstraints.weightx = 1;
3370		-// aWindowConstraints.gridwidth = 3;
3371		-// // aConstraints.gridheight = 3;
3372		-// aWindowConstraints.gridx = 1;
3373		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3374		-// bigThree.add(centralPanel, aWindowConstraints);
3375		-// aWindowConstraints.weightx = 0;
3376		-// aWindowConstraints.gridx = 4;
3377		-// aWindowConstraints.gridwidth = 1;
3378		-// // aConstraints.gridheight = 3;
3379		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3380		-// //bigThree.add(XYZPanel, aWindowConstraints);
3381		-// scenePanel.setVisible(false);
3382		-// centralPanel.setVisible(true);
3383		-// XYZPanel.setVisible(false);
3384		- bigThree.ClearUI();
3385		- bigThree.add(centralPanel);
3386		- bigThree.FlushUI();
	3765	+ Show3DView();
3387	3766
3388	3767	cameraView.requestFocusInWindow();
3389	3768
..	..	@@ -3569,6 +3948,7 @@
3569	3948	} else
3570	3949	if (source == rootButton)
3571	3950	{
	3951	+ Replace();
3572	3952	Object3D obj;
3573	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3574	3954	{
..	..	@@ -3626,10 +4006,10 @@
3626	4006	{
3627	4007	Object3D child = (Object3D)e.nextElement();
3628	4008	if(child.editWindow != null)
3629		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3630	4009	child.pinned = false;
3631	4010	child.CloseUI();
3632	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3633	4013
3634	4014	//child.editWindow = null; // ???????????
3635	4015	}
..	..	@@ -3648,6 +4028,7 @@
3648	4028	obj.CloseUI();
3649	4029	}
3650	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
3651	4032	refreshContents(true);
3652	4033	} else
3653	4034	if (source == allParamsButton)
..	..	@@ -3704,8 +4085,6 @@
3704	4085
3705	4086	copy = group;
3706	4087
3707		- SetUndoStates();
3708		-
3709	4088	//Globals.theRenderer.object = group;
3710	4089	if(!useclient)
3711	4090	{
..	..	@@ -3733,7 +4112,23 @@
3733	4112	*/
3734	4113	radio.layout.doClick();
3735	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	+
3736	4130	ClearUnpinned();
	4131	+
3737	4132	//Grafreed.Assert(group != null);
3738	4133	//Grafreed.Assert(group.selection != null);
3739	4134	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3750,11 +4145,13 @@
3750	4145	} else if (event.getSource() == editCameraItem)
3751	4146	{
3752	4147	cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
3753	4149	cameraView.repaint();
3754	4150	return;
3755	4151	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3756	4152	{
3757	4153	cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
3758	4155	cameraView.repaint();
3759	4156	return;
3760	4157	// } else if (event.getSource() == textureButton)
..	..	@@ -4887,9 +5284,7 @@
4887	5284
4888	5285	freezemodel = false;
4889	5286	}
4890		-
4891		- boolean flashIt = true;
4892		-
	5287	+
4893	5288	public void valueChanged(TreeSelectionEvent e)
4894	5289	//public boolean handleEvent(Event event)
4895	5290	{
..	..	@@ -4962,13 +5357,30 @@
4962	5357	{
4963	5358	editButton.setEnabled(enabled);
4964	5359	uneditButton.setEnabled(enabled);
4965		- unselectButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
4966	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);
4967	5379	}
4968	5380
4969	5381	void refreshContents(boolean cp)
4970	5382	{
4971		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4972	5384	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4973	5385	{
4974	5386	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4978,7 +5390,7 @@
4978	5390	Object3D child = (Object3D) group.selection.get(i);
4979	5391
4980	5392	objEditor.AddInfo(child, this, true);
4981		- System.err.println("info : " + child.GetPath());
	5393	+// System.err.println("info : " + child.GetPath());
4982	5394	}
4983	5395
4984	5396	objEditor.SetText(); // jan 2014
..	..	@@ -5804,7 +6216,6 @@
5804	6216
5805	6217	cButton restoreCameraButton;
5806	6218
5807		- cButton saveButton;
5808	6219	cButton oneStepButton;
5809	6220
5810	6221	cButton groupButton;
..	..	@@ -5862,11 +6273,11 @@
5862	6273	private MenuItem lookAtItem;
5863	6274	private MenuItem lookFromItem;
5864	6275	private MenuItem switchViewItem;
5865		- private MenuItem cutItem;
	6276	+ private JMenuItem cutItem;
5866	6277	private MenuItem undoItem;
5867	6278	private MenuItem redoItem;
5868	6279	private JMenuItem duplicateItem;
5869		- private MenuItem cloneItem;
	6280	+ private JMenuItem cloneItem;
5870	6281	private MenuItem cloneSupportItem;
5871	6282	private MenuItem overwriteGeoItem;
5872	6283	private MenuItem overwriteMatItem;
..	..	@@ -5887,13 +6298,13 @@
5887	6298	private MenuItem cloneGeometriesItem;
5888	6299	private MenuItem shareGeometriesItem;
5889	6300	private MenuItem mergeGeometriesItem;
5890		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
5891	6302	private MenuItem pasteItem;
5892		- private MenuItem pasteIntoItem;
5893		- private MenuItem pasteLinkItem;
5894		- private MenuItem pasteCloneItem;
5895		- private MenuItem pasteExpandItem;
5896		- private MenuItem deleteItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
5897	6308	private MenuItem clearAllItem;
5898	6309	private MenuItem genUVItem;
5899	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -5948,7 +6359,7 @@
5948	6359	private MenuItem transformGeometryItem;
5949	6360	private MenuItem transformChildrenItem;
5950	6361	private MenuItem hideItem;
5951		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
5952	6363	private MenuItem backItem;
5953	6364	private MenuItem frontItem;
5954	6365	private MenuItem cameraItem;
..	..	@@ -5961,7 +6372,7 @@
5961	6372	private MenuItem switchTransfoItem;
5962	6373	private MenuItem morphItem;
5963	6374	private MenuItem linkerItem;
5964		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
5965	6376	private MenuItem editItem;
5966	6377	private MenuItem openWindowItem;
5967	6378	private MenuItem editLeafItem;