~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", !Globals.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, !Globals.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(JTabbedPane.LEFT);
	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,11 +415,15 @@
85	415	this.copy = this.group = group;
86	416	//selectees = this.group.selectees;
87	417
88		- if (copy.versions == null)
89		- {
90		- copy.versions = new byte[100][];
91		- copy.versionindex = -1;
92		- }
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
93	427
94	428	if(ui)
95	429	SetupUI(objEditor);
..	..	@@ -112,13 +446,13 @@
112	446
113	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
114	448
115		- if (copy.versions == null)
116		- {
117		- copy.versions = new byte[100][];
118		- copy.versionindex = -1;
119		-
120		- Save(true);
121		- }
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
122	456	}
123	457
124	458	void CloneSelection(boolean supports)
..	..	@@ -208,33 +542,35 @@
208	542	// menu.add("-");
209	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
210	544	duplicateItem.addActionListener(this);
211		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
212	547	cloneItem.addActionListener(this);
213		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
214	549	{
215	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
216	551	cloneSupportItem.addActionListener(this);
217	552	}
	553	+ oe.jTree.popup.addSeparator();
218	554	menu.add("-");
219		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
220	556	cutItem.addActionListener(this);
221		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
222	558	copyItem.addActionListener(this);
223	559	pasteItem = menu.add(new MenuItem("Paste"));
224	560	pasteItem.addActionListener(this);
225	561
226		- menu.add("-");
227		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
228	565	pasteIntoItem.addActionListener(this);
229		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
230	567	pasteLinkItem.addActionListener(this);
231		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
232	569	pasteCloneItem.addActionListener(this);
233		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
234	571	// pasteExpandItem.addActionListener(this);
235		- menu.add("-");
236		- deleteItem = menu.add(new MenuItem("Delete"));
237		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
238	574
239	575	if (Globals.ADVANCED)
240	576	{
..	..	@@ -320,11 +656,9 @@
320	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
321	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
322	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
323		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
324	659	oe.cameraMenu.add("-");
325	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
326	661	openWindowItem.addActionListener(this);
327		- editLeafItem.addActionListener(this);
328	662	lookAtItem.addActionListener(this);
329	663	//lookFromItem.addActinoListener(this);
330	664	//switchViewItem.addActionListener(this);
..	..	@@ -371,9 +705,8 @@
371	705	setMasterItem.addActionListener(this);
372	706	}
373	707
374		- oe.menuBar.add(menu = new Menu("Group"));
375		-// grabItem = menu.add(new MenuItem("Grab"));
376		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
377	710	backItem = menu.add(new MenuItem("Back"));
378	711	backItem.addActionListener(this);
379	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -381,13 +714,21 @@
381	714	// compositeItem = menu.add(new MenuItem("Composite"));
382	715	// compositeItem.addActionListener(this);
383	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
384	720	if (Globals.ADVANCED)
385	721	{
386	722	hideItem = menu.add(new MenuItem("Hidden Group"));
387	723	hideItem.addActionListener(this);
388	724	}
389		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
390	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
391	732
392	733	// menu.add("-");
393	734	//
..	..	@@ -424,11 +765,11 @@
424	765	shadowYItem.addActionListener(this);
425	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
426	767	shadowZItem.addActionListener(this);
427		- attributeItem = menu.add(new MenuItem("Attribute"));
428		- attributeItem.addActionListener(this);
429	768
430	769	if (Globals.ADVANCED)
431	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
432	773	menu.add("-");
433	774	linkerItem = menu.add(new MenuItem("Linker"));
434	775	linkerItem.addActionListener(this);
..	..	@@ -438,11 +779,18 @@
438	779	pointflowItem.addActionListener(this);
439	780	}
440	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
441	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
442	790	resetTransformItem.addActionListener(this);
443	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
444	792	resetCentroidItem.addActionListener(this);
445		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
446	794	resetCentroidXZItem.addActionListener(this);
447	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
448	796	transformGeometryItem.addActionListener(this);
..	..	@@ -494,6 +842,8 @@
494	842	}
495	843
496	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
497	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
498	848	clearMaterialsItem.addActionListener(this);
499	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -516,9 +866,9 @@
516	866	hideleavesItem.addActionListener(this);
517	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
518	868	showleavesItem.addActionListener(this);
519		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
520	870	markleavesItem.addActionListener(this);
521		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
522	872	unmarkleavesItem.addActionListener(this);
523	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
524	874	rewindleavesItem.addActionListener(this);
..	..	@@ -572,6 +922,9 @@
572	922	shareGeometriesItem.addActionListener(this);
573	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
574	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
575	928	if (Globals.ADVANCED)
576	929	{
577	930	// Pretty much the same as duplicate and clone.
..	..	@@ -588,6 +941,79 @@
588	941	buildToolsMenu(menu);
589	942	}
590	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
591	1017
592	1018	void SetupUI2(ObjEditor oe)
593	1019	{
..	..	@@ -606,11 +1032,6 @@
606	1032	//new Exception().printStackTrace();
607	1033
608	1034	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	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
615	1036
616	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -631,9 +1052,9 @@
631	1052	oe.radioPanel.add(dummyButton);
632	1053	oe.buttonGroup.add(dummyButton);
633	1054	*/
634		- cGridBag copyOptionsPanel = new cGridBag();
	1055	+ cGridBag versionManagerPanel = new cGridBag();
635	1056
636		- copyOptionsPanel.preferredHeight = 2;
	1057	+ versionManagerPanel.preferredHeight = 4;
637	1058
638	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
639	1060
..	..	@@ -643,58 +1064,102 @@
643	1064
644	1065	if (Globals.ADVANCED)
645	1066	{
646		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- maxButton.setToolTipText("Maximize window");
648		- maxButton.addActionListener(this);
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
649	1070	}
650	1071
651		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
652	1112	fullButton.setToolTipText("Full-screen window");
653	1113	fullButton.addActionListener(this);
654	1114
655		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
656	1116	screenfitButton.setToolTipText("Screen fit");
657	1117	screenfitButton.addActionListener(this);
658	1118
659		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
660	1120	restoreCameraButton.setToolTipText("Restore viewpoint");
661	1121	restoreCameraButton.addActionListener(this);
662	1122
663		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- saveButton.setToolTipText("New version");
665		- saveButton.addActionListener(this);
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
666	1126
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);
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
671	1136
672	1137	cGridBag updown = new cGridBag().setVertical(true);
673		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- restoreButton.setToolTipText("Restore current");
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
675	1140	restoreButton.addActionListener(this);
676	1141	restoreButton.setEnabled(false);
677	1142
678		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679		- replaceButton.setToolTipText("Replace current");
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
680	1145	replaceButton.addActionListener(this);
681	1146	replaceButton.setEnabled(false);
682	1147
683		- copyOptionsPanel.add(updown);
	1148	+ versionManagerPanel.add(updown);
684	1149
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);
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oneStepButton.setToolTipText("Animate one step forward");
	1157	+ oneStepButton.addActionListener(this);
689	1158
690	1159	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
691	1160	liveCB.setToolTipText("Enable animation");
692	1161	liveCB.addItemListener(this);
693	1162
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	1163	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
699	1164	fastCB.setToolTipText("Fast mode");
700	1165	fastCB.addItemListener(this);
..	..	@@ -710,38 +1175,23 @@
710	1175
711	1176	if (Globals.ADVANCED)
712	1177	{
713		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
714	1179	snapobjectButton.addActionListener(this);
715	1180	snapobjectButton.setToolTipText("Snap Object");
716	1181
717		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
718	1183	fourButton.addActionListener(this);
719	1184	fourButton.setToolTipText("Show control panel only");
720	1185	}
721	1186
722	1187	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
723	1188
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	1189
740		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
741	1191	rootButton.setToolTipText("Open selection in new tab");
742	1192	rootButton.addActionListener(this);
743	1193
744		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
745	1195	closeButton.setToolTipText("Close tab");
746	1196	closeButton.addActionListener(this);
747	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -750,38 +1200,38 @@
750	1200	cGridBag row1 = new cGridBag();
751	1201
752	1202	// INSERT
753		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754		- gridButton.setToolTipText("Create grid");
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
755	1205	gridButton.addActionListener(this);
756	1206
757		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
758	1208	boxButton.setToolTipText("Create box");
759	1209	boxButton.addActionListener(this);
760	1210
761		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762		- sphereButton.setToolTipText("Create sphere");
763		- sphereButton.addActionListener(this);
764		-
765		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- coneButton.setToolTipText("Create cone");
767		- coneButton.addActionListener(this);
768		-
769		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
770		- torusButton.setToolTipText("Create torus");
771		- torusButton.addActionListener(this);
772		-
773		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
774	1212	superButton.setToolTipText("Create superellipsoid");
775	1213	superButton.addActionListener(this);
776	1214
777		- if (Globals.ADVANCED)
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
778	1228	{
779		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
780	1230	kleinButton.setToolTipText("Create Klein bottle");
781	1231	kleinButton.addActionListener(this);
782	1232	}
783	1233
784		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
785	1235	particlesButton.setToolTipText("Create particle system");
786	1236	particlesButton.addActionListener(this);
787	1237
..	..	@@ -789,160 +1239,73 @@
789	1239
790	1240	cGridBag row2 = new cGridBag();
791	1241
792		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
793	1243	groupButton.setToolTipText("Create group");
794	1244	groupButton.addActionListener(this);
795	1245
796		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
797	1247	compositeButton.setToolTipText("Create composite");
798	1248	compositeButton.addActionListener(this);
799	1249
800		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
801	1251	switchButton.setToolTipText("Create item switcher");
802	1252	switchButton.addActionListener(this);
803	1253
804		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
805	1255	loopButton.setToolTipText("Create loop");
806	1256	loopButton.addActionListener(this);
807	1257
808		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
809	1259	textureButton.setToolTipText("Create texture");
810	1260	textureButton.addActionListener(this);
811	1261
812		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
813	1263	overlayButton.setToolTipText("Create overlay");
814	1264	overlayButton.addActionListener(this);
815	1265
816		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
817	1267	lightButton.setToolTipText("Create light");
818	1268	lightButton.addActionListener(this);
819	1269
820	1270	oe.toolboxPanel.add(row2);
821	1271
822		- // ENVYMAPS
823		- cGridBag row3 = new cGridBag();
824		- row3.preferredHeight = 20;
	1272	+ cGridBag textures = new cGridBag();
825	1273
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;
	1274	+ CreateTexturePanel(textures);
836	1275
837		- AddSkyboxButton("bridge", "Bridge2", row4);
838		- AddSkyboxButton("urban", "GamlaStan2", row4);
839		- AddSkyboxButton("urban", "Parliament", row4);
840		- AddSkyboxButton("urban", "Roundabout", row4);
	1276	+ int tabCount = resourcecontainer.getTabCount();
841	1277
842		- oe.toolboxPanel.add(row4);
843		-
844		- cGridBag row5 = new cGridBag();
845		- row5.preferredHeight = 20;
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
846	1280
847		- AddSkyboxButton("urban", "SaintLazarusChurch", row5);
848		- AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
849		- AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
850		- AddSkyboxButton("urban", "UnionSquare", row5);
	1281	+ oe.toolboxPanel.add(textures);
851	1282
852		- oe.toolboxPanel.add(row5);
853		-
854		- cGridBag row6 = new cGridBag();
855		- row6.preferredHeight = 20;
	1283	+ textures.preferredHeight = 100;
856	1284
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		- }
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
923	1286
924	1287	// EDIT panel
925		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
926	1289	editButton.setToolTipText("Pin selection controls");
927	1290	editButton.addActionListener(this);
928	1291
929		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
930		- uneditButton.setToolTipText("Remove selection controls");
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
931	1294	uneditButton.addActionListener(this);
932	1295
933	1296	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
934		- allParamsButton.setToolTipText("Show all controle");
	1297	+ allParamsButton.setToolTipText("Show all controls");
935	1298	allParamsButton.addActionListener(this);
936	1299
937		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
938		- clearPanelButton.setToolTipText("Clear edit panel");
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
939	1302	clearPanelButton.addActionListener(this);
940	1303
941		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- unselectButton.setToolTipText("Unselect");
943		- unselectButton.addActionListener(this);
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
944	1307
945		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
946	1309	flashSelectionButton.setToolTipText("Highlight selection");
947	1310	flashSelectionButton.addActionListener(this);
948	1311
..	..	@@ -965,6 +1328,8 @@
965	1328
966	1329	cGridBag jSPPanel = new cGridBag();
967	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
968	1333	JScrollPane jSP;
969	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
970	1335	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -973,11 +1338,11 @@
973	1338	oe.treePanel.add(jSPPanel);
974	1339	oe.treePanel.Return();
975	1340
976		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
977	1342	oe.treePanel.Return();
978		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
979		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
980		- sliderPane.preferredHeight = 1;
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
981	1346
982	1347	// mainPanel.setDividerLocation(0.1); //1.0);
983	1348	mainPanel.setResizeWeight(0.4);
..	..	@@ -1000,7 +1365,7 @@
1000	1365	dgr.addDragGestureListener(this);
1001	1366	}catch(Exception e) {}
1002	1367	*/
1003		- radio.layout = sixButton; // sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
1004	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1005	1370	}
1006	1371
..	..	@@ -1051,9 +1416,12 @@
1051	1416	smoothCB.setToolTipText("Snapping delay");
1052	1417	smoothCB.addItemListener(this);
1053	1418
1054		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1055		- slowCB.setToolTipText("Smooth interpolation");
1056		- slowCB.addItemListener(this);
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
1057	1425
1058	1426	// constraints.gridy += 1;
1059	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1132,6 +1500,14 @@
1132	1500
1133	1501	void EditObject(Object3D obj)
1134	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
1135	1511	cRadio radioButton = new cRadio(obj.name);
1136	1512
1137	1513	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1142,7 +1518,7 @@
1142	1518	}
1143	1519
1144	1520	radioButton.SetObject(obj);
1145		- radioButton.layout = sixButton; // sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
1146	1522	radioButton.SetCamera(cameraView.renderCamera, false);
1147	1523	radioButton.addActionListener(this);
1148	1524	radioPanel.add(radioButton);
..	..	@@ -1156,6 +1532,7 @@
1156	1532
1157	1533	oe.SetupViews();
1158	1534
	1535	+ if (Globals.DEBUG)
1159	1536	System.out.println("SetupViews");
1160	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1161	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1167,6 +1544,8 @@
1167	1544	cCheckBox localCB;
1168	1545	cCheckBox crowdCB;
1169	1546	cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
1170	1549	cToggleButton fastCB;
1171	1550	cCheckBox slowCB;
1172	1551	cCheckBox boxCB;
..	..	@@ -1237,6 +1616,12 @@
1237	1616	{
1238	1617	cameraView.ToggleInertia();
1239	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
1240	1625	}
1241	1626	else if(e.getSource() == localCB)
1242	1627	{
..	..	@@ -1514,7 +1899,12 @@
1514	1899	TreePath path;
1515	1900
1516	1901	public TransferableTreePath(TreePath tp) {
1517		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1518	1908	}
1519	1909
1520	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1746,24 +2136,24 @@
1746	2136	switch(axis)
1747	2137	{
1748	2138	case 0 :
1749		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1750		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1751		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1752		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1753	2143	norm = cVector.X;
1754	2144	break;
1755	2145	case 1 :
1756		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1757		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1758		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1759		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1760	2150	norm = cVector.Y;
1761	2151	break;
1762	2152	case 2 :
1763		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1764		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1765		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1766		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1767	2157	norm = cVector.Z;
1768	2158	break;
1769	2159	}
..	..	@@ -1804,7 +2194,11 @@
1804	2194	shadow.material = new cMaterial(obj.material);
1805	2195	shadow.material.diffuse = 0.0001f;
1806	2196	shadow.material.specular = 0.0001f;
1807		- //shadow.projectedVertices[1].x = 300;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1808	2202
1809	2203	makeSomething(shadow);
1810	2204	}
..	..	@@ -2325,27 +2719,35 @@
2325	2719	} else
2326	2720	if (source == loopItem \|\| source == loopButton)
2327	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
2328	2724	Composite csg = new GroupLeaf();
2329	2725	csg.count = 5;
2330		- group(csg);
2331	2726	Composite child = new cGroup("Branch");
2332	2727	csg.addChild(child);
2333	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
2334	2731	} else
2335	2732	if (source == doubleItem)
2336	2733	{
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
2337	2736	Composite csg = new GroupLeaf("Fork");
2338	2737	csg.count = 5;
2339		- group(csg);
2340	2738	Composite child = new cGroup("Branch A");
2341	2739	csg.addChild(child);
2342	2740	child.addChild(csg);
2343	2741	child = new cGroup("Branch B");
2344	2742	csg.addChild(child);
2345	2743	child.addChild(csg);
	2744	+ group(csg);
	2745	+ }
2346	2746	} else
2347	2747	if (source == tripleItem)
2348	2748	{
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
2349	2751	Composite csg = new GroupLeaf("Trident");
2350	2752	csg.count = 4;
2351	2753	group(csg);
..	..	@@ -2358,6 +2760,7 @@
2358	2760	child = new cGroup();
2359	2761	csg.addChild(child);
2360	2762	child.addChild(csg);
	2763	+ }
2361	2764	} else
2362	2765	if (source == computeAOItem)
2363	2766	{
..	..	@@ -2377,7 +2780,7 @@
2377	2780	if (source == invariantsItem)
2378	2781	{
2379	2782	System.out.println("Invariants:");
2380		- Grafreed.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
2381	2784	} else
2382	2785	if (source == memoryItem)
2383	2786	{
..	..	@@ -2408,33 +2811,52 @@
2408	2811	{
2409	2812	ToggleFullScreen();
2410	2813	} else
2411		- if (source == undoButton)
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
	2825	+ } else
	2826	+ if (source == previousVersionButton)
2412	2827	{
2413	2828	// Go to previous version
2414	2829	//if (!Undo())
2415	2830	//java.awt.Toolkit.getDefaultToolkit().beep();
2416		- Undo();
	2831	+ PreviousVersion();
2417	2832	} else
2418	2833	if (source == restoreButton)
2419	2834	{
2420	2835	// Restore current version
2421	2836	Restore();
	2837	+ //restoreButton.setEnabled(false);
2422	2838	} else
2423	2839	if (source == replaceButton)
2424	2840	{
2425	2841	// Overwrite current version
2426	2842	Replace();
	2843	+ //replaceButton.setEnabled(false);
2427	2844	} else
2428		- if (source == redoButton)
	2845	+ if (source == nextVersionButton)
2429	2846	{
2430	2847	// Go to next version
2431		- Redo();
	2848	+ NextVersion();
2432	2849	} else
2433		- if (source == saveButton)
	2850	+ if (source == saveVersionButton)
2434	2851	{
2435	2852	// Save a new version
2436	2853	if (!Save(true))
2437	2854	java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
2438	2860	} else
2439	2861	if (source == oneStepButton)
2440	2862	{
..	..	@@ -2489,11 +2911,11 @@
2489	2911	} else
2490	2912	if (source == undoItem)
2491	2913	{
2492		- Undo();
	2914	+ PreviousVersion();
2493	2915	} else
2494	2916	if (source == redoItem)
2495	2917	{
2496		- Redo();
	2918	+ NextVersion();
2497	2919	} else
2498	2920	if (source == duplicateItem)
2499	2921	{
..	..	@@ -2974,22 +3396,34 @@
2974	3396	} else
2975	3397	if (source == ungroupItem \|\| source == ungroupButton)
2976	3398	{
2977		- boolean hasRoot = false;
	3399	+ boolean canUngroup = true;
2978	3400
2979	3401	for (int i=0; i<group.selection.size(); i++)
2980	3402	{
2981		- if (group.selection.get(i) == group)
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
2982	3406	{
2983		- hasRoot = true;
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
2984	3416	break;
2985	3417	}
2986	3418	}
2987	3419
2988		- if (!hasRoot)
	3420	+ if (canUngroup)
2989	3421	{
2990	3422	for (int i=0; i<group.selection.size(); i++)
2991	3423	{
2992		- Ungroup(group.selection.get(i));
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
2993	3427	}
2994	3428
2995	3429	ClearSelection(false);
..	..	@@ -3040,6 +3474,10 @@
3040	3474	if (source == clearMaterialsItem)
3041	3475	{
3042	3476	ClearMaterials();
	3477	+ } else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
3043	3481	} else
3044	3482	if (source == liveleavesItem)
3045	3483	{
..	..	@@ -3180,6 +3618,18 @@
3180	3618	if (source == transformChildrenItem)
3181	3619	{
3182	3620	TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
3183	3633	} else
3184	3634	if (source == resetTransformItem)
3185	3635	{
..	..	@@ -3352,38 +3802,7 @@
3352	3802	if (CameraPane.FULLSCREEN)
3353	3803	fullscreenLayout = radio.layout;
3354	3804
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();
	3805	+ Show3DView();
3387	3806
3388	3807	cameraView.requestFocusInWindow();
3389	3808
..	..	@@ -3569,6 +3988,7 @@
3569	3988	} else
3570	3989	if (source == rootButton)
3571	3990	{
	3991	+ Replace();
3572	3992	Object3D obj;
3573	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3574	3994	{
..	..	@@ -3583,6 +4003,9 @@
3583	4003	if (source == closeButton)
3584	4004	{
3585	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3586	4009	cRadio ab;
3587	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3588	4011	{
..	..	@@ -3626,10 +4049,10 @@
3626	4049	{
3627	4050	Object3D child = (Object3D)e.nextElement();
3628	4051	if(child.editWindow != null)
3629		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3630	4052	child.pinned = false;
3631	4053	child.CloseUI();
3632	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3633	4056
3634	4057	//child.editWindow = null; // ???????????
3635	4058	}
..	..	@@ -3648,6 +4071,7 @@
3648	4071	obj.CloseUI();
3649	4072	}
3650	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
3651	4075	refreshContents(true);
3652	4076	} else
3653	4077	if (source == allParamsButton)
..	..	@@ -3680,6 +4104,9 @@
3680	4104	} else
3681	4105	if(source instanceof cRadio)
3682	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3683	4110	group.parent = keepparent;
3684	4111	group.attributes = 0;
3685	4112	//group.editWindow = null;
..	..	@@ -3704,8 +4131,6 @@
3704	4131
3705	4132	copy = group;
3706	4133
3707		- SetUndoStates();
3708		-
3709	4134	//Globals.theRenderer.object = group;
3710	4135	if(!useclient)
3711	4136	{
..	..	@@ -3733,7 +4158,33 @@
3733	4158	*/
3734	4159	radio.layout.doClick();
3735	4160
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
3736	4186	ClearUnpinned();
	4187	+
3737	4188	//Grafreed.Assert(group != null);
3738	4189	//Grafreed.Assert(group.selection != null);
3739	4190	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3750,11 +4201,13 @@
3750	4201	} else if (event.getSource() == editCameraItem)
3751	4202	{
3752	4203	cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
3753	4205	cameraView.repaint();
3754	4206	return;
3755	4207	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3756	4208	{
3757	4209	cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
3758	4211	cameraView.repaint();
3759	4212	return;
3760	4213	// } else if (event.getSource() == textureButton)
..	..	@@ -3843,6 +4296,18 @@
3843	4296	refreshContents();
3844	4297	}
3845	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
3846	4311	void ResetTransform()
3847	4312	{
3848	4313	ResetTransform(-1);
..	..	@@ -3858,42 +4323,8 @@
3858	4323	if (obj.toParent == null)
3859	4324	continue;
3860	4325
3861		- if (mask == -1)
3862		- {
3863		- if (obj instanceof Camera) // jan 2014
3864		- {
3865		- LA.matIdentity(obj.toParent);
3866		- LA.matIdentity(obj.fromParent);
3867		- }
3868		- else
3869		- {
3870		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3871		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3872		- }
3873		- TouchTransform(obj);
3874		- continue;
3875		- }
3876		- if ((mask&2) != 0) // Scale
3877		- {
3878		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3879		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3880		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3881		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3882		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3883		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3884		- }
3885		- if ((mask&4) != 0) // Rotation
3886		- {
3887		- // ?
3888		- }
3889		- if ((mask&1) != 0) // Translation
3890		- {
3891		- if (obj.toParent != null)
3892		- {
3893		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3894		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3895		- }
3896		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3897	4328	if (obj.parent == null)
3898	4329	{
3899	4330	System.out.println("NULL PARENT!");
..	..	@@ -4402,6 +4833,12 @@
4402	4833	{
4403	4834	Object3D obj = group.selection.get(i);
4404	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
4405	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4406	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4407	4844	}
..	..	@@ -4693,6 +5130,12 @@
4693	5130	refreshContents();
4694	5131	}
4695	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
4696	5139	void FlipV(boolean flip)
4697	5140	{
4698	5141	group.selection.FlipV(flip);
..	..	@@ -4887,9 +5330,7 @@
4887	5330
4888	5331	freezemodel = false;
4889	5332	}
4890		-
4891		- boolean flashIt = true;
4892		-
	5333	+
4893	5334	public void valueChanged(TreeSelectionEvent e)
4894	5335	//public boolean handleEvent(Event event)
4895	5336	{
..	..	@@ -4962,13 +5403,31 @@
4962	5403	{
4963	5404	editButton.setEnabled(enabled);
4964	5405	uneditButton.setEnabled(enabled);
4965		- unselectButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
4966	5407	flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
4967	5425	}
4968	5426
4969	5427	void refreshContents(boolean cp)
4970	5428	{
4971		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4972	5431	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4973	5432	{
4974	5433	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4978,7 +5437,7 @@
4978	5437	Object3D child = (Object3D) group.selection.get(i);
4979	5438
4980	5439	objEditor.AddInfo(child, this, true);
4981		- System.err.println("info : " + child.GetPath());
	5440	+// System.err.println("info : " + child.GetPath());
4982	5441	}
4983	5442
4984	5443	objEditor.SetText(); // jan 2014
..	..	@@ -5804,7 +6263,6 @@
5804	6263
5805	6264	cButton restoreCameraButton;
5806	6265
5807		- cButton saveButton;
5808	6266	cButton oneStepButton;
5809	6267
5810	6268	cButton groupButton;
..	..	@@ -5862,11 +6320,11 @@
5862	6320	private MenuItem lookAtItem;
5863	6321	private MenuItem lookFromItem;
5864	6322	private MenuItem switchViewItem;
5865		- private MenuItem cutItem;
	6323	+ private JMenuItem cutItem;
5866	6324	private MenuItem undoItem;
5867	6325	private MenuItem redoItem;
5868	6326	private JMenuItem duplicateItem;
5869		- private MenuItem cloneItem;
	6327	+ private JMenuItem cloneItem;
5870	6328	private MenuItem cloneSupportItem;
5871	6329	private MenuItem overwriteGeoItem;
5872	6330	private MenuItem overwriteMatItem;
..	..	@@ -5887,13 +6345,13 @@
5887	6345	private MenuItem cloneGeometriesItem;
5888	6346	private MenuItem shareGeometriesItem;
5889	6347	private MenuItem mergeGeometriesItem;
5890		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
5891	6349	private MenuItem pasteItem;
5892		- private MenuItem pasteIntoItem;
5893		- private MenuItem pasteLinkItem;
5894		- private MenuItem pasteCloneItem;
5895		- private MenuItem pasteExpandItem;
5896		- private MenuItem deleteItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
5897	6355	private MenuItem clearAllItem;
5898	6356	private MenuItem genUVItem;
5899	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -5919,6 +6377,7 @@
5919	6377	private MenuItem clipMeshItem;
5920	6378	private MenuItem smoothMeshItem;
5921	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
5922	6381
5923	6382	private MenuItem liveleavesItem;
5924	6383	private MenuItem unliveleavesItem;
..	..	@@ -5942,13 +6401,16 @@
5942	6401	private MenuItem maxTexturesItem;
5943	6402	private MenuItem panoTexturesItem;
5944	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5945	6407	private MenuItem resetCentroidItem;
5946	6408	private MenuItem resetCentroidXZItem;
5947	6409	private MenuItem resetTransformItem;
5948	6410	private MenuItem transformGeometryItem;
5949	6411	private MenuItem transformChildrenItem;
5950	6412	private MenuItem hideItem;
5951		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5952	6414	private MenuItem backItem;
5953	6415	private MenuItem frontItem;
5954	6416	private MenuItem cameraItem;
..	..	@@ -5961,7 +6423,7 @@
5961	6423	private MenuItem switchTransfoItem;
5962	6424	private MenuItem morphItem;
5963	6425	private MenuItem linkerItem;
5964		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5965	6427	private MenuItem editItem;
5966	6428	private MenuItem openWindowItem;
5967	6429	private MenuItem editLeafItem;