~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,32 +540,37 @@
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"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
237	574	deleteItem.addActionListener(this);
238	575
239	576	if (Globals.ADVANCED)
..	..	@@ -320,11 +657,9 @@
320	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
321	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
322	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
323		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
324	660	oe.cameraMenu.add("-");
325	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
326	662	openWindowItem.addActionListener(this);
327		- editLeafItem.addActionListener(this);
328	663	lookAtItem.addActionListener(this);
329	664	//lookFromItem.addActinoListener(this);
330	665	//switchViewItem.addActionListener(this);
..	..	@@ -386,7 +721,7 @@
386	721	hideItem = menu.add(new MenuItem("Hidden Group"));
387	722	hideItem.addActionListener(this);
388	723	}
389		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
390	725	ungroupItem.addActionListener(this);
391	726
392	727	// menu.add("-");
..	..	@@ -572,6 +907,9 @@
572	907	shareGeometriesItem.addActionListener(this);
573	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
574	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
575	913	if (Globals.ADVANCED)
576	914	{
577	915	// Pretty much the same as duplicate and clone.
..	..	@@ -588,6 +926,74 @@
588	926	buildToolsMenu(menu);
589	927	}
590	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ //boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+// for (int i = 0; i < path.length; i++)
	944	+// System.out.print(path[i] + "/");
	945	+// System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
591	997
592	998	void SetupUI2(ObjEditor oe)
593	999	{
..	..	@@ -606,11 +1012,6 @@
606	1012	//new Exception().printStackTrace();
607	1013
608	1014	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	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
615	1016
616	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -643,10 +1044,49 @@
643	1044
644	1045	if (Globals.ADVANCED)
645	1046	{
646		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- maxButton.setToolTipText("Maximize window");
648		- maxButton.addActionListener(this);
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
649	1050	}
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
650	1090
651	1091	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652	1092	fullButton.setToolTipText("Full-screen window");
..	..	@@ -660,41 +1100,45 @@
660	1100	restoreCameraButton.setToolTipText("Restore viewpoint");
661	1101	restoreCameraButton.addActionListener(this);
662	1102
663		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- saveButton.setToolTipText("New version");
665		- saveButton.addActionListener(this);
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
666	1106
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);
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
671	1115
672	1116	cGridBag updown = new cGridBag().setVertical(true);
673	1117	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- restoreButton.setToolTipText("Restore current");
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
675	1119	restoreButton.addActionListener(this);
676		- restoreButton.setEnabled(false);
	1120	+ //restoreButton.setEnabled(false);
677	1121
678	1122	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- replaceButton.setToolTipText("Replace current");
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
680	1124	replaceButton.addActionListener(this);
681		- replaceButton.setEnabled(false);
	1125	+ //replaceButton.setEnabled(false);
682	1126
683	1127	copyOptionsPanel.add(updown);
684	1128
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);
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ oneStepButton.setToolTipText("Animate one step forward");
	1136	+ oneStepButton.addActionListener(this);
689	1137
690	1138	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
691	1139	liveCB.setToolTipText("Enable animation");
692	1140	liveCB.addItemListener(this);
693	1141
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	1142	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
699	1143	fastCB.setToolTipText("Fast mode");
700	1144	fastCB.addItemListener(this);
..	..	@@ -721,21 +1165,6 @@
721	1165
722	1166	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
723	1167
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	1168
740	1169	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1170	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -751,12 +1180,16 @@
751	1180
752	1181	// INSERT
753	1182	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754		- gridButton.setToolTipText("Create grid");
	1183	+ gridButton.setToolTipText("Create ground");
755	1184	gridButton.addActionListener(this);
756	1185
757	1186	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
758	1187	boxButton.setToolTipText("Create box");
759	1188	boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
760	1193
761	1194	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762	1195	sphereButton.setToolTipText("Create sphere");
..	..	@@ -769,10 +1202,6 @@
769	1202	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
770	1203	torusButton.setToolTipText("Create torus");
771	1204	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	1205
777	1206	if (Globals.ADVANCED)
778	1207	{
..	..	@@ -819,107 +1248,15 @@
819	1248
820	1249	oe.toolboxPanel.add(row2);
821	1250
822		- // ENVYMAPS
823		- cGridBag row3 = new cGridBag();
824		- row3.preferredHeight = 20;
	1251	+ cGridBag textures = new cGridBag();
825	1252
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;
	1253	+ CreateTexturePanel(textures);
836	1254
837		- AddSkyboxButton("bridge", "Bridge2", row4);
838		- AddSkyboxButton("urban", "GamlaStan2", row4);
839		- AddSkyboxButton("urban", "Parliament", row4);
840		- AddSkyboxButton("urban", "Roundabout", row4);
	1255	+ oe.toolboxPanel.add(textures);
841	1256
842		- oe.toolboxPanel.add(row4);
843		-
844		- cGridBag row5 = new cGridBag();
845		- row5.preferredHeight = 20;
	1257	+ textures.preferredHeight = 100;
846	1258
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		- }
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
923	1260
924	1261	// EDIT panel
925	1262	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -927,20 +1264,20 @@
927	1264	editButton.addActionListener(this);
928	1265
929	1266	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
930		- uneditButton.setToolTipText("Remove selection controls");
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
931	1268	uneditButton.addActionListener(this);
932	1269
933	1270	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
934		- allParamsButton.setToolTipText("Show all controle");
	1271	+ allParamsButton.setToolTipText("Show all controls");
935	1272	allParamsButton.addActionListener(this);
936	1273
937		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
938		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
939	1276	clearPanelButton.addActionListener(this);
940	1277
941		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- unselectButton.setToolTipText("Unselect");
943		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
944	1281
945	1282	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
946	1283	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1000,7 +1337,7 @@
1000	1337	dgr.addDragGestureListener(this);
1001	1338	}catch(Exception e) {}
1002	1339	*/
1003		- radio.layout = sixButton; // sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
1004	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1005	1342	}
1006	1343
..	..	@@ -1051,9 +1388,12 @@
1051	1388	smoothCB.setToolTipText("Snapping delay");
1052	1389	smoothCB.addItemListener(this);
1053	1390
1054		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1055		- slowCB.setToolTipText("Smooth interpolation");
1056		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
1057	1397
1058	1398	// constraints.gridy += 1;
1059	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1132,6 +1472,14 @@
1132	1472
1133	1473	void EditObject(Object3D obj)
1134	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
1135	1483	cRadio radioButton = new cRadio(obj.name);
1136	1484
1137	1485	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1142,7 +1490,7 @@
1142	1490	}
1143	1491
1144	1492	radioButton.SetObject(obj);
1145		- radioButton.layout = sixButton; // sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
1146	1494	radioButton.SetCamera(cameraView.renderCamera, false);
1147	1495	radioButton.addActionListener(this);
1148	1496	radioPanel.add(radioButton);
..	..	@@ -1167,6 +1515,8 @@
1167	1515	cCheckBox localCB;
1168	1516	cCheckBox crowdCB;
1169	1517	cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
1170	1520	cToggleButton fastCB;
1171	1521	cCheckBox slowCB;
1172	1522	cCheckBox boxCB;
..	..	@@ -1237,6 +1587,12 @@
1237	1587	{
1238	1588	cameraView.ToggleInertia();
1239	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
1240	1596	}
1241	1597	else if(e.getSource() == localCB)
1242	1598	{
..	..	@@ -1514,7 +1870,12 @@
1514	1870	TreePath path;
1515	1871
1516	1872	public TransferableTreePath(TreePath tp) {
1517		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1518	1879	}
1519	1880
1520	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1804,7 +2165,11 @@
1804	2165	shadow.material = new cMaterial(obj.material);
1805	2166	shadow.material.diffuse = 0.0001f;
1806	2167	shadow.material.specular = 0.0001f;
1807		- //shadow.projectedVertices[1].x = 300;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
1808	2173
1809	2174	makeSomething(shadow);
1810	2175	}
..	..	@@ -2325,27 +2690,35 @@
2325	2690	} else
2326	2691	if (source == loopItem \|\| source == loopButton)
2327	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
2328	2695	Composite csg = new GroupLeaf();
2329	2696	csg.count = 5;
2330		- group(csg);
2331	2697	Composite child = new cGroup("Branch");
2332	2698	csg.addChild(child);
2333	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
2334	2702	} else
2335	2703	if (source == doubleItem)
2336	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2337	2707	Composite csg = new GroupLeaf("Fork");
2338	2708	csg.count = 5;
2339		- group(csg);
2340	2709	Composite child = new cGroup("Branch A");
2341	2710	csg.addChild(child);
2342	2711	child.addChild(csg);
2343	2712	child = new cGroup("Branch B");
2344	2713	csg.addChild(child);
2345	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2346	2717	} else
2347	2718	if (source == tripleItem)
2348	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2349	2722	Composite csg = new GroupLeaf("Trident");
2350	2723	csg.count = 4;
2351	2724	group(csg);
..	..	@@ -2358,6 +2731,7 @@
2358	2731	child = new cGroup();
2359	2732	csg.addChild(child);
2360	2733	child.addChild(csg);
	2734	+ }
2361	2735	} else
2362	2736	if (source == computeAOItem)
2363	2737	{
..	..	@@ -2377,7 +2751,7 @@
2377	2751	if (source == invariantsItem)
2378	2752	{
2379	2753	System.out.println("Invariants:");
2380		- Grafreed.grafreeD.universe.invariants();
	2754	+ Grafreed.grafreed.universe.invariants();
2381	2755	} else
2382	2756	if (source == memoryItem)
2383	2757	{
..	..	@@ -2408,33 +2782,52 @@
2408	2782	{
2409	2783	ToggleFullScreen();
2410	2784	} else
2411		- if (source == undoButton)
	2785	+ if (source == collapseButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ CollapseToolbar();
	2789	+ } else
	2790	+ if (source == maximize3DButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ radio.layout = twoButton;
	2794	+ Show3DView();
	2795	+ CollapseToolbar();
	2796	+ } else
	2797	+ if (source == previousVersionButton)
2412	2798	{
2413	2799	// Go to previous version
2414	2800	//if (!Undo())
2415	2801	//java.awt.Toolkit.getDefaultToolkit().beep();
2416		- Undo();
	2802	+ PreviousVersion();
2417	2803	} else
2418	2804	if (source == restoreButton)
2419	2805	{
2420	2806	// Restore current version
2421	2807	Restore();
	2808	+ //restoreButton.setEnabled(false);
2422	2809	} else
2423	2810	if (source == replaceButton)
2424	2811	{
2425	2812	// Overwrite current version
2426	2813	Replace();
	2814	+ //replaceButton.setEnabled(false);
2427	2815	} else
2428		- if (source == redoButton)
	2816	+ if (source == nextVersionButton)
2429	2817	{
2430	2818	// Go to next version
2431		- Redo();
	2819	+ NextVersion();
2432	2820	} else
2433		- if (source == saveButton)
	2821	+ if (source == saveVersionButton)
2434	2822	{
2435	2823	// Save a new version
2436	2824	if (!Save(true))
2437	2825	java.awt.Toolkit.getDefaultToolkit().beep();
	2826	+ } else
	2827	+ if (source == deleteVersionButton)
	2828	+ {
	2829	+ // Delete a new version
	2830	+ DeleteVersion();
2438	2831	} else
2439	2832	if (source == oneStepButton)
2440	2833	{
..	..	@@ -2489,11 +2882,11 @@
2489	2882	} else
2490	2883	if (source == undoItem)
2491	2884	{
2492		- Undo();
	2885	+ PreviousVersion();
2493	2886	} else
2494	2887	if (source == redoItem)
2495	2888	{
2496		- Redo();
	2889	+ NextVersion();
2497	2890	} else
2498	2891	if (source == duplicateItem)
2499	2892	{
..	..	@@ -2974,22 +3367,34 @@
2974	3367	} else
2975	3368	if (source == ungroupItem \|\| source == ungroupButton)
2976	3369	{
2977		- boolean hasRoot = false;
	3370	+ boolean canUngroup = true;
2978	3371
2979	3372	for (int i=0; i<group.selection.size(); i++)
2980	3373	{
2981		- if (group.selection.get(i) == group)
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
2982	3377	{
2983		- hasRoot = true;
	3378	+ // Cannot ungroup leaves
	3379	+ canUngroup = false;
	3380	+ break;
	3381	+ }
	3382	+
	3383	+ if (selectedItem == group)
	3384	+ {
	3385	+ // Cannot ungroup root
	3386	+ canUngroup = false;
2984	3387	break;
2985	3388	}
2986	3389	}
2987	3390
2988		- if (!hasRoot)
	3391	+ if (canUngroup)
2989	3392	{
2990	3393	for (int i=0; i<group.selection.size(); i++)
2991	3394	{
2992		- Ungroup(group.selection.get(i));
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
2993	3398	}
2994	3399
2995	3400	ClearSelection(false);
..	..	@@ -3352,38 +3757,7 @@
3352	3757	if (CameraPane.FULLSCREEN)
3353	3758	fullscreenLayout = radio.layout;
3354	3759
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();
	3760	+ Show3DView();
3387	3761
3388	3762	cameraView.requestFocusInWindow();
3389	3763
..	..	@@ -3569,6 +3943,7 @@
3569	3943	} else
3570	3944	if (source == rootButton)
3571	3945	{
	3946	+ Replace();
3572	3947	Object3D obj;
3573	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3574	3949	{
..	..	@@ -3626,10 +4001,10 @@
3626	4001	{
3627	4002	Object3D child = (Object3D)e.nextElement();
3628	4003	if(child.editWindow != null)
3629		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3630	4004	child.pinned = false;
3631	4005	child.CloseUI();
3632	4006	listUI.remove(child);
	4007	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3633	4008
3634	4009	//child.editWindow = null; // ???????????
3635	4010	}
..	..	@@ -3648,6 +4023,7 @@
3648	4023	obj.CloseUI();
3649	4024	}
3650	4025	listUI.clear();
	4026	+ SetPinStates(group.selection.size() > 0);
3651	4027	refreshContents(true);
3652	4028	} else
3653	4029	if (source == allParamsButton)
..	..	@@ -3704,8 +4080,6 @@
3704	4080
3705	4081	copy = group;
3706	4082
3707		- SetUndoStates();
3708		-
3709	4083	//Globals.theRenderer.object = group;
3710	4084	if(!useclient)
3711	4085	{
..	..	@@ -3733,7 +4107,20 @@
3733	4107	*/
3734	4108	radio.layout.doClick();
3735	4109
	4110	+ assert(copy instanceof Composite);
	4111	+
	4112	+ if (copy.versionlist == null)
	4113	+ {
	4114	+ copy.versionlist = new Object3D[100];
	4115	+ copy.versionindex = -1;
	4116	+
	4117	+ Save(true);
	4118	+ }
	4119	+
	4120	+ SetVersionStates();
	4121	+
3736	4122	ClearUnpinned();
	4123	+
3737	4124	//Grafreed.Assert(group != null);
3738	4125	//Grafreed.Assert(group.selection != null);
3739	4126	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3750,11 +4137,13 @@
3750	4137	} else if (event.getSource() == editCameraItem)
3751	4138	{
3752	4139	cameraView.ProtectCamera();
	4140	+ cameraView.requestFocusInWindow();
3753	4141	cameraView.repaint();
3754	4142	return;
3755	4143	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3756	4144	{
3757	4145	cameraView.RevertCamera();
	4146	+ cameraView.requestFocusInWindow();
3758	4147	cameraView.repaint();
3759	4148	return;
3760	4149	// } else if (event.getSource() == textureButton)
..	..	@@ -4887,9 +5276,7 @@
4887	5276
4888	5277	freezemodel = false;
4889	5278	}
4890		-
4891		- boolean flashIt = true;
4892		-
	5279	+
4893	5280	public void valueChanged(TreeSelectionEvent e)
4894	5281	//public boolean handleEvent(Event event)
4895	5282	{
..	..	@@ -4962,13 +5349,29 @@
4962	5349	{
4963	5350	editButton.setEnabled(enabled);
4964	5351	uneditButton.setEnabled(enabled);
4965		- unselectButton.setEnabled(enabled);
	5352	+ //unselectButton.setEnabled(enabled);
4966	5353	flashSelectionButton.setEnabled(enabled);
	5354	+
	5355	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5356	+
	5357	+ boolean allComposites = true;
	5358	+
	5359	+ if (group.selection != null)
	5360	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5361	+ {
	5362	+ if (!(e.nextElement() instanceof Composite))
	5363	+ {
	5364	+ allComposites = false;
	5365	+ break;
	5366	+ }
	5367	+ }
	5368	+
	5369	+ rootButton.setEnabled(allComposites);
4967	5370	}
4968	5371
4969	5372	void refreshContents(boolean cp)
4970	5373	{
4971		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5374	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4972	5375	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4973	5376	{
4974	5377	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4978,7 +5381,7 @@
4978	5381	Object3D child = (Object3D) group.selection.get(i);
4979	5382
4980	5383	objEditor.AddInfo(child, this, true);
4981		- System.err.println("info : " + child.GetPath());
	5384	+// System.err.println("info : " + child.GetPath());
4982	5385	}
4983	5386
4984	5387	objEditor.SetText(); // jan 2014
..	..	@@ -5804,7 +6207,6 @@
5804	6207
5805	6208	cButton restoreCameraButton;
5806	6209
5807		- cButton saveButton;
5808	6210	cButton oneStepButton;
5809	6211
5810	6212	cButton groupButton;
..	..	@@ -5862,11 +6264,11 @@
5862	6264	private MenuItem lookAtItem;
5863	6265	private MenuItem lookFromItem;
5864	6266	private MenuItem switchViewItem;
5865		- private MenuItem cutItem;
	6267	+ private JMenuItem cutItem;
5866	6268	private MenuItem undoItem;
5867	6269	private MenuItem redoItem;
5868	6270	private JMenuItem duplicateItem;
5869		- private MenuItem cloneItem;
	6271	+ private JMenuItem cloneItem;
5870	6272	private MenuItem cloneSupportItem;
5871	6273	private MenuItem overwriteGeoItem;
5872	6274	private MenuItem overwriteMatItem;
..	..	@@ -5887,13 +6289,13 @@
5887	6289	private MenuItem cloneGeometriesItem;
5888	6290	private MenuItem shareGeometriesItem;
5889	6291	private MenuItem mergeGeometriesItem;
5890		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
5891	6293	private MenuItem pasteItem;
5892		- private MenuItem pasteIntoItem;
5893		- private MenuItem pasteLinkItem;
5894		- private MenuItem pasteCloneItem;
5895		- private MenuItem pasteExpandItem;
5896		- private MenuItem deleteItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
5897	6299	private MenuItem clearAllItem;
5898	6300	private MenuItem genUVItem;
5899	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -5961,7 +6363,7 @@
5961	6363	private MenuItem switchTransfoItem;
5962	6364	private MenuItem morphItem;
5963	6365	private MenuItem linkerItem;
5964		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
5965	6367	private MenuItem editItem;
5966	6368	private MenuItem openWindowItem;
5967	6369	private MenuItem editLeafItem;